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

Dru Lavigne dru at
Fri May 2 15:30:24 UTC 2014

Author: dru
Date: Fri May  2 15:30:23 2014
New Revision: 44738

  Editorial review of GNOME section.
  Fix some xrefs while here.
  More commits to this chapter to come.
  Sponsored by:	iXsystems


Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri May  2 05:37:53 2014	(r44737)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri May  2 15:30:23 2014	(r44738)
@@ -521,9 +521,8 @@ dbus_enable="YES"</programlisting>
 	not complete enough to serve as screen fonts.  In addition,
 	<application>&xorg;</application> can be configured to use
 	&truetype; fonts with a minimum of effort.  For more details
-	on this, see the &man.X.7; manual page or the <link
-	  linkend="truetype">section on &truetype;
-	  fonts</link>.</para>
+	on this, see the &man.X.7; manual page or <xref
+	  linkend="truetype"/>.</para>
       <para>To install the above Type1 font collections from the
 	Ports Collection, run the following commands:</para>
@@ -551,9 +550,8 @@ dbus_enable="YES"</programlisting>
 	<filename>~/.xsession</filename> when logging in through a
 	graphical login manager like <application>XDM</application>).
 	A third way is to use the new
-	<filename>/usr/local/etc/fonts/local.conf</filename> file: see
-	the section on
-	<link linkend="antialias">anti-aliasing</link>.</para>
+	<filename>/usr/local/etc/fonts/local.conf</filename> file as demonstrated in
+	<xref linkend="antialias"/>.</para>
     <sect2 xml:id="truetype">
@@ -597,8 +595,8 @@ dbus_enable="YES"</programlisting>
 &prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
       <para>Now add the &truetype; directory to the font path.  This
-	is just the same as described above for <link
-	  linkend="type1">Type1</link> fonts, that is, use</para>
+	is just the same as described in <xref
+	  linkend="type1"/>:</para>
       <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
@@ -1070,151 +1068,110 @@ DisplayManager.requestPort:     0</scree
   <sect1 xml:id="x11-wm">
-    <!--
-    <sect1info>
+    <info>
+    <title>Desktop Environments</title>
+	<personname>
-	  <contrib>Contributed in June 2001 by </contrib>
+	  </personname>
+	  <!--
+	  <contrib>Contributed in June 2001 by </contrib> -->
-    </sect1info>
-    -->
-    <title>Desktop Environments</title>
+    </info>
-    <para>This section describes the different desktop environments
-      available for X on FreeBSD.  A
-      <quote>desktop environment</quote> can mean anything ranging
+    <para>This section describes how to install three popular
+      desktop environments on a &os; system.  A
+      desktop environment can range
       from a simple window manager to a complete suite of desktop
-      applications, such as <application>KDE</application> or
-      <application>GNOME</application>.</para>
+      applications.  Over a hundred desktop environments are
+      available in the <filename>x11-wm</filename> category of the
+      Ports Collection.</para>
     <sect2 xml:id="x11-wm-gnome">
-      <sect3 xml:id="x11-wm-gnome-about">
-	<title>About GNOME</title>
 	<para><application>GNOME</application> is a user-friendly
-	  desktop environment that enables users to easily use and
-	  configure their computers.  <application>GNOME</application>
-	  includes a panel (for starting applications and displaying
-	  status), a desktop (where data and applications can be
-	  placed), a set of standard desktop tools and applications,
-	  anda set of conventions that make it easy for applications
-	  to cooperate and be consistent with each other.  Users of
-	  other operating systems or environments should feel right at
-	  home using the powerful graphics-driven environment that
-	  <application>GNOME</application> provides.  More information
-	  regarding <application>GNOME</application> on FreeBSD can be
-	  found on the <link
-	    xlink:href="">FreeBSD GNOME
-	    Project</link>'s web site.  The web site also contains
-	  fairly comprehensive FAQs about installing, configuring, and
-	  managing <application>GNOME</application>.</para>
-      </sect3>
-      <sect3 xml:id="x11-wm-gnome-install">
-	<title>Installing GNOME</title>
+	  desktop environment.  It
+	  includes a panel for starting applications and displaying
+	  status, a desktop, a set of tools and applications,
+	  and a set of conventions that make it easy for applications
+	  to cooperate and be consistent with each other.  More information
+	  regarding <application>GNOME</application> on &os; can be
+	  found at <link
+	    xlink:href=""></link>.
+	  That web site contains additional documentation
+	  about installing, configuring, and
+	  managing <application>GNOME</application> on &os;.</para>
-	<para>The software can be easily installed from a package
-	  or the Ports Collection:</para>
-	<para>To install the <application>GNOME</application> package,
-	  type:</para>
+	<para>This desktop environment can be installed from a package:</para>
 	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
-	<para>To build <application>GNOME</application> from source,
-	  use the ports tree:</para>
+	<para>To instead build <application>GNOME</application> from
+	  ports:</para>
 	<screen>&prompt.root; <userinput>cd /usr/ports/x11/gnome2</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 	<para>For proper operation, <application>GNOME</application>
-	  requires the <filename>/proc</filename> filesystem to be
-	  mounted.  Add</para>
+	  requires the <filename>/proc</filename> file system to be
+	  mounted.  Add this line to <filename>/etc/fstab</filename> to mount
+	  this file system automatically during system
+	  startup:</para>
 	<programlisting>proc           /proc       procfs  rw  0   0</programlisting>
-	<para>to <filename>/etc/fstab</filename> to mount
-	  &man.procfs.5; automatically during
-	  startup.</para>
 	<para>Once <application>GNOME</application> is installed,
