Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision b31b493cf96803c56df4a17055f0ee1d553a00b5)
+++ general/prog/python-modules.xml	(revision 66b546ab595b3e1a644c4881464cf78f413b06cd)
@@ -5,5 +5,6 @@
   %general-entities;
 
-  <!ENTITY pyxml-download-http "&sourceforge-repo;/pyxml/PyXML-&pyxml-version;.tar.gz">
+  <!ENTITY pyxml-download-http
+  "&sourceforge-repo;/pyxml/PyXML-&pyxml-version;.tar.gz">
   <!ENTITY pyxml-download-ftp  "&gentoo-ftp-repo;/PyXML-&pyxml-version;.tar.gz">
   <!ENTITY pyxml-md5sum        "1f7655050cebbb664db976405fdba209">
@@ -12,5 +13,6 @@
   <!ENTITY pyxml-time          "less than 0.1 SBU">
 
-  <!ENTITY pycairo-download-http "http://cairographics.org/releases/pycairo-&pycairo-version;.tar.gz">
+  <!ENTITY pycairo-download-http
+  "http://cairographics.org/releases/pycairo-&pycairo-version;.tar.gz">
   <!ENTITY pycairo-download-ftp  " ">
   <!ENTITY pycairo-md5sum        "054da6c125cb427a003f5fd6c54f853e">
@@ -19,5 +21,6 @@
   <!ENTITY pycairo-time          "0.1 SBU">
 
-  <!ENTITY py2cairo-download-http "http://cairographics.org/releases/py2cairo-&py2cairo-version;.tar.bz2">
+  <!ENTITY py2cairo-download-http
+  "http://cairographics.org/releases/py2cairo-&py2cairo-version;.tar.bz2">
   <!ENTITY py2cairo-download-ftp  " ">
   <!ENTITY py2cairo-md5sum        "20337132c4ab06c1146ad384d55372c5">
@@ -26,6 +29,8 @@
   <!ENTITY py2cairo-time          "less than 0.1 SBU">
 
-  <!ENTITY pygobject2-download-http "&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
-  <!ENTITY pygobject2-download-ftp  "&gnome-download-ftp;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
+  <!ENTITY pygobject2-download-http
+  "&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
+  <!ENTITY pygobject2-download-ftp
+  "&gnome-download-ftp;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
   <!ENTITY pygobject2-md5sum        "9415cb7f2b3a847f2310ccea258b101e">
   <!ENTITY pygobject2-size          "730 KB">
@@ -33,6 +38,8 @@
   <!ENTITY pygobject2-time          "0.2 SBU">
 
-  <!ENTITY pygobject3-download-http "&gnome-download-http;/pygobject/3.0/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-download-ftp  "&gnome-download-ftp;/pygobject/3.0/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-download-http
+  "&gnome-download-http;/pygobject/3.0/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-download-ftp
+  "&gnome-download-ftp;/pygobject/3.0/pygobject-&pygobject3-version;.tar.xz">
   <!ENTITY pygobject3-md5sum        "d17e2565e139d647e8ee50fd1126aa9e">
   <!ENTITY pygobject3-size          "540 KB">
@@ -40,6 +47,8 @@
   <!ENTITY pygobject3-time          "0.2 SBU">
 
-  <!ENTITY pygtk-download-http "&gnome-download-http;/pygtk/2.17/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-download-ftp  "&gnome-download-ftp;/pygtk/2.17/pygtk-&pygtk-version;.tar.bz2">
+  <!ENTITY pygtk-download-http
+  "&gnome-download-http;/pygtk/2.17/pygtk-&pygtk-version;.tar.bz2">
+  <!ENTITY pygtk-download-ftp
+  "&gnome-download-ftp;/pygtk/2.17/pygtk-&pygtk-version;.tar.bz2">
   <!ENTITY pygtk-md5sum        "43d704343d7ca04a6e4ddd4fa73a3c55">
   <!ENTITY pygtk-size          "2.2 MB">
@@ -47,6 +56,8 @@
   <!ENTITY pygtk-time          "0.7 SBU">
 
-  <!ENTITY pygtksourceview-download-http "&gnome-download-http;/pygtksourceview/2.10/pygtksourceview-&pygtksourceview-version;.tar.bz2">
-  <!ENTITY pygtksourceview-download-ftp  "&gnome-download-ftp;/pygtksourceview/2.10/pygtksourceview-&pygtksourceview-version;.tar.bz2">
+  <!ENTITY pygtksourceview-download-http
+  "&gnome-download-http;/pygtksourceview/2.10/pygtksourceview-&pygtksourceview-version;.tar.bz2">
+  <!ENTITY pygtksourceview-download-ftp
+  "&gnome-download-ftp;/pygtksourceview/2.10/pygtksourceview-&pygtksourceview-version;.tar.bz2">
   <!ENTITY pygtksourceview-md5sum        "2654354d61422fb79d8375fc3a3b5393">
   <!ENTITY pygtksourceview-size          "283 KB">
@@ -54,6 +65,8 @@
   <!ENTITY pygtksourceview-time          "0.4 SBU">
 
-  <!ENTITY pyatspi2-download-http "&gnome-download-http;/pyatspi/2.2/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-download-ftp  "&gnome-download-ftp;/pyatspi/2.2/pyatspi-&pyatspi2-version;.tar.xz">
+  <!ENTITY pyatspi2-download-http
+  "&gnome-download-http;/pyatspi/2.2/pyatspi-&pyatspi2-version;.tar.xz">
+  <!ENTITY pyatspi2-download-ftp
+  "&gnome-download-ftp;/pyatspi/2.2/pyatspi-&pyatspi2-version;.tar.xz">
   <!ENTITY pyatspi2-md5sum        "9e3abb0d33bdf66e025cc16588095cba">
   <!ENTITY pyatspi2-size          "260 KB">
@@ -61,6 +74,7 @@
   <!ENTITY pyatspi2-time          "less than 0.1 SBU">
 
-  <!ENTITY pyxdg-download-http "http://www.freedesktop.org/~lanius/pyxdg-&pyxdg-version;.tar.gz">
-  <!ENTITY pyxdg-download-ftp  "">
+  <!ENTITY pyxdg-download-http
+  "http://www.freedesktop.org/~lanius/pyxdg-&pyxdg-version;.tar.gz">
+  <!ENTITY pyxdg-download-ftp  " ">
   <!ENTITY pyxdg-md5sum        "9f33542e846d0fc1e0bfa992a8555b0a">
   <!ENTITY pyxdg-size          "38 KB">
@@ -68,5 +82,6 @@
   <!ENTITY pyxdg-time          "less than 0.1 SBU">
 
-  <!ENTITY ipython-download-http "http://archive.ipython.org/release/&ipython-version;/ipython-&ipython-version;.tar.gz">
+  <!ENTITY ipython-download-http
+  "http://archive.ipython.org/release/&ipython-version;/ipython-&ipython-version;.tar.gz">
   <!ENTITY ipython-download-ftp  "">
   <!ENTITY ipython-md5sum        "4cf9f23b1171b3517f9a7a2bfc875b5f">
