Index: gnome/core/gdm.xml
===================================================================
--- gnome/core/gdm.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
+++ gnome/core/gdm.xml	(revision 7ded7e326af261f81459ac464892f59fcedac236)
@@ -24,5 +24,5 @@
 
   <indexterm zone="gdm">
-    <primary sortas="a-GDM">GDM</primary>
+    <primary sortas="a-gdm">gdm</primary>
   </indexterm>
 
@@ -30,7 +30,9 @@
     <title>Introduction to GDM</title>
 
-    <para>The <application>GDM</application> package contains
-    <application>GNOME</application>'s Display Manager daemon. This is
-    useful for allowing configurable graphical logins.</para>
+    <para>
+      <application>GDM</application> is a system service that is
+      responsible for providing graphical logins and managing local
+      and remote displays.
+    </para>
 
     &lfs70_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gdm-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gdm-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gdm-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gdm-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gdm-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gdm-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gdm-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gdm-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gdm-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gdm-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gdm-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gdm-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,10 +75,14 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/gdm-&gdm-version;-vt-allocation-hack-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/gdm-&gdm-version;-blfs-patch-1.patch"/></para>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gdm-&gdm-version;-vt-allocation-hack-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gdm-&gdm-version;-blfs-patch-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -108,6 +126,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gdm"/></para>
-
+      <ulink url="&blfs-wiki;/gdm"/>
+    </para>
   </sect2>
 
@@ -115,15 +133,19 @@
     <title>Installation of GDM</title>
 
-    <para>It is recommended to have a dedicated user and group to take
-    control of the <command>gdm</command> daemon after it is
-    started. Issue the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>groupadd -fg 21 gdm &amp;&amp;
+    <para>
+      It is recommended to have a dedicated user and group to take
+      control of the <command>gdm</command> daemon after it is
+      started. Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -fg 21 gdm &amp;&amp;
 useradd -c "GDM Daemon Owner" -d /var/lib/gdm -u 21 \
         -g gdm -s /bin/false gdm</userinput></screen>
 
-    <para>Install <application>GDM</application> by running
-    the following commands as an unprivileged user:</para>
+    <para>
+      Install <application>GDM</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../gdm-&gdm-version;-vt-allocation-hack-1.patch &amp;&amp;
@@ -137,10 +159,14 @@
 make</userinput></screen>
 
-    <para>If you have installed <xref linkend="check"/> and you wish to run
-    the testsuite, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install &amp;&amp;
+    <para>
+      If you have installed <xref linkend="check"/> and you wish to run
+      the testsuite, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
 chown -R -v gdm:gdm /var/lib/gdm /var/cache/gdm /var/log/gdm
 </userinput></screen>
@@ -151,21 +177,17 @@
     <title>Command Explanations</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    <para>
+      <parameter>--libexecdir=/usr/lib/gdm</parameter>: This
+      parameter is used so that the <application>GDM</application> internal
+      support programs are installed in the preferred location of <filename
+      class="directory">/usr/lib/gdm</filename> instead of <filename
+      class="directory">/usr/libexec</filename>.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/> -->
-
-    <para><parameter>--libexecdir=/usr/lib/gdm</parameter>: This
-    parameter is used so that the <application>GDM</application> internal
-    support programs are installed in the preferred location of <filename
-    class='directory'>/usr/lib/gdm</filename> instead of <filename
-    class='directory'>/usr/libexec</filename>.</para>
+      href="../../xincludes/static-libraries.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-scrollkeeper.xml"/>
+      href="../../xincludes/without-scrollkeeper.xml"/>
 
   </sect2>
@@ -189,22 +211,28 @@
       <title>Configuration Information</title>
 
-      <para>The GDM daemon is configured using the
-      <filename>/etc/gdm/custom.conf</filename> file.
-      Default values are stored in GConf in the
-      <filename>gdm.schemas</filename> file. It is recommended that end-users
-      modify the <filename>/etc/gdm/custom.conf</filename> file
-      because the schemas file may be overwritten when the user updates their
-      system to have a newer version of GDM.</para>
+      <para>
+        The GDM daemon is configured using the
+        <filename>/etc/gdm/custom.conf</filename> file.
+        Default values are stored in GConf in the
+        <filename>gdm.schemas</filename> file. It is recommended that end-users
+        modify the <filename>/etc/gdm/custom.conf</filename> file
+        because the schemas file may be overwritten when the user updates their
+        system to have a newer version of GDM.
+      </para>
 
       <important>