-	  the X server must be told to start
-	  <application>GNOME</application> instead of a default window
-	  manager.</para>
-	<para>The easiest way to start
-	  <application>GNOME</application> is with
-	  <application>GDM</application>, the GNOME Display Manager.
-	  <application>GDM</application> is installed as part
-	  of the <application>GNOME</application> desktop, although
-	  it is disabled by default.  It can be enabled by adding this
+	  configure <application>&xorg;</application> to start
+	  <application>GNOME</application>.  The easiest way to do this
+	  is to enable the GNOME Display Manager,
+	  <application>GDM</application>,
+	  which is installed as part
+	  of the <application>GNOME</application> package or port.
+	  It can be enabled by adding this
 	  line to <filename>/etc/rc.conf</filename>:</para>
-	<para>Once you have rebooted, <application>GDM</application>
-	  will start automatically.</para>
-	<para>It is often desirable to start all
-	  <application>GNOME</application> services together with
-	  <application>GDM</application>.  To achieve this, add the
-	  following line to <filename>/etc/rc.conf</filename>:</para>
+	<para>It is often desirable to also start all
+	  <application>GNOME</application> services.  To achieve this, add
+	  a second line to <filename>/etc/rc.conf</filename>:</para>
-	<para><application>GNOME</application> may also be started
-	  from the command-line by properly configuring a file named
-	  <filename>.xinitrc</filename>.  If a custom
-	  <filename>.xinitrc</filename> is already in place, simply
+	<para><application>GDM</application>
+	  will now start automatically when the system boots.</para>
+	<para>A second method for starting
+	  <application>GNOME</application> is to type <command>startx</command>
+	  from the command-line after configuring
+	  <filename>~/.xinitrc</filename>.  If this file already exists,
 	  replace the line that starts the current window manager with
 	  one that starts
-	  <application>/usr/local/bin/gnome-session</application>
-	  instead.  If nothing special has been done to the
-	  configuration file, then it is enough simply to type:</para>
+	  <filename>/usr/local/bin/gnome-session</filename>.  If
+	  this file does not exist, create it with this command:</para>
 	<screen>&prompt.user; <userinput>echo "/usr/local/bin/gnome-session" > ~/.xinitrc</userinput></screen>
-	<para>Next, type <command>startx</command>, and the
-	  <application>GNOME</application> desktop environment will
-	  be started.</para>
-	<note>
-	  <para>If an older display manager, like
-	    <application>XDM</application>, is being used, this will
-	    not work.  Instead, create an executable
-	    <filename>.xsession</filename> file with the same command
-	    in it.  To do this, edit the file and replace the existing
-	    window manager command with
-	    <application>/usr/local/bin/gnome-session</application>:</para>
-	</note>
+	  <para>A third method is to use
+	    <application>XDM</application> as the display manager.  In this case,
+	    create an executable
+	    <filename>~/.xsession</filename>:</para>
 	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/bin/gnome-session" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
-	<para>Yet another option is to configure the display manager
-	  to allow choosing the window manager at login time; the
-	  section on
-	  <link linkend="x11-wm-kde-details">KDE details</link>
-	  explains how to do this for <application>KDM</application>,
-	  the display manager of
-	  <application>KDE</application>.</para>
-      </sect3>
     <sect2 xml:id="x11-wm-kde">
-      <sect3 xml:id="x11-wm-kde-about">
-	<title>About KDE</title>
 	<para><application>KDE</application> is an easy to use
 	  contemporary desktop environment.  Some of the things that
@@ -1274,10 +1231,6 @@ DisplayManager.requestPort:     0</scree
 	  <application>KDE</application>, consult the
 	  <link xlink:href="">KDE/FreeBSD
 	    initiative</link>'s website.</para>
-      </sect3>
-      <sect3 xml:id="x11-wm-kde-install">
-	<title>Installing KDE</title>
 	<para>Just as with <application>GNOME</application> or any
 	  other desktop environment, the software can be easily
@@ -1319,11 +1272,6 @@ DisplayManager.requestPort:     0</scree
 	  <filename>.xsession</filename> file instead.  Instructions
 	  for <application>KDM</application> are described later in
 	  this chapter.</para>
-      </sect3>
-    </sect2>
-    <sect2 xml:id="x11-wm-kde-details">
-      <title>More Details on KDE</title>
       <para>Now that <application>KDE</application> is installed on
 	the system, most things can be discovered through the help
@@ -1368,9 +1316,6 @@ DisplayManager.requestPort:     0</scree
     <sect2 xml:id="x11-wm-xfce">
-      <sect3 xml:id="x11-wm-xfce-about">
-	<title>About Xfce</title>
 	<para><application>Xfce</application> is a desktop environment
 	  based on the GTK+ toolkit used by
 	  <application>GNOME</application>, but is much more
@@ -1416,10 +1361,6 @@ DisplayManager.requestPort:     0</scree
 	<para>More information on <application>Xfce</application>
 	  can be found on the <link
 	    xlink:href="">Xfce website</link>.</para>
-      </sect3>
-      <sect3 xml:id="x11-wm-xfce-install">
-	<title>Installing Xfce</title>
 	<para>To install <application>Xfce</application>, type:</para>
@@ -1441,13 +1382,12 @@ DisplayManager.requestPort:     0</scree
 	  <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 the section
-	  on <link linkend="x11-wm-gnome">GNOME</link>, but with the
+	  <filename>.xsession</filename>, as described in
+	  <xref linkend="x11-wm-gnome"/>, but with the
 	  <filename>/usr/local/bin/startxfce4</filename> command; or,
 	  configure the display manager to allow choosing a desktop at
-	  login time, as explained in the section on
-	  <link linkend="x11-wm-kde-kdm">kdm</link>.</para>
-      </sect3>
+	  login time, as explained in
+	  <xref linkend="x11-wm-kde-kdm"/>.</para>

More information about the svn-doc-all mailing list