Index: general/prog/cmake-systemd.xml
===================================================================
--- general/prog/cmake-systemd.xml	(revision fc78579dc272954fa8d7dd1d7162b67374c905f7)
+++ general/prog/cmake-systemd.xml	(revision 5ca26c766b817d003885d62cf584e1565d8cfcb2)
@@ -122,5 +122,5 @@
       <command>bin/ctest -R "problem1-test"</command> and, to omit it, use
       <command>bin/ctest -E "problem1-test"</command>. These options can be
-      used toghether:
+      used together:
       <command>bin/ctest -R "problem1-test" -E "problem2-test"</command>.
       Option -N can be used to display all available tests, and you can run
Index: general/prog/gcc-ada.xml
===================================================================
--- general/prog/gcc-ada.xml	(revision fc78579dc272954fa8d7dd1d7162b67374c905f7)
+++ general/prog/gcc-ada.xml	(revision 5ca26c766b817d003885d62cf584e1565d8cfcb2)
@@ -45,5 +45,5 @@
 
     <para>The compiler and associated tools on this page are known as the
-    <application>GNAT</application> technology, developped by the Adacore
+    <application>GNAT</application> technology, developed by the Adacore
     company, using the <application>GCC</application> backend. Since
     parts of the Ada compiler are written in Ada, there is a circular
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision fc78579dc272954fa8d7dd1d7162b67374c905f7)
+++ general/prog/git.xml	(revision 5ca26c766b817d003885d62cf584e1565d8cfcb2)
@@ -9,9 +9,8 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "0caa9c54bb04612062d21823163ecb13">
-  <!ENTITY git-size          "3.3 MB">
-  <!ENTITY git-buildsize     "269 MB (additional 13 MB for downloaded docs and man pages, or 24 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 5.5 SBU for tests or 2.5 SBU for docs and man build)
-">
+  <!ENTITY git-md5sum        "47b1f55d9a16be112f7ae2c778a9b30c">
+  <!ENTITY git-size          "3.4 MB">
+  <!ENTITY git-buildsize     "208 MB (additional 14 MB for downloaded docs and man pages, or 27 MB building docs and man pages)">
+  <!ENTITY git-time          " 0.7 SBU (additional 9.6 SBU for tests or 2.8 SBU for docs and man build)">
 ]>
 
@@ -145,4 +144,10 @@
 
     <para>
+      You can build the man pages and/or html docs, or
+      use downloaded ones. If you choose to build them, use next two following
+      instructions.
+    </para>
+
+    <para>
       If you have installed <ulink
       url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> you can
@@ -171,6 +176,9 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If you created the man pages, install them as the
+<!-- ==== Method 1 for docs ====== -->
+    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
+
+    <para>
+      Install the man pages as
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -179,21 +187,15 @@
 
     <para>
-      If you created the html docs, install them as the
+      Install the html docs as
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html              &amp;&amp;
-mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
-mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
-mkdir    /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
-mv       /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen>
-
-    <para>
-      Alternatively, If you downloaded the man pages untar them as the
+<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
+
+<!-- ==== Method 2 for docs ====== -->
+    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
+
+    <para>
+      If you downloaded the man pages untar them as the
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -212,7 +214,15 @@
 
 find /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \;     &amp;&amp;
-find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;     &amp;&amp;
-
-mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
+find /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
+
+<!-- ==== Reorganize docs ====== -->
+    <bridgehead renderas="sect3">Reorganize man pages and/or html docs (both methods)</bridgehead>
+
+    <para>
+      For both methods, reorganize the files, as
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mv       /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
 mv       /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
 mkdir    /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
@@ -267,10 +277,4 @@
       permissions in the shipped documentation tar file.
     </para>
-
-    <para><option>--libexecdir=/usr/lib</option>: This option puts the
-    <filename class="directory">git-core</filename> directory in
-    <filename class="directory">/usr/lib</filename> instead of
-    <filename class="directory">/usr/libexec</filename> in accordance
-    with the old version of the FHS used before LFS-7.5.</para>
 
   </sect2>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision fc78579dc272954fa8d7dd1d7162b67374c905f7)
+++ general/prog/subversion.xml	(revision 5ca26c766b817d003885d62cf584e1565d8cfcb2)
@@ -10,8 +10,8 @@
   "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "bd495517a760ddd764ce449a891971db">
+  <!ENTITY subversion-md5sum        "3068256761b40863df96128834d6b71b">
   <!ENTITY subversion-size          "6.6 MB">
-  <!ENTITY subversion-buildsize     "147 MB  (284 MB with all bindings and API documentation built; additional 968 MB for tests)">
-  <!ENTITY subversion-time          "1.3 SBU (2.5 SBU with all bindings and API documentation built; additional 12.6 SBU for tests)">
+  <!ENTITY subversion-buildsize     "143 MB  (284 MB with all bindings and API documentation built; additional 968 MB for tests)">
+  <!ENTITY subversion-time          "0.9 SBU (2.5 SBU with all bindings and API documentation built; additional 12.6 SBU for tests)">
 ]>
 
