From owner-svn-doc-head@FreeBSD.ORG  Tue Sep 10 15:11:43 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 880B62D5;
 Tue, 10 Sep 2013 15:11:43 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5AF43227B;
 Tue, 10 Sep 2013 15:11:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8AFBhD4090704;
 Tue, 10 Sep 2013 15:11:43 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8AFBhvf090703;
 Tue, 10 Sep 2013 15:11:43 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201309101511.r8AFBhvf090703@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 10 Sep 2013 15:11:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42646 - head/en_US.ISO8859-1/books/handbook/x11
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: Tue, 10 Sep 2013 15:11:43 -0000

Author: brd
Date: Tue Sep 10 15:11:42 2013
New Revision: 42646
URL: http://svnweb.freebsd.org/changeset/doc/42646

Log:
  - Correct the xfce pkg name [1]
  - Unify the install instructions for gnome/xfce with KDE
  
  PR:		181142 [1]
  Submitted by:	Robert <robert@ml.erje.net> [1]

Modified:
  head/en_US.ISO8859-1/books/handbook/x11/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Sep 10 12:15:41 2013	(r42645)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Sep 10 15:11:42 2013	(r42646)
@@ -1455,6 +1455,11 @@ DisplayManager.requestPort:     0</scree
 
 	<screen>&prompt.root; <userinput>pkg_add -r gnome2</userinput></screen>
 
+	<para>For <application>pkgng</application> users, the
+	  equivalent command is:</para>
+
+	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
+
 	<para>To build <application>GNOME</application> from source,
 	  use the ports tree:</para>
 
@@ -1613,7 +1618,7 @@ DisplayManager.requestPort:     0</scree
 	<para>To install the <application>KDE 4</application> package
 	  from the network, type:</para>
 
-	<screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg_add -r kde</userinput></screen>
 
 	<para>&man.pkg.add.1; will automatically fetch the latest
 	  version of the application.</para>
@@ -1621,7 +1626,7 @@ DisplayManager.requestPort:     0</scree
 	<para>For <application>pkgng</application> users, the
 	  equivalent command is:</para>
 
-	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg install kde</userinput></screen>
 
 	<para>To build <application>KDE</application> from source,
 	  use the ports tree:</para>
@@ -1756,11 +1761,15 @@ DisplayManager.requestPort:     0</scree
       <sect3 id="x11-wm-xfce-install">
 	<title>Installing Xfce</title>
 
-	<para>A binary package for <application>Xfce</application>
-	  exists (at the time of writing).  To install, simply
-	  type:</para>
+	<para>To install the <application>Xfce</application> from the
+	  network, simply type:</para>
+
+	<screen>&prompt.root; <userinput>pkg_add -r xfce</userinput></screen>
+
+	<para>For <application>pkgng</application> users, the
+	  equivalent command is:</para>
 
-	<screen>&prompt.root; <userinput>pkg_add -r xfce4</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>
 
 	<para>Alternatively, to build from source, use the
 	  Ports Collection:</para>