Index: general/prog/python-dependencies.xml
===================================================================
--- general/prog/python-dependencies.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -64,4 +64,19 @@
       <listitem>
         <para>
+          <xref linkend="certifi"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="charset-normalizer"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="idna"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="imagesize"/>
         </para>
@@ -74,4 +89,14 @@
       <listitem>
         <para>
+          <xref linkend="pyparsing"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pytz"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="snowballstemmer"/>
         </para>
@@ -79,30 +104,35 @@
       <listitem>
         <para>
-          <xref linkend="sphinxcontrib-applehelp"/>
+          <xref linkend="sc-applehelp"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          <xref linkend="sphinxcontrib-devhelp"/>
+          <xref linkend="sc-devhelp"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          <xref linkend="sphinxcontrib-htmlhelp"/>
+          <xref linkend="sc-htmlhelp"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          <xref linkend="sphinxcontrib-jsmath"/>
+          <xref linkend="sc-jsmath"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          <xref linkend="sphinxcontrib-qthelp"/>
+          <xref linkend="sc-qthelp"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          <xref linkend="sphinxcontrib-serializinghtml"/>
+          <xref linkend="sc-serializinghtml"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="urllib3"/>
         </para>
       </listitem>
@@ -117,8 +147,23 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/certifi.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/charset-normalizer.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/idna.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-dependencies/imagesize.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-dependencies/packaging.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/pyparsing.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/pytz.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -143,3 +188,6 @@
     href="python-dependencies/sphinxcontrib-serializinghtml.xml"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-dependencies/urllib3.xml"/>
+
 </sect1>
Index: general/prog/python-dependencies/alabaster.xml
===================================================================
--- general/prog/python-dependencies/alabaster.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/alabaster.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY alabster-download-http "https://github.com/bitprophet/alabaster/archive/&alabaster-version;/alabaster-&alabaster-version;.tar.gz">
-  <!ENTITY alabster-download-ftp  " ">
-  <!ENTITY alabster-md5sum        "0b34444e429f5c21fd077cce1808cc7f">
-  <!ENTITY alabster-size          "23 KB">
-  <!ENTITY alabster-buildsize     "2.6 MB">
-  <!ENTITY alabster-time          "less than 0.1 SBU">
+  <!ENTITY alabaster-download-http "https://github.com/bitprophet/alabaster/archive/&alabaster-version;/alabaster-&alabaster-version;.tar.gz">
+  <!ENTITY alabaster-download-ftp  " ">
+  <!ENTITY alabaster-md5sum        "0b34444e429f5c21fd077cce1808cc7f">
+  <!ENTITY alabaster-size          "23 KB">
+  <!ENTITY alabaster-buildsize     "2.6 MB">
+  <!ENTITY alabaster-time          "less than 0.1 SBU">
 ]>
 
@@ -69,5 +69,5 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
+      <title>Installation of Alabaster</title>
 
     <para>Build the module: </para>
@@ -83,5 +83,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user alabaster</userinput></screen>
 
     </sect3>
Index: general/prog/python-dependencies/babel.xml
===================================================================
--- general/prog/python-dependencies/babel.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/babel.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -13,5 +13,4 @@
 ]>
 
-<!-- Begin Py3c -->
   <sect2 id="babel" xreflabel="babel-&babel-version;">
 
@@ -68,5 +67,5 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Babel Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
@@ -135,4 +134,5 @@
           </listitem>
         </varlistentry>
+      </variablelist>
 
     </sect3>
