Attachment 113933 Details for Bug 155552 – file.diff

[patch] file.diff

file.diff (text/plain), 7.12 KB, created by Jason Helfman on 2011-03-14 13:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2011-03-14 13:10:11 UTC

Size: 7.12 KB

patch

obsolete

>Index: faq/book.sgml
>===================================================================
>RCS file: /home/jhelfman/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
>retrieving revision 1.1133
>diff -u -r1.1133 book.sgml
>--- faq/book.sgml	8 Mar 2011 09:42:08 -0000	1.1133
>+++ faq/book.sgml	14 Mar 2011 12:45:31 -0000
>@@ -4155,7 +4155,9 @@
> 	<answer>
> 	  <para>The open-source <application><ulink
> 	      url="http://www.openoffice.org">OpenOffice.org</ulink></application>
>-	    office suite works natively on &os;.  The &linux; version of
>+	    and <application><ulink
>+              url="http://www.libreoffice.org">LibreOffice</ulink></application>
>+            office suites work natively on &os;.  The &linux; version of
> 	    <application><ulink
> 	      url="http://www.oracle.com/us/products/applications/open-office/index.html">Oracle Open Office</ulink></application>,
> 	    the value-added closed-source version of OpenOffice.org,
>Index: handbook/config/chapter.sgml
>===================================================================
>RCS file: /home/jhelfman/ncvs/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v
>retrieving revision 1.245
>diff -u -r1.245 chapter.sgml
>--- handbook/config/chapter.sgml	1 Dec 2010 20:37:03 -0000	1.245
>+++ handbook/config/chapter.sgml	14 Mar 2011 12:38:49 -0000
>@@ -135,9 +135,9 @@
> 	    with &man.pkg.add.1; the packaging tools extract a temporary copy
> 	    of the packages under <filename class="directory">/var/tmp</filename>.  Large
> 	    software packages, like <application>Firefox</application>,
>-	    or <application>OpenOffice</application> may be tricky to install
>-	    if there is not enough disk space
>-	    under <filename class="directory">/var/tmp</filename>.</para>
>+	    <application>OpenOffice</application> or <application>LibreOffice</application>
>+	    may be tricky to install if there is not enough disk space under 
>+	    <filename class="directory">/var/tmp</filename>.</para>
> 	</note>
> 
> 	<para>The <filename class="directory">/usr</filename> partition holds many
>Index: handbook/desktop/chapter.sgml
>===================================================================
>RCS file: /home/jhelfman/ncvs/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v
>retrieving revision 1.101
>diff -u -r1.101 chapter.sgml
>--- handbook/desktop/chapter.sgml	25 Feb 2011 09:12:49 -0000	1.101
>+++ handbook/desktop/chapter.sgml	14 Mar 2011 12:19:59 -0000
>@@ -59,7 +59,8 @@
>           <application>KOffice</application>,
>           <application>AbiWord</application>,
>           <application>The GIMP</application>,
>-          <application>OpenOffice.org</application>)</para>
>+          <application>OpenOffice.org</application>,
>+          <application>LibreOffice</application>)</para>
>       </listitem>
> 
>       <listitem>
>@@ -527,6 +528,14 @@
>             <entry>huge</entry>
>             <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
>           </row>
>+
>+          <row>
>+            <entry><application>LibreOffice</application></entry>
>+            <entry>somewhat heavy</entry>
>+            <entry>huge</entry>
>+            <entry><application>Gtk+</application>, or <application>KDE</application>/ 
>+	    <application>GNOME</application>, or <application>&jdk;</application></entry>
>+          </row>
>         </tbody>
>       </tgroup>
>     </informaltable>
>@@ -732,6 +741,87 @@
> 
>       <screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
>     </sect2>
>+
>+    <sect2>
>+      <title>LibreOffice</title>
>+      <indexterm>
>+	<primary><application>LibreOffice</application></primary>
>+      </indexterm>
>+      <indexterm>
>+	<primary>office suite</primary>
>+	<secondary><application>LibreOffice</application></secondary>
>+      </indexterm>
>+
>+      <para><application>LibreOffice</application> includes all of the
>+        mandatory applications in a complete office productivity
>+        suite: a word processor, a spreadsheet, a presentation manager,
>+        and a drawing program.  Its user interface is very similar
>+        to other office suites, and it can import and export in various
>+        popular file formats.  It is available in a number of
>+        different languages &mdash; internationalization has been
>+        extended to interfaces, spell checkers, and
>+        dictionaries.</para>
>+
>+      <para>The word processor of <application>LibreOffice</application> 
>+	uses a native XML file format for increased portability and 
>+	flexibility.  The spreadsheet program features a macro language 
>+	and it can be interfaced with external databases.
>+        <application>LibreOffice</application> is already stable
>+        and runs natively on &windows;, Linux, FreeBSD, and 
>+	&macos;&nbsp;X.  More information about <application>LibreOffice
>+	</application> can be found on the
>+	<ulink url="http://www.libreoffice.org/">LibreOffice web site</ulink>.
>+	</para>
>+
>+      <para>To install <application>LibreOffice</application> as package, 
>+	do:</para>
>+
>+      <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
>+
>+      <note>
>+	<para>When running a -RELEASE version of &os;, this should work.
>+      </note>
>+
>+      <para>Once the package is installed, you need to type the following 
>+	command to run <application>LibreOffice</application>:
>+      </para>
>+
>+      <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
>+
>+      <note>
>+	<para>During the first launch, you will be asked some
>+	  questions and a <filename>.libreoffice</filename> folder
>+	  will be created in your home directory.</para>
>+      </note>
>+
>+      <para>If the <application>LibreOffice</application> packages
>+        are not available, you still have the option to compile the
>+        port.  However, you must bear in mind that it requires a lot of
>+        disk space and a fairly long time to compile.</para>
>+
>+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/libreoffice</userinput>
>+&prompt.root; <userinput>make install clean</userinput></screen>
>+
>+      <note>
>+	<para>If you want to build a localized version, replace the
>+	  previous command line with the following:</para>
>+
>+	<screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>your_language</replaceable> install clean</userinput></screen>
>+
>+	<para>You have to replace
>+	  <replaceable>your_language</replaceable> with the correct
>+	  language ISO-code.  A list of supported language codes are 
>+	  available in the <maketarget>pre-fetch</maketarget> target of
>+	  the port <filename>Makefile</filename>.
>+	</para>
>+      </note>
>+
>+      <para>Once this is done,
>+	<application>LibreOffice</application> can be launched with
>+	the command:</para>
>+
>+      <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
>+    </sect2>
>   </sect1>
> 
>   <sect1 id="desktop-viewers">
>@@ -1154,6 +1244,12 @@
> 	  </row>
> 
> 	  <row>
>+            <entry><application>LibreOffice</application></entry>
>+	    <entry><literal>libreoffice</literal></entry>
>+	    <entry><filename role="package">editors/libreoffice</filename></entry>
>+	  </row>
>+
>+	  <row>
>             <entry><application>&acrobat.reader;</application></entry>
> 	    <entry><literal>acroread</literal></entry>
> 	    <entry><filename role="package">print/acroread8</filename></entry>

Actions: View | Diff

Attachments on bug 155552: 113933