@@ -74,26 +89,4 @@
   <!ENTITY ipython-buildsize     "58 MB">
   <!ENTITY ipython-time          "less than 0.1 SBU">
-
-  <!--
-  <!ENTITY pyorbit-download-http "&gnome-download-http;/pyorbit/2.24/pyorbit-&pyorbit-version;.tar.bz2">
-  <!ENTITY pyorbit-download-ftp  "&gnome-download-ftp;/pyorbit/2.24/pyorbit-&pyorbit-version;.tar.bz2">
-  <!ENTITY pyorbit-md5sum        "574593815e75ee6e98062c75d6d1581f">
-  <!ENTITY pyorbit-size          "286 KB">
-  <!ENTITY pyorbit-buildsize     "4 MB">
-  <!ENTITY pyorbit-time          "0.1 SBU">
-
-  <!ENTITY gnome-python-download-http "&gnome-download-http;/gnome-python/2.28/gnome-python-&gnome-python-version;.tar.bz2">
-  <!ENTITY gnome-python-download-ftp  "&gnome-download-ftp;/gnome-python/2.28/gnome-python-&gnome-python-version;.tar.bz2">
-  <!ENTITY gnome-python-md5sum        "a17ad952813ed86f520de8e07194a2bf">
-  <!ENTITY gnome-python-size          "549 KB">
-  <!ENTITY gnome-python-buildsize     "12 MB">
-  <!ENTITY gnome-python-time          "0.3 SBU">
-
-  <!ENTITY gnome-python-desktop-download-http "&gnome-download-http;/gnome-python-desktop/&gnome-version;/gnome-python-desktop-&gnome-python-desktop-version;.tar.bz2">
-  <!ENTITY gnome-python-desktop-download-ftp  "&gnome-download-ftp;/gnome-python-desktop/&gnome-version;/gnome-python-desktop-&gnome-python-desktop-version;.tar.bz2">
-  <!ENTITY gnome-python-desktop-md5sum        "b90f6e96a6321e7bf859f6faff2aa4df">
-  <!ENTITY gnome-python-desktop-size          "584 KB">
-  <!ENTITY gnome-python-desktop-buildsize     "15 MB">
-  <!ENTITY gnome-python-desktop-time          "0.3 SBU"> -->
 ]>
 
@@ -115,52 +108,64 @@
     <title>Introduction to Python Modules</title>
 
-    <para>The <application>Python</application> module packages add useful
-    objects to the <application>Python</application> language. Modules utilized
-    by packages throughout BLFS are listed here, along with their dependencies.
-    Installation of the modules shown on this page is meant to follow from top
-    to bottom to handle optional dependencies in each module.</para>
+    <para>
+      The <application>Python</application> module packages add useful objects
+      to the <application>Python</application> language. Modules utilized by
+      packages throughout BLFS are listed here, along with their dependencies.
+      Installation of the modules shown on this page is meant to follow from top
+      to bottom to handle optional dependencies in each module.
+    </para>
 
     <itemizedlist spacing="compact">
       <listitem>
-        <para><xref linkend="pyxml"/></para>
+        <para>
+          <xref linkend="pyxml"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="py2cairo"/></para>
+        <para>
+          <xref linkend="py2cairo"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pycairo"/></para>
+        <para>
+          <xref linkend="pycairo"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pygobject2"/></para>
+        <para>
+          <xref linkend="pygobject2"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pygobject3"/></para>
+        <para>
+          <xref linkend="pygobject3"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pygtk"/></para>
+        <para>
+          <xref linkend="pygtk"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pygtksourceview"/></para>
+        <para>
+          <xref linkend="pygtksourceview"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pyatspi2"/></para>
+        <para>
+          <xref linkend="pyatspi2"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="pyxdg"/></para>
+        <para>
+          <xref linkend="pyxdg"/>
+        </para>
       </listitem>
       <listitem>
-        <para><xref linkend="ipython"/></para>
+        <para>
+          <xref linkend="ipython"/>
+        </para>
       </listitem>
-      <!--<listitem>
-        <para><xref linkend="pyorbit"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="gnome-python"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="gnome-python-desktop"/></para>
-      </listitem>-->
     </itemizedlist>
-
   </sect2>
 
@@ -177,30 +182,45 @@
       <title>Introduction to PyXML Module</title>
 
-      <para>The <application>PyXML</application> package contains a validating
-      XML parser, an implementation of the SAX and DOM programming interfaces,
-      an interface to the Expat parser, and a C helper module that can speed up
-      <filename>xmllib.py</filename> by a factor of five. This is useful for
-      validating, parsing and manipulating XML files using Python
-      programs.</para>
+      <para>
+        The <application>PyXML</application> package contains a validating XML
+        parser, an implementation of the SAX and DOM programming interfaces, an
+        interface to the Expat parser, and a C helper module that can speed up
+        <filename>xmllib.py</filename> by a factor of five. This is useful for
+        validating, parsing and manipulating XML files using Python programs.
+      </para>
+
+      &lfs71_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pyxml-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pyxml-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pyxml-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pyxml-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pyxml-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pyxml-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pyxml-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyxml-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyxml-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyxml-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyxml-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyxml-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -209,9 +229,11 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python2"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pyxml"/></para>
-
+      <para role="required">
+        <xref linkend="python2"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyxml"/>
+      </para>
     </sect3>
 
@@ -219,10 +241,14 @@
       <title>Installation of PyXML</title>
 
-      <para>Install <application>PyXML</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>PyXML</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>python setup.py build</userinput></screen>
 
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>python setup.py install &amp;&amp;
@@ -232,11 +258,12 @@
 install -v -m644 README* /usr/share/doc/PyXML-&pyxml-version;</userinput></screen>
 
-      <para>To run the regression tests, the package must first be installed.
-      Then, as an unprivileged user, issue the following commands:</para>
+      <para>
+        To run the regression tests, the package must first be installed. Then,
+        as an unprivileged user, issue the following commands:
+      </para>
 
 <screen><userinput>cd test &amp;&amp;
 python regrtest.py &amp;&amp;
 cd ..</userinput></screen>
-
     </sect3>
 
@@ -244,11 +271,14 @@
       <title>Command Explanations</title>
 
-      <para><command>python setup.py build</command>: This command copies the
-      <filename>*.py</filename> files to a staging area and compiles the C
-      extensions.</para>
-
-      <para><command>python setup.py install</command>: This command installs
-      the package.</para>
-
+      <para>
+        <command>python setup.py build</command>: This command copies the
+        <filename>*.py</filename> files to a staging area and compiles the C
+        extensions.
+      </para>
+
+      <para>
+        <command>python setup.py install</command>: This command installs the
+        package.
+      </para>
     </sect3>
 
