Index: general/prog/Jinja2.xml
===================================================================
--- general/prog/Jinja2.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
+++ general/prog/Jinja2.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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 Jinja2-download-http
+           "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
+  <!ENTITY Jinja2-download-ftp  " ">
+  <!ENTITY Jinja2-md5sum        "b9dffd2f3b43d673802fe857c8445b1a">
+  <!ENTITY Jinja2-size          "372 KB">
+  <!ENTITY Jinja2-buildsize     "7.8 MB">
+  <!ENTITY Jinja2-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Jinja2 -->
+  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;">
+
+    <title>Jinja2-&Jinja2-version;</title>
+
+    <indexterm zone="Jinja2">
+      <primary sortas="a-Jinja2">Jinja2</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Jinja2 Module</title>
+
+      <para>
+        <application>Jinja2</application> is a <application>Python</application>
+        module that implements a simple pythonic template language.
+      </para>
+
+      &lfs75_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &Jinja2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &Jinja2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &Jinja2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &Jinja2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="MarkupSafe"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/Jinja2"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Jinja2</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/Jinja2,
+            /usr/lib/python&python2-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/Jinja2,
+            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End Jinja2 -->
Index: general/prog/MarkupSafe.xml
===================================================================
--- general/prog/MarkupSafe.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
+++ general/prog/MarkupSafe.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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 MarkupSafe-download-http
+           "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
+  <!ENTITY MarkupSafe-download-ftp  " ">
+  <!ENTITY MarkupSafe-md5sum        "f5ab3deee4c37cd6a922fb81e730da6e">
+  <!ENTITY MarkupSafe-size          "16 KB">
+  <!ENTITY MarkupSafe-buildsize     "780 KB">
+  <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin MarkupSafe -->
+  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;">
+
+    <title>MarkupSafe-&MarkupSafe-version;</title>
+
+    <indexterm zone="MarkupSafe">
+      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to MarkupSafe Module</title>
+
+      <para>
+        <application>MarkupSafe</application> is a <application>Python</application>
+        module that implements a XML/HTML/XHTML Markup safe string.
+      </para>
+
+      &lfs75_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &MarkupSafe-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &MarkupSafe-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &MarkupSafe-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &MarkupSafe-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">MarkupSafe Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="setuptools"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/MarkupSafe"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of MarkupSafe</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To build the <application>Python 2</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To build the <application>Python 3</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/markupsafe,
+            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/markupsafe,
+            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End MarkupSafe -->
Index: general/prog/python-modules-systemd.xml
===================================================================
--- general/prog/python-modules-systemd.xml	(revision 8e775d54c25f4d2a73f8e3aa899aee3d1b55648f)
+++ general/prog/python-modules-systemd.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
@@ -72,4 +72,19 @@
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <xref linkend="setuptools"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="MarkupSafe"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="Jinja2"/>
+        </para>
+      </listitem>
     </itemizedlist>
   </sect2>
@@ -99,3 +114,12 @@
     href="pyxdg.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="MarkupSafe.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="Jinja2.xml"/>
+
 </sect1>
Index: general/prog/setuptools.xml
===================================================================
--- general/prog/setuptools.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
+++ general/prog/setuptools.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 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 setuptools-download-http
+           "https://pypi.python.org/packages/source/s/setuptools/setuptools-&setuptools-version;.tar.gz">
+  <!ENTITY setuptools-download-ftp  " ">
+  <!ENTITY setuptools-md5sum        "95ed0bcef8a41302d6dd8f7562258679">
+  <!ENTITY setuptools-size          "996 KB">
+  <!ENTITY setuptools-buildsize     "9.8 MB">
+  <!ENTITY setuptools-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Setuptools -->
+  <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;">
+
+    <title>Setuptools-&setuptools-version;</title>
+
+    <indexterm zone="setuptools">
+      <primary sortas="a-Setuptools">Setuptools</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Setuptools Module</title>
+
+      <para>
+        <application>Setuptools</application> is a <application>Python</application>
+        module that makes it easier to download, build, install, upgrade, and
+        uninstall <application>Python</application> packages.
+      </para>
+
+      &lfs75_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&setuptools-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&setuptools-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &setuptools-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &setuptools-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &setuptools-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &setuptools-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Setuptools Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/setuptools"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Setuptools</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            easy_install, easy_install-&python2-majorver;, and easy_install-&python3-majorver;
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/_markerlib,
+            /usr/lib/python&python2-majorver;/site-packages/setuptools,
+            /usr/lib/python&python2-majorver;/site-packages/setuptools-&setuptools-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/_markerlib,
+            /usr/lib/python&python3-majorver;/site-packages/setuptools,
+            /usr/lib/python&python3-majorver;/site-packages/setuptools-&setuptools-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End Setuptools -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8e775d54c25f4d2a73f8e3aa899aee3d1b55648f)
+++ introduction/welcome/changelog.xml	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
@@ -63,4 +63,13 @@
           <para>[fernando] - Update to harfbuzz-0.9.34. Fixes
           <ulink url="&blfs-ticket-root;5327">#5327</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Added setuptools-5.4.2 - A Python Module.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Added MarkupSafe-0.23 - A Python Module.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Added Jinja2-2.7.3 - A Python Module.</para>
         </listitem>
       </itemizedlist>
Index: systemd.ent
===================================================================
--- systemd.ent	(revision 8e775d54c25f4d2a73f8e3aa899aee3d1b55648f)
+++ systemd.ent	(revision bd7946fd940a3f33893331e9ce274875ea23ceea)
@@ -26,4 +26,8 @@
 <!ENTITY weston-version               "1.5.0">
 
+<!ENTITY Jinja2-version               "2.7.3">
+<!ENTITY MarkupSafe-version           "0.23">
+<!ENTITY setuptools-version           "5.4.2">
+
 <!ENTITY % kde5-entities SYSTEM "kde5/kde5.ent">
 %kde5-entities;
