Index: .gitignore
===================================================================
--- .gitignore	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ .gitignore	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -4,2 +4,3 @@
 xxx
 *.swp
+.swo
Index: general.ent
===================================================================
--- general.ent	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general.ent	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -106,4 +106,8 @@
 <!ENTITY man                  "https://man.archlinux.org/man/">
 
+<!ENTITY python2 "<ulink url='https://www.python.org/downloads/release/python-2718/'>Python2</ulink>">
+
+<!ENTITY gtk2 "<ulink url='https://download.gnome.org/sources/gtk+/2.24/'>GTK+-2</ulink>">
+
 <!-- Convenience entities -->
 <!ENTITY root                 "<systemitem class='username'>root</systemitem>">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/genlib/genlib.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -109,5 +109,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/prog/php.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -253,5 +253,4 @@
     <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
     <para role="optional">
-      <xref linkend="libiodbc"/>,
       <xref linkend="lmdb"/>,
       <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
@@ -268,4 +267,5 @@
       <ulink url="http://www.frontbase.com/cgi-bin/WebObjects/FBWebSite">FrontBase</ulink>,
       <ulink url="https://www.ibm.com/analytics/us/en/db2/">IBM DB2</ulink>,
+      <ulink url="https://sourceforge.net/projects/iodbc/files/">libiodbc</ulink>,
       <ulink url="https://hughestech.com.au/products/msql/">Mini SQL</ulink>,
       <ulink url="https://www.monetra.com/">Monetra</ulink>, and
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/prog/python-modules.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -160,9 +160,9 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           <xref linkend="pycairo2"/>
         </para>
-      </listitem>
+      </listitem>-->
       <listitem>
         <para>
@@ -180,9 +180,9 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           <xref linkend="pygobject2"/>
         </para>
-      </listitem>
+      </listitem> -->
       <listitem>
         <para>
@@ -190,9 +190,9 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           <xref linkend="pygtk"/>
         </para>
-      </listitem>
+      </listitem> -->
       <listitem>
         <para>
@@ -319,6 +319,6 @@
     href="python-modules/pyatspi2.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pycairo2.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pycairo2.xml"/>-->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -330,14 +330,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pygments.xml"/>
-
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pygobject2.xml"/>
-
+-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pygobject3.xml"/>
-
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pygtk.xml"/>
-
+-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="python-modules/pyparsing.xml"/>
Index: general/prog/python-modules/pycairo.xml
===================================================================
--- general/prog/python-modules/pycairo.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/prog/python-modules/pycairo.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -83,5 +83,5 @@
     <sect3 role="installation">
       <title>Installation of PyCairo</title>
-
+<!--
       <note>
         <para>
@@ -91,5 +91,5 @@
         </para>
       </note>
-
+-->
       <para>
         Install <application>PyCairo</application> for Python3 by
Index: general/prog/python-modules/pyxdg.xml
===================================================================
--- general/prog/python-modules/pyxdg.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/prog/python-modules/pyxdg.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -66,12 +66,5 @@
         </listitem>
       </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">PyXDG Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="python2"/>
-      </para>
--->
     </sect3>
 
Index: general/prog/python-modules/six.xml
===================================================================
--- general/prog/python-modules/six.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/prog/python-modules/six.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -64,33 +64,10 @@
         </listitem>
       </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Six Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended Dependencies</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/>
-      </para>
--->
     </sect3>
 
     <sect3 role="installation">
       <title>Installation of Six</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>
-        Install <application>six</application> for Python 2 and Python 3
-        by running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
--->
       <para>
         Build the module:
@@ -106,8 +83,4 @@
         Now, as the <systemitem class="username">root</systemitem> user:
       </para>
-<!--
-<screen role="root"><userinput>python2 setup.py install - -optimize=1 &amp;&amp;
-python3 setup.py install - -optimize=1</userinput></screen>
--->
 
 <screen role="root"><userinput>&install-wheel; six</userinput></screen>
Index: general/prog/yasm.xml
===================================================================
--- general/prog/yasm.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/prog/yasm.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -73,6 +73,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="python2"/> and
-      <xref linkend="cython"/>
+      <xref linkend="cython"/> and
+      &python2;
     </para>
 
Index: general/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ general/sysutils/redland.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -76,9 +76,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libiodbc"/>,
       <xref linkend="sqlite"/>,
       <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
       <xref linkend="postgresql"/>,
       &berkeley-db;
