From owner-svn-doc-all@FreeBSD.ORG  Sun Jan 13 05:59:43 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 70A397A0;
 Sun, 13 Jan 2013 05:59:43 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3371C867;
 Sun, 13 Jan 2013 05:59:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0D5xh4h026443;
 Sun, 13 Jan 2013 05:59:43 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0D5xhgG026442;
 Sun, 13 Jan 2013 05:59:43 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301130559.r0D5xhgG026442@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 13 Jan 2013 05:59:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40598 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jan 2013 05:59:43 -0000

Author: eadler
Date: Sun Jan 13 05:59:42 2013
New Revision: 40598
URL: http://svnweb.freebsd.org/changeset/doc/40598

Log:
  Reorganize a bit:  move database systems from "commercial applications"
  to "user 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:56:49 2013	(r40597)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 13 05:59:42 2013	(r40598)
@@ -2936,25 +2936,6 @@ kern.timecounter.hardware: TSC -&gt; i82
 	  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">
@@ -3263,6 +3244,22 @@ kern.timecounter.hardware: TSC -&gt; i82
       </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
 	    tools?</para>