Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision fe88aee6843a936ef535eb63673a1c88b7792453)
+++ general/prog/python-modules.xml	(revision d1daeac2a5dd16591bd6c5211b1f4696a88939aa)
@@ -14,35 +14,35 @@
   <!ENTITY pycairo-download-http "http://cairographics.org/releases/pycairo-&pycairo-version;.tar.gz">
   <!ENTITY pycairo-download-ftp  " ">
-  <!ENTITY pycairo-md5sum        "e26e77919b606113f565d70036c1f504">
-  <!ENTITY pycairo-size          "468 KB">
-  <!ENTITY pycairo-buildsize     "5.2 MB">
+  <!ENTITY pycairo-md5sum        "054da6c125cb427a003f5fd6c54f853e">
+  <!ENTITY pycairo-size          "465 KB">
+  <!ENTITY pycairo-buildsize     "3 MB">
   <!ENTITY pycairo-time          "0.1 SBU">
 
-  <!ENTITY pygobject-download-http "&gnome-download-http;/pygobject/2.12/pygobject-&pygobject-version;.tar.bz2">
-  <!ENTITY pygobject-download-ftp  "&gnome-download-ftp;/pygobject/2.12/pygobject-&pygobject-version;.tar.bz2">
-  <!ENTITY pygobject-md5sum        "009986021225b7ea6e0ba848707785af">
-  <!ENTITY pygobject-size          "331 KB">
-  <!ENTITY pygobject-buildsize     "5.2">
-  <!ENTITY pygobject-time          "0.1 SBU">
-
-  <!ENTITY pygtk-download-http "&gnome-download-http;/pygtk/2.10/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-download-ftp  "&gnome-download-ftp;/pygtk/2.10/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-md5sum        "f051e25adcbdc1ddcf736fadad3d66f2">
-  <!ENTITY pygtk-size          "1.9 MB">
-  <!ENTITY pygtk-buildsize     "5.2 MB">
+  <!ENTITY pygobject-download-http "&gnome-download-http;/pygobject/2.20/pygobject-&pygobject-version;.tar.bz2">
+  <!ENTITY pygobject-download-ftp  "&gnome-download-ftp;/pygobject/2.20/pygobject-&pygobject-version;.tar.bz2">
+  <!ENTITY pygobject-md5sum        "10e1fb79be3d698476a28b1e1b0c5640">
+  <!ENTITY pygobject-size          "651 KB">
+  <!ENTITY pygobject-buildsize     "16 MB">
+  <!ENTITY pygobject-time          "0.2 SBU">
+
+  <!ENTITY pygtk-download-http "&gnome-download-http;/pygtk/2.16/pygtk-&pygtk-version;.tar.bz2">
+  <!ENTITY pygtk-download-ftp  "&gnome-download-ftp;/pygtk/2.16/pygtk-&pygtk-version;.tar.bz2">
+  <!ENTITY pygtk-md5sum        "bd0d437fefd6d5390f5d770a495cd50c">
+  <!ENTITY pygtk-size          "2.1 MB">
+  <!ENTITY pygtk-buildsize     "64 MB">
   <!ENTITY pygtk-time          "0.7 SBU">
 
-  <!ENTITY pyorbit-download-http "&gnome-download-http;/pyorbit/2.14/pyorbit-&pyorbit-version;.tar.bz2">
-  <!ENTITY pyorbit-download-ftp  "&gnome-download-ftp;/pyorbit/2.14/pyorbit-&pyorbit-version;.tar.bz2">
-  <!ENTITY pyorbit-md5sum        "3c4d42ae1a7303fd85071a842617043f">
-  <!ENTITY pyorbit-size          "0.3 MB">
-  <!ENTITY pyorbit-buildsize     "5.3 MB">
+  <!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/&gnome-old-version;/gnome-python-&gnome-python-version;.tar.bz2">
-  <!ENTITY gnome-python-download-ftp  "&gnome-download-ftp;/gnome-python/&gnome-old-version;/gnome-python-&gnome-python-version;.tar.bz2">
-  <!ENTITY gnome-python-md5sum        "3df58e4354526d4e0be8524c0bf6ddb8">
-  <!ENTITY gnome-python-size          "0.4 MB">
-  <!ENTITY gnome-python-buildsize     "5.4 MB">
+  <!ENTITY gnome-python-download-http "&gnome-download-http;/gnome-python/&gnome-version;/gnome-python-&gnome-python-version;.tar.bz2">
+  <!ENTITY gnome-python-download-ftp  "&gnome-download-ftp;/gnome-python/&gnome-version;/gnome-python-&gnome-python-version;.tar.bz2">
+  <!ENTITY gnome-python-md5sum        "b627abbb0ed912e221cc072e3dd6f9d6">
+  <!ENTITY gnome-python-size          "548 KB">
+  <!ENTITY gnome-python-buildsize     "12 MB">
   <!ENTITY gnome-python-time          "0.3 SBU">
 
