Index: general/prog/dbus-python.xml
===================================================================
--- general/prog/dbus-python.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/dbus-python.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/jinja2.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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 a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/libxml2py2.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/lxml.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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 a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/mako.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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/pycairo.xml
===================================================================
--- general/prog/pycairo.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/pycairo.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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 a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/pycrypto.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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 a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/pyyaml.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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/scour.xml
===================================================================
--- general/prog/scour.xml	(revision a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/scour.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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 a42c273e166c3dc6f1143c72aa3ca8701a8fc978)
+++ general/prog/six.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
@@ -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>