@@ -264,6 +294,8 @@
           <seg>xmlproc_parse and xmlproc_val</seg>
           <seg>PyXML Python library modules</seg>
-          <seg>/usr/lib/python&python2-majorver;/site-packages/_xmlplus and
-          /usr/share/doc/PyXML-&pyxml-version;</seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/_xmlplus and
+            /usr/share/doc/PyXML-&pyxml-version;
+          </seg>
         </seglistitem>
       </segmentedlist>
@@ -277,5 +309,7 @@
           <term><command>xmlproc_parse</command></term>
           <listitem>
-            <para>is a simple XML file parser using the xmlproc parser.</para>
+            <para>
+              is a simple XML file parser using the xmlproc parser.
+            </para>
             <indexterm zone="pyxml xmlproc_parse">
               <primary sortas="b-xmlproc_parse">xmlproc_parse</primary>
@@ -287,5 +321,7 @@
           <term><command>xmlproc_val</command></term>
           <listitem>
-            <para>is a validating XML file parser using the xmlproc parser.</para>
+            <para>
+              is a validating XML file parser using the xmlproc parser.
+            </para>
             <indexterm zone="pyxml xmlproc_val">
               <primary sortas="b-xmlproc_val">xmlproc_val</primary>
@@ -294,7 +330,5 @@
         </varlistentry>
       </variablelist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
 
@@ -313,28 +347,42 @@
       <title>Introduction to Py2cairo Module</title>
 
-      <para>Py2cairo provides <application>Python2</application> bindings to
-      <application>Cairo</application>.</para>
-
-      &lfs70_checked;
+      <para>
+        Py2cairo provides <application>Python 2</application> bindings to
+        <application>Cairo</application>.
+      </para>
+
+      &lfs71_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&py2cairo-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&py2cairo-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &py2cairo-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &py2cairo-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &py2cairo-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &py2cairo-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&py2cairo-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&py2cairo-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &py2cairo-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &py2cairo-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &py2cairo-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &py2cairo-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -353,7 +401,7 @@
       </para>
 
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pycairo"/></para>
-
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
+      </para>
     </sect3>
 
@@ -361,19 +409,24 @@
       <title>Installation of Py2cairo</title>
 
-      <para>Install <application>Py2cairo</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>Py2cairo</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <para>The test suite requires the optional <application>pytest</application>
-      package.  If installed, it is run by changing to the 
-      <filename class='directory'>test</filename> directory and running 
-      <userinput>py.test</userinput>.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        The test suite requires the optional <application>pytest</application>
+        package.  If installed, it is run by changing to the 
+        <filename class='directory'>test</filename> directory and running 
+        <userinput>py.test</userinput>.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
     </sect3>
 
@@ -382,18 +435,16 @@
 
       <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
         <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
           <seg>_cairo.so</seg>
-          <seg>/usr/include/pycairo and
-          /usr/lib/python2.7/site-packages/cairo</seg>
+          <seg>
+            /usr/include/pycairo and
+            /usr/lib/python2.7/site-packages/cairo
+          </seg>
         </seglistitem>
       </segmentedlist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
 
@@ -411,26 +462,40 @@
       <title>Introduction to Pycairo Module</title>
 
-      <para>Pycairo provides <application>Python</application> bindings to
-      <application>Cairo</application>.</para>
+      <para>
+        Pycairo provides <application>Python 3</application> bindings to
+        <application>Cairo</application>.
+      </para>
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pycairo-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pycairo-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pycairo-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pycairo-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pycairo-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pycairo-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pycairo-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycairo-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycairo-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycairo-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycairo-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycairo-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -439,10 +504,12 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python2"/> and
-      <xref linkend="cairo"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pycairo"/></para>
-
+      <para role="required">
+        <xref linkend="python2"/> and
+        <xref linkend="cairo"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
+      </para>
     </sect3>
 
@@ -450,16 +517,21 @@
       <title>Installation of Pycairo</title>
 
-      <para>Install <application>Pycairo</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>Pycairo</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <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>make install</userinput></screen>
-
     </sect3>
 
@@ -468,20 +540,17 @@
 
       <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
         <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directories</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
           <seg>Pycairo Python library module</seg>
-          <seg>/usr/include/pycairo and
-          /usr/lib/python&python2-majorver;/site-packages/cairo</seg>
+          <seg>
+            /usr/include/pycairo and
+            /usr/lib/python&python2-majorver;/site-packages/cairo
+          </seg>
         </seglistitem>
       </segmentedlist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
-
   <!-- End Pycairo -->
 
@@ -498,26 +567,43 @@
       <title>Introduction to PyGObject Module</title>
 
-      <para>PyGObject provides <application>Python</application> bindings to the
-      GObject class from <application>GLib</application>.</para>
+      <para>
+        PyGObject-&pygobject2-version; provides
+        <application>Python 2</application> bindings to the GObject class from
+        <application>GLib</application>.
+      </para>
+
+      &lfs71_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pygobject2-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pygobject2-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pygobject2-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pygobject2-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pygobject2-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pygobject2-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pygobject2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygobject2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygobject2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygobject2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygobject2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygobject2-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -537,14 +623,18 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="pycairo"/> and
-      <xref linkend="pkgconfig"/></para>
+      <para role="required">
+        <xref linkend="pycairo"/> and
+        <xref linkend="pkgconfig"/>.
+      </para>
 
       <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional"><xref linkend="gobject-introspection"/> and
-      <xref linkend="libxslt"/> (to Build Documentation)</para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pygobject"/></para>
-
+      <para role="optional">
+        <xref linkend="gobject-introspection"/> and
+        <xref linkend="libxslt"/> (to Build Documentation)
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygobject"/>
+      </para>
     </sect3>
 
@@ -552,6 +642,8 @@
       <title>Installation of PyGObject</title>
 
-      <para>Install <application>PyGObject</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>PyGObject</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>patch -p1 &lt; ../pygobject2-&pygobject2-version;-introspection-1.patch &amp;&amp;
@@ -559,13 +651,16 @@
 make</userinput></screen>
 
-      <!-- not strictly true, blows up with
-      No rule to make target `Regress-1.0.typelib', needed by `check-local' -->
-      <para>This package does not have a testsuite.</para>
-      <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        This package does not have a working testsuite.
+      </para>
+      <!-- <para>
+        To test the results, issue: <command>make check</command>.
+      </para> -->
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
     </sect3>
 
@@ -573,12 +668,14 @@
       <title>Command Explanations</title>
 