+      <ulink url="https://sourceforge.net/projects/iodbc/files/">libiodbc</ulink>,
       <ulink url="&sourceforge-dl;/virtuoso/">virtuoso</ulink>, and
       <ulink url="https://sourceforge.net/projects/threestore/">3store</ulink>
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ multimedia/libdriv/alsa-lib.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -99,6 +99,6 @@
     <para role="optional">
       <xref linkend="doxygen"/>,
-      <xref linkend="python2"/>, and
-      <ulink url="https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-&alsa-lib-version;.tar.bz2">alsa-ucm-conf</ulink>
+      <ulink url="https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-&alsa-lib-version;.tar.bz2">alsa-ucm-conf</ulink>, and
+      &python2;
     </para>
 
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ multimedia/libdriv/libdriv.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -57,5 +57,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmad.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libogg.xml"/>
Index: networking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ networking/netlibs/ldns.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -70,15 +70,10 @@
 
     <bridgehead renderas="sect3">ldns Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="make-ca"/> and
       <xref linkend="libpcap"/> (for example programs),
-      <xref linkend="python2"/> and
+      &python2;, and
       <xref linkend="swig"/> (for Python bindings), and
       <xref linkend="doxygen"/> (for html documentation)
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ pst/printing/cups.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -90,7 +90,6 @@
       <xref linkend="libpaper"/>,
       <xref linkend="mitkrb"/>,
-      <!--<xref linkend="openjdk"/>, Not found in 2.4.0 -->
       <xref linkend="php"/>, and
-      <xref linkend="python2"/>
+      &python2;
     </para>
 
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ server/other/unbound.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -85,5 +85,5 @@
       <xref linkend="nettle"/>,
       <xref linkend="protobuf-c"/> (for dnstap),
-      <xref linkend="python2"/>,
+      &python2;,
       <xref linkend="sphinx"/> (for Python bindings documentation),
       <xref linkend="swig"/> (for Python bindings),
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ x/lib/lib.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -71,5 +71,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libepoxy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxklavier.xml"/>
Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ x/wm/icewm.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -319,5 +319,7 @@
       <para>
         If you wish to put icons on your desktop, you will need to install a
-        program such as <xref linkend="rox-filer"/> which provides a pinboard.
+        program such as 
+        <ulink url='https://sourceforge.net/projects/rox/files/rox/2.11/'>rox-filer</ulink>  
+        which provides a pinboard.
         If you do that you will no longer be able to access the menu by
         right-clicking on the desktop, you will have to use the
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ x/wm/openbox.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -210,6 +210,6 @@
 
 <screen><userinput>cp -rf /etc/xdg/openbox ~/.config</userinput></screen>
-      <para>
-
+
+<!--      <para>
         <filename>~/.config/openbox/menu.xml</filename> can be edited with a
         text editor or you can install
@@ -217,5 +217,5 @@
         <ulink url="https://pyxml.sourceforge.net/topics/">pyxml</ulink>
         and <xref linkend="pygtk"/>).
-      </para>
+      </para> -->
 
       <para>
Index: xincludes/texruntime.xml
===================================================================
--- xincludes/texruntime.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ xincludes/texruntime.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 
 
-<para role="recommended">
-  <xref role="runtime" linkend="python2"/> is used by the unmaintained
+<para role="optional">
+  &python2; is used by the unmaintained
   ebong CTAN module (intended for writing Bengali in Rapid Roman Format).
   <filename>/usr/bin/python</filename> is also in the shebang line for the
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ xsoft/other/gimp.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -182,7 +182,7 @@
       <xref linkend="lua"/>,
       <xref linkend="openjpeg2"/>,
-      <xref linkend="pygtk"/> (including the gtk, pango and pangocairo modules),
+<!--      <xref linkend="pygtk"/> (including the gtk, pango and pangocairo modules),
       an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> program),
+      <command>sendmail</command> program), -->
       <xref linkend="gtk-doc"/>,
       <ulink url="https://github.com/HEASARC/cfitsio">cfitsio</ulink>,
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision cb1db1ef05604481c8480871d59dfc7d462da54a)
+++ xsoft/other/other.xml	(revision b29fc64232caaccc7a763d8c3dcd452b24a529c7)
@@ -24,5 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rox-filer.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rox-filer.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rxvt-unicode.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunderbird.xml"/>
