From owner-svn-doc-head@FreeBSD.ORG  Tue Feb  4 15:12:58 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 72CCA1DD;
 Tue,  4 Feb 2014 15:12:58 +0000 (UTC)
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 53611179E;
 Tue,  4 Feb 2014 15:12:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14FCw4F016805;
 Tue, 4 Feb 2014 15:12:58 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14FCwkF016804;
 Tue, 4 Feb 2014 15:12:58 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041512.s14FCwkF016804@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 15:12:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43760 - 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.17
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, 04 Feb 2014 15:12:58 -0000

Author: dru
Date: Tue Feb  4 15:12:57 2014
New Revision: 43760
URL: http://svnweb.freebsd.org/changeset/doc/43760

Log:
  Chase pkg_ in this chapter.
  
  Sponsored by: iXsystems

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 Feb  4 15:05:54 2014	(r43759)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Feb  4 15:12:57 2014	(r43760)
@@ -259,13 +259,7 @@
     </note>
 
     <para>Alternatively, <application>&xorg;</application> can be
-      installed directly from packages.  To install the package using
-      <application>pkg_add</application>, type:</para>
-
-    <screen>&prompt.root; <userinput>pkg_add -r xorg</userinput></screen>
-
-    <para>To instead install the package using
-      <application>pkg</application>, type:</para>
+      installed directly from packages with this command:</para>
 
     <screen>&prompt.root; <userinput>pkg install xorg</userinput></screen>
   </sect1>
@@ -1119,13 +1113,7 @@ DisplayManager.requestPort:     0</scree
 	<para>The software can be easily installed from a package
 	  or the Ports Collection:</para>
 
-	<para>To install the <application>GNOME</application> package
-	  from the network, simply type:</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r gnome2</userinput></screen>
-
-	<para>For <application>pkgng</application> users, the
-	  equivalent command is:</para>
+	<para>To install the <application>GNOME</application> package, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
 
@@ -1284,16 +1272,7 @@ DisplayManager.requestPort:     0</scree
 	  other desktop environment, the software can be easily
 	  installed from a package or the Ports Collection:</para>
 
-	<para>To install the <application>KDE 4</application> package
-	  from the network, type:</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
-
-	<para>&man.pkg.add.1; will automatically fetch the latest
-	  version of the application.</para>
-
-	<para>For <application>pkgng</application> users, the
-	  equivalent command is:</para>
+	<para>To install the <application>KDE4</application> package, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
 
@@ -1429,13 +1408,7 @@ DisplayManager.requestPort:     0</scree
       <sect3 xml:id="x11-wm-xfce-install">
 	<title>Installing Xfce</title>
 
-	<para>To install the <application>Xfce</application> from the
-	  network, simply type:</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r xfce4</userinput></screen>
-
-	<para>For <application>pkgng</application> users, the
-	  equivalent command is:</para>
+	<para>To install <application>Xfce</application>, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>