-      <para><parameter>--disable-introspection</parameter>: This switch is
-      required because the package cannot build against recent versions of
-      <application>gobject-introspection</application>.</para>
-
-      <para><option>--disable-docs</option>: This option disables the
-      rebuilding of the html documentation if <xref linkend="libxslt"/> is
-      installed.</para>
-
+      <para>
+        <parameter>--disable-introspection</parameter>: This switch is required
+        if you have not installed
+        <application>gobject-introspection</application>.
+      </para>
+
+      <para>
+        <option>--disable-docs</option>: This option disables the rebuilding of
+        the html documentation if <xref linkend="libxslt"/> is installed.
+      </para>
     </sect3>
 
@@ -593,17 +690,21 @@
         <seglistitem>
           <seg>pygobject-codegen-2.0</seg>
-          <seg>libpyglib-2.0-python.so, _gio.so, unix.so, _glib.so, and
-          _gobject.so</seg>
-          <seg>/usr/{include/pygtk-2.0,
-          lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
-          share/{gtk-doc/html/pygobject,pygobject/{2.0/{codegen,defs},
-          xsl}}}</seg>
+          <seg>
+            libpyglib-2.0-python.so,
+            _gio.so,
+            unix.so,
+            _glib.so and
+            _gobject.so.
+          </seg>
+          <seg>
+            /usr/include/pygtk-2.0,
+            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
+            /usr/share/gtk-doc/html/pygobject and
+            /usr/share/pygobject/2.0
+          </seg>
         </seglistitem>
       </segmentedlist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
-
   <!-- End PyGObject2 -->
 
@@ -620,6 +721,9 @@
       <title>Introduction to PyGObject Module</title>
 
-      <para>PyGObject provides <application>Python</application> bindings to the
-      GObject class from <application>GLib</application>.</para>
+      <para>
+        PyGObject-&pygobject3-version; provides
+        <application>Python 3</application> bindings to the GObject class from
+        <application>GLib</application>.
+      </para>
 
       &lfs70_checked;
@@ -628,20 +732,32 @@
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pygobject3-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pygobject3-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pygobject3-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pygobject3-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pygobject3-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pygobject3-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pygobject3-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygobject3-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygobject3-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygobject3-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygobject3-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygobject3-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -661,26 +777,29 @@
       </para>
 
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pygobject"/></para>
-
-    </sect3>
-
-  <!-- Begin PyGObject -->
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygobject"/>
+      </para>
+    </sect3>
 
     <sect3 role="installation">
       <title>Installation of PyGObject</title>
 
-      <para>Install <application>PyGObject</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>PyGObject</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <para>To test the results, issue: <command>make check</command>.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        To test the results, issue: <command>make check</command>.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
     </sect3>
 
@@ -688,8 +807,9 @@
       <title>Command Explanations</title>
 
-      <para><parameter>--disable-docs</parameter>: This option disables the
-      rebuilding of the html documentation if <xref linkend="libxslt"/> is
-      installed.</para>
-
+      <para>
+        <parameter>--disable-docs</parameter>: This option disables the
+        rebuilding of the html documentation if <xref linkend="libxslt"/> is
+        installed.
+      </para>
     </sect3>
 
@@ -704,20 +824,18 @@
         <seglistitem>
           <seg>pygobject-codegen-2.0</seg>
-          
-          <seg>libpyglib-gi-2.0-python.so, 
-               _gio.so, 
-               _gi_cairo.so
-               _gobject.so</seg>
-
-          <seg>/usr/include/pygobject-3.0 and
-               /usr/lib/python2.7
+          <seg>
+            libpyglib-gi-2.0-python.so, 
+             _gio.so, 
+             _gi_cairo.so and
+             _gobject.so.
+           </seg>
+          <seg>
+            /usr/include/pygobject-3.0 and
+            /usr/lib/python2.7
           </seg>
         </seglistitem>
       </segmentedlist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
-
   <!-- End PyGObject -->
 
@@ -734,27 +852,42 @@
       <title>Introduction to PyGTK Module</title>
 
-      <para>PyGTK lets you to easily create programs with a graphical user
-      interface using the <application>Python</application> programming
-      language.</para>
+      <para>
+        PyGTK lets you to easily create programs with a graphical user interface
+        using the <application>Python</application> programming language.
+      </para>
+
+      &lfs71_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pygtk-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pygtk-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pygtk-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pygtk-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pygtk-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pygtk-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pygtk-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygtk-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygtk-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygtk-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygtk-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygtk-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -763,34 +896,49 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="pygobject2"/></para>
+      <para role="required">
+        <xref linkend="pygobject2"/>
+      </para>
 
       <bridgehead renderas="sect5">Required (atk module)</bridgehead>
-      <para role="required"><xref linkend="atk"/></para>
+      <para role="required">
+        <xref linkend="atk"/>
+      </para>
 
       <bridgehead renderas="sect5">Required (pango module)</bridgehead>
-      <para role="required"><xref linkend="pango"/></para>
+      <para role="required">
+        <xref linkend="pango"/>
+      </para>
 
       <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
-      <para role="required"><xref linkend="pycairo"/> and
-      <xref linkend="pango"/></para>
-
-      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint
-      modules)</bridgehead>
-      <para role="required"><xref linkend="pycairo"/> and
-      <xref linkend="gtk2"/></para>
+      <para role="required">
+        <xref linkend="pycairo"/> and
+        <xref linkend="pango"/>
+      </para>
+
+      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
+      <para role="required">
+        <xref linkend="pycairo"/> and
+        <xref linkend="gtk2"/>.
+      </para>
 
       <bridgehead renderas="sect5">Required (gtk.libglade module)</bridgehead>
-      <para role="required"><xref linkend="pycairo"/> and
-      <xref linkend="libglade"/></para>
+      <para role="required">
+        <xref linkend="pycairo"/> and
+        <xref linkend="libglade"/>.
+      </para>
 
       <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional"><ulink url="http://numpy.scipy.org/">NumPy</ulink></para>
+      <para role="optional">
+        <ulink url="http://numpy.scipy.org/">NumPy</ulink>
+      </para>
 
       <bridgehead renderas="sect5">Optional (to Build Documentation)</bridgehead>
-      <para role="optional"><xref linkend="libxslt"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pygtk"/></para>
-
+      <para role="optional">
+        <xref linkend="libxslt"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygtk"/>
+      </para>
     </sect3>
 
@@ -798,17 +946,22 @@
       <title>Installation of PyGTK</title>
 
-      <para>Install <application>PyGTK</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>PyGTK</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-      <para>The tests must be run from an active X display. If this is so,
-      issue: <command>make check</command>.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        The tests must be run from an active X display. If this is so, issue:
+        <command>make check</command>.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
     </sect3>
 
@@ -816,8 +969,8 @@
       <title>Command Explanations</title>
 
-      <para><parameter>--enable-docs</parameter>: This option enables
-      rebuilding the html documentation if <xref linkend="libxslt"/> is
-      installed.</para>
-
+      <para>
+        <parameter>--enable-docs</parameter>: This option enables rebuilding the
+        html documentation if <xref linkend="libxslt"/> is installed.
+      </para>
     </sect3>
 
