Index: general/prog/dbus-python.xml
===================================================================
--- general/prog/dbus-python.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/dbus-python.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -118,5 +118,5 @@
 <screen><userinput>mkdir python2 &amp;&amp;
 pushd python2 &amp;&amp;
-PYTHON=/usr/bin/python     \
+PYTHON=/usr/bin/python2     \
 ../configure --prefix=/usr --docdir=/usr/share/doc/dbus-python-&dbus-python-version; &amp;&amp;
 make &amp;&amp;
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/doxygen.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -150,5 +150,5 @@
     </para>
 
-<screen><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
+<screen remap="doc"><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
 
 make docs</userinput></screen>
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/gdb.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -120,5 +120,5 @@
     </para>
 
-<screen><userinput>make -C gdb/doc doxy</userinput></screen>
+<screen remap="doc"><userinput>make -C gdb/doc doxy</userinput></screen>
 
     <para>
@@ -126,5 +126,5 @@
     </para>
 
-<screen><userinput>pushd gdb/testsuite &amp;&amp;
+<screen remap="test"><userinput>pushd gdb/testsuite &amp;&amp;
 make  site.exp      &amp;&amp;
 echo  "set gdb_test_timeout 120" &gt;&gt; site.exp &amp;&amp;
@@ -205,5 +205,6 @@
     </para>
 
-<screen role="root"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
 rm -rf gdb/doc/doxy/xml &amp;&amp;
 cp -Rv gdb/doc/doxy /usr/share/doc/gdb-&gdb-version;</userinput></screen>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/git.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -165,5 +165,5 @@
     </para>
 
-<screen><userinput>make html</userinput></screen>
+<screen remap="doc"><userinput>make html</userinput></screen>
 
     <para>
@@ -172,5 +172,5 @@
     </para>
 
-<screen><userinput>make man</userinput></screen>
+<screen remap="doc"><userinput>make man</userinput></screen>
 
     <para>
@@ -195,5 +195,5 @@
     </para>
 
-<screen role="root"><userinput>make install-man</userinput></screen>
+<screen role="root" remap="doc"><userinput>make install-man</userinput></screen>
 
     <para>
@@ -202,5 +202,5 @@
     </para>
 
-<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
+<screen role="root" remap="doc"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
 
 <!-- ==== Method 2 for docs ====== -->
Index: general/prog/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/jinja2.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -97,5 +97,5 @@
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
 
       <para>
Index: general/prog/libxml2py2.xml
===================================================================
--- general/prog/libxml2py2.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/libxml2py2.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -99,5 +99,5 @@
 
 <screen><userinput>cd python             &amp;&amp;
-python setup.py build</userinput></screen>
+python2 setup.py build</userinput></screen>
 
       <para>
@@ -107,5 +107,5 @@
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/llvm.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -211,4 +211,23 @@
 
     <para>
+      If you have installed <application>Sphinx</application> and
+      <application>recommonmark</application> and wish
+      to generate the html documentation and manual pages, issue the following
+      commands:
+    </para>
+
+<screen remap="doc"><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
+      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
+      -Wno-dev -G Ninja ..            &amp;&amp;
+ninja docs-llvm-html  docs-llvm-man</userinput></screen>
+
+    <para>
+      If you have downloaded the optional packages, the clang documentation
+      can be built too:
+    </para>
+
+<screen remap="doc"><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
+
+    <para>
       <!-- EDITORS - if you have more than 4 cores, take some offline to measure
       the elapsed time for the tests.  Also, libstdc++.a and perhaps libstdc++fs.a
@@ -234,34 +253,22 @@
 
     <para>
