Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 76d24bfcca712add3b42bf30c3de2d2e6ac4f7b2)
+++ general/prog/python-modules.xml	(revision 53d92c8462d9a953613fbe32e31f534c1bb2c34b)
@@ -67,13 +67,12 @@
       <listitem>
         <para>
+          <xref linkend="python-dbusmock"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="dbus-python"/>
         </para>
       </listitem>
-<!--      <listitem>
-        <para>
-          <xref linkend="decorator"/>
-        </para>
-      </listitem>
--->
       <listitem>
         <para>
@@ -96,4 +95,29 @@
         </para>
       </listitem>
+      <listitem revision="sysv">
+        <para>
+          <xref linkend="Jinja2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="libxml2py2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="lxml"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="Mako"/>
+        </para>
+      </listitem>
+      <listitem revision="sysv">
+        <para>
+          <xref linkend="MarkupSafe"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
@@ -113,4 +137,9 @@
       <listitem>
         <para>
+          <xref linkend="pycairo2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pycairo"/>
         </para>
@@ -118,9 +147,4 @@
       <listitem>
         <para>
-          <xref linkend="pycairo2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="pycryptodome"/>
         </para>
@@ -128,9 +152,4 @@
       <listitem>
         <para>
-          <xref linkend="python-dbusmock"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="pygments"/>
         </para>
@@ -153,52 +172,20 @@
       <listitem>
         <para>
+          <xref linkend="pyparsing"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pytest"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pyxdg"/>
         </para>
       </listitem>
-<!--      <listitem>
-        <para>
-          <xref linkend="funcsigs"/>
-        </para>
-      </listitem>
--->
-<!--      <listitem>
-        <para>
-          <xref linkend="Beaker"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="libxml2py2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="lxml"/>
-        </para>
-      </listitem>
-      <listitem revision="sysv">
-        <para>
-          <xref linkend="MarkupSafe"/>
-        </para>
-      </listitem>
-      <listitem revision="sysv">
-        <para>
-          <xref linkend="Jinja2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="Mako"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyparsing"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pytest"/>
+      <listitem>
+        <para>
+          <xref linkend="PyYAML"/>
         </para>
       </listitem>
@@ -231,9 +218,4 @@
         <para>
           <xref linkend="sphinx_rtd_theme"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="PyYAML"/>
         </para>
       </listitem>
@@ -252,9 +234,9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/python-dbusmock.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/dbus-python.xml"/>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="decorator.xml"/>
--->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/docutils.xml"/>
@@ -270,4 +252,19 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/jinja2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/libxml2py2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/lxml.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/mako.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/markupsafe.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/packaging.xml"/>
 
@@ -277,21 +274,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pyatspi2.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="py2cairo.xml"/>
--->
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pycairo2.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pycairo.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pycairo2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pycryptodome.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/python-dbusmock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pygments.xml"/>
 
@@ -306,44 +297,18 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pyparsing.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pytest.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pyxdg.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pyyaml.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/recommonmark.xml"/>
 
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="setuptools.xml"/>
--->
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="funcsigs.xml"/> -->
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="beaker.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/libxml2py2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/lxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/markupsafe.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/jinja2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/mako.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyparsing.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pytest.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyyaml.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/requests.xml"/>
Index: general/prog/python-modules/libxml2py2.xml
===================================================================
--- general/prog/python-modules/libxml2py2.xml	(revision 76d24bfcca712add3b42bf30c3de2d2e6ac4f7b2)
+++ general/prog/python-modules/libxml2py2.xml	(revision 53d92c8462d9a953613fbe32e31f534c1bb2c34b)
@@ -15,5 +15,5 @@
 
   <!-- Begin libxml2py2 -->
-  <sect2 id="libxml2py2" xreflabel="Python2 libxml2-&libxml2-version; module">
+  <sect2 id="libxml2py2" xreflabel="libxml2-&libxml2-version; python2 module">
 
     <title>libxml2-&libxml2-version; (for its Python2 module)</title>