@@ -832,9 +985,19 @@
         <seglistitem>
           <seg>pygtk-codegen-2.0</seg>
-          <seg>atk.so, _gtk.so, glade.so, gtkunixprint.so, pango.so, and
-          pangocairo.so</seg>
-          <seg>/usr/{include/pygtk-2.0/pygtk,lib/{pygtk/2.0/demos/images,
-          python&python2-majorver;/site-packages/gtk-2.0/gtk},
-          share/{gtk-doc/html/pygtk/{cursors,icons,images},pygtk/2.0/defs}}</seg>
+          <seg>
+            atk.so,
+            _gtk.so,
+            glade.so,
+            gtkunixprint.so,
+            pango.so and
+            pangocairo.so.
+          </seg>
+          <seg>
+            /usr/include/pygtk-2.0,
+            /usr/lib/pygtk,
+            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0,
+            /usr/share/gtk-doc/html/pygtk and
+            /usr/share/pygtk.
+          </seg>
         </seglistitem>
       </segmentedlist>
@@ -848,6 +1011,8 @@
           <term><command>pygtk-codegen-2.0</command></term>
           <listitem>
-            <para>is a wrapper script to run the <application>PyGTK</application>
-            codegen module.</para>
+            <para>
+              is a wrapper script to run the <application>PyGTK</application>
+              codegen module.
+            </para>
             <indexterm zone="pygtk pygtk-codegen-2.0">
               <primary sortas="b-pygtk-codegen-2.0">pygtk-codegen-2.0</primary>
@@ -859,6 +1024,8 @@
           <term><command>pygtk-demo</command></term>
           <listitem>
-            <para>is a Python wrapper to run the <application>PyGTK</application>
-            demo program.</para>
+            <para>
+              is a Python wrapper to run the <application>PyGTK</application>
+              demo program.
+            </para>
             <indexterm zone="pygtk pygtk-demo">
               <primary sortas="b-pygtk-demo">pygtk-demo</primary>
@@ -867,7 +1034,5 @@
         </varlistentry>
       </variablelist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
   <!-- End PyGTK -->
@@ -885,26 +1050,40 @@
       <title>Introduction to PyGtkSourceView Module</title>
 
-      <para>PyGtkSourceView contains python bindings for the version 2 of the
-      <application>GtkSourceView</application> library.</para>
+      <para>
+        PyGtkSourceView contains python bindings for the version 2 of the
+        <application>GtkSourceView</application> library.
+      </para>
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pygtksourceview-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pygtksourceview-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pygtksourceview-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pygtksourceview-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pygtksourceview-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pygtksourceview-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pygtksourceview-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygtksourceview-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygtksourceview-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygtksourceview-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygtksourceview-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygtksourceview-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -913,16 +1092,22 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="gtksourceview"/> and
-      <xref linkend="pygtk"/></para>
+      <para role="required">
+        <xref linkend="gtksourceview"/> and
+        <xref linkend="pygtk"/>.
+      </para>
 
       <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended"><xref linkend="DocBook"/></para>
+      <para role="recommended">
+        <xref linkend="DocBook"/>
+      </para>
 
       <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional"><xref linkend="gtk-doc"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pygtksourceview"/></para>
-
+      <para role="optional">
+        <xref linkend="gtk-doc"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygtksourceview"/>
+      </para>
     </sect3>
 
@@ -930,16 +1115,21 @@
       <title>Installation of PyGtkSourceView</title>
 
-      <para>Install <application>PyGtkSourceView</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>PyGtkSourceView</application> by running the
+        following commands:
+      </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <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>make install</userinput></screen>
-
     </sect3>
 
@@ -947,11 +1137,12 @@
       <title>Command Explanations</title>
 
-      <para><option>--disable-docs</option>: This option disables the
-      documentation building and is required if
-      <application>DocBook</application> is not installed.</para>
+      <para>
+        <option>--disable-docs</option>: This option disables the documentation
+        building and is required if <application>DocBook</application> is not
+        installed.
+      </para>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-
     </sect3>
 
@@ -960,10 +1151,8 @@
 
       <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
         <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
           <seg>gtksourceview2.so</seg>
           <seg>/usr/share/gtk-doc/html/pygtksourceview2</seg>
@@ -979,5 +1168,7 @@
           <term><filename class='libraryfile'>gtksourceview2.so</filename></term>
           <listitem>
-            <para>PyGtkSourceView Python library module.</para>
+            <para>
+              PyGtkSourceView Python library module.
+            </para>
             <indexterm zone="pygtksourceview gtksourceview2">
               <primary sortas="c-gtksourceview2">gtksourceview2.so</primary>
@@ -985,9 +1176,6 @@
           </listitem>
         </varlistentry>
-
       </variablelist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
   <!-- End PyGtkSourceView -->
@@ -1003,10 +1191,10 @@
 
     <sect3 role="package">
-
-
       <title>Introduction to pyatspi2</title>
 
-      <para>The <application>pyatspi2</application> package contains Python2 bindings
-      for the core components of GNOME Accessibility.</para>
+      <para>
+        The <application>pyatspi2</application> package contains Python2
+        bindings for the core components of GNOME Accessibility.
+      </para>
 
       &lfs70_built;
@@ -1015,20 +1203,32 @@
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pyatspi2-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pyatspi2-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pyatspi2-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pyatspi2-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pyatspi2-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pyatspi2-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyatspi2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyatspi2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyatspi2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyatspi2-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -1037,12 +1237,16 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="pygobject2"/></para>
+      <para role="required">
+        <xref linkend="pygobject2"/>
+      </para>
 
       <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended"><xref linkend="at-spi2-core"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pyatspi2"/></para>
-
+      <para role="recommended">
+        <xref linkend="at-spi2-core"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
+      </para>
     </sect3>
 
@@ -1050,6 +1254,8 @@
       <title>Installation of pyatspi2</title>
 
-      <para>Install <application>pyatspi2</application> by running the following
-      commands:</para>
+      <para>
+        Install <application>pyatspi2</application> by running the following
+        commands:
+      </para>
 
 <screen><userinput>./configure --prefix=$GNOME_PREFIX \
@@ -1058,10 +1264,13 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
     </sect3>
 
@@ -1071,10 +1280,12 @@
       <segmentedlist>
         <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directory</segtitle>
 
         <seglistitem>
-          <seg>Accessibility.py, appevent.py, constants.py, deviceevent.py, document.py, editabletext.py, enum.py, interfaces.py, registry.py, role.py, state.py, text.py, and utils.py</seg>
-          <seg>None</seg>
+          <seg>
+            Accessibility.py, appevent.py, constants.py, deviceevent.py,
+            document.py, editabletext.py, enum.py, interfaces.py, registry.py,
+            role.py, state.py, text.py, and utils.py
+          </seg>
           <seg><envar>$GNOME_PREFIX</envar>/lib/python2.7/site-packages/pyatspi</seg>
         </seglistitem>
