White space fix only. Translators can ignore.

Sponsored by:	iXsystems

en_US.ISO8859-1/books/handbook/x11/chapter.xml

@@ -550,8 +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 as demonstrated in
+	<filename>/usr/local/etc/fonts/local.conf</filename> file as
-	<xref linkend="antialias"/>.</para>
+	demonstrated in <xref linkend="antialias"/>.</para>
     </sect2>
 
     <sect2 xml:id="truetype">
@@ -661,8 +661,7 @@ dbus_enable="YES"</programlisting>
 	definition, and then the <literal>&lt;fontconfig&gt;</literal>
 	tag:</para>
 
-      <programlisting>
+      <programlisting>&lt;?xml version="1.0"?&gt;
-      &lt;?xml version="1.0"?&gt;
       &lt;!DOCTYPE fontconfig SYSTEM "fonts.dtd"&gt;
       &lt;fontconfig&gt;</programlisting>
 
@@ -783,8 +782,7 @@ dbus_enable="YES"</programlisting>
 	dramatic.  To enable this, add the line somewhere in the
 	<filename>local.conf</filename> file:</para>
 
-      <programlisting>
+      <programlisting>&lt;match target="font"&gt;
-	  &lt;match target="font"&gt;
 	     &lt;test qual="all" name="rgba"&gt;
 		 &lt;const&gt;unknown&lt;/const&gt;
 	     &lt;/test&gt;
@@ -821,35 +819,33 @@ dbus_enable="YES"</programlisting>
     <indexterm><primary>X Display Manager</primary></indexterm>
     <para><application>&xorg;</application> provides an X Display
       Manager, <application>XDM</application>, which can be used for
-	login session management.  <application>XDM</application> provides a graphical
+      login session management.  <application>XDM</application>
-	interface for choosing which display server to connect to
+      provides a graphical interface for choosing which display server
-	and for entering authorization information such as a login and
+      to connect to and for entering authorization information such as
-	password combination.</para>
+      a login and password combination.</para>
 
     <para>  This section demonstrates how to configure the X Display
       Manager on &os;.  Some desktop environments provide their own
       graphical login manager.  Refer to <xref
-	  linkend="x11-wm-gnome"/> for instructions on how to
+	linkend="x11-wm-gnome"/> for instructions on how to configure
-	configure the GNOME Display Manager and <xref
+      the GNOME Display Manager and <xref linkend="x11-wm-kde"/> for
-	  linkend="x11-wm-kde"/> for instructions on how to configure
+      instructions on how to configure the KDE Display Manager.</para>
-	the KDE Display Manager.</para>
 
     <sect2>
       <title>Configuring <application>XDM</application></title>
 
       <para>To install <application>XDM</application>, use the
 	<package>x11/xdm</package> package or port.  Once installed,
-	<application>XDM</application> can be configured to run when the 
+	<application>XDM</application> can be configured to run when
-	machine boots up by editing this
+	the  machine boots up by editing this entry in
-	entry in <filename>/etc/ttys</filename>:</para>
+	<filename>/etc/ttys</filename>:</para>
 
       <screen>ttyv8   "/usr/local/bin/xdm -nodaemon"  xterm   off secure</screen>
 
-      <para>Change the <literal>off</literal> to
+      <para>Change the <literal>off</literal> to <literal>on</literal>
-	<literal>on</literal> and save the edit.  The
+	and save the edit.  The <literal>ttyv8</literal> in this entry
-	<literal>ttyv8</literal> in this entry indicates that
+	indicates that <application>XDM</application> will run on the
-	<application>XDM</application> will run on the ninth
+	ninth virtual terminal.</para>
-	virtual terminal.</para>
 
       <para>The <application>XDM</application> configuration directory
 	is located in <filename>/usr/local/lib/X11/xdm</filename>.