-        <para>If the system-wide <application>D-BUS</application> daemon was
-        running during the installation of <application>gdm</application>,
-        ensure you stop and restart the <application>D-BUS</application>
-        daemon before attempting to start <command>gdm</command>.</para>
+        <para>
+          If the system-wide <application>D-BUS</application> daemon was
+          running during the installation of <application>gdm</application>,
+          ensure you stop and restart the <application>D-BUS</application>
+          daemon before attempting to start <command>gdm</command>.
+        </para>
       </important>
 
-      <para><command>gdm</command> can be tested by executing it as the
-      <systemitem class="username">root</systemitem> user. If you wish to stop
-      it you will need to go to a different tty and then kill it.</para>
+      <para>
+        <command>gdm</command> can be tested by executing it as the
+        <systemitem class="username">root</systemitem> user. If you wish to stop
+        it you will need to go to a different tty and then kill it.
+      </para>
 
     </sect3>
@@ -213,13 +241,9 @@
       <title>Boot Script</title>
 
-      <para>To start a graphical login when the system is booted, install the
-      <filename>/etc/rc.d/init.d/gdm</filename> init script included in the
-      <xref linkend="bootscripts"/> package.<!-- If your
-      <envar>GNOME_PREFIX</envar> environment variable is anything other than
-      <filename class='directory'>/usr</filename> or <filename
-      class='directory'>/opt/gnome-&gnome-version;&gnome-minor-version;</filename>,
-      you will need to modify the <envar>PATH</envar> statement in the script
-      to include the path where you have <application>GNOME</application>
-      installed.--></para>
+      <para>
+        To start a graphical login when the system is booted, install the
+        <filename>/etc/rc.d/init.d/gdm</filename> init script included in the
+        <xref linkend="bootscripts"/> package.
+      </para>
 
       <indexterm zone="gdm gdm-init">
@@ -229,6 +253,8 @@
 <screen role="root"><userinput>make install-gdm</userinput></screen>
 
-      <para>Now edit <filename>/etc/inittab</filename> with the following
-      commands.</para>
+      <para>
+        Now edit <filename>/etc/inittab</filename> with the following
+        commands.
+      </para>
 
 <screen role="root"><userinput>sed -i 's/id:3:initdefault:/id:5:initdefault:/' \
@@ -255,7 +281,12 @@
         </seg>
         <seg>
-          /etc/dconf/db/gdm.d, /etc/gdm, /usr/include/gdm,
-          /usr/lib/gdm, /usr/share/gdm, /usr/share/gnome/help/gdm,
-          /usr/share/omf/gdm and /var/{cache,lib,log,run}/gdm
+          /etc/dconf/db/gdm.d,
+          /etc/gdm,
+          /usr/include/gdm,
+          /usr/lib/gdm,
+          /usr/share/gdm,
+          /usr/share/gnome/help/gdm,
+          /usr/share/omf/gdm and
+          /var/{cache,lib,log,run}/gdm
         </seg>
       </seglistitem>
@@ -270,5 +301,7 @@
         <term><command>gdm</command></term>
         <listitem>
-          <para>is the <application>GNOME</application> based login prompt.</para>
+          <para>
+            is the <application>GNOME</application> based login prompt.
+          </para>
           <indexterm zone="gdm gdm-prog">
             <primary sortas="b-gdm">gdm</primary>
@@ -280,6 +313,9 @@
         <term><command>gdmflexiserver</command></term>
         <listitem>
-          <para>is the flexi server mechanism which allows to run GDM sessions
-          on demand, in a new virtual console.</para>
+          <para>
+            is the flexi server mechanism which allows to run 
+            <application>GDM sessions</application>
+            on demand in a new virtual console.
+          </para>
           <indexterm zone="gdm gdmflexiserver">
             <primary sortas="b-gdmflexiserver">gdmflexiserver</primary>
@@ -291,5 +327,7 @@
         <term><command>gdm-screenshot</command></term>
         <listitem>
-          <para>is a screenshot tool.</para>
+          <para>
+            is a screenshot tool.
+          </para>
           <indexterm zone="gdm gdm-screenshot">
             <primary sortas="b-gdm-screenshot">gdm-screenshot</primary>