Index: general/prog/python-dependencies/certifi.xml
===================================================================
--- general/prog/python-dependencies/certifi.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
+++ general/prog/python-dependencies/certifi.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY certifi-download-http "https://github.com/pypa/certifi/releases/download/&certifi-version;/certifi-&certifi-version;.tar.gz">
+  <!ENTITY certifi-download-ftp  " ">
+  <!ENTITY certifi-md5sum        "e713c1939f294fd729af4a7be40dd141">
+  <!ENTITY certifi-size          "83 KB">
+  <!ENTITY certifi-buildsize     "2.6 MB">
+  <!ENTITY certifi-time          "less than 0.1 SBU">
+]>
+
+  <sect2 id="certifi" xreflabel="certifi-&certifi-version;">
+
+    <title>Packaging-&certifi-version;</title>
+
+    <indexterm zone="certifi">
+      <primary sortas="a-certifi">certifi</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Packaging Module</title>
+
+      <para>
+        The <application>Packaging</application> library provides utilities
+        that implement the interoperability specifications which have clearly
+        one correct behaviour or benefit greatly from having a single shared
+        implementation.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&certifi-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&certifi-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &certifi-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &certifi-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &certifi-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &certifi-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="optional">
+        <xref linkend="pyparsing"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Packaging</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user certifi</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/certifi and
+            /usr/lib/python&python3-majorver;/site-packages/certifi-&certifi-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-dependencies/charset-normalizer.xml
===================================================================
--- general/prog/python-dependencies/charset-normalizer.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
+++ general/prog/python-dependencies/charset-normalizer.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY charset-normalizer-download-http "https://github.com/pypa/charset-normalizer/releases/download/&charset-normalizer-version;/charset-normalizer-&charset-normalizer-version;.tar.gz">
+  <!ENTITY charset-normalizer-download-ftp  " ">
+  <!ENTITY charset-normalizer-md5sum        "e713c1939f294fd729af4a7be40dd141">
+  <!ENTITY charset-normalizer-size          "83 KB">
+  <!ENTITY charset-normalizer-buildsize     "2.6 MB">
+  <!ENTITY charset-normalizer-time          "less than 0.1 SBU">
+]>
+
+  <sect2 id="charset-normalizer" xreflabel="charset-normalizer-&charset-normalizer-version;">
+
+    <title>Packaging-&charset-normalizer-version;</title>
+
+    <indexterm zone="charset-normalizer">
+      <primary sortas="a-charset-normalizer">charset-normalizer</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Packaging Module</title>
+
+      <para>
+        The <application>Packaging</application> library provides utilities
+        that implement the interoperability specifications which have clearly
+        one correct behaviour or benefit greatly from having a single shared
+        implementation.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&charset-normalizer-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&charset-normalizer-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &charset-normalizer-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &charset-normalizer-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &charset-normalizer-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &charset-normalizer-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="optional">
+        <xref linkend="pyparsing"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Packaging</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user charset-normalizer</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/charset-normalizer and
+            /usr/lib/python&python3-majorver;/site-packages/charset-normalizer-&charset-normalizer-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-dependencies/idna.xml
===================================================================
--- general/prog/python-dependencies/idna.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
+++ general/prog/python-dependencies/idna.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY idna-download-http "https://github.com/pypa/idna/releases/download/&idna-version;/idna-&idna-version;.tar.gz">
+  <!ENTITY idna-download-ftp  " ">
+  <!ENTITY idna-md5sum        "e713c1939f294fd729af4a7be40dd141">
+  <!ENTITY idna-size          "83 KB">
+  <!ENTITY idna-buildsize     "2.6 MB">
+  <!ENTITY idna-time          "less than 0.1 SBU">
+]>
+
+  <sect2 id="idna" xreflabel="idna-&idna-version;">
+
+    <title>Packaging-&idna-version;</title>
+
+    <indexterm zone="idna">
+      <primary sortas="a-idna">idna</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Packaging Module</title>
+
+      <para>
+        The <application>Packaging</application> library provides utilities
+        that implement the interoperability specifications which have clearly
+        one correct behaviour or benefit greatly from having a single shared
+        implementation.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&idna-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&idna-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &idna-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &idna-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &idna-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &idna-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="optional">
+        <xref linkend="pyparsing"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Packaging</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user idna</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/idna and
+            /usr/lib/python&python3-majorver;/site-packages/idna-&idna-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-dependencies/imagesize.xml
===================================================================
--- general/prog/python-dependencies/imagesize.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/imagesize.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -13,7 +13,7 @@
 ]>
 
-  <sect2 id="Imagesize" xreflabel="imagesize-&imagesize-version;">
+  <sect2 id="imagesize" xreflabel="imagesize-&imagesize-version;">
 
-    <title>Asciidoc-&imagesize-version;</title>
+    <title>Imagesize-&imagesize-version;</title>
 
     <indexterm zone="imagesize">
Index: general/prog/python-dependencies/packaging.xml
===================================================================
--- general/prog/python-dependencies/packaging.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/packaging.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -13,6 +13,5 @@
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id=" packaging" xreflabel=" packaging-&packaging-version;">
+  <sect2 id="packaging" xreflabel="packaging-&packaging-version;">
 
     <title>Packaging-&packaging-version;</title>
