From d63bf467d5fb2bdde8772f89155881e77cbc4987 Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 13 Jan 2013 05:56:49 +0000
Subject: [PATCH]  Reorganize a bit: OpenOffice and Liberoffice are not
 commercial applications.

Approved by:	bcr (mentor)

Merge conflicts handled manually
---
 en_US.ISO8859-1/books/faq/book.xml | 35 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 2afe6e4832..ef8c1b4d33 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -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