Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/boost.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -70,5 +70,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="Optional">
-    <xref linkend="python"/>
+    <xref linkend="python2"/>
     </para>
 
Index: general/genlib/gamin.xml
===================================================================
--- general/genlib/gamin.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/gamin.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/></para>
+    <para role="optional"><xref linkend="python2"/></para>
 
     <!-- Though configure mentions these two packages, the build
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/glib2.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libffi"/> and <xref linkend="python"/>
+    <para role="required"><xref linkend="libffi"/> and <xref linkend="python2"/>
     <!--<para role="required"><xref linkend="pkgconfig"/> -->
     </para> 
Index: general/genlib/gobject-introspection.xml
===================================================================
--- general/genlib/gobject-introspection.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/gobject-introspection.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
       <xref linkend="libffi"/> or <xref linkend="gcc"/> (build Java so that
         <filename class='libraryfile'>libffi</filename> is built), and
-      <xref linkend="python"/>
+      <xref linkend="python2"/>
     </para>
 
Index: general/genlib/iso-codes.xml
===================================================================
--- general/genlib/iso-codes.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/iso-codes.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/></para>
+    <para role="required"><xref linkend="python2"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: general/genlib/libglade.xml
===================================================================
--- general/genlib/libglade.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/libglade.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>
+    <para role="optional"><xref linkend="python2"/>
     and <xref linkend="gtk-doc"/></para>
 
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/libgsf.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -67,5 +67,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>,
+    <para role="optional"><xref linkend="python2"/>,
     <xref linkend="pygtk"/>,
     <xref linkend="GConf"/> (required to build the
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/libxml2.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -69,5 +69,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> (to build and install a
+    <para role="optional"><xref linkend="python2"/> (to build and install a
     <application>Python</application> library module, additionally it is
     required to run the full suite of tests)</para>
Index: general/genlib/libxslt.xml
===================================================================
--- general/genlib/libxslt.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/libxslt.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> and
+    <para role="optional"><xref linkend="python2"/> and
     <xref linkend="libgcrypt"/></para>
 
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genlib/telepathy-glib.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -66,5 +66,5 @@
     <para role="required"><xref linkend="dbus-glib"/>,
     <xref linkend="libxslt"/>, and
-    <xref linkend="python"/></para>
+    <xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genutils/graphviz.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -118,5 +118,5 @@
     <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="php"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
     <xref linkend="tcl"/>,
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genutils/gtk-doc.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -80,5 +80,5 @@
     <xref linkend="docbook-dsssl"/>
     (SGML support, not actively maintained any more),
-    <xref linkend="python"/> (builds gtkdoc-depscan), and
+    <xref linkend="python2"/> (builds gtkdoc-depscan), and
     <xref linkend="rarian"/></para>
 
Index: general/genutils/pilot-link.xml
===================================================================
--- general/genutils/pilot-link.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genutils/pilot-link.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -73,5 +73,5 @@
     <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="tcl"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <ulink url="http://www.bluez.org/">BlueZ</ulink>, and
     <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
Index: general/genutils/recode.xml
===================================================================
--- general/genutils/recode.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/genutils/recode.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -81,5 +81,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>
+    <para role="optional"><xref linkend="python2"/>
     (for the <quote>bigauto</quote> test) and
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/graphlib/exiv2.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -86,5 +86,5 @@
     <para role="optional">
     <xref linkend="imagemagick"/>,
-    <xref linkend="python"/>
+    <xref linkend="python2"/>
     </para>
 -->
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/graphlib/gegl.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -82,5 +82,5 @@
     <ulink url="http://www.openexr.org">OpenEXR</ulink>,
     <xref linkend="pango"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
     <xref linkend="sdl"/>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/graphlib/lcms.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -73,5 +73,5 @@
     <para role="optional"><xref linkend="libtiff"/>,
     <xref linkend="libjpeg"/>, and
-    <xref linkend="python"/> (with
+    <xref linkend="python2"/> (with
     <ulink url="http://www.swig.org/">SWIG</ulink> also)</para>
 
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/graphlib/librsvg.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -71,5 +71,5 @@
     <para role="optional"><xref linkend="gtk-doc"/>,
     <xref linkend="docbook-utils"/>, and
-    <xref linkend="python"/>, providing a legacy wrapper interface
+    <xref linkend="python2"/>, providing a legacy wrapper interface
     <command>rsvg</command> for the newer
     <command>rsvg-convert</command>.</para>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/doxygen.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -76,5 +76,5 @@
     <para role="optional"><xref linkend="qt4"/> (for doxywizard),
     <xref linkend="graphviz"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
     <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
@@ -134,5 +134,5 @@
     packages are required if you wish to use extended capabilities. If you
     need to use the language translation features, you must have
-    <xref linkend="python"/> installed. If you require formulas to
+    <xref linkend="python2"/> installed. If you require formulas to
     create PDF documentation, then you must have <!--<xref linkend="tetex"/> or-->
     <xref linkend="texlive"/> installed. If you require formulas to convert
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/git.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -70,5 +70,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/></para>
+    <para role="required"><xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/pdl.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -238,5 +238,5 @@
             <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
             <xref linkend="tk"/>,
-            <xref linkend="python"/> (with
+            <xref linkend="python2"/> (with
             <ulink url="http://www.numpy.org/">Numeric Python</ulink>),
             <ulink url="&blfs-wiki;/gcc3">a
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/python-modules.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -179,5 +179,5 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python"/></para>
+      <para role="required"><xref linkend="python2"/></para>
 
       <para condition="html" role="usernotes">User Notes:
@@ -314,5 +314,5 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python"/> and
+        <xref linkend="python2"/> and
         <xref linkend="cairo"/>
       </para>
@@ -409,5 +409,5 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python"/> and
+      <para role="required"><xref linkend="python2"/> and
       <xref linkend="cairo"/></para>
 
@@ -610,5 +610,5 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python"/> and
+        <xref linkend="python2"/> and
         <xref linkend="glib2"/>
       </para>
@@ -993,5 +993,5 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python"/> and
+      <para role="required"><xref linkend="python2"/> and
       <xref linkend="ORBit2"/></para>
 
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/python2.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -17,5 +17,5 @@
 ]>
 
-<sect1 id="python" xreflabel="Python-&python2-version;">
+<sect1 id="python2" xreflabel="Python-&python2-version;">
   <?dbhtml filename="python2.html" ?>
 
@@ -27,5 +27,5 @@
   <title>Python-&python2-version;</title>
 
-  <indexterm zone="python">
+  <indexterm zone="python2">
     <primary sortas="a-Python2">Python</primary>
   </indexterm>
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
 
-    <itemizedlist spacing='compact'>
+    <itemizedlist spacing="compact">
       <title>Optional HTML Documentation</title>
       <listitem>
@@ -201,5 +201,5 @@
           <para>is a wrapper script that opens a
           <application>Python</application> aware GUI editor.</para>
-          <indexterm zone="python idle2">
+          <indexterm zone="python2 idle2">
             <primary sortas="b-idle2">idle</primary>
           </indexterm>
@@ -212,5 +212,5 @@
           <para>is the <application>Python</application> documentation
           tool.</para>
-          <indexterm zone="python pydoc2">
+          <indexterm zone="python2 pydoc2">
             <primary sortas="b-pydoc2">pydoc</primary>
           </indexterm>
@@ -223,6 +223,6 @@
           <para>is an interpreted, interactive, object-oriented programming
           language.</para>
-          <indexterm zone="python python2-prog">
-            <primary sortas="b-python">python</primary>
+          <indexterm zone="python2 python2-prog">
+            <primary sortas="b-python2">python</primary>
           </indexterm>
         </listitem>
@@ -234,5 +234,5 @@
           <para>is a version-specific name for the <command>python</command>
           program.</para>
-          <indexterm zone="python python2-ver">
+          <indexterm zone="python2 python2-ver">
             <primary sortas="b-python&python2-majorver;">python&python2-majorver;</primary>
           </indexterm>
@@ -245,5 +245,5 @@
           <para>is an SMTP proxy implemented in
           <application>Python</application>.</para>
-          <indexterm zone="python smtpd.py2">
+          <indexterm zone="python2 smtpd.py2">
             <primary sortas="b-smtpd.py2">smtpd.py</primary>
           </indexterm>
Index: general/prog/spidermonkey.xml
===================================================================
--- general/prog/spidermonkey.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/spidermonkey.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="nspr"/>,
-    <xref linkend="python"/> and
+    <xref linkend="python2"/> and
     <xref linkend="zip"/></para>
 
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/prog/subversion.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -82,5 +82,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> (required to run the test suite),
+    <para role="optional"><xref linkend="python2"/> (required to run the test suite),
     <xref linkend="db"/>,
     <xref linkend="sqlite"/>,
@@ -104,5 +104,5 @@
     <bridgehead renderas="sect4">Optional to Build the SWIG Bindings</bridgehead>
     <para role="optional"><ulink url="http://www.swig.org">SWIG</ulink>**,
-    <xref linkend="python"/>, and
+    <xref linkend="python2"/>, and
     <xref linkend="ruby"/></para>
 
Index: general/sysutils/dbus-bindings.xml
===================================================================
--- general/sysutils/dbus-bindings.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ general/sysutils/dbus-bindings.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -259,5 +259,5 @@
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python"/> and
+        <xref linkend="python2"/> and
         <xref linkend="dbus-glib"/>
       </para>
Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ gnome/add/at-spi.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -65,5 +65,5 @@
     <xref linkend="gtk2"/>,
     <xref linkend="libbonobo"/>,
-    <xref linkend="python"/>, and
+    <xref linkend="python2"/>, and
     <xref linkend="xorg7-lib"/></para>
 
Index: gnome/add/hamster-applet.xml
===================================================================
--- gnome/add/hamster-applet.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ gnome/add/hamster-applet.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/> with <xref linkend="sqlite"/>
+    <para role="required"><xref linkend="python2"/> with <xref linkend="sqlite"/>
     <!-- FIXME:ken -->
     and Gnome-Python-Desktop-2.30.2 (gnomeapplet module only)</para>
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ gnome/core/gnome-doc-utils.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -70,5 +70,5 @@
     <para role="required"><xref linkend="intltool"/>,
     <xref linkend="libxslt"/>, and
-    <xref linkend="python"/> ( Required to be installed prior to <xref linkend="libxml2"/>)</para>
+    <xref linkend="python2"/> ( Required to be installed prior to <xref linkend="libxml2"/>)</para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ gnome/core/gnome-menus.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -67,5 +67,5 @@
     <para role="required"><xref linkend="glib2"/>,
     <xref linkend="intltool"/>, and
-    <xref linkend="python"/></para>
+    <xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: gnome/otherlibs/libglade14.xml
===================================================================
--- gnome/otherlibs/libglade14.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ gnome/otherlibs/libglade14.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -63,5 +63,5 @@
     <para role="optional"><xref linkend="gnome-libs"/>,
     <xref linkend="bonobo14"/>,
-    <xref linkend="python"/> (to run the <command>libglade-xgettext</command>
+    <xref linkend="python2"/> (to run the <command>libglade-xgettext</command>
     script) and <xref linkend="gtk-doc"/></para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ introduction/welcome/changelog.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -91,4 +91,7 @@
           <para>[ken] - add at-spi2-core-2.3.1 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - libassuan-2.0.3.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde/add/kdeutils.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -75,5 +75,5 @@
       <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
       <ulink url="http://tpctl.sourceforge.net/">tpctl</ulink> (for Thinkpad support),
-      <xref linkend="python"/>,
+      <xref linkend="python2"/>,
       <ulink url="http://www.xmms.org/">XMMS</ulink>,
       <xref linkend="graphviz"/>, and
Index: kde/devel/kdebindings.xml
===================================================================
--- kde/devel/kdebindings.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde/devel/kdebindings.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -81,5 +81,5 @@
     <para role="optional"><!-- <xref linkend="GLib"/>,
     <xref linkend="GTK"/>, -->
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
     <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
Index: kde/devel/kdevelop.xml
===================================================================
--- kde/devel/kdevelop.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde/devel/kdevelop.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -66,5 +66,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>,
+    <para role="optional"><xref linkend="python2"/>,
     <ulink url="http://sourceforge.net/projects/docbase/">DocBase</ulink>,
     <xref linkend="graphviz"/>, and
Index: kde4/add/kde4accessibility.xml
===================================================================
--- kde4/add/kde4accessibility.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde4/add/kde4accessibility.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -70,5 +70,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     </para>
 
Index: kde4/add/kde4admin.xml
===================================================================
--- kde4/add/kde4admin.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde4/add/kde4admin.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -71,5 +71,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="kde4pimlibs"/>,
     <xref linkend="kde4bindings"/> (for pyKDE4), 
Index: kde4/add/kde4pim.xml
===================================================================
--- kde4/add/kde4pim.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde4/add/kde4pim.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -72,5 +72,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="kde4pimlibs"/>
     <!-- libffi gobject-introspection pycairo pygobject pygtk pycups desktop-file-utils system-config-printer -->
Index: kde4/add/kde4pimruntime.xml
===================================================================
--- kde4/add/kde4pimruntime.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde4/add/kde4pimruntime.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="kde4pimlibs"/>
     <!-- libffi gobject-introspection pycairo pygobject pygtk pycups desktop-file-utils system-config-printer -->
Index: kde4/add/kde4plasmaaddons.xml
===================================================================
--- kde4/add/kde4plasmaaddons.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde4/add/kde4plasmaaddons.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -70,5 +70,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="qca"/>, 
     <xref linkend="kde4baseworkspace"/>, 
Index: kde4/core/kde4bindings.xml
===================================================================
--- kde4/core/kde4bindings.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ kde4/core/kde4bindings.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -74,5 +74,5 @@
     <para role="required">
     <xref linkend="ruby"/>, 
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="qca"/>, 
     <xref linkend="qimageblitz"/>,
Index: multimedia/libdriv/farsight2.xml
===================================================================
--- multimedia/libdriv/farsight2.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ multimedia/libdriv/farsight2.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -62,5 +62,5 @@
     <para role="required"><xref linkend="gst-plugins-base"/>,
     <xref linkend="libnice"/>, and
-    <xref linkend="python"/></para>
+    <xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -97,5 +97,5 @@
     Documentation)</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python"/> (compiled against an XML parser such as
+    <xref linkend="python2"/> (compiled against an XML parser such as
     <xref linkend=" expat"/>).</para>
 
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -113,5 +113,5 @@
     Documentation)</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python"/> (compiled against an XML parser such as
+    <xref linkend="python2"/> (compiled against an XML parser such as
     <xref linkend=" expat"/>).</para>
 
Index: multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst-plugins-ugly.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ multimedia/libdriv/gst-plugins-ugly.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -94,5 +94,5 @@
     Documentation)</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python"/> (compiled against an XML parser such as
+    <xref linkend="python2"/> (compiled against an XML parser such as
     <xref linkend=" expat"/>).</para>
 
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ multimedia/libdriv/gstreamer.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -85,5 +85,5 @@
     Documentation)</bridgehead>
     <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python"/> (compiled against an XML Parser such as