@@ -113,52 +113,55 @@
     </indexterm>
 
-    <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>
-
-    <bridgehead renderas="sect3">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>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PyXML Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pyxml"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PyXML</title>
-
-    <para>Install <application>PyXML</application> by running the following
-    commands:</para>
+    <sect3 role="package">
+      <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>
+
+      <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>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyXML Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required"><xref linkend="python"/></para>
+
+      <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/pyxml"/></para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyXML</title>
+
+      <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;
@@ -168,6 +171,6 @@
 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;
@@ -175,61 +178,64 @@
 cd ..</userinput></screen>
 
+    </sect3>
+
+    <sect3 role="commands">
+      <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>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>xmlproc_parse and xmlproc_val</seg>
+          <seg>PyXML Python library modules</seg>
+          <seg>/usr/lib/python&python-majorver;/site-packages/_xmlplus and
+          /usr/share/doc/PyXML-&pyxml-version;</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="xmlproc_parse">
+          <term><command>xmlproc_parse</command></term>
+          <listitem>
+            <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>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="xmlproc_val">
+          <term><command>xmlproc_val</command></term>
+          <listitem>
+            <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>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+    </sect3>
+
   </sect2>
 
-  <sect2 role="commands">
-    <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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>xmlproc_parse and xmlproc_val</seg>
-        <seg>PyXML Python library modules</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/_xmlplus and
-        /usr/share/doc/PyXML-&pyxml-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xmlproc_parse">
-        <term><command>xmlproc_parse</command></term>
-        <listitem>
-          <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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlproc_val">
-        <term><command>xmlproc_val</command></term>
-        <listitem>
-          <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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
   <!-- End PyXML -->
 
@@ -243,77 +249,89 @@
     </indexterm>
 
-    <para>Pycairo provides <application>Python</application> bindings to
-    <application>Cairo</application>.</para>
-
-    <bridgehead renderas="sect3">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>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pycairo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/> and
-    <xref linkend="cairo"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pycairo"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pycairo</title>
-
-    <para>Install <application>Pycairo</application> by running the following
-    commands:</para>
+    <sect3 role="package">
+      <title>Introduction to Pycairo Module</title>
+
+      <para>Pycairo provides <application>Python</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>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Pycairo Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required"><xref linkend="python"/> and
+      <xref linkend="cairo"/></para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional"><ulink
+      url="http://codespeak.net/py/dist/">PyPI</ulink> (Required for the
+      regression tests)</para>
+
+      <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/pycairo"/></para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Pycairo</title>
+
+      <para>Install <application>Pycairo</application> by running the following
+      commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</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>make install</userinput></screen>
 
-    <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 test.py)</userinput></screen>
+      <para>To run the regression tests, the package must first be installed and
+      also the PyPI package which contains the py.test tool.
+      Then, as an unprivileged user, issue the following commands:</para>
+
+<screen><userinput>python py.test</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>Pycairo Python library module</seg>
+          <seg>/usr/include/pycairo and
+          /usr/lib/python&python-majorver;/site-packages/cairo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
 
   </sect2>
 
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <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&python-majorver;/site-packages/cairo</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
   <!-- End Pycairo -->
 
@@ -327,86 +345,92 @@
     </indexterm>
 
-    <para>PyGObject provides <application>Python</application> bindings to the
-    GObject class from <application>GLib</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pygobject-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pygobject-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pygobject-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pygobject-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pygobject-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pygobject-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PyGObject Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/> and
-    <xref linkend="glib2"/></para>
-
-    <bridgehead renderas="sect4">Optional (to Build Documentation)</bridgehead>
-    <para role="optional"><xref linkend="libxslt"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pygobject"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PyGObject</title>
-
-    <para>Install <application>PyGObject</application> by running the following
-    commands:</para>
+    <sect3 role="package">
+      <title>Introduction to PyGObject Module</title>
+
+      <para>PyGObject provides <application>Python</application> bindings to the
+      GObject class from <application>GLib</application>.</para>
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>Download (HTTP): <ulink url="&pygobject-download-http;"/></para>
+        </listitem>
+        <listitem>
+          <para>Download (FTP): <ulink url="&pygobject-download-ftp;"/></para>
+        </listitem>
+        <listitem>
+          <para>Download MD5 sum: &pygobject-md5sum;</para>
+        </listitem>
+        <listitem>
+          <para>Download size: &pygobject-size;</para>
+        </listitem>
+        <listitem>
+          <para>Estimated disk space required: &pygobject-buildsize;</para>
+        </listitem>
+        <listitem>
+          <para>Estimated build time: &pygobject-time;</para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyGObject Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required"><xref linkend="python"/> and
+      <xref linkend="glib2"/></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;/pygobject"/></para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyGObject</title>
+
+      <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>
+
+    <sect3 role="commands">
+      <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>
+
+    </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>PyGObject Python library module</seg>
+          <seg>/usr/include/pygtk-2.0, /usr/share/pygobject and
+          /usr/lib/python&python-majorver;/site-packages/gtk-2.0</seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
   </sect2>
 