Index: general/prog/python-dependencies/pyparsing.xml
===================================================================
--- general/prog/python-dependencies/pyparsing.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
+++ general/prog/python-dependencies/pyparsing.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pyparsing-download-http "https://github.com/pypa/pyparsing/releases/download/&pyparsing-version;/pyparsing-&pyparsing-version;.tar.gz">
+  <!ENTITY pyparsing-download-ftp  " ">
+  <!ENTITY pyparsing-md5sum        "e713c1939f294fd729af4a7be40dd141">
+  <!ENTITY pyparsing-size          "83 KB">
+  <!ENTITY pyparsing-buildsize     "2.6 MB">
+  <!ENTITY pyparsing-time          "less than 0.1 SBU">
+]>
+
+  <sect2 id="pyparsing" xreflabel="pyparsing-&pyparsing-version;">
+
+    <title>Packaging-&pyparsing-version;</title>
+
+    <indexterm zone="pyparsing">
+      <primary sortas="a-pyparsing">pyparsing</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Packaging Module</title>
+
+      <para>
+        The <application>Packaging</application> library provides utilities
+        that implement the interoperability specifications which have clearly
+        one correct behaviour or benefit greatly from having a single shared
+        implementation.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pyparsing-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyparsing-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyparsing-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyparsing-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyparsing-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyparsing-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="optional">
+        <xref linkend="pyparsing"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Packaging</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user pyparsing</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/pyparsing and
+            /usr/lib/python&python3-majorver;/site-packages/pyparsing-&pyparsing-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-dependencies/pytz.xml
===================================================================
--- general/prog/python-dependencies/pytz.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
+++ general/prog/python-dependencies/pytz.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pytz-download-http "https://github.com/pypa/pytz/releases/download/&pytz-version;/pytz-&pytz-version;.tar.gz">
+  <!ENTITY pytz-download-ftp  " ">
+  <!ENTITY pytz-md5sum        "e713c1939f294fd729af4a7be40dd141">
+  <!ENTITY pytz-size          "83 KB">
+  <!ENTITY pytz-buildsize     "2.6 MB">
+  <!ENTITY pytz-time          "less than 0.1 SBU">
+]>
+
+  <sect2 id="pytz" xreflabel="pytz-&pytz-version;">
+
+    <title>Packaging-&pytz-version;</title>
+
+    <indexterm zone="pytz">
+      <primary sortas="a-pytz">pytz</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Packaging Module</title>
+
+      <para>
+        The <application>Packaging</application> library provides utilities
+        that implement the interoperability specifications which have clearly
+        one correct behaviour or benefit greatly from having a single shared
+        implementation.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pytz-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pytz-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pytz-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pytz-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pytz-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pytz-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="optional">
+        <xref linkend="pyparsing"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Packaging</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user pytz</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/pytz and
+            /usr/lib/python&python3-majorver;/site-packages/pytz-&pytz-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-dependencies/snowballstemmer.xml
===================================================================
--- general/prog/python-dependencies/snowballstemmer.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/snowballstemmer.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,8 +5,8 @@
   %general-entities;
 
-  <!ENTITY snowballstemmer-download-http "https://files.pythonhosted.org/packages/source/a/snowballstemmer/snowballstemmer-&snowballstemmer-version;.tar.gz">
+  <!ENTITY snowballstemmer-download-http "https://github.com/snowballstem/snowball/archive/refs/tags/v&snowballstemmer-version;/snowball-&snowballstemmer-version;.tar.gz">
   <!ENTITY snowballstemmer-download-ftp  " ">
-  <!ENTITY snowballstemmer-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY snowballstemmer-size          "212 KB">
+  <!ENTITY snowballstemmer-md5sum        "5e1c4789c9ca774a214a5ca49cca717a">
+  <!ENTITY snowballstemmer-size          "219 KB">
   <!ENTITY snowballstemmer-buildsize     "2.6 MB">
   <!ENTITY snowballstemmer-time          "less than 0.1 SBU">
@@ -29,5 +29,5 @@
         in Information Retrieval, plus a collection of stemming algorithms
         implemented using it. Stemming maps different forms of the same word
-        to a common <quote>stem</quote> &emdash; for example, the English
+        to a common <quote>stem</quote> &mdash; for example, the English
         stemmer maps <emphasis>connection</emphasis>,
         <emphasis>connections</emphasis>, <emphasis>connective</emphasis>,
@@ -94,5 +94,5 @@
 
     </sect3>