+    <xref linkend="python2"/> (compiled against an XML Parser such as
     <xref linkend="expat"/>).  Alternatively, developers can access
     the online API docs at <ulink
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -79,5 +79,5 @@
     <bridgehead renderas="sect4">Optional to Build the Python
     Bindings</bridgehead>
-    <para role="optional"><xref linkend="python"/></para>
+    <para role="optional"><xref linkend="python2"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: networking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ networking/mailnews/fetchmail.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -64,5 +64,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> and <xref linkend="tk"/></para>
+    <para role="optional"><xref linkend="python2"/> and <xref linkend="tk"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: networking/netlibs/libproxy.xml
===================================================================
--- networking/netlibs/libproxy.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ networking/netlibs/libproxy.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="x-window-system"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="xulrunner"/>,
     <xref linkend="webkitgtk"/> (built with <application>gtk+-2</application>) or
Index: networking/netprogs/samba3.xml
===================================================================
--- networking/netprogs/samba3.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ networking/netprogs/samba3.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -81,5 +81,5 @@
     <xref linkend="xfs"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="python"/> (used only in parts of the test suite),
+    <xref linkend="python2"/> (used only in parts of the test suite),
     <ulink url="http://tdb.samba.org/">tdb</ulink> (version 1.2.1),
     <xref linkend="libcap2"/>,