-  <sect2 role="commands">
-    <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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>PyGObject Python library module</seg>
-        <seg>/usr/include/pygtk-2.0, /usr/share/pygobject and
-        /usr/lib/python&python-majorver;/site-packages/gtk-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
   <!-- End PyGObject -->
 
@@ -420,136 +444,141 @@
     </indexterm>
 
-    <para>PyGTK lets you to easily create programs with a graphical user
-    interface using the <application>Python</application> programming
-    language.</para>
-
-    <bridgehead renderas="sect3">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>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PyGTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pygobject"/></para>
-
-    <bridgehead renderas="sect4">Required (atk module)</bridgehead>
-    <para role="required"><xref linkend="atk"/></para>
-
-    <bridgehead renderas="sect4">Required (pango module)</bridgehead>
-    <para role="required"><xref linkend="pango"/></para>
-
-    <bridgehead renderas="sect4">Required (pangocairo module)</bridgehead>
-    <para role="required"><xref linkend="pycairo"/> and
-    <xref linkend="pango"/></para>
-
-    <bridgehead renderas="sect4">Required (gtk and gtk.unixprint
-    modules)</bridgehead>
-    <para role="required"><xref linkend="pycairo"/> and
-    <xref linkend="gtk2"/></para>
-
-    <bridgehead renderas="sect4">Required (gtk.libglade module)</bridgehead>
-    <para role="required"><xref linkend="pycairo"/> and
-    <xref linkend="libglade"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://numpy.scipy.org/">Numeric
-    (version 24.2)</ulink></para>
-
-    <bridgehead renderas="sect4">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>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PyGTK</title>
-
-    <para>Install <application>PyGTK</application> by running the following
-    commands:</para>
+    <sect3 role="package">
+      <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>
+
+      <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>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyGTK Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required"><xref linkend="pygobject"/></para>
+
+      <bridgehead renderas="sect5">Required (atk module)</bridgehead>
+      <para role="required"><xref linkend="atk"/></para>
+
+      <bridgehead renderas="sect5">Required (pango module)</bridgehead>
+      <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>
+
+      <bridgehead renderas="sect5">Required (gtk.libglade module)</bridgehead>
+      <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/">Numeric
+      (version 24.2)</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>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyGTK</title>
+
+      <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>
 
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--enable-docs</parameter>: This option enables
-    rebuilding the html documentation if <xref linkend="libxslt"/> is
-    installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>pygtk-codegen-2.0 and pygtk-demo</seg>
-        <seg>PyGTK Python library modules</seg>
-        <seg>/usr/lib/pygtk, /usr/share/pygtk and
-        /usr/lib/python&python-majorver;/site-packages/gtk-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pygtk-codegen-2.0">
-        <term><command>pygtk-codegen-2.0</command></term>
-        <listitem>
-          <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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pygtk-demo">
-        <term><command>pygtk-demo</command></term>
-        <listitem>
-          <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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para><parameter>--enable-docs</parameter>: This option enables
+      rebuilding the html documentation if <xref linkend="libxslt"/> 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>pygtk-codegen-2.0 and pygtk-demo</seg>
+          <seg>PyGTK Python library modules</seg>
+          <seg>/usr/lib/pygtk, /usr/share/pygtk and
+          /usr/lib/python&python-majorver;/site-packages/gtk-2.0</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="pygtk-codegen-2.0">
+          <term><command>pygtk-codegen-2.0</command></term>
+          <listitem>
+            <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>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="pygtk-demo">
+          <term><command>pygtk-demo</command></term>
+          <listitem>
+            <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>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+    </sect3>
 
   </sect2>
@@ -565,72 +594,77 @@
     </indexterm>
 
-    <para>This is a <application>Python</application> language binding for
-    the <application>ORBit2</application> CORBA implementation.</para>
-
-    <bridgehead renderas="sect3">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="sect3">PyORBit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/> and
-    <xref linkend="ORBit2"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pyorbit"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PyORBit</title>
-
-    <para>Install <application>PyORBit</application> by running the following
-    commands:</para>
+    <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="python"/> 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>
+      <!-- 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>
 
