Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision eb425b409922751fab69720e213809ff67c5bd8f)
+++ x/installing/xbitmaps.xml	(revision a205fd07ca52d56dfc60414a9d639c95cf229e8b)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY xbitmaps-download-http "http://xorg.freedesktop.org/releases/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
-  <!ENTITY xbitmaps-download-ftp  "ftp://ftp.x.org/pub/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
+  <!ENTITY xbitmaps-download-http "&xorg-download-http;/data/xbitmaps-&xbitmaps-version;.tar.bz2">
+  <!ENTITY xbitmaps-download-ftp  "&xorg-download-ftp;/data/xbitmaps-&xbitmaps-version;.tar.bz2">
   <!ENTITY xbitmaps-md5sum        "7444bbbd999b53bec6a60608a5301f4c">
   <!ENTITY xbitmaps-size          "116 KB">
@@ -30,6 +30,8 @@
     <title>Introduction to xbitmaps</title>
 
-    <para>The <application>xbitmaps</application> package contains bitmap
-    images used by multiple applications.</para>
+    <para>
+      The <application>xbitmaps</application> package contains bitmap
+      images used by multiple applications built in Xorg chapter.
+    </para>
 
     &lfs71_checked;
@@ -38,26 +40,38 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xbitmaps-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&xbitmaps-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&xbitmaps-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&xbitmaps-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &xbitmaps-md5sum;</para>
+        <para>
+          Download MD5 sum: &xbitmaps-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &xbitmaps-size;</para>
+        <para>
+          Download size: &xbitmaps-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xbitmaps-buildsize;</para>
+        <para>
+          Estimated disk space required: &xbitmaps-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xbitmaps-time;</para>
+        <para>
+          Estimated build time: &xbitmaps-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xbitmaps"/></para>
-
+      <ulink url="&blfs-wiki;/xbitmaps"/>
+    </para>
   </sect2>
 
@@ -65,12 +79,18 @@
     <title>Installation of xbitmaps</title>
 
-    <para>Install <application>xbitmaps</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>xbitmaps</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure $XORG_CONFIG</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>
@@ -82,12 +102,10 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>$XORG_PREFIX/include/X11/bitmaps</seg>
+        <seg>
+          <envar>$XORG_PREFIX</envar>/include/X11/bitmaps
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: x/installing/xcursor-themes.xml
===================================================================
--- x/installing/xcursor-themes.xml	(revision eb425b409922751fab69720e213809ff67c5bd8f)
+++ x/installing/xcursor-themes.xml	(revision a205fd07ca52d56dfc60414a9d639c95cf229e8b)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY xcursor-themes-download-http "http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-&xcursor-themes-version;.tar.bz2">
-  <!ENTITY xcursor-themes-download-ftp  "ftp://ftp.x.org/pub/individual/data/xcursor-themes-&xcursor-themes-version;.tar.bz2">
+  <!ENTITY xcursor-themes-download-http "&xorg-download-http;/data/xcursor-themes-&xcursor-themes-version;.tar.bz2">
+  <!ENTITY xcursor-themes-download-ftp  "&xorg-download-ftp;/data/xcursor-themes-&xcursor-themes-version;.tar.bz2">
   <!ENTITY xcursor-themes-md5sum        "ba21aad0b353f1881f5069e423a44587">
   <!ENTITY xcursor-themes-size          "2.2 MB">
@@ -30,6 +30,8 @@
     <title>Introduction to xcursor-themes</title>
 
-    <para>The <application>xcursor-themes</application> package contains the
-    redglass and whiteglass animated cursor themes.</para>
+    <para>
+      The <application>xcursor-themes</application> package contains the
+      redglass and whiteglass animated cursor themes.
+    </para>
 
     &lfs71_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xcursor-themes-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&xcursor-themes-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&xcursor-themes-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&xcursor-themes-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &xcursor-themes-md5sum;</para>
+        <para>
+          Download MD5 sum: &xcursor-themes-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &xcursor-themes-size;</para>
+        <para>
+          Download size: &xcursor-themes-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xcursor-themes-buildsize;</para>
+        <para>
+          Estimated disk space required: &xcursor-themes-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xcursor-themes-time;</para>
+        <para>
+          Estimated build time: &xcursor-themes-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -60,9 +74,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-app"/></para>
+    <para role="required">
+      <xref linkend="xorg7-app"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xcursor-themes"/></para>
-
+      <ulink url="&blfs-wiki;/xcursor-themes"/>
+    </para>
   </sect2>
 
@@ -70,13 +86,19 @@
     <title>Installation of xcursor-themes</title>
 
-    <para>Install <application>xcursor-themes</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>xcursor-themes</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 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>
@@ -88,12 +110,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>$XORG_PREFIX/icons</seg>
+        <seg>
+          <envar>$XORG_PREFIX</envar>/share/icons/handhelds,
+          <envar>$XORG_PREFIX</envar>/share/icons/redglass and
+          <envar>$XORG_PREFIX</envar>/share/icons/whiteglass
+        </seg>
       </seglistitem>
     </segmentedlist>