@@ -97,5 +97,5 @@
     <bridgehead renderas="sect4">Optional for Samba4 Support</bridgehead>
     <para role="optional"><xref linkend="gnutls"/> (recommended),
-    <xref linkend="python"/>, and
+    <xref linkend="python2"/>, and
     <xref linkend="sqlite"/></para>
 
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ networking/netutils/avahi.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -78,5 +78,5 @@
     <xref linkend="libdaemon"/>,
     <xref linkend="libglade"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="pygtk"/>,
     <xref linkend="qt"/>, and
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ networking/netutils/wireshark.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -91,5 +91,5 @@
     <xref linkend="openssl"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="pcre"/>,
     <xref linkend="gnutls"/>,
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ postlfs/editors/vim.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -88,5 +88,5 @@
       <xref linkend="gtk2"/> or
       <xref linkend="lesstif"/>,
-      <xref linkend="python"/>,
+      <xref linkend="python2"/>,
       <xref linkend="tcl"/>,
       <xref linkend="ruby"/>, and
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ postlfs/security/cracklib.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -105,5 +105,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/></para>
+    <para role="optional"><xref linkend="python2"/></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: postlfs/virtualization/qemu-kvm.xml
===================================================================
--- postlfs/virtualization/qemu-kvm.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ postlfs/virtualization/qemu-kvm.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -61,5 +61,5 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="python"/>,
+      <xref linkend="python2"/>,
       <xref linkend="sdl"/>, and
       <xref linkend="x-window-system"/>
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ pst/printing/cups.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -80,5 +80,5 @@
       <xref linkend="php"/>,
       <xref linkend="gs"/>,
