svn commit: r42646 - head/en_US.ISO8859-1/books/handbook/x11

[Brad Davis]

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 at 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>