Date: Sun, 13 Jan 2013 05:56:50 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40597 - head/en_US.ISO8859-1/books/faq Message-ID: <201301130556.r0D5uoDn026055@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Sun Jan 13 05:56:49 2013 New Revision: 40597 URL: http://svnweb.freebsd.org/changeset/doc/40597 Log: Reorganize a bit: OpenOffice and Liberoffice are not commercial applications. Approved by: bcr (mentor) Merge conflicts handled manually Modified: head/en_US.ISO8859-1/books/faq/book.xml Modified: head/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/faq/book.xml Sun Jan 13 05:54:06 2013 (r40596) +++ head/en_US.ISO8859-1/books/faq/book.xml Sun Jan 13 05:56:49 2013 (r40597) @@ -2938,23 +2938,6 @@ kern.timecounter.hardware: TSC -> i82 </note> <qandaset> - <qandaentry> - <question id="officesuite"> - <para>Where can I get an Office Suite for &os;?</para> - </question> - - <answer> - <para>The open-source <application><ulink - url="http://www.openoffice.org">Apache OpenOffice</ulink></application> - and <application><ulink - url="http://www.libreoffice.org">LibreOffice</ulink></application>; - office suites work natively on &os;.</para> - - <para>&os; also includes a variety of text editors, - spreadsheets, and drawing programs in the Ports - Collection.</para> - </answer> - </qandaentry> <qandaentry> <question id="database-systems"> @@ -3262,6 +3245,24 @@ kern.timecounter.hardware: TSC -> i82 </qandaentry> <qandaentry> + <question id="officesuite"> + <para>Where can I get an Office Suite for &os;?</para> + </question> + + <answer> + <para>The open-source <application><ulink + url="http://www.openoffice.org">Apache OpenOffice</ulink></application> + and <application><ulink + url="http://www.libreoffice.org">LibreOffice</ulink></application>; + office suites work natively on &os;.</para> + + <para>&os; also includes a variety of text editors, + spreadsheets, and drawing programs in the Ports + Collection.</para> + </answer> + </qandaentry> + + <qandaentry> <question id="convert-back-from-pkgng"> <para>How can I convert from pkgng to the old package tools?</para>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301130556.r0D5uoDn026055>