From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 13 05:56:50 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7B73D742;
 Sun, 13 Jan 2013 05:56:50 +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 54193862;
 Sun, 13 Jan 2013 05:56:50 +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 r0D5uo4v026056;
 Sun, 13 Jan 2013 05:56:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0D5uoDn026055;
 Sun, 13 Jan 2013 05:56:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301130556.r0D5uoDn026055@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 13 Jan 2013 05:56:50 +0000 (UTC)
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
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jan 2013 05:56:50 -0000

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 -&gt; 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 -&gt; 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>