Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 4c2be43886361a629e4715d6d5119f642e462b27)
+++ gnome/core/gnome-keyring.xml	(revision 7ded7e326af261f81459ac464892f59fcedac236)
@@ -26,12 +26,14 @@
 
   <indexterm zone="gnome-keyring">
-    <primary sortas="a-Gnome-keyring">Gnome-keyring</primary>
+    <primary sortas="a-gnome-keyring">gnome-keyring</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to gnome-keyring</title>
+    <title>Introduction to GNOME Keyring</title>
 
-    <para>The <application>gnome-keyring</application> package contains a
-    daemon that keeps passwords and other secrets for users.</para>
+    <para>
+      The <application>GNOME Keyring</application> package contains a
+      daemon that keeps passwords and other secrets for users.
+    </para>
 
     &lfs70_checked;
@@ -40,25 +42,37 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-keyring-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&gnome-keyring-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gnome-keyring-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&gnome-keyring-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &gnome-keyring-md5sum;</para>
+        <para>
+          Download MD5 sum: &gnome-keyring-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &gnome-keyring-size;</para>
+        <para>
+          Download size: &gnome-keyring-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &gnome-keyring-buildsize;</para>
+        <para>
+          Estimated disk space required: &gnome-keyring-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &gnome-keyring-time;</para>
+        <para>
+          Estimated build time: &gnome-keyring-time;
+        </para>
       </listitem>
     </itemizedlist>
 
 
-    <bridgehead renderas="sect3">gnome-keyring Dependencies</bridgehead>
+    <bridgehead renderas="sect3">GNOME Keyring Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -79,13 +93,15 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-keyring"/></para>
-
+      <ulink url="&blfs-wiki;/gnome-keyring"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of gnome-keyring</title>
+    <title>Installation of GNOME Keyring</title>
 
-    <para>Install <application>gnome-keyring</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>GNOME Keyring</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
@@ -95,7 +111,11 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -106,16 +126,14 @@
     <title>Command Explanations</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    <para>
+      <parameter>--with-pam-dir=/lib/security</parameter>: This parameter
+      specifies where the pam modules will be installed: you can omit this if you
+      have not installed <application>Linux-PAM</application>.
+    </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/> -->
-
-    <para><parameter>--with-pam-dir=/lib/security</parameter>: This parameter
-    specifies where the pam modules will be installed: you can omit this if you
-    have not installed <application>Linux-PAM</application>.</para>
-
-    <para><parameter>--with-root-certs=/etc/ssl/certs</parameter>: This
-    parameter specifies where the trusted root certificates are located.</para>
+    <para>
+      <parameter>--with-root-certs=/etc/ssl/certs</parameter>: This
+      parameter specifies where the trusted root certificates are located.
+    </para>
 
   </sect2>
@@ -150,5 +168,7 @@
         <term><command>gnome-keyring-daemon</command></term>
         <listitem>
-          <para>is a session daemon that keeps passwords for users.</para>
+          <para>
+            is a session daemon that keeps passwords for users.
+          </para>
           <indexterm zone="gnome-keyring gnome-keyring-daemon">
             <primary sortas="b-gnome-keyring-daemon">gnome-keyring-daemon</primary>