@@ -857,9 +853,9 @@ dbus_enable="YES"</programlisting>
 	behavior and appearance of <application>XDM</application>, as
 	well as a few scripts and programs used to set up the desktop
 	when <application>XDM</application> is running.  <xref
-	  linkend="xdm-config-files"/> summarizes the function of
+	  linkend="xdm-config-files"/> summarizes the function of each
-	each of these files.  The exact syntax and usage of these
+	of these files.  The exact syntax and usage of these files is
-	files is described in &man.xdm.1;.</para>
+	described in &man.xdm.1;.</para>
 
       <table frame="none" pgwide="1" xml:id="xdm-config-files">
 	<title>XDM Configuration Files</title>
@@ -955,13 +951,12 @@ dbus_enable="YES"</programlisting>
       <title>Configuring Remote Access</title>
 
       <para>By default, only users on the same system can login using
-	<application>XDM</application>.  To enable users on
+	<application>XDM</application>.  To enable users on other
-	other systems to connect to the display
+	systems to connect to the display server, edit the access
-	server, edit the access control rules and enable
+	control rules and enable the connection listener.</para>
-	the connection listener.</para>
 
-      <para>To configure <application>XDM</application> to
+      <para>To configure <application>XDM</application> to listen for
-	listen for any remote connection, comment out the
+	any remote connection, comment out the
 	<literal>DisplayManager.requestPort</literal> line in
 	<filename>/usr/local/lib/X11/xdm/xdm-config</filename> by
 	putting a <literal>!</literal> in front of it:</para>
@@ -971,9 +966,9 @@ dbus_enable="YES"</programlisting>
 DisplayManager.requestPort:     0</screen>
 
       <para>Save the edits and restart <application>XDM</application>.
-	To restrict remote access, look at the
+	To restrict remote access, look at the example entries in
-	example entries in <filename>/usr/local/lib/X11/xdm/Xaccess</filename> and refer to
+	<filename>/usr/local/lib/X11/xdm/Xaccess</filename> and refer
-	&man.xdm.1; for further information.</para>
+	to &man.xdm.1; for further information.</para>
     </sect2>
   </sect1>
 
@@ -993,9 +988,8 @@ DisplayManager.requestPort:     0</screen>
       </authorgroup>
     </info>
 
-    <para>This section describes how to install three popular
+    <para>This section describes how to install three popular desktop
-      desktop environments on a &os; system.  A
+      environments on a &os; system.  A desktop environment can range
-      desktop environment can range
       from a simple window manager to a complete suite of desktop
       applications.  Over a hundred desktop environments are
       available in the <filename>x11-wm</filename> category of the
@@ -1006,26 +1000,26 @@ DisplayManager.requestPort:     0</screen>
 
       <indexterm><primary>GNOME</primary></indexterm>
       <para><application>GNOME</application> is a user-friendly
-	  desktop environment.  It
+	desktop environment.  It includes a panel for starting
-	  includes a panel for starting applications and displaying
+	applications and displaying status, a desktop, a set of tools
-	  status, a desktop, a set of tools and applications,
+	and applications, and a set of conventions that make it easy
-	  and a set of conventions that make it easy for applications
+	for applications to cooperate and be consistent with each
-	  to cooperate and be consistent with each other.  More information
+	other.  More information regarding
-	  regarding <application>GNOME</application> on &os; can be
+	<application>GNOME</application> on &os; can be found at <link
-	  found at <link
 	    xlink:href="http://www.FreeBSD.org/gnome">http://www.FreeBSD.org/gnome</link>.
-	  That web site contains additional documentation
+	That web site contains additional documentation about
-	  about installing, configuring, and
+	installing, configuring, and managing
-	  managing <application>GNOME</application> on &os;.</para>
+	<application>GNOME</application> on &os;.</para>
 
-	<para>This desktop environment can be installed from a package:</para>
+      <para>This desktop environment can be installed from a
+	package:</para>
 
       <screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
 
       <para>To instead build <application>GNOME</application> from
 	ports, use the following command.
