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

[Dru Lavigne]

Author: dru
Date: Fri May  2 17:55:14 2014
New Revision: 44741
URL: http://svnweb.freebsd.org/changeset/doc/44741

Log:
  Finish editorial review of Desktop Environments.
  
  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	Fri May  2 17:37:04 2014	(r44740)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri May  2 17:55:14 2014	(r44741)
@@ -1077,8 +1077,8 @@ DisplayManager.requestPort:     0</scree
 	  <firstname>Valentino</firstname>
 	  <surname>Vaschetto</surname>
 	  </personname>
-	  <!--
-	  <contrib>Contributed in June 2001 by </contrib> -->
+	  <contrib>Contributed by </contrib>
+	   <!-- in June 2001 -->
 	</author>
       </authorgroup>
     </info>
@@ -1236,7 +1236,7 @@ DisplayManager.requestPort:     0</scree
 	  executable <filename>~/.xsession</filename> as
 	  follows:</para>
 
-  	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
+	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/kde4/bin/startkde" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
 
@@ -1250,73 +1250,43 @@ DisplayManager.requestPort:     0</scree
 
 	<para><application>Xfce</application> is a desktop environment
 	  based on the GTK+ toolkit used by
-	  <application>GNOME</application>, but is much more
-	  lightweight and meant for those who want a simple, efficient
-	  desktop which is nevertheless easy to use and configure.
-	  Visually, it looks very much like
-	  <application>CDE</application>, found on commercial &unix;
-	  systems.  Some of <application>Xfce</application>'s features
-	  are:</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>A simple, easy-to-handle desktop</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Fully configurable via mouse, with drag and drop,
-	      etc.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Main panel similar to
-	      <application>CDE</application>, with menus, applets and
-	      applications launchers</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Integrated window manager, file manager, sound
-	      manager, <application>GNOME</application> compliance
-	      module, and more</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Themeable (since it uses GTK+)</para>
-	  </listitem>
+	  <application>GNOME</application>.  However, it is more
+	  lightweight and provides a simple, efficient, easy-to-use
+	  desktop.  It is fully configurable, has a main panel with menus, applets, and
+	  application launchers, provides a file manager and sound manager,
+	  and is themeable.  Since it is fast, light, and efficient,
+	  it is ideal for older or slower machines with memory
+	  limitations.  More information on <application>Xfce</application>
+	  can be found at <link
+	    xlink:href="http://www.xfce.org/">http://www.xfce.org</link>.</para>
 
-	  <listitem>
-	    <para>Fast, light and efficient: ideal for older/slower
-	      machines or machines with memory limitations</para>
-	  </listitem>
-	</itemizedlist>
-
-	<para>More information on <application>Xfce</application>
-	  can be found on the <link
-	    xlink:href="http://www.xfce.org/">Xfce website</link>.</para>
-
-	<para>To install <application>Xfce</application>, type:</para>
+	<para>To install the <application>Xfce</application> package:</para>
 
 	<screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>
 
-	<para>Alternatively, to build from source, use the
-	  Ports Collection:</para>
+	<para>Alternatively, to build the port:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/xfce4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>Now, tell the X server to launch
-	  <application>Xfce</application> the next time X is started.
-	  Simply type this:</para>
+	<para>Unlike <application>GNOME</application> or
+	  <application>KDE</application>,
+	  <application>Xfce</application> does not provide its own
+	  login manager.  In order to start <application>Xfce</application>
+	  from the command line by typing <command>startx</command>,
+	  first add its entry to
+	  <filename>~/.xinitrc</filename>:</para>
 
 	<screen>&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" > ~/.xinitrc</userinput></screen>
 
-	<para>The next time X is started,
-	  <application>Xfce</application> will be the desktop.  As
-	  before, if a display manager like
-	  <application>XDM</application> is being used, create an
-	  <filename>.xsession</filename>, as described in
-	  <xref linkend="x11-wm-gnome"/>, but with the
-	  <filename>/usr/local/bin/startxfce4</filename>.</para>
+	<para>An alternate method is to use
+	  <application>XDM</application>.  To configure this method,
+	  create an executable
+	  <filename>~/.xsession</filename>:</para>
+
+	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
+&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" >> ~/.xsession</userinput>
+&prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
     </sect2>
   </sect1>