-
+    <!-- TODO -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../../xincludes/pip3-cmd-explain.xml"/>
Index: general/prog/python-dependencies/sphinxcontrib-applehelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-applehelp.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/sphinxcontrib-applehelp.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,29 +5,27 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY sc-applehelp-download-http "https://github.com/sphinx-doc/sphinxcontrib-applehelp/archive/refs/tags/&sc-applehelp-version;/sphinxcontrib-applehelp-&sc-applehelp-version;.tar.gz">
+  <!ENTITY sc-applehelp-download-ftp  " ">
+  <!ENTITY sc-applehelp-md5sum        "4b813df230e3c615fc16b88d3faecbd5">
+  <!ENTITY sc-applehelp-size          "20 KB">
+  <!ENTITY sc-applehelp-buildsize     "2.6 MB">
+  <!ENTITY sc-applehelp-time          "less than 0.1 SBU">
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id="sphinxcontrib-applehelp" xreflabel="sphinxcontrib-applehelp-&asciidoc-version;">
+  <sect2 id="sc-applehelp" xreflabel="sphinxcontrib-applehelp-&sc-applehelp-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Sphinxcontrib-applehelp-&sc-applehelp-version;</title>
 
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
+    <indexterm zone="sc-applehelp">
+      <primary sortas="a-sphinxcontrib-applehelp">sphinxcontrib-applehelp</primary>
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
+      <title>Introduction to Sphinxcontrib-applehelp Module</title>
 
       <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
+        The <application>Sphinxcontrib-applehelp</application> package is a
+        <application>Sphinx</application> extension which outputs Apple
+        help books.
       </para>
 
@@ -38,44 +36,48 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&sc-applehelp-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&sc-applehelp-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &sc-applehelp-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &sc-applehelp-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &sc-applehelp-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &sc-applehelp-time;
           </para>
         </listitem>
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Sphinxcontrib-applehelp Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
+        <xref linkend="pytest"/> (for tests),
+        <ulink url="https://pypi.org/project/docutils-stubs/">
+          docutils-stubs
+        </ulink>,
+        <ulink url="https://pypi.org/project/flake8/">
+          flake8
+        </ulink>, and
+        <ulink url="https://pypi.org/project/mypy/">
+          mypy
+        </ulink>
       </para>
 
@@ -83,14 +85,6 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
+      <title>Installation of Sphinxcontrib-applehelp</title>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
     <para> Build the module: </para>
 
@@ -105,5 +99,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-applehelp</userinput></screen>
 
     </sect3>
@@ -121,48 +115,13 @@
 
         <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
+          <seg>None</seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_applehelp-&sc-applehelp-dev-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>
-      <!--
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-      -->
     </sect3>
 
Index: general/prog/python-dependencies/sphinxcontrib-devhelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-devhelp.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/sphinxcontrib-devhelp.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,29 +5,28 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY sc-devhelp-download-http "https://github.com/sphinx-doc/sphinxcontrib-devhelp/archive/refs/tags/&sc-devhelp-version;/sphinxcontrib-devhelp-&sc-devhelp-version;.tar.gz">
+  <!ENTITY sc-devhelp-download-ftp  " ">
+  <!ENTITY sc-devhelp-md5sum        "5ff568fed7b7e2a1ab0e09b874c413de">
+  <!ENTITY sc-devhelp-size          "13 KB">
+  <!ENTITY sc-devhelp-buildsize     "2.6 MB">
+  <!ENTITY sc-devhelp-time          "less than 0.1 SBU">
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id="sphinxcontrib-devhelp" xreflabel="sphinxcontrib-devhelp-&asciidoc-version;">
+  <sect2 id="sc-devhelp" xreflabel="sphinxcontrib-devhelp-&sc-devhelp-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Sphinxcontrib-devhelp-&sc-devhelp-version;</title>
 
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
+    <indexterm zone="sc-devhelp">
+      <primary sortas="a-sphinxcontrib-devhelp">sphinxcontrib-devhelp</primary>
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
+      <title>Introduction to Sphinxcontrib-devhelp Module</title>
 
       <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
+        The <application>Sphinxcontrib-devhelp</application> package is a
+        <application>Sphinx</application> extension which outputs
+        <ulink url="https://wiki.gnome.org/Apps/Devhelp">Devhelp</ulink>
+        documents.
       </para>
 
