Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision ecb66167cfc18e64ea1be53a9a27ac5785350441)
+++ general/prog/cmake.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -7,11 +7,11 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "d4aef1eab859df61d2664721a72732c0">
-  <!ENTITY cmake-size          "5.5 MB">
-  <!ENTITY cmake-buildsize     "311 MB (including tests)">
+  <!ENTITY cmake-md5sum        "097278785da7182ec0aea8769d06860c">
+  <!ENTITY cmake-size          "5.6 MB">
+  <!ENTITY cmake-buildsize     "255 MB (including tests)">
   <!ENTITY cmake-time          "1.9 SBU (additional 3.1 SBU for the test suite)">
 ]>
 
-<sect1 id="cmake" xreflabel="cmake-&cmake-version;">
+<sect1 id="cmake" xreflabel="CMake-&cmake-version;">
   <?dbhtml filename="cmake.html"?>
 
@@ -30,10 +30,12 @@
     <title>Introduction to CMake</title>
 
-    <para>The <application>CMake</application> package contains a modern 
-    toolset used for generating Makefiles. It is a successor of the 
-    auto-generated <command>configure</command> script and aims to be platform-
-    and compiler-independent. A significant user of 
-    <application>CMake</application> is <application>KDE</application> since 
-    version 4.</para>
+    <para>
+      The <application>CMake</application> package contains a modern 
+      toolset used for generating Makefiles. It is a successor of the 
+      auto-generated <command>configure</command> script and aims to
+      be platform- and compiler-independent. A significant user of 
+      <application>CMake</application> is <application>KDE</application>
+      since version 4.
+    </para>
 
     &lfs72_checked;
@@ -42,20 +44,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&cmake-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cmake-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cmake-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cmake-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cmake-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cmake-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&cmake-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cmake-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cmake-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cmake-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cmake-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cmake-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -77,6 +91,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cmake"/></para>
-
+      <ulink url="&blfs-wiki;/cmake"/>
+    </para>
   </sect2>
 
@@ -84,6 +98,8 @@
     <title>Installation of CMake</title>
 
-    <para>Install <application>CMake</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>CMake</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./bootstrap --prefix=/usr       \
@@ -93,7 +109,11 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make test</userinput>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <userinput>make test</userinput>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -104,11 +124,16 @@
     <title>Command Explanations</title>
 
-    <para><option>--system-libs</option>: This option forces the build system
-    to link against <application>Zlib</application>, <application>Bzip2</application>, 
-    <application>cURL</application> and <application>Expat</application> installed 
-    on the system.</para>
+    <para>
+      <option>--system-libs</option>: This switch forces the build system to
+      link against <application>Zlib</application>, <application>Bzip2</application>, 
+      <application>cURL</application> and <application>Expat</application> installed 
+      on the system.
+    </para>
     
-    <para><option>--qt-gui</option>: This option builds a <application>Qt</application>-based 
-    GUI for <application>CMake</application>.</para>
+    <para>
+      <option>--qt-gui</option>: This switch enables building of the
+      <application>Qt</application>-based  GUI for
+      <application>CMake</application>.
+    </para>
 
   </sect2>
@@ -119,12 +144,14 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>ccmake, cmake, cmake-gui, cpack and ctest</seg>
-        <seg>none</seg>
-        <seg>/usr/share/cmake-&cmake-major-version; and
-        /usr/share/doc/cmake-&cmake-version;</seg>
+        <seg>
+          ccmake, cmake, cmake-gui, cpack and ctest
+        </seg>
+        <seg>
+          /usr/share/cmake-&cmake-major-version; and
+          /usr/share/doc/cmake-&cmake-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -139,5 +166,8 @@
         <term><command>ccmake</command></term>
         <listitem>
-          <para>is a curses based interactive frontend to cmake.</para>
+          <para>
+            is a curses based interactive frontend to
+            <command>cmake</command>.
+          </para>
           <indexterm zone="cmake ccmake">
             <primary sortas="b-ccmake">ccmake</primary>
@@ -146,9 +176,11 @@
       </varlistentry>
 
-      <varlistentry id="c_make">
+      <varlistentry id="cmake-prog">
         <term><command>cmake</command></term>
         <listitem>
-          <para>is the makefile generator.</para>
-          <indexterm zone="cmake c_make">
+          <para>
+            is the makefile generator.
+          </para>
+          <indexterm zone="cmake cmake-prog">
             <primary sortas="b-cmake">cmake</primary>
           </indexterm>
@@ -159,5 +191,8 @@
         <term><command>cmake-gui</command></term>
         <listitem>
-          <para>is the Qt-based frontent to CMake.</para>
+          <para>
+            is the <application>Qt</application>-based frontent to 
+            <command>cmake</command>.
+          </para>
           <indexterm zone="cmake cmake-gui">
             <primary sortas="b-cmake-gui">cmake-gui</primary>
@@ -169,5 +204,7 @@
         <term><command>cpack</command></term>
         <listitem>
-          <para>is the CMake packaging program.</para>
+          <para>
+            is the <application>CMake</application> packaging program.
+          </para>
           <indexterm zone="cmake cpack">
             <primary sortas="b-cpack">cpack</primary>
@@ -179,5 +216,7 @@
         <term><command>ctest</command></term>
         <listitem>
-          <para>is a testing utility for cmake-generated build trees.</para>
+          <para>
+            is a testing utility for cmake-generated build trees.
+          </para>
           <indexterm zone="cmake ctest">
             <primary sortas="b-ctest">ctest</primary>
