Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 3f2db3a638d9b8a14bcb7f076eccf68e4a92faa0)
+++ general/prog/python-modules.xml	(revision 3ef383c4828851e1d4fa8ad890ccc5c2cfa2b7e8)
@@ -48,4 +48,11 @@
 
     <itemizedlist spacing="compact">
+<!--
+      <listitem>
+        <para>
+          <xref linkend="pythonhosted"/>
+        </para>
+      </listitem>
+-->
       <listitem>
         <para>
@@ -76,4 +83,24 @@
       <listitem>
         <para>
+          <xref linkend="doxypypy"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="doxyqml"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="gi-docgen"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="packaging"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="py3c"/>
         </para>
@@ -166,10 +193,24 @@
         </para>
       </listitem>
-<!--      <listitem>
-        <para>
-          <xref linkend="python-slip"/>
-        </para>
-      </listitem>
--->
+      <listitem>
+        <para>
+          <xref linkend="pyparsing"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pytest"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="recommonmark"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="requests"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
@@ -180,4 +221,14 @@
         <para>
           <xref linkend="six"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="sphinx"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="sphinx_rtd_theme"/>
         </para>
       </listitem>
@@ -190,12 +241,16 @@
   </sect2>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="asciidoc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="cython.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="dbus-python.xml"/>
+<!--
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/pythonhosted.xml"/>
+-->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/asciidoc.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/cython.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"
@@ -203,11 +258,23 @@
 -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="docutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="py3c.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyatspi2.xml"/>
+    href="python-modules/docutils.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/doxypypy.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/doxyqml.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/gi-docgen.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/packaging.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/py3c.xml"/>
+
+  <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"
@@ -215,29 +282,32 @@
 -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycairo.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycairo2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycryptodome.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dbusmock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygments.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygobject2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygobject3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygtk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyxdg.xml"/>
+    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"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygobject2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygobject3.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygtk.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/recommonmark.xml"/>
 
 <!--
@@ -253,29 +323,41 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libxml2py2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="lxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="markupsafe.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="jinja2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="mako.xml"/>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-slip.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyyaml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="scour.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="six.xml"/>
+    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"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/scour.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/six.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/sphinx.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/sphinx_rtd_theme.xml"/>
 
 </sect1>
