Index: gnome/core/gnome-screensaver.xml
===================================================================
--- gnome/core/gnome-screensaver.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
+++ gnome/core/gnome-screensaver.xml	(revision 7ded7e326af261f81459ac464892f59fcedac236)
@@ -30,11 +30,13 @@
 
   <sect2 role="package">
-    <title>Introduction to gnome-screensaver</title>
-
-    <para>The <application>gnome-screensaver</application> package contains a
-    screen saver and locker designed to have simple, sane, secure defaults
-    and be well integrated with the desktop. It supports locking down of
-    configuration settings, has translations into many languages and
-    convenient user switching.</para>
+    <title>Introduction to GNOME Screensaver</title>
+
+    <para>
+      The <application>GNOME Screensaver</application> package contains a
+      screen saver and locker designed to have simple, sane, secure defaults
+      and be well integrated with the desktop. It supports locking down of
+      configuration settings, has translations into many languages and
+      convenient user switching.
+    </para>
 
     &lfs70_checked;
@@ -43,24 +45,36 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-screensaver-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-screensaver-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-screensaver-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-screensaver-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-screensaver-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-screensaver-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gnome-screensaver-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-screensaver-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-screensaver-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-screensaver-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-screensaver-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-screensaver-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">gnome-screensaver Dependencies</bridgehead>
+    <bridgehead renderas="sect3">GNOME Screensaver Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -77,13 +91,15 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-screensaver"/></para>
-
+      <ulink url="&blfs-wiki;/gnome-screensaver"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of gnome-screensaver</title>
-
-    <para>Install <application>gnome-screensaver</application> by running the
-    following commands:</para>
+    <title>Installation of GNOME Screensaver</title>
+
+    <para>
+      Install <application>GNOME Screensaver</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed -i 's|etc/pam\.d"|etc"|' data/Makefile.in &amp;&amp;
@@ -94,9 +110,13 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -105,29 +125,29 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's|etc/pam\.d"|etc|' data/Makefile.in</command>:
-    This command is used so that an erroneous message to copy the PAM
-    configuration file is not displayed.</para>
-
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/> -->
-
-    <para><parameter>--libexecdir=/usr/lib/gnome-screensaver</parameter>:
-    This parameter causes the libexec files to be installed in the preferred
-    location of <filename
-    class="directory">/usr/lib/gnome-screensaver</filename> instead of
-    <filename class="directory">/usr/libexec</filename>.</para>
-
-    <para><parameter>--with-pam-prefix=/etc</parameter>: This parameter is
-    used so that the <application>Linux-PAM</application> configuration file
-    for the <application>gnome-screensaver</application> application is
-    installed in the correct location.</para>
+    <para>
+      <command>sed -i 's|etc/pam\.d"|etc|' data/Makefile.in</command>:
+      This command is used so that an erroneous message to copy the PAM
+      configuration file is not displayed.
+    </para>
+
+    <para>
+      <parameter>--libexecdir=/usr/lib/gnome-screensaver</parameter>:
+      This parameter causes the libexec files to be installed in the preferred
+      location of <filename
+      class="directory">/usr/lib/gnome-screensaver</filename> instead of
+      <filename class="directory">/usr/libexec</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-pam-prefix=/etc</parameter>: This parameter is
+      used so that the <application>Linux PAM</application> configuration file
+      for the <application>GNOME Screensaver</application> application is
+      installed in the correct location.
+    </para>
 
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring gnome-screensaver</title>
+    <title>Configuring GNOME Screensaver</title>
 
     <sect3 id="gnome-screensaver-config">
@@ -147,10 +167,12 @@
 
       <sect4>
-        <title>Linux-PAM Configuration</title>
-
-        <para>The default <filename>gnome-screensaver</filename> configuration
-        file does not work with a BLFS system. Replace the existing file with
-        one that can be used on a BLFS system by issuing the following command
-        as the <systemitem class='username'>root</systemitem> user:</para>
+        <title>Linux PAM Configuration</title>
+
+        <para>
+          The default <filename>GNOME Screensaver</filename> configuration
+          file does not work with a BLFS system. Replace the existing file with
+          one that can be used on a BLFS system by issuing the following command
+          as the <systemitem class="username">root</systemitem> user:
+        </para>
 
 <screen role="root"><userinput>cat &gt; /etc/pam.d/gnome-screensaver &lt;&lt; "EOF"
@@ -199,6 +221,8 @@
         <term><command>gnome-screensaver</command></term>
         <listitem>
-          <para>is a screensaver and screen-locking program designed to
-          work seamlessly with the GNOME desktop.</para>
+          <para>
+            is a screensaver and screen-locking program designed to work
+            seamlessly with the <application>GNOME</application> Desktop.
+          </para>
           <indexterm zone="gnome-screensaver gnome-screensaver-prog">
             <primary sortas="b-gnome-screensaver">gnome-screensaver</primary>
@@ -210,6 +234,8 @@
         <term><command>gnome-screensaver-command</command></term>
         <listitem>
-          <para>is a tool for controlling an already
-          running instance of gnome-screensaver.</para>
+          <para>
+            is a tool used for controlling an already running instance
+            of <application>GNOME Screensaver</application>.
+          </para>
           <indexterm zone="gnome-screensaver gnome-screensaver-command">
             <primary sortas="b-gnome-screensaver-command">gnome-screensaver-command</primary>