@@ -38,44 +37,48 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&sc-devhelp-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&sc-devhelp-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &sc-devhelp-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &sc-devhelp-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &sc-devhelp-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &sc-devhelp-time;
           </para>
         </listitem>
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Sphinxcontrib-devhelp Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
+        <xref linkend="pytest"/> (for tests),
+        <ulink url="https://pypi.org/project/docutils-stubs/">
+          docutils-stubs
+        </ulink>,
+        <ulink url="https://pypi.org/project/flake8/">
+          flake8
+        </ulink>, and
+        <ulink url="https://pypi.org/project/mypy/">
+          mypy
+        </ulink>
       </para>
 
@@ -83,14 +86,6 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
+      <title>Installation of Sphinxcontrib-devhelp</title>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
     <para> Build the module: </para>
 
@@ -105,5 +100,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-devhelp</userinput></screen>
 
     </sect3>
@@ -121,48 +116,13 @@
 
         <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
+          <seg>None</seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_devhelp-&sc-devhelp-dev-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>
-      <!--
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-      -->
     </sect3>
 
Index: general/prog/python-dependencies/sphinxcontrib-htmlhelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-htmlhelp.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/sphinxcontrib-htmlhelp.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,29 +5,27 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY sc-htmlhelp-download-http "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/archive/refs/tags/&sc-htmlhelp-version;/sphinxcontrib-htmlhelp-&sc-htmlhelp-version;.tar.gz">
+  <!ENTITY sc-htmlhelp-download-ftp  " ">
+  <!ENTITY sc-htmlhelp-md5sum        "cb68f8a134e2954b9dba5b8f214c1be5">
+  <!ENTITY sc-htmlhelp-size          "23 KB">
+  <!ENTITY sc-htmlhelp-buildsize     "2.6 MB">
+  <!ENTITY sc-htmlhelp-time          "less than 0.1 SBU">
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id="sphinxcontrib-htmlhelp" xreflabel="sphinxcontrib-htmlhelp-&asciidoc-version;">
+  <sect2 id="sc-htmlhelp" xreflabel="sphinxcontrib-htmlhelp-&asciidoc-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Sphinxcontrib-htmlhelp-&sc-htmlhelp-version;</title>
 
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
+    <indexterm zone="sc-htmlhelp">
+      <primary sortas="a-sphinxcontrib-htmlhelp">sphinxcontrib-htmlhelp</primary>
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
+      <title>Introduction to Sphinxcontrib-htmlhelp Module</title>
 
       <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
+        The <application>Sphinxcontrib-htmlhelp</application> package is a
+        <application>Sphinx</application> extension which renders HTML
+        help files.
       </para>
 
@@ -38,44 +36,51 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&sc-htmlhelp-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&sc-htmlhelp-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &sc-htmlhelp-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &sc-htmlhelp-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &sc-htmlhelp-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &sc-htmlhelp-time;
           </para>
         </listitem>
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Sphinxcontrib-htmlhelp Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
+        <xref linkend="pytest"/> (for tests),
+        <ulink url="https://pypi.org/project/docutils-stubs/">
+          docutils-stubs
+        </ulink>,
+        <ulink url="https://pypi.org/project/flake8/">
+          flake8
+        </ulink>,
+        <ulink url="https://pypi.org/project/html5lib/">
+          html5lib
+        </ulink> (for tests), and
+        <ulink url="https://pypi.org/project/mypy/">
+          mypy
+        </ulink>
       </para>
 
@@ -83,14 +88,6 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
+      <title>Installation of Sphinxcontrib-htmlhelp</title>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
     <para> Build the module: </para>
 
@@ -105,5 +102,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-htmlhelp</userinput></screen>
 
     </sect3>
@@ -121,48 +118,13 @@
 
         <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
+          <seg>None</seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_htmlhelp-&sc-htmlhelp-dev-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>
-      <!--
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-      -->
     </sect3>
 
Index: general/prog/python-dependencies/sphinxcontrib-jsmath.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-jsmath.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/sphinxcontrib-jsmath.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,29 +5,27 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY sc-jsmath-download-http "https://github.com/sphinx-doc/sphinxcontrib-jsmath/archive/refs/tags/&sc-jsmath-version;/sphinxcontrib-jsmath-&sc-jsmath-version;.tar.gz">
+  <!ENTITY sc-jsmath-download-ftp  " ">
+  <!ENTITY sc-jsmath-md5sum        "63b128d164e727722f48d388a1b57dde">
+  <!ENTITY sc-jsmath-size          "14 KB">
+  <!ENTITY sc-jsmath-buildsize     "2.6 MB">
+  <!ENTITY sc-jsmath-time          "less than 0.1 SBU">
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id="sphinxcontrib-jsmath" xreflabel="sphinxcontrib-jsmath-&asciidoc-version;">
+  <sect2 id="sc-jsmath" xreflabel="sphinxcontrib-jsmath-&asciidoc-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Sphinxcontrib-jsmath-&sc-jsmath-version;</title>
 
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
+    <indexterm zone="sc-jsmath">
+      <primary sortas="a-sphinxcontrib-jsmath">sphinxcontrib-jsmath</primary>
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
+      <title>Introduction to Sphinxcontrib-jsmath Module</title>
 
       <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
