Reorganize a bit: OpenOffice and Liberoffice are not commercial

applications.

Approved by:	bcr (mentor)

Merge conflicts handled manually
This commit is contained in:
Eitan Adler 2013-01-13 05:56:49 +00:00
parent d42d1b16af
commit d63bf467d5
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=40597

View file

@ -2938,23 +2938,6 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
</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">
@ -3261,6 +3244,24 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
</answer>
</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