-      If you have installed <application>Sphinx</application> and
-      <application>recommonmark</application> and wish
-      to generate the html documentation and manual pages, issue the following
-      commands:
-    </para>
-<screen><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
-      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
-      -Wno-dev -G Ninja ..            &amp;&amp;
-ninja docs-llvm-html  docs-llvm-man</userinput></screen>
-    <para>
-      If you have downloaded the optional packages, the clang documentation
-      can be built too:
-    </para>
-<screen><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
-
-    <para>
-      Install the llvm documentation by running the following command as the 
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 docs/man/* /usr/share/man/man1             &amp;&amp;
+      If you have built the the llvm documentation, install it by running the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 docs/man/* /usr/share/man/man1             &amp;&amp;
 install -v -d -m755 /usr/share/doc/llvm-&llvm-version;/llvm-html     &amp;&amp;
 cp -Rv docs/html/* /usr/share/doc/llvm-&llvm-version;/llvm-html</userinput></screen>
 
     <para>
-      The clang documentation can be installed in the same way (again as the
+      If you have built the clang documentation, it can be installed in the
+      same way (again as the
       <systemitem class="username">root</systemitem> user):
     </para>
 
-<screen role="root"><userinput>install -v -m644 tools/clang/docs/man/* /usr/share/man/man1 &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -m644 tools/clang/docs/man/* /usr/share/man/man1 &amp;&amp;
 install -v -d -m755 /usr/share/doc/llvm-&llvm-version;/clang-html    &amp;&amp;
 cp -Rv tools/clang/docs/html/* /usr/share/doc/llvm-&llvm-version;/clang-html</userinput></screen>
Index: general/prog/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/lxml.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -105,11 +105,15 @@
 
       <para>
-        To build the <application>Python 2</application> module, run:
+        To build both <application>Python 2</application> and
+        <application>Python 3</application> modules, run:
       </para>
 
-<screen><userinput>python setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
      <para>
-       If you wish to run the tests, enter: <command>make test</command>.
+       If you wish to run the tests, enter:
+       <command>make PYTHON=python2 test</command> and
+       <command>make PYTHON=python3 test</command>.
        This will rebuild the package for inplace use before running the tests.
        One or more tests sometimes fail.
@@ -117,31 +121,10 @@
 
       <para>
-        To install the <application>Python 2</application> module,
-        as the
-        <systemitem class="username">root</systemitem> user run:
+        To install both modules, issue the following commands as the
+        <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module, run:
-      </para>
-
-<screen><userinput>python3 setup.py clean &amp;&amp;
-python3 setup.py build</userinput></screen>
-
-     <para>
-       If you wish to run the tests, enter: <command>make PYTHON=python3
-       test</command>. This will rebuild the package for inplace use before
-       running the tests. One or more tests sometimes fail.
-     </para>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        as the
-        <systemitem class="username">root</systemitem> user run:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
Index: general/prog/mako.xml
===================================================================
--- general/prog/mako.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/mako.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -99,5 +99,5 @@
       </para>
 
-<screen role="root"><userinput>python setup.py install - -optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install - -optimize=1</userinput></screen>
 -->
       <para>
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/mercurial.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -100,5 +100,5 @@
     issue:</para>
 
-<screen><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
+<screen remap="doc"><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &amp;&amp;
 2to3-3.7 -w doc/hgmanpage.py            &amp;&amp;
 make doc</userinput></screen>
@@ -111,5 +111,5 @@
     issue:</para>
 
-<screen><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
+<screen remap="test"><userinput>cat &gt; tests/blacklists/failed-tests &lt;&lt; "EOF"
 <literal># Test Failures
   test-gpg.t</literal>
@@ -119,5 +119,5 @@
       To run the test suite, issue:
     </para>
-<screen><userinput>rm -rf tests/tmp &amp;&amp;
+<screen remap="test"><userinput>rm -rf tests/tmp &amp;&amp;
 TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/failed-tests" make check</userinput></screen>
 
@@ -130,5 +130,5 @@
     the tests that failed before:</para>
 
-<screen><userinput>pushd tests  &amp;&amp;
+<screen remap="test"><userinput>pushd tests  &amp;&amp;
   rm -rf tmp &amp;&amp;
   ./run-tests.py --tmpdir tmp test-gpg.t
@@ -142,5 +142,5 @@
     or not. One test, test-https.t, is known to fail.</para>
 
-    <para>An interesting switch is "- -time", which will generate at the end of
+    <para>An interesting switch is "--time", which will generate at the end of
     the test suite execution, a table with all executed tests and respective
     start, end, user, system and real times. Notice that the switches may be
@@ -156,5 +156,6 @@
     command (as <systemitem class="username">root</systemitem>):</para>
 
-<screen role="root"><userinput>make PREFIX=/usr install-doc</userinput></screen>
+<screen role="root"
+        remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
 
     <para>After installed, two very quick and simple tests should run correctly.
Index: general/prog/pycairo.xml
===================================================================
--- general/prog/pycairo.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/pycairo.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -95,9 +95,10 @@
 
       <para>
-        Install <application>PyCairo</application> for Python2 by running 
-        the following commands:
+        Install <application>PyCairo</application> for Python2  and Python3 by
+        running the following commands:
       </para>
 
-<screen><userinput>python2 setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
@@ -109,26 +110,9 @@
       </para>
 
-<screen role="root"><userinput>python2 setup.py install --optimize=1   &amp;&amp;
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
+<!-- Seems that install does the following too
 python2 setup.py install_pycairo_header &amp;&amp;
-python2 setup.py install_pkgconfig</userinput></screen>
-
-      <para>
-        Install <application>PyCairo</application> for Python3 by running 
-        the following commands:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1   &amp;&amp;
-python3 setup.py install_pycairo_header &amp;&amp;
-python3 setup.py install_pkgconfig</userinput></screen>
+python2 setup.py install_pkgconfig</userinput></screen>-->
 
     </sect3>
Index: general/prog/pycrypto.xml
===================================================================
--- general/prog/pycrypto.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/pycrypto.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -93,32 +93,18 @@
 
       <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
+        To build the <application>Python 2</application> and
+        <application>Python 3</application> modules, run the following commands:
       </para>
 
-<screen><userinput>python setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
+        To install both modules, run the following commands as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
@@ -137,6 +123,6 @@
           </seg>
           <seg>
-            pycrypto-&pycrypto-version;-py2.7.egg-info and/or
-            pycrypto-&pycrypto-version;-py3.6.egg-info
+            pycrypto-&pycrypto-version;-py&python2-majorver;.egg-info and/or
+            pycrypto-&pycrypto-version;-py&python3-majorver;.egg-info
           </seg>
           <seg>
Index: general/prog/pyyaml.xml
===================================================================
--- general/prog/pyyaml.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/pyyaml.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -97,32 +97,19 @@
 
       <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
+        To build both <application>Python 2</application> and
+        <application>Python 3</application> modules,
+        run the following commands:
       </para>
 
-<screen><userinput>python setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
+        To install both modules, run the following commands as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/rust.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -185,7 +185,5 @@
     <para role="optional">
       <xref linkend="gdb"/> (used by the testsuite if it is present) and
-      <xref linkend="python2"/> (if gdb is present, it must have been built
-      with Python 2 support to prevent some tests failing. Furthermore, another
-      test fails if Python 2 is not present)
+      <xref linkend="python2"/> (one test fails if Python 2 is not present)
     </para>
 
@@ -301,5 +299,5 @@
       which need Thumb (ARM) compilers will fail, all in <filename
       class="directory">ui/issues</filename> for issues 37131, 49851 and 50993.
-      Occasionally a fourth test,
+      If <xref linkend="python2"/> is not installed, a fourth test,
       <filename>run-make-fulldeps/sysroot-crates-are-unstable</filename>
       fails. If gdb has been installed, in some circumstances three tests in
Index: general/prog/scour.xml
===================================================================
--- general/prog/scour.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/scour.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -107,38 +107,25 @@
 
       <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
+        To build both <application>Python 2</application> and
+        <application>Python 3</application> modules,
+        run the following commands:
       </para>
 
-<screen><userinput>python setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
-        To partially test the results, issue: <command>python testcss.py</command>.
+        To partially test the results, issue: <command>python2 testcss.py</command>.
         If you have installed <application>Six</application> you can run the main
-        tests by issuing: <command>python testscour.py</command>.
+        tests by issuing: <command>python2 testscour.py</command>.
       </para>
 
       <para>
-        To install the <application>Python 2</application> module
-        run the following command as the
+        To install both modules, run the following command as the
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
Index: general/prog/six.xml
===================================================================
--- general/prog/six.xml	(revision e7d893b3954f8a479230e0de5b0386dd431db981)
+++ general/prog/six.xml	(revision 5e8edab526a4dcf583fb7ebda3151f324ba132df)
@@ -90,9 +90,10 @@
 
       <para>
-        Install <application>six</application> for Python2 by running 
-        the following commands:
+        Install <application>six</application> for Python 2 and Python 3
+        by running the following commands:
       </para>
 
-<screen><userinput>python2 setup.py build</userinput></screen>
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
 
       <para>
@@ -104,22 +105,6 @@
       </para>
 
-<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        Install <application>six</application> for Python3 by running 
-        the following commands:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+<screen role="root"><userinput>python2 setup.py install --optimize=1 &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
 
     </sect3>