@@ -1089,5 +1300,7 @@
           <term><command>Accessibility.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 Accessibility.py">
               <primary sortas="b-Accessibility.py">Accessibility.py</primary>
@@ -1099,5 +1312,7 @@
           <term><command>appevent.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 appevent.py">
               <primary sortas="b-appevent.py">appevent.py</primary>
@@ -1109,5 +1324,7 @@
           <term><command>constants.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 constants.py">
               <primary sortas="b-constants.py">constants.py</primary>
@@ -1119,5 +1336,7 @@
           <term><command>deviceevent.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 deviceevent.py">
               <primary sortas="b-deviceevent.py">deviceevent.py</primary>
@@ -1129,5 +1348,7 @@
           <term><command>document.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 document.py">
               <primary sortas="b-document.py">document.py</primary>
@@ -1139,5 +1360,7 @@
           <term><command>editabletext.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 editabletext.py">
               <primary sortas="b-editabletext.py">editabletext.py</primary>
@@ -1149,5 +1372,7 @@
           <term><command>enum.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 enum.py">
               <primary sortas="b-enum.py">enum.py</primary>
@@ -1159,5 +1384,7 @@
           <term><command>interfaces.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 interfaces.py">
               <primary sortas="b-interfaces.py">interfaces.py</primary>
@@ -1169,5 +1396,7 @@
           <term><command>registry.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 registry.py">
               <primary sortas="b-registry.py">registry.py</primary>
@@ -1179,5 +1408,7 @@
           <term><command>role.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 role.py">
               <primary sortas="b-role.py">role.py</primary>
@@ -1189,5 +1420,7 @@
           <term><command>state.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 state.py">
               <primary sortas="b-state.py">state.py</primary>
@@ -1199,5 +1432,7 @@
           <term><command>text.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 text.py">
               <primary sortas="b-text.py">text.py</primary>
@@ -1209,5 +1444,7 @@
           <term><command>utils.py</command></term>
           <listitem>
-            <para>does this .....</para>
+            <para>
+              does this .....
+            </para>
             <indexterm zone="pyatspi2 utils.py">
               <primary sortas="b-utils.py">utils.py</primary>
@@ -1215,9 +1452,6 @@
           </listitem>
         </varlistentry>
-
       </variablelist>-->
-
-    </sect3>
-
+    </sect3>
   </sect2>
   <!-- End pyatspi2 -->
@@ -1235,26 +1469,40 @@
       <title>Introduction to PyXDG Module</title>
 
-      <para><application>PyXDG</application> is a <application>Python</application>
-      library to access freedesktop.org standards.</para>
+      <para>
+        <application>PyXDG</application> is a <application>Python</application>
+        library to access freedesktop.org standards.
+      </para>
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&pyxdg-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pyxdg-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pyxdg-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pyxdg-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pyxdg-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pyxdg-time;</para>
+          <para>
+          Download (HTTP): <ulink url="&pyxdg-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyxdg-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyxdg-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyxdg-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyxdg-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyxdg-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -1263,9 +1511,11 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python2"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pyxdg"/></para>
-
+      <para role="required">
+        <xref linkend="python2"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyxdg"/>
+      </para>
     </sect3>
 
@@ -1273,11 +1523,10 @@
       <title>Installation of PyXDG</title>
 
-      <para>Install <application>pyxdg</application> by running the following
-      commands:</para>
-
-      <para>As the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        Install <application>pyxdg</application> by running the following
+        commands as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>python setup.py install</userinput></screen>
-
     </sect3>
 
@@ -1285,8 +1534,9 @@
       <title>Command Explanations</title>
 
-      <para><command>python setup.py install</command>: This command installs
-      the package.  There are other options available, see
-      <command>Python setup.py --help-commands</command> for details.</para>
-
+      <para>
+        <command>python setup.py install</command>: This command installs
+        the package.  There are other options available, see
+        <command>Python setup.py --help-commands</command> for details.
+      </para>
     </sect3>
 
@@ -1296,17 +1546,15 @@
       <segmentedlist>
         <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directories</segtitle>
 
         <seglistitem>
-          <seg>BaseDirectory.py, Config.py, Exceptions.py, IconTheme.py, IniFile.py,
-            Locale.py, Menu.py, RecentFile.py</seg>
-          <seg>none</seg>
+          <seg>
+            BaseDirectory.py, Config.py, Exceptions.py, IconTheme.py,
+            IniFile.py, Locale.py, Menu.py and RecentFile.py.
+          </seg>
           <seg>/usr/lib/python&python2-majorver;/site-packages/xdg</seg>
         </seglistitem>
       </segmentedlist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
   <!--End pyxdg -->
@@ -1324,26 +1572,40 @@
       <title>Introduction to IPython Module</title>
 
-      <para><application>IPython</application> provides a rich toolkit to help you
-      make the most out of using Python interactively.</para>
+      <para>
+        <application>IPython</application> provides a rich toolkit to help you
+        make the most out of using Python interactively.
+      </para>
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
-          <para>Download (HTTP): <ulink url="&ipython-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&ipython-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &ipython-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &ipython-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &ipython-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &ipython-time;</para>
+          <para>
+            Download (HTTP): <ulink url="&ipython-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&ipython-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &ipython-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &ipython-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &ipython-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &ipython-time;
+          </para>
         </listitem>
       </itemizedlist>
@@ -1352,23 +1614,26 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python2"/>
-      ( or <xref linkend="python3"/> : not tested), and
-      <xref linkend="sqlite"/></para>
+      <para role="required">
+        <xref linkend="python2"/>
+        ( or <xref linkend="python3"/> : not tested), and
+        <xref linkend="sqlite"/>
+      </para>
 
       <bridgehead renderas="sect5">optional</bridgehead>
       <para role="optional">
-      <ulink url="http://sphinx.pocoo.org">sphinx</ulink> (for building docs),
-      <ulink url="http://pygments.org">pygments</ulink> (for syntax higlighting
-       documentation),
-      <ulink url="http://pypi.python.org/pypi/nose">nose</ulink> (to build the test
-       program),
-      <ulink url="http://www.noah.org/python/pexpect">pexpect</ulink> (for
-       standalone doctests), and
-      <ulink url="http://pypi.python.org/pypi/pyzmq">sphinx</ulink> (for qtconsole,
-       notebook, parallel computing)</para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/ipython"/></para>
-
+        <ulink url="http://sphinx.pocoo.org">sphinx</ulink> (for building docs),
+        <ulink url="http://pygments.org">pygments</ulink> (for syntax
+        higlighting documentation),
+        <ulink url="http://pypi.python.org/pypi/nose">nose</ulink> (to build the
+        test program),
+        <ulink url="http://www.noah.org/python/pexpect">pexpect</ulink> (for
+        standalone doctests), and
+        <ulink url="http://pypi.python.org/pypi/pyzmq">sphinx</ulink> (for
+        qtconsole, notebook, parallel computing)
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/ipython"/>
+      </para>
     </sect3>
 