-	  <application>GNOME</application> is a large application
+	<application>GNOME</application> is a large application and
-	  and will take some time to compile, even on a fast
+	will take some time to compile, even on a fast
 	computer.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/x11/gnome2</userinput>
@@ -1033,8 +1027,8 @@ DisplayManager.requestPort:     0</screen>
 
       <para>For proper operation, <application>GNOME</application>
 	requires the <filename>/proc</filename> file system to be
-	  mounted.  Add this line to <filename>/etc/fstab</filename> to mount
+	mounted.  Add this line to <filename>/etc/fstab</filename> to
-	  this file system automatically during system
+	mount this file system automatically during system
 	startup:</para>
 
       <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
@@ -1043,37 +1037,36 @@ DisplayManager.requestPort:     0</screen>
 	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>,
+	<application>GDM</application>, which is installed as part of
-	  which is installed as part
+	the <application>GNOME</application> package or port.  It can
-	  of the <application>GNOME</application> package or port.
+	be enabled by adding this line to
-	  It can be enabled by adding this
+	<filename>/etc/rc.conf</filename>:</para>
-	  line to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>gdm_enable="YES"</programlisting>
 
       <para>It is often desirable to also start all
-	  <application>GNOME</application> services.  To achieve this, add
+	<application>GNOME</application> services.  To achieve this,
-	  a second line to <filename>/etc/rc.conf</filename>:</para>
+	add a second line to
+	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>gnome_enable="YES"</programlisting>
 
-	<para><application>GDM</application>
+      <para><application>GDM</application> will now start
-	  will now start automatically when the system boots.</para>
+	automatically when the system boots.</para>
 
       <para>A second method for starting
-	  <application>GNOME</application> is to type <command>startx</command>
+	<application>GNOME</application> is to type
-	  from the command-line after configuring
+	<command>startx</command> from the command-line after
-	  <filename>~/.xinitrc</filename>.  If this file already exists,
+	configuring <filename>~/.xinitrc</filename>.  If this file
-	  replace the line that starts the current window manager with
+	already exists, replace the line that starts the current
-	  one that starts
+	window manager with one that starts
-	  <filename>/usr/local/bin/gnome-session</filename>.  If
+	<filename>/usr/local/bin/gnome-session</filename>.  If this
-	  this file does not exist, create it with this command:</para>
+	file does not exist, create it with this command:</para>
 
       <screen>&prompt.user; <userinput>echo "/usr/local/bin/gnome-session" &gt; ~/.xinitrc</userinput></screen>
 
-	  <para>A third method is to use
+      <para>A third method is to use <application>XDM</application> as
-	    <application>XDM</application> as the display manager.  In this case,
+	the display manager.  In this case, create an executable
-	    create an executable
 	<filename>~/.xsession</filename>:</para>
 
       <screen>&prompt.user; <userinput>echo "#!/bin/sh" &gt; ~/.xsession</userinput>
@@ -1090,10 +1083,10 @@ DisplayManager.requestPort:     0</screen>
 	desktop environment.  This desktop provides a suite of
 	applications with a consistent look and feel, a standardized
 	menu and toolbars, keybindings, color-schemes,
-	  internationalization, and a centralized, dialog-driven
+	internationalization, and a centralized, dialog-driven desktop
-	  desktop configuration.  More information on
+	configuration.  More information on
-	  <application>KDE</application> can be found at
+	<application>KDE</application> can be found at <link
-	  <link xlink:href="http://www.kde.org/">http://www.kde.org/</link>.
+	  xlink:href="http://www.kde.org/">http://www.kde.org/</link>.
 	For &os;-specific information, consult <link
 	  xlink:href="http://freebsd.kde.org/">http://freebsd.kde.org</link>.</para>
 
@@ -1102,12 +1095,11 @@ DisplayManager.requestPort:     0</screen>
 
       <screen>&prompt.root; <userinput>pkg install x11/kde4</userinput></screen>
 