+        The <application>Sphinxcontrib-jsmath</application> package is a
+        <application>Sphinx</application> extension which renders display
+        math in HTML via JavaScript.
       </para>
 
@@ -38,44 +36,45 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&sc-jsmath-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&sc-jsmath-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &sc-jsmath-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &sc-jsmath-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &sc-jsmath-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &sc-jsmath-time;
           </para>
         </listitem>
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Sphinxcontrib-jsmath Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
+        <xref linkend="pytest"/> (for tests),
+        <ulink url="https://pypi.org/project/flake8/">
+          flake8
+        </ulink>, and
+        <ulink url="https://pypi.org/project/mypy/">
+          mypy
+        </ulink>
       </para>
 
@@ -83,14 +82,6 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
+      <title>Installation of Sphinxcontrib-jsmath</title>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
     <para> Build the module: </para>
 
@@ -105,5 +96,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-jsmath</userinput></screen>
 
     </sect3>
@@ -121,48 +112,13 @@
 
         <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
+          <seg>None</seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_jsmath-&sc-jsmath-dev-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>
-      <!--
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-      -->
     </sect3>
 
Index: general/prog/python-dependencies/sphinxcontrib-qthelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-qthelp.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/sphinxcontrib-qthelp.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,29 +5,27 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY sc-qthelp-download-http "https://github.com/sphinx-doc/sphinxcontrib-qthelp/archive/refs/tags/&sc-qthelp-version;/sphinxcontrib-qthelp-&sc-qthelp-version;.tar.gz">
+  <!ENTITY sc-qthelp-download-ftp  " ">
+  <!ENTITY sc-qthelp-md5sum        "2cf0be6419124f8ed6dc72e39f73da8c">
+  <!ENTITY sc-qthelp-size          "17 KB">
+  <!ENTITY sc-qthelp-buildsize     "2.6 MB">
+  <!ENTITY sc-qthelp-time          "less than 0.1 SBU">
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id="sphinxcontrib-qthelp" xreflabel="sphinxcontrib-qthelp-&asciidoc-version;">
+  <sect2 id="sc-qthelp" xreflabel="sphinxcontrib-qthelp-&asciidoc-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Sphinxcontrib-qthelp-&sc-qthelp-version;</title>
 
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
+    <indexterm zone="sc-qthelp">
+      <primary sortas="a-sphinxcontrib-qthelp">sphinxcontrib-qthelp</primary>
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
+      <title>Introduction to Sphinxcontrib-qthelp Module</title>
 
       <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
+        The <application>Sphinxcontrib-qthelp</application> package is a
+        <application>Sphinx</application> extension which outputs QtHelp
+        documents.
       </para>
 
@@ -38,44 +36,48 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&sc-qthelp-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&sc-qthelp-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &sc-qthelp-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &sc-qthelp-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &sc-qthelp-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &sc-qthelp-time;
           </para>
         </listitem>
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Sphinxcontrib-qthelp Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
+        <xref linkend="pytest"/> (for tests),
+        <ulink url="https://pypi.org/project/docutils-stubs/">
+          docutils-stubs
+        </ulink>,
+        <ulink url="https://pypi.org/project/flake8/">
+          flake8
+        </ulink>, and
+        <ulink url="https://pypi.org/project/mypy/">
+          mypy
+        </ulink>
       </para>
 
@@ -83,14 +85,6 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
+      <title>Installation of Sphinxcontrib-qthelp</title>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
     <para> Build the module: </para>
 
@@ -105,5 +99,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-qthelp</userinput></screen>
 
     </sect3>
@@ -121,48 +115,13 @@
 
         <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
+          <seg>None</seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_qthelp-&sc-qthelp-dev-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>
-      <!--
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-      -->
     </sect3>
 