-      <xref linkend="python"/>,
+      <xref linkend="python2"/>,
       <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
       <ulink url="http://portland.freedesktop.org/wiki/">Xdg-utils</ulink>,
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ server/databases/postgresql.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -69,5 +69,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>,
+    <para role="optional"><xref linkend="python2"/>,
     <xref linkend="tcl"/>,
     <xref linkend="openssl"/>,
Index: server/other/virtuoso.xml
===================================================================
--- server/other/virtuoso.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ server/other/virtuoso.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -90,5 +90,5 @@
     <para role="optional">
     <xref linkend="imagemagick"/>,
-    <xref linkend="python"/>
+    <xref linkend="python2"/>
     </para>
 
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ x/installing/xcb-proto.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -62,5 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/></para>
+    <para role="required"><xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Optional (required to run the
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ x/wm/xfce.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -415,5 +415,5 @@
     support in <xref linkend="Thunar"/>.</para>
 
-    <para><parameter>--disable-python</parameter>: disables building <xref linkend="python"/>
+    <para><parameter>--disable-python</parameter>: disables building <xref linkend="python2"/>
     bindings in <xref linkend="exo"/>.</para>
 
Index: xsoft/other/xchat.xml
===================================================================
--- xsoft/other/xchat.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ xsoft/other/xchat.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -76,5 +76,5 @@
     <para role="optional"><xref linkend="dbus-glib"/>,
     <xref linkend="openssl"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="tcl"/>,
     <xref linkend="GConf"/>, and
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ xsoft/suites/koffice.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -87,5 +87,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="aspell"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
     <ulink url="http://pqxx.org">libpqxx</ulink> (for kexi, requires <xref linkend="postgresql"/>),
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 30e5181c48f8cfc00569fa8cf815c3052ee946be)
+++ xsoft/suites/openoffice.xml	(revision 4716d520a0e32a4f9dcc0ae9afeb6a69c80d5e43)
@@ -141,5 +141,5 @@
     <xref linkend="neon"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="sane"/>,
     <xref linkend="startup-notification"/>, and
