Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
+++ gnome/core/gnome-doc-utils.xml	(revision 7ded7e326af261f81459ac464892f59fcedac236)
@@ -26,5 +26,5 @@
 
   <indexterm zone="gnome-doc-utils">
-    <primary sortas="a-GNOME-Doc-Utils">GNOME Doc Utils</primary>
+    <primary sortas="a-gnome-doc-utils">gnome-doc-utils</primary>
   </indexterm>
 
@@ -32,9 +32,11 @@
     <title>Introduction to GNOME Doc Utils</title>
 
-    <para>The <application>GNOME Doc Utils</application> package is a collection
-    of documentation utilities for the <application>GNOME</application> project.
-    Notably, it contains utilities for building documentation and all auxiliary
-    files in your source tree, and it contains the DocBook XSLT stylesheets that
-    were once distributed with <application>Yelp</application>.</para>
+    <para>
+      The <application>GNOME Doc Utils</application> package is a collection
+      of documentation utilities for the <application>GNOME</application> project.
+      Notably, it contains utilities for building documentation and all auxiliary
+      files in your source tree, and it contains the DocBook XSLT stylesheets that
+      were once distributed with <application>Yelp</application>.
+    </para>
 
     &lfs70_checked;
@@ -43,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-doc-utils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-doc-utils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-doc-utils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-doc-utils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-doc-utils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-doc-utils-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gnome-doc-utils-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnome-doc-utils-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnome-doc-utils-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnome-doc-utils-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnome-doc-utils-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnome-doc-utils-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -79,14 +93,16 @@
     </para>
 
-    <para>The packages are listed as recommended even though
-    <application>GNOME Doc Utils</application> will build fine without them.
-    If you don't install the recommended packages (and you pass the appropriate
-    flags to the <command>configure</command> command so that it will build
-    without them), functionality will be missing that is expected later in
-    other GNOME packages.</para>
+    <para>
+      The packages are listed as recommended even though
+      <application>GNOME Doc Utils</application> will build fine without them.
+      If you don't install the recommended packages (and you pass the appropriate
+      flags to the <command>configure</command> command so that it will build
+      without them), functionality will be missing that is expected later in
+      other <application>GNOME</application> packages.
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-doc-utils"/></para>
-
+      <ulink url="&blfs-wiki;/gnome-doc-utils"/>
+    </para>
   </sect2>
 
@@ -94,28 +110,23 @@
     <title>Installation of GNOME Doc Utils</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/> -->
-
-    <para>Install <application>GNOME Doc Utils</application>
-    by running the following commands:</para>
+    <para>
+      Install <application>GNOME Doc Utils</application>
+      by running the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
-
-<!--  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-  </sect2> -->
 
   <sect2 role="content">
@@ -133,7 +144,9 @@
         <seg>
           /usr/lib/python2.7/site-packages/xml2po,
-          /usr/share/gnome-doc-utils, /usr/share/xml/gnome,
-          /usr/share/xml/mallard, /usr/share/gnome/help/gnome-doc-make
-          and /usr/share/gnome/help/gnome-doc-xslt
+          /usr/share/gnome-doc-utils,
+          /usr/share/xml/gnome,
+          /usr/share/xml/mallard,
+          /usr/share/gnome/help/gnome-doc-make and
+          /usr/share/gnome/help/gnome-doc-xslt
         </seg>
         <seg>
@@ -151,6 +164,8 @@
         <term><command>gnome-doc-prepare</command></term>
         <listitem>
-          <para>prepares a package to use
-          <application>gnome-doc-utils</application>.</para>
+          <para>
+            prepares a package to use
+            <application>GNOME Doc Utils</application>.
+          </para>
           <indexterm zone="gnome-doc-utils gnome-doc-prepare">
             <primary sortas="b-gnome-doc-prepare">gnome-doc-prepare</primary>
@@ -162,5 +177,7 @@
         <term><command>gnome-doc-tool</command></term>
         <listitem>
-          <para>is used to convert documents to either HTML or XHTML.</para>
+          <para>
+            is used to convert documents to either HTML or XHTML.
+          </para>
           <indexterm zone="gnome-doc-utils gnome-doc-tool">
             <primary sortas="b-gnome-doc-tool">gnome-doc-tool</primary>
@@ -172,6 +189,8 @@
         <term><command>xml2po</command></term>
         <listitem>
-          <para>is a <application>Python</application> script used to
-          translate XML documents.</para>
+          <para>
+            is a <application>Python</application> script used to
+            translate XML documents.
+          </para>
           <indexterm zone="gnome-doc-utils xml2po">
             <primary sortas="b-xml2po">xml2po</primary>