Index: general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,29 +5,27 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY sc-serializinghtml-download-http "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/archive/refs/tags/&sc-serializinghtml-version;/sphinxcontrib-serializinghtml-&sc-serializinghtml-version;.tar.gz">
+  <!ENTITY sc-serializinghtml-download-ftp  " ">
+  <!ENTITY sc-serializinghtml-md5sum        "0196750dd6e4669ae5c9e32b77c35915">
+  <!ENTITY sc-serializinghtml-size          "16 KB">
+  <!ENTITY sc-serializinghtml-buildsize     "2.6 MB">
+  <!ENTITY sc-serializinghtml-time          "less than 0.1 SBU">
 ]>
 
-<!-- Begin Py3c -->
-  <sect2 id="sphinxcontrib-serializinghtml" xreflabel="sphinxcontrib-serializinghtml-&asciidoc-version;">
+  <sect2 id="sc-serializinghtml" xreflabel="sphinxcontrib-serializinghtml-&asciidoc-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Sphinxcontrib-serializinghtml-&sc-serializinghtml-version;</title>
 
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
+    <indexterm zone="sc-serializinghtml">
+      <primary sortas="a-sphinxcontrib-serializinghtml">sphinxcontrib-serializinghtml</primary>
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
+      <title>Introduction to Sphinxcontrib-serializinghtml Module</title>
 
       <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
+        The <application>Sphinxcontrib-serializinghtml</application> package is a
+        <application>Sphinx</application> extension which outputs
+        <quote>serialized</quote> HTML files (json and pickle).
       </para>
 
@@ -38,44 +36,48 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&sc-serializinghtml-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&sc-serializinghtml-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &sc-serializinghtml-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &sc-serializinghtml-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &sc-serializinghtml-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &sc-serializinghtml-time;
           </para>
         </listitem>
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+      <bridgehead renderas="sect4">Sphinxcontrib-serializinghtml Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <bridgehead renderas="sect5">Optional</bridgehead>
       <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
+        <xref linkend="pytest"/> (for tests),
+        <ulink url="https://pypi.org/project/docutils-stubs/">
+          docutils-stubs
+        </ulink>,
+        <ulink url="https://pypi.org/project/flake8/">
+          flake8
+        </ulink>, and
+        <ulink url="https://pypi.org/project/mypy/">
+          mypy
+        </ulink>
       </para>
 
@@ -83,14 +85,6 @@
 
     <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
+      <title>Installation of Sphinxcontrib-serializinghtml</title>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
     <para> Build the module: </para>
 
@@ -105,5 +99,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-serializinghtml</userinput></screen>
 
     </sect3>
@@ -121,48 +115,13 @@
 
         <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
+          <seg>None</seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
+            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_serializinghtml-&sc-serializinghtml-dev-version;.dist-info
           </seg>
         </seglistitem>
       </segmentedlist>
-      <!--
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
 
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-      -->
     </sect3>
 
Index: general/prog/python-dependencies/urllib3.xml
===================================================================
--- general/prog/python-dependencies/urllib3.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
+++ general/prog/python-dependencies/urllib3.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY urllib3-download-http "https://github.com/pypa/urllib3/releases/download/&urllib3-version;/urllib3-&urllib3-version;.tar.gz">
+  <!ENTITY urllib3-download-ftp  " ">
+  <!ENTITY urllib3-md5sum        "e713c1939f294fd729af4a7be40dd141">
+  <!ENTITY urllib3-size          "83 KB">
+  <!ENTITY urllib3-buildsize     "2.6 MB">
+  <!ENTITY urllib3-time          "less than 0.1 SBU">
+]>
+
+  <sect2 id="urllib3" xreflabel="urllib3-&urllib3-version;">
+
+    <title>Packaging-&urllib3-version;</title>
+
+    <indexterm zone="urllib3">
+      <primary sortas="a-urllib3">urllib3</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Packaging Module</title>
+
+      <para>
+        The <application>Packaging</application> library provides utilities
+        that implement the interoperability specifications which have clearly
+        one correct behaviour or benefit greatly from having a single shared
+        implementation.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&urllib3-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&urllib3-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &urllib3-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &urllib3-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &urllib3-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &urllib3-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="optional">
+        <xref linkend="pyparsing"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Packaging</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user urllib3</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/urllib3 and
+            /usr/lib/python&python3-majorver;/site-packages/urllib3-&urllib3-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pytest.xml
===================================================================
--- general/prog/python-modules/pytest.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-modules/pytest.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -5,16 +5,16 @@
   %general-entities;
 