-  </sect2>
-
-  <sect2 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>
+
+    <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>
@@ -646,89 +680,94 @@
     </indexterm>
 
-    <para>Gnome-Python provides <application>Python</application> modules
-    for various GNOME libraries.</para>
-
-    <bridgehead renderas="sect3">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="sect3">Gnome-Python Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">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="sect4">Required (gnome.ui module)</bridgehead>
-    <para role="required"><xref linkend="pyorbit"/> and
-    <xref linkend="libgnomeui"/></para>
-
-    <bridgehead renderas="sect4">Required (gnome.canvas module)</bridgehead>
-    <para role="required"><xref linkend="libgnomecanvas"/></para>
-
-    <bridgehead renderas="sect4">Required (gnomevfs module bonobo
-    support)</bridgehead>
-    <para role="required"><xref linkend="pyorbit"/></para>
-
-    <bridgehead renderas="sect4">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>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gnome-Python</title>
-
-    <para>Install <application>Gnome-Python</application> by running the following
-    commands:</para>
+    <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>
+      <!-- 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>
 
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Gnome-Python library modules</seg>
-        <seg>/usr/include/gnome-python-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
+    </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>Gnome-Python library modules</seg>
+          <seg>/usr/include/gnome-python-2.0</seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
 
   </sect2>
@@ -744,124 +783,129 @@
     </indexterm>
 
-    <para>Gnome-Python-Desktop provides additional <application>Python</application>
-    modules for GNOME libraries.</para>
-
-    <bridgehead renderas="sect3">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="sect3">Gnome-Python-Desktop Dependencies</bridgehead>
-
-    <!-- Not strictly true, but needed to find install directories and
-         by most modules -->
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-python"/></para>
-
-    <bridgehead renderas="sect4">Required (gnomeapplet module)</bridgehead>
-    <para role="required"><xref linkend="gnome-panel"/></para>
-
-    <bridgehead renderas="sect4">Required (gnomeprint module)</bridgehead>
-    <para role="required"><xref linkend="libgnomeprint"/></para>
-
-    <bridgehead renderas="sect4">Required (gnomeprint.ui module)</bridgehead>
-    <para role="required"><xref linkend="libgnomeprintui"/></para>
-
-    <bridgehead renderas="sect4">Required (gtksourceview module)</bridgehead>
-    <para role="required"><xref linkend="gtksourceview"/></para>
-
-    <bridgehead renderas="sect4">Required (wnck module)</bridgehead>
-    <para role="required"><xref linkend="libwnck"/></para>
-
-    <bridgehead renderas="sect4">Required (totem.plparser module)</bridgehead>
-    <para role="required"><xref linkend="totem"/></para>
-
-    <bridgehead renderas="sect4">Required (gtop module)</bridgehead>
-    <para role="required"><xref linkend="libgtop"/></para>
-
-    <bridgehead renderas="sect4">Required (nautilusburn module)</bridgehead>
-    <para role="required"><xref linkend="nautilus-cd-burner"/></para>
-
-    <bridgehead renderas="sect4">Required (mediaprofiles module)</bridgehead>
-    <para role="required"><xref linkend="gnome-media"/></para>
-
-    <bridgehead renderas="sect4">Required (rsvg module)</bridgehead>
-    <para role="required"><xref linkend="librsvg"/></para>
-
-    <bridgehead renderas="sect4">Required (metacity module)</bridgehead>
-    <para role="required"><xref linkend="metacity"/></para>
-
-    <bridgehead renderas="sect4">Required (gnomekeyring module)</bridgehead>
-    <para role="required"><xref linkend="gnome-keyring"/></para>
-
-    <bridgehead renderas="sect4">Required (gnomedesktop module)</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/></para>
-
-    <bridgehead renderas="sect4">Required (bugbuddy module)</bridgehead>
-    <para role="required"><xref linkend="bug-buddy"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-python-desktop"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gnome-Python-Desktop</title>
-
-    <para>Install <application>Gnome-Python-Desktop</application> by running
-    the following commands:</para>
+    <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>
+
+      <bridgehead renderas="sect5">Required (gtksourceview module)</bridgehead>
+      <para role="required"><xref linkend="gtksourceview"/></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 (nautilusburn module)</bridgehead>
+      <para role="required"><xref linkend="nautilus-cd-burner"/></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>
+
+      <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>
+      <!-- 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>
 
-  </sect2>
-
-  <sect2 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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Gnome-Python-Desktop library modules</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
+    </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>Gnome-Python-Desktop library modules</seg>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
 
   </sect2>