-	<para>To instead build the <application>KDE</application>
+      <para>To instead build the <application>KDE</application> port,
-	  port, use the following command.  Installing the port will
+	use the following command.  Installing the port will provide a
-	  provide a menu for selecting which components to
+	menu for selecting which components to install.
-	  install.  <application>KDE</application> is a large application
+	<application>KDE</application> is a large application and will
-	  and will take some time to compile, even on a fast
+	take some time to compile, even on a fast computer.</para>
-	  computer.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1134,25 +1126,24 @@ DisplayManager.requestPort:     0</screen>
 
       <para>A second method for launching
 	<application>KDE</application> is to type
-	  <command>startx</command> from the command line.  For this
+	<command>startx</command> from the command line.  For this to
-	  to work, the following line is needed in
+	work, the following line is needed in
 	<filename>~/.xinitrc</filename>:</para>
 
       <programlisting>exec /usr/local/kde4/bin/startkde</programlisting>
 
-	<para>A third method for starting
+      <para>A third method for starting <application>KDE</application>
-	  <application>KDE</application> is through
+	is through <application>XDM</application>.  To do so, create
-	  <application>XDM</application>.  To do so, create an
+	an executable <filename>~/.xsession</filename> as
-	  executable <filename>~/.xsession</filename> as
 	follows:</para>
 
       <screen>&prompt.user; <userinput>echo "#!/bin/sh" &gt; ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/kde4/bin/startkde" &gt;&gt; ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
 
-      <para>Once <application>KDE</application> is started,
+      <para>Once <application>KDE</application> is started, refer to
-	refer to its built-in help system for more information on how
+	its built-in help system for more information on how to use
-	to use its various menus and applications.</para>
+	its various menus and applications.</para>
     </sect2>
 
     <sect2 xml:id="x11-wm-xfce">
@@ -1162,15 +1153,16 @@ DisplayManager.requestPort:     0</screen>
 	based on the GTK+ toolkit used by
 	<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
+	desktop.  It is fully configurable, has a main panel with
-	  application launchers, provides a file manager and sound manager,
+	menus, applets, and application launchers, provides a file
-	  and is themeable.  Since it is fast, light, and efficient,
+	manager and sound manager, and is themeable.  Since it is
-	  it is ideal for older or slower machines with memory
+	fast, light, and efficient, it is ideal for older or slower
-	  limitations.  More information on <application>Xfce</application>
+	machines with memory limitations.  More information on
-	  can be found at <link
+	<application>Xfce</application> can be found at <link
 	  xlink:href="http://www.xfce.org/">http://www.xfce.org</link>.</para>
 
-	<para>To install the <application>Xfce</application> package:</para>
+      <para>To install the <application>Xfce</application>
+	package:</para>
 
       <screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>
 
@@ -1181,18 +1173,16 @@ DisplayManager.requestPort:     0</screen>
 
       <para>Unlike <application>GNOME</application> or
 	<application>KDE</application>,
-	  <application>Xfce</application> does not provide its own
+	<application>Xfce</application> does not provide its own login
-	  login manager.  In order to start <application>Xfce</application>
+	manager.  In order to start <application>Xfce</application>
 	from the command line by typing <command>startx</command>,
-	  first add its entry to
+	first add its entry to <filename>~/.xinitrc</filename>:</para>
-	  <filename>~/.xinitrc</filename>:</para>
 
       <screen>&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" &gt; ~/.xinitrc</userinput></screen>
 
       <para>An alternate method is to use
 	<application>XDM</application>.  To configure this method,
-	  create an executable
+	create an executable <filename>~/.xsession</filename>:</para>
-	  <filename>~/.xsession</filename>:</para>
 
       <screen>&prompt.user; <userinput>echo "#!/bin/sh" &gt; ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/bin/startxfce4" &gt;&gt; ~/.xsession</userinput>