-  <!ENTITY asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+  <!ENTITY pytest-download-http "https://files.pythonhosted.org/packages/source/a/pytest/pytest-&pytest-version;.tar.gz">
+  <!ENTITY pytest-download-ftp  " ">
+  <!ENTITY pytest-md5sum        "ecac3af818f7a65596efc6e243b520a0">
+  <!ENTITY pytest-size          "212 KB">
+  <!ENTITY pytest-buildsize     "2.6 MB">
+  <!ENTITY pytest-time          "less than 0.1 SBU">
 ]>
 
 <!-- Begin Py3c -->
-  <sect2 id="pytest" xreflabel="pytest-&asciidoc-version;">
+  <sect2 id="pytest" xreflabel="pytest-&pytest-version;">
 
-    <title>Asciidoc-&asciidoc-version;</title>
+    <title>Asciidoc-&pytest-version;</title>
 
     <indexterm zone="pytest">
@@ -38,30 +38,30 @@
         <listitem>
           <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+            Download (HTTP): <ulink url="&pytest-download-http;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+            Download (FTP): <ulink url="&pytest-download-ftp;"/>
           </para>
         </listitem>
         <listitem>
           <para>
-            Download MD5 sum: &asciidoc-md5sum;
+            Download MD5 sum: &pytest-md5sum;
           </para>
         </listitem>
         <listitem>
           <para>
-            Download size: &asciidoc-size;
+            Download size: &pytest-size;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated disk space required: &asciidoc-buildsize;
+            Estimated disk space required: &pytest-buildsize;
           </para>
         </listitem>
         <listitem>
           <para>
-            Estimated build time: &asciidoc-time;
+            Estimated build time: &pytest-time;
           </para>
         </listitem>
@@ -91,5 +91,5 @@
       </para>
 
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
+<screen role="root"><userinput>rm -rf /usr/bin/{pytest*,a2x*}</userinput></screen>
 -->
     <para> Build the module: </para>
@@ -105,5 +105,5 @@
     </para>
 
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user pytest</userinput></screen>
 
     </sect3>
@@ -123,10 +123,10 @@
           <seg>
             a2x and
-            asciidoc
+            pytest
           </seg>
           <seg>None</seg>
           <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+            /usr/lib/python&python3-majorver;/site-packages/pytest and
+            /usr/lib/python&python3-majorver;/site-packages/pytest-&pytest-version;.dist-info
           </seg>
         </seglistitem>
@@ -145,5 +145,5 @@
               (converts Asciidoc text files to other file formats)
             </para>
-            <indexterm zone="asciidoc a2x">
+            <indexterm zone="pytest a2x">
               <primary sortas="b-a2x">a2x</primary>
             </indexterm>
@@ -151,12 +151,12 @@
         </varlistentry>
 
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
+        <varlistentry id="pytest-prog">
+          <term><command>pytest</command></term>
           <listitem>
             <para>
               converts an AsciiDoc text file to HTML or DocBook
             </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
+            <indexterm zone="pytest pytest-prog">
+              <primary sortas="b-pytest-prog">pytest</primary>
             </indexterm>
           </listitem>
Index: general/prog/python-modules/sphinx.xml
===================================================================
--- general/prog/python-modules/sphinx.xml	(revision 2dfb0a580b74abf39221de602166093525487f08)
+++ general/prog/python-modules/sphinx.xml	(revision 036821bd865cef469cce23543cc9267ce0beaf83)
@@ -79,10 +79,10 @@
         <xref linkend="requests"/>,
         <xref linkend="snowballstemmer"/>,
-        <xref linkend="sphinxcontrib-applehelp"/>,
-        <xref linkend="sphinxcontrib-devhelp"/>,
-        <xref linkend="sphinxcontrib-htmlhelp"/>,
-        <xref linkend="sphinxcontrib-jsmath"/>,
-        <xref linkend="sphinxcontrib-qthelp"/>, and
-        <xref linkend="sphinxcontrib-serializinghtml"/>
+        <xref linkend="sc-applehelp"/>,
+        <xref linkend="sc-devhelp"/>,
+        <xref linkend="sc-htmlhelp"/>,
+        <xref linkend="sc-jsmath"/>,
+        <xref linkend="sc-qthelp"/>, and
+        <xref linkend="sc-serializinghtml"/>
       </para>
 
