From owner-svn-doc-all@FreeBSD.ORG  Sun Jan 13 06:16:37 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@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 EEA0DADF;
 Sun, 13 Jan 2013 06:16:37 +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 B19358CE;
 Sun, 13 Jan 2013 06:16:37 +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 r0D6GbQ1032540;
 Sun, 13 Jan 2013 06:16:37 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0D6Gb1n032539;
 Sun, 13 Jan 2013 06:16:37 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301130616.r0D6Gb1n032539@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 13 Jan 2013 06:16:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40603 - 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 06:16:38 -0000

Author: eadler
Date: Sun Jan 13 06:16:37 2013
New Revision: 40603
URL: http://svnweb.freebsd.org/changeset/doc/40603

Log:
  Update and modernize the running-X question
  
  Approved by:	bcr (mentor)
  
  Patch reconstructed by hand

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 06:11:30 2013	(r40602)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 13 06:16:37 2013	(r40603)
@@ -5304,19 +5304,29 @@ options    SYSVMSG          # enable for
 
       <qandaentry>
 	<question id="running-X">
-	  <para>I want to run X, how do I go about it?</para>
+	  <para>I want to run &xorg;, how do I go about it?</para>
 	</question>
 
 	<answer>
-	  <para>If you would like to add X to an existing installation,
-	    you should use either the <filename
-	      role="package">x11/xorg</filename> meta-port, which will
-	    build and install all the necessary components, or install
-	    &xorg; from &os; packages:</para>
+	  <para>To install &xorg; do one of the following:</para>
+
+	  <para>Use the <filename role="package">x11/xorg</filename>
+	    meta-port, which builds and installs every &xorg;
+	    component.</para>
+
+	  <para>Use the <filename
+	      role="package">x11/xorg-minimal</filename>, which builds
+	    and installs only the neccasary &xorg; components.</para>
+
+	  <para>Install &xorg; from &os; packages:</para>
 
 	  <screen><userinput>&prompt.root; pkg_add -r xorg</userinput></screen>
 
-	  <para>After the installation of &xorg; was successful, follow
+	  <para>or on systems using <application>pkg</application>:</para>
+
+	  <screen><userinput>&prompt.root; pkg install xorg</userinput></screen>
+
+	  <para>After the installation of &xorg;, follow
 	    the instructions from the <ulink
 	      url="&url.books.handbook;/x-config.html">X11 Configuration</ulink> section of
 	    the &os; Handbook.</para>