@@ -1376,16 +1641,17 @@
       <title>Installation of IPython</title>
 
-      <para>Install <application>ipython</application> by running the following
-      commands:</para>
-
-      <para>As the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        Install <application>ipython</application> by running the following
+        commands as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>python setup.py install --prefix=/usr</userinput></screen>
 
-      <para>If you built this against <application>nose</application>, you can
-      run the testsuite after the package has been installed by entering:
-      <command>iptest</command>. The tests test_startup_{,i}py (and perhaps others
-      if you provided the optional dependencies) will fail.</para>
-
+      <para>
+        If you built this against <application>nose</application>, you can run
+        the testsuite after the package has been installed by entering:
+        <command>iptest</command>. The tests test_startup_{,i}py (and perhaps
+        others if you provided the optional dependencies) will fail.
+      </para>
     </sect3>
 
@@ -1393,9 +1659,10 @@
       <title>Command Explanations</title>
 
-      <para><command>python setup.py install --prefix=/usr</command>: This command
-      installs the package. The prefix ensures that the programs are located in
-      <filename class="directory">/usr/bin</filename> instead of
-      <filename class="directory">/usr/local/bin</filename>.</para>
-
+      <para>
+        <command>python setup.py install --prefix=/usr</command>: This command
+        installs the package. The prefix ensures that the programs are located
+        in <filename class="directory">/usr/bin</filename> instead of
+        <filename class="directory">/usr/local/bin</filename>.
+      </para>
     </sect3>
 
@@ -1405,13 +1672,15 @@
       <segmentedlist>
         <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
         <segtitle>Installed Directories</segtitle>
 
         <seglistitem>
-          <seg>ipcluster, ipcontroller, ipengine, iplogger, iptest (if nose was
-          installed), ipython, irunner, pycolor and a host of python scripts</seg>
-          <seg>none</seg>
-          <seg>/usr/lib/python&python2-majorver;/site-packages/IPython,
-          /usr/share/doc/IPython</seg>
+          <seg>
+            ipcluster, ipcontroller, ipengine, iplogger, iptest (if nose was
+            installed), ipython, irunner, pycolor and a host of python scripts.
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/IPython and
+            /usr/share/doc/IPython.
+          </seg>
         </seglistitem>
       </segmentedlist>
@@ -1425,5 +1694,7 @@
           <term><command>ipcluster</command></term>
           <listitem>
-            <para>IPython parallel computing cluster control tool</para>
+            <para>
+              IPython parallel computing cluster control tool
+            </para>
             <indexterm zone="ipython ipcluster">
               <primary sortas="b-ipcluster">ipcluster</primary>
@@ -1436,5 +1707,7 @@
           <listitem>
             <!-- this is what the manpage says! -->
-            <para>IPython parallel computing controller control tool</para>
+            <para>
+              IPython parallel computing controller control tool
+            </para>
             <indexterm zone="ipython ipcontroller">
               <primary sortas="b-ipcontroller">ipcontroller</primary>
@@ -1446,5 +1719,7 @@
           <term><command>ipengine</command></term>
           <listitem>
-            <para>IPython parallel computing engine control tool</para>
+            <para>
+              IPython parallel computing engine control tool
+            </para>
             <indexterm zone="ipython ipengine">
               <primary sortas="b-ipengine">ipengine</primary>
@@ -1456,5 +1731,7 @@
           <term><command>iplogger</command></term>
           <listitem>
-            <para>IPython logger fpr parallel computing</para>
+            <para>
+              IPython logger fpr parallel computing
+            </para>
             <indexterm zone="ipython iplogger">
               <primary sortas="b-iplogger">iplogger</primary>
@@ -1466,5 +1743,7 @@
           <term><command>iptest</command></term>
           <listitem>
-            <para>runs the IPython testsuite</para>
+            <para>
+              runs the IPython testsuite
+            </para>
             <indexterm zone="ipython iptest">
               <primary sortas="b-iptest">iptest</primary>
@@ -1477,5 +1756,7 @@
           <listitem>
             <!-- again, description from the manpage -->
-            <para>Tools for Interactive Computing in Python</para>
+            <para>
+              Tools for Interactive Computing in Python
+            </para>
             <indexterm zone="ipython ipython">
               <primary sortas="b-ipython">ipython</primary>
@@ -1487,5 +1768,7 @@
           <term><command>irunner</command></term>
           <listitem>
-            <para>is an interface to IPython&apos;s runner module</para>
+            <para>
+              is an interface to IPython&apos;s runner module
+            </para>
             <indexterm zone="ipython irunner">
               <primary sortas="b-irunner">irunner</primary>
@@ -1497,5 +1780,7 @@
           <term><command>pycolor</command></term>
           <listitem>
-            <para>Colorize a python file or stdin using ANSI and print to stdout</para>
+            <para>
+              Colorize a python file or stdin using ANSI and print to stdout
+            </para>
             <indexterm zone="ipython pycolor">
               <primary sortas="b-pycolor">pycolor</primary>
@@ -1503,354 +1788,7 @@
           </listitem>
         </varlistentry>
-
       </variablelist>
-
-    </sect3>
-
+    </sect3>
   </sect2>
   <!-- End IPython -->
-
-  <!--
-  <!\-\- Begin PyORBit \-\->
-  <sect2 id="pyorbit" xreflabel="PyORBit-&pyorbit-version;">
-
-    <title>PyORBit-&pyorbit-version;</title>
-
-    <indexterm zone="pyorbit">
-      <primary sortas="a-PyORBit">PyORBit</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyORBit Module</title>
-
-      <para>This is a <application>Python</application> language binding for
-      the <application>ORBit2</application> CORBA implementation.</para>
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Download (HTTP): <ulink url="&pyorbit-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&pyorbit-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &pyorbit-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &pyorbit-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &pyorbit-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &pyorbit-time;</para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyORBit Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python2"/> and
-      <xref linkend="ORBit2"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pyorbit"/></para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyORBit</title>
-
-      <para>Install <application>PyORBit</application> by running the following
-      commands:</para>
-
-<screen><userinput>./configure \-\-prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <!\-\- There's some test scripts, but I don't know what to run \-\->
-      <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>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>PyORBit Python library module</seg>
-          <seg>/usr/include/pyorbit-2</seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!\-\- End PyORBit \-\->
-
-  <!\-\- Begin Gnome-Python \-\->
-  <sect2 id="gnome-python" xreflabel="Gnome-Python-&gnome-python-version;">
-
-    <title>Gnome-Python-&gnome-python-version;</title>
-
-    <indexterm zone="gnome-python">
-      <primary sortas="a-Gnome-Python">Gnome-Python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Gnome-Python Module</title>
-
-      <para>Gnome-Python provides <application>Python</application> modules
-      for various GNOME libraries.</para>
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Download (HTTP): <ulink url="&gnome-python-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&gnome-python-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &gnome-python-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &gnome-python-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &gnome-python-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &gnome-python-time;</para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Gnome-Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="pygtk"/> and
-      <xref linkend="libgnome"/></para>
-
-      <!\-\- Many modules get their deps pulled in through libgnome: libbonobo,
-           gnome-vfs, GConf \-\->
-
-      <bridgehead renderas="sect5">Required (gnome.ui module)</bridgehead>
-      <para role="required"><xref linkend="pyorbit"/> and
-      <xref linkend="libgnomeui"/></para>
-
-      <bridgehead renderas="sect5">Required (gnome.canvas module)</bridgehead>
-      <para role="required"><xref linkend="libgnomecanvas"/></para>
-
-      <bridgehead renderas="sect5">Required (gnomevfs module bonobo
-      support)</bridgehead>
-      <para role="required"><xref linkend="pyorbit"/></para>
-
-      <bridgehead renderas="sect5">Required (bonobo.ui module)</bridgehead>
-      <para role="required"><xref linkend="libbonoboui"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-python"/></para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Gnome-Python</title>
-
-      <para>Install <application>Gnome-Python</application> by running the following
-      commands:</para>
-
-<screen><userinput>./configure \-\-prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <!\-\- Tests were crashing on me; need to figure out why \-\->
-      <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>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>libpythonmethod.so, _bonobo.so, activation.so, ui.so, gconf.so,
-          _gnome.so, ui.so, gnomecanvas.so, _gnomevfs.so, and
-          gnomevfsbonobo.so</seg>
-          <seg>/usr/{include/gnome-python-2.0,
-          lib/python&python2-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs},
-          share/{gtk-doc/html/pygnomevfs,pygtk/2.0/argtypes}}</seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!\-\- End Gnome-Python \-\->
-
-  <!\-\- Begin Gnome-Python-Desktop \-\->
-  <sect2 id="gnome-python-desktop" xreflabel="Gnome-Python-Desktop-&gnome-python-desktop-version;">
-
-    <title>Gnome-Python-Desktop-&gnome-python-desktop-version;</title>
-
-    <indexterm zone="gnome-python-desktop">
-      <primary sortas="a-Gnome-Python-Desktop">Gnome-Python-Desktop</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Gnome-Python-Desktop Module</title>
-
-      <para>Gnome-Python-Desktop provides additional <application>Python</application>
-      modules for GNOME libraries.</para>
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Download (HTTP): <ulink url="&gnome-python-desktop-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&gnome-python-desktop-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &gnome-python-desktop-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &gnome-python-desktop-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &gnome-python-desktop-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &gnome-python-desktop-time;</para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Gnome-Python-Desktop Dependencies</bridgehead>
-
-      <!\-\- Not strictly true, but needed to find install directories and
-           by most modules \-\->
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="gnome-python"/></para>
-
-      <bridgehead renderas="sect5">Required (gnomeapplet module)</bridgehead>
-      <para role="required"><xref linkend="gnome-panel"/></para>
-
-      <bridgehead renderas="sect5">Required (gnomeprint module)</bridgehead>
-      <para role="required"><xref linkend="libgnomeprint"/></para>
-
-      <bridgehead renderas="sect5">Required (gnomeprint.ui module)</bridgehead>
-      <para role="required"><xref linkend="libgnomeprintui"/></para>
-
-      <!\-\- looks like version 1.x of gtksourceview is the requirement \-\->
-      <bridgehead renderas="sect5">Required (gtksourceview module)</bridgehead>
-      <para role="required"><xref linkend="gtksourceview"/> (Version 1.x required)</para>
-
-      <bridgehead renderas="sect5">Required (wnck module)</bridgehead>
-      <para role="required"><xref linkend="libwnck"/></para>
-
-      <bridgehead renderas="sect5">Required (totem.plparser module)</bridgehead>
-      <para role="required"><xref linkend="totem"/></para>
-
-      <bridgehead renderas="sect5">Required (gtop module)</bridgehead>
-      <para role="required"><xref linkend="libgtop"/></para>
-
-      <bridgehead renderas="sect5">Required (braseromedia and braseroburn modules)</bridgehead>
-      <para role="required"><xref linkend="brasero"/></para>
-
-      <bridgehead renderas="sect5">Required (mediaprofiles module)</bridgehead>
-      <para role="required"><xref linkend="gnome-media"/></para>
-
-      <bridgehead renderas="sect5">Required (rsvg module)</bridgehead>
-      <para role="required"><xref linkend="librsvg"/></para>
-
-      <bridgehead renderas="sect5">Required (metacity module)</bridgehead>
-      <para role="required"><xref linkend="metacity"/></para>
-
-      <bridgehead renderas="sect5">Required (gnomekeyring module)</bridgehead>
-      <para role="required"><xref linkend="gnome-keyring"/></para>
-
-      <bridgehead renderas="sect5">Required (gnomedesktop module)</bridgehead>
-      <para role="required"><xref linkend="gnome-desktop"/></para>
-
-      <bridgehead renderas="sect5">Required (bugbuddy module)</bridgehead>
-      <para role="required"><xref linkend="bug-buddy"/></para>
-
-      <bridgehead renderas="sect5">Required (evolution.ebook and evolution.ecal modules)</bridgehead>
-      <para role="required"><xref linkend="evolution-data-server"/></para>
-
-      <bridgehead renderas="sect5">Required (evince module)</bridgehead>
-      <para role="required"><xref linkend="evince"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-python-desktop"/></para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Gnome-Python-Desktop</title>
-
-      <para>Install <application>Gnome-Python-Desktop</application> by running
-      the following commands:</para>
-
-<screen><userinput>./configure \-\-prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <!\-\- Tests were crashing on me; need to figure out why \-\->
-      <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>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para><parameter>\-\-enable-metacity</parameter>: This option enables
-      building the metacity module if <xref linkend="metacity"/> is
-      installed.</para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>braseroburn.so, braseromedia.so, evince.so, ebook.so, ecal.so,
-          gnomeapplet.so, _gnomedesktop.so, gnomekeyring.so, _print.so, ui.so,
-          gtop.so, mediaprofiles.so, rsvg.so, plparser.so, and wnck.so</seg>
-          <seg>/usr/{lib/python&python2-majorver;/site-packages/gtk-2.0/{evolution,
-          gnomedesktop,gnomeprint,totem},share/gtk-doc/html/pygnomeprintui}</seg>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!\-\- End Gnome-Python-Desktop -->
-
 </sect1>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision b31b493cf96803c56df4a17055f0ee1d553a00b5)
+++ template/template.xml	(revision 66b546ab595b3e1a644c4881464cf78f413b06cd)
@@ -55,5 +55,4 @@
     <!-- if it works: -->
     &lfs71_checked;
-
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
