From a43ceff709e4734afe1d31614459fb5c7c84604b Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 13 Jan 2013 05:59:42 +0000
Subject: [PATCH] Reorganize a bit:  move database systems from "commercial
 applications" to "user applications"

Approved by:	bcr (mentor)

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

diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index ef8c1b4d33..fd3fc5556a 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -2936,25 +2936,6 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	  url="&url.base;/commercial/index.html">the Vendors page</ulink>
 	for a longer list.</para>
     </note>
-
-    <qandaset>
-
-      <qandaentry>
-	<question id="database-systems">
-	  <para>Are there any Database systems for &os;?</para>
-	</question>
-
-	<answer>
-	  <para>Yes!  See the <ulink
-	      url="&url.base;/commercial/software_bycat.html#category_database">Commercial Vendors</ulink>
-	    section of &os;'s Web site.</para>
-
-	  <para>Also see the <ulink
-	      url="&url.base;/ports/databases.html">Databases</ulink>
-	    section of the Ports Collection.</para>
-	</answer>
-      </qandaentry>
-    </qandaset>
   </chapter>
 
   <chapter id="applications">
@@ -3262,6 +3243,22 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	</answer>
       </qandaentry>
 
+      <qandaentry>
+	<question id="database-systems">
+	  <para>Are there any Database systems for &os;?</para>
+	</question>
+
+	<answer>
+	  <para>Yes!  See the <ulink
+	      url="&url.base;/commercial/software_bycat.html#category_database">Commercial Vendors</ulink>
+	    section of &os;'s Web site.</para>
+
+	  <para>Also see the <ulink
+	      url="&url.base;/ports/databases.html">Databases</ulink>
+	    section of the Ports Collection.</para>
+	</answer>
+      </qandaentry>
+
       <qandaentry>
 	<question id="convert-back-from-pkgng">
 	  <para>How can I convert from pkgng to the old package