Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision c08b5cbdf92404c7c63f38c67fab4c292ef2c5cd)
+++ general/graphlib/libpng.xml	(revision 7fe0ce3b8527f8f5ccdbe11096ee5cb738d28578)
@@ -8,5 +8,5 @@
            "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "51ce71a1642cdde1f4485a7ff82193c0">
+  <!ENTITY libpng-md5sum        "14e037c5c9f1db16844760285ad5c2d6">
   <!ENTITY libpng-size          "856 KB">
   <!ENTITY libpng-buildsize     "12 MB (additional 1 MB for the tests)">
@@ -145,5 +145,5 @@
       <seglistitem>
         <seg>
-          libpng-config, libpng16-config, pngfix and png-fix-itxt
+          libpng-config (symlink), libpng16-config, pngfix and png-fix-itxt
         </seg>
         <seg>
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision c08b5cbdf92404c7c63f38c67fab4c292ef2c5cd)
+++ general/prog/python2.xml	(revision 7fe0ce3b8527f8f5ccdbe11096ee5cb738d28578)
@@ -154,6 +154,12 @@
 
     <para>
-      If you have downloaded the preformatted documentation from
-      <ulink url="http://docs.python.org/download.html"/>, install it
+      Since <application>Python 2</application> is in maintenance mode, and
+      <application>Python 3</application> is recommended by upstream for
+      development, probably, you do not need to install the documentation.
+      However, if you still want to install documentation for both
+      <application>Python</application> versions, be sure to define PYTHONDOCS
+      variable for the version you want to use, each time you need to consult
+      the documentation. If you have downloaded the preformatted documentation
+      from <ulink url="http://docs.python.org/download.html"/>, install it
       as the <systemitem class="username">root</systemitem> user:
     </para>
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision c08b5cbdf92404c7c63f38c67fab4c292ef2c5cd)
+++ general/prog/python3.xml	(revision 7fe0ce3b8527f8f5ccdbe11096ee5cb738d28578)
@@ -8,13 +8,12 @@
            "http://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "4ca001c5586eb0744e3174bc75c6fba8">
+  <!ENTITY python3-md5sum        "8fb961a20600aafafd249537af3ac637">
   <!ENTITY python3-size          "12 MB">
-  <!ENTITY python3-buildsize     "224 MB (additional 35 MB for the docs and
-                                  35 MB for the tests)">
-  <!ENTITY python3-time          "1.1 SBU (additional 1.4 SBU for the tests)">
+  <!ENTITY python3-buildsize     "260 MB (225 MB without docs or 144 MB for the tests)">
+  <!ENTITY python3-time          "1.0 SBU (or 2.5 SBU for the tests)">
 
   <!ENTITY python3htmldoc-download-http
            "http://docs.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3htmldoc-md5sum        "ed20d57923a9f76f62f6122aa12be08f">
+  <!ENTITY python3htmldoc-md5sum        "81d3756044c4af97b61ebf003a301a07">
   <!ENTITY python3htmldoc-size          "4.8 MB">
 ]>
@@ -110,5 +109,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/> and
+      <xref linkend="bluez"/>,
+      <xref linkend="gdb"/>, and
       <ulink url="http://www.valgrind.org/">Valgrind</ulink>
     </para>
@@ -142,6 +142,5 @@
 
     <para>
-      To test the results, issue: <command>make -k test</command>. One test
-      (test_gdb) has been reported to fail.
+      The test suite must be run separately, using an X terminal (see below).
     </para>
 
@@ -167,4 +166,18 @@
     -xvf ../python-&python3-version;-docs-html.tar.bz2</userinput></screen>
 
+    <para>
+      The test suite must be run separately from the build, either before or
+      after the package is installed. Do not install the package, after running
+      the test suite. To install the package, you need to start with a fresh or
+      clean source tree. For the test, you also need a clean source code, so
+      either start by removing the source code directory and starting over, by
+      uncompressing the source tarball or by running
+      <command>make clean</command>. Then configure again,
+      adding <quote>--with-pydebug</quote> to the <command>configure</command>
+      switches above, run <command>make</command>, then
+      <command>make test</command>.
+      Remember that some tests fail, if not run in an X terminal.
+    </para>
+
   </sect2>
 
@@ -221,27 +234,27 @@
       <seglistitem>
         <seg>
-          2to3 (symbolic link to 2to3-&python3-majorver;),
+          2to3 (symlink),
           2to3-&python3-majorver;,
 
-          pydoc3 (symbolic link to pydoc&python3-majorver;),
+          pydoc3 (symlink),
           pydoc&python3-majorver;,
 
-          python3 (symbolic link to python&python3-majorver;),
-          python&python3-majorver; (hard link to python&python3-majorver;m),
-          python&python3-majorver;m,
-
-          python3-config (symbolic link to python&python3-majorver;-config),
-          python&python3-majorver;-config (symbolic link to python3m-config),
+          python3 (symlink);
+          python&python3-majorver; and python&python3-majorver;m (hardlinked);
+
+          python3-config (symlink),
+          python&python3-majorver;-config (symlink),
           python&python3-majorver;m-config,
 
-          pyvenv (symbolic link to pyvenv&python3-majorver;),
+          pyvenv (symlink),
           pyvenv&python3-majorver;,
 
           and optionally, if Tk is installed,
-          idle3 (symbolic link to idle&python3-majorver;) and
+          idle3 (symlink) and
           idle&python3-majorver;
         </seg>
         <seg>
-          libpython&python3-majorver;m.so and libpython3.so
+          libpython&python3-majorver;m.so and libpython3.so;
+          several under /usr/lib/python3.3/lib-dynload/
         </seg>
         <seg>
