[blfs-book] r9451 - in trunk/BOOK: general/genlib general/genutils general/graphlib general/prog general/sysutils gnome/add gnome/core gnome/otherlibs introduction/welcome kde/add kde/devel kde4/add kde4/core multimedia/libdriv networking/mailnews networking/netlibs networking/netprogs networking/netutils postlfs/editors postlfs/security postlfs/virtualization pst/printing server/databases server/other x/installing x/wm xsoft/other xsoft/suites

andy at linuxfromscratch.org andy at linuxfromscratch.org
Fri Feb 17 06:43:33 PST 2012


Author: andy
Date: 2012-02-17 07:43:28 -0700 (Fri, 17 Feb 2012)
New Revision: 9451

Modified:
   trunk/BOOK/general/genlib/boost.xml
   trunk/BOOK/general/genlib/gamin.xml
   trunk/BOOK/general/genlib/glib2.xml
   trunk/BOOK/general/genlib/gobject-introspection.xml
   trunk/BOOK/general/genlib/iso-codes.xml
   trunk/BOOK/general/genlib/libglade.xml
   trunk/BOOK/general/genlib/libgsf.xml
   trunk/BOOK/general/genlib/libxml2.xml
   trunk/BOOK/general/genlib/libxslt.xml
   trunk/BOOK/general/genlib/telepathy-glib.xml
   trunk/BOOK/general/genutils/graphviz.xml
   trunk/BOOK/general/genutils/gtk-doc.xml
   trunk/BOOK/general/genutils/pilot-link.xml
   trunk/BOOK/general/genutils/recode.xml
   trunk/BOOK/general/graphlib/exiv2.xml
   trunk/BOOK/general/graphlib/gegl.xml
   trunk/BOOK/general/graphlib/lcms.xml
   trunk/BOOK/general/graphlib/librsvg.xml
   trunk/BOOK/general/prog/doxygen.xml
   trunk/BOOK/general/prog/git.xml
   trunk/BOOK/general/prog/pdl.xml
   trunk/BOOK/general/prog/python-modules.xml
   trunk/BOOK/general/prog/python2.xml
   trunk/BOOK/general/prog/spidermonkey.xml
   trunk/BOOK/general/prog/subversion.xml
   trunk/BOOK/general/sysutils/dbus-bindings.xml
   trunk/BOOK/gnome/add/at-spi.xml
   trunk/BOOK/gnome/add/hamster-applet.xml
   trunk/BOOK/gnome/core/gnome-doc-utils.xml
   trunk/BOOK/gnome/core/gnome-menus.xml
   trunk/BOOK/gnome/otherlibs/libglade14.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde/add/kdeutils.xml
   trunk/BOOK/kde/devel/kdebindings.xml
   trunk/BOOK/kde/devel/kdevelop.xml
   trunk/BOOK/kde4/add/kde4accessibility.xml
   trunk/BOOK/kde4/add/kde4admin.xml
   trunk/BOOK/kde4/add/kde4pim.xml
   trunk/BOOK/kde4/add/kde4pimruntime.xml
   trunk/BOOK/kde4/add/kde4plasmaaddons.xml
   trunk/BOOK/kde4/core/kde4bindings.xml
   trunk/BOOK/multimedia/libdriv/farsight2.xml
   trunk/BOOK/multimedia/libdriv/gst-plugins-base.xml
   trunk/BOOK/multimedia/libdriv/gst-plugins-good.xml
   trunk/BOOK/multimedia/libdriv/gst-plugins-ugly.xml
   trunk/BOOK/multimedia/libdriv/gstreamer.xml
   trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml
   trunk/BOOK/networking/mailnews/fetchmail.xml
   trunk/BOOK/networking/netlibs/libproxy.xml
   trunk/BOOK/networking/netprogs/samba3.xml
   trunk/BOOK/networking/netutils/avahi.xml
   trunk/BOOK/networking/netutils/wireshark.xml
   trunk/BOOK/postlfs/editors/vim.xml
   trunk/BOOK/postlfs/security/cracklib.xml
   trunk/BOOK/postlfs/virtualization/qemu-kvm.xml
   trunk/BOOK/pst/printing/cups.xml
   trunk/BOOK/server/databases/postgresql.xml
   trunk/BOOK/server/other/virtuoso.xml
   trunk/BOOK/x/installing/xcb-proto.xml
   trunk/BOOK/x/wm/xfce.xml
   trunk/BOOK/xsoft/other/xchat.xml
   trunk/BOOK/xsoft/suites/koffice.xml
   trunk/BOOK/xsoft/suites/openoffice.xml
Log:
Removed the python linkend. The python links now point at python2

Modified: trunk/BOOK/general/genlib/boost.xml
===================================================================
--- trunk/BOOK/general/genlib/boost.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/boost.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -69,7 +69,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="Optional">
-    <xref linkend="python"/>
+    <xref linkend="python2"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/genlib/gamin.xml
===================================================================
--- trunk/BOOK/general/genlib/gamin.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/gamin.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
     <para role="required"><xref linkend="glib2"/></para>
 
     <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
          system can and does absolutely nothing with them. Commenting

Modified: trunk/BOOK/general/genlib/glib2.xml
===================================================================
--- trunk/BOOK/general/genlib/glib2.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/glib2.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
     <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
 
     <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> 
 

Modified: trunk/BOOK/general/genlib/gobject-introspection.xml
===================================================================
--- trunk/BOOK/general/genlib/gobject-introspection.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/gobject-introspection.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
       <xref linkend="glib2"/>,
       <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>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: trunk/BOOK/general/genlib/iso-codes.xml
===================================================================
--- trunk/BOOK/general/genlib/iso-codes.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/iso-codes.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -60,7 +60,7 @@
     <bridgehead renderas="sect3">ISO Codes Dependencies</bridgehead>
 
     <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:
     <ulink url="&blfs-wiki;/iso-codes"/></para>

Modified: trunk/BOOK/general/genlib/libglade.xml
===================================================================
--- trunk/BOOK/general/genlib/libglade.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/libglade.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
     <xref linkend="gtk2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>
+    <para role="optional"><xref linkend="python2"/>
     and <xref linkend="gtk-doc"/></para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/genlib/libgsf.xml
===================================================================
--- trunk/BOOK/general/genlib/libgsf.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/libgsf.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -66,7 +66,7 @@
     <xref linkend="perl-xml-parser"/></para>
 
     <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
     <command>gsf-office-thumbnailer</command> program),

Modified: trunk/BOOK/general/genlib/libxml2.xml
===================================================================
--- trunk/BOOK/general/genlib/libxml2.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/libxml2.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -68,7 +68,7 @@
     <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
 
     <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>
 

Modified: trunk/BOOK/general/genlib/libxslt.xml
===================================================================
--- trunk/BOOK/general/genlib/libxslt.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/libxslt.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
     <para role="required"><xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> and
+    <para role="optional"><xref linkend="python2"/> and
     <xref linkend="libgcrypt"/></para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/genlib/telepathy-glib.xml
===================================================================
--- trunk/BOOK/general/genlib/telepathy-glib.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genlib/telepathy-glib.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -65,7 +65,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="dbus-glib"/>,
     <xref linkend="libxslt"/>, and
-    <xref linkend="python"/></para>
+    <xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gobject-introspection"/>,

Modified: trunk/BOOK/general/genutils/graphviz.xml
===================================================================
--- trunk/BOOK/general/genutils/graphviz.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genutils/graphviz.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -117,7 +117,7 @@
     <xref linkend="guile"/>,
     <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
     <xref linkend="php"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
     <xref linkend="tcl"/>,
     C# (<ulink url="http://www.southern-storm.com.au/portable_net.html">DotGNU Portable.NET</ulink>

Modified: trunk/BOOK/general/genutils/gtk-doc.xml
===================================================================
--- trunk/BOOK/general/genutils/gtk-doc.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genutils/gtk-doc.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -79,7 +79,7 @@
     <xref linkend="sgml-dtd"/> and
     <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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/genutils/pilot-link.xml
===================================================================
--- trunk/BOOK/general/genutils/pilot-link.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genutils/pilot-link.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -72,7 +72,7 @@
     <xref linkend="libusb-compat"/>,
     <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>
 

Modified: trunk/BOOK/general/genutils/recode.xml
===================================================================
--- trunk/BOOK/general/genutils/recode.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/genutils/recode.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -80,7 +80,7 @@
     <bridgehead renderas="sect3">Recode Dependencies</bridgehead>
 
     <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>
 

Modified: trunk/BOOK/general/graphlib/exiv2.xml
===================================================================
--- trunk/BOOK/general/graphlib/exiv2.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/graphlib/exiv2.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -85,7 +85,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
     <xref linkend="imagemagick"/>,
-    <xref linkend="python"/>
+    <xref linkend="python2"/>
     </para>
 -->
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/graphlib/gegl.xml
===================================================================
--- trunk/BOOK/general/graphlib/gegl.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/graphlib/gegl.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -81,7 +81,7 @@
     <ulink url="http://www.lua.org/">Lua</ulink>,
     <ulink url="http://www.openexr.org">OpenEXR</ulink>,
     <xref linkend="pango"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
     <xref linkend="sdl"/>
     <ulink url="http://ftp.gnome.org/pub/gnome/sources/vala/">vala</ulink>,

Modified: trunk/BOOK/general/graphlib/lcms.xml
===================================================================
--- trunk/BOOK/general/graphlib/lcms.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/graphlib/lcms.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -72,7 +72,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/graphlib/librsvg.xml
===================================================================
--- trunk/BOOK/general/graphlib/librsvg.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/graphlib/librsvg.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -70,7 +70,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <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>
 

Modified: trunk/BOOK/general/prog/doxygen.xml
===================================================================
--- trunk/BOOK/general/prog/doxygen.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/doxygen.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -75,7 +75,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <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>
 
@@ -133,7 +133,7 @@
     <application>Doxygen</application> package although three additional
     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
     PostScript files to bitmaps, then you must have <xref linkend="gs"/>

Modified: trunk/BOOK/general/prog/git.xml
===================================================================
--- trunk/BOOK/general/prog/git.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/git.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -69,7 +69,7 @@
     <bridgehead renderas="sect3">Git Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/></para>
+    <para role="required"><xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="curl"/> (without libcurl you won't

Modified: trunk/BOOK/general/prog/pdl.xml
===================================================================
--- trunk/BOOK/general/prog/pdl.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/pdl.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -237,7 +237,7 @@
             Libraries-1.4</ulink>,
             <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
             Fortran compiler</ulink>,

Modified: trunk/BOOK/general/prog/python-modules.xml
===================================================================
--- trunk/BOOK/general/prog/python-modules.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/python-modules.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -178,7 +178,7 @@
       <bridgehead renderas="sect4">PyXML Dependencies</bridgehead>
 
       <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:
       <ulink url="&blfs-wiki;/pyxml"/></para>
@@ -313,7 +313,7 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python"/> and
+        <xref linkend="python2"/> and
         <xref linkend="cairo"/>
       </para>
 
@@ -408,7 +408,7 @@
       <bridgehead renderas="sect4">Pycairo Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python"/> and
+      <para role="required"><xref linkend="python2"/> and
       <xref linkend="cairo"/></para>
 
       <para condition="html" role="usernotes">User Notes:
@@ -609,7 +609,7 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python"/> and
+        <xref linkend="python2"/> and
         <xref linkend="glib2"/>
       </para>
 
@@ -992,7 +992,7 @@
       <bridgehead renderas="sect4">PyORBit Dependencies</bridgehead>
 
       <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="python"/> and
+      <para role="required"><xref linkend="python2"/> and
       <xref linkend="ORBit2"/></para>
 
       <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/prog/python2.xml
===================================================================
--- trunk/BOOK/general/prog/python2.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/python2.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -16,7 +16,7 @@
   <!ENTITY python2htmldoc-size          "4.1 MB">
 ]>
 
-<sect1 id="python" xreflabel="Python-&python2-version;">
+<sect1 id="python2" xreflabel="Python-&python2-version;">
   <?dbhtml filename="python2.html" ?>
 
   <sect1info>
@@ -26,7 +26,7 @@
 
   <title>Python-&python2-version;</title>
 
-  <indexterm zone="python">
+  <indexterm zone="python2">
     <primary sortas="a-Python2">Python</primary>
   </indexterm>
 
@@ -68,7 +68,7 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
 
-    <itemizedlist spacing='compact'>
+    <itemizedlist spacing="compact">
       <title>Optional HTML Documentation</title>
       <listitem>
         <para>Download (HTTP): <ulink url="&python2htmldoc-download-http;"/></para>
@@ -200,7 +200,7 @@
         <listitem>
           <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>
         </listitem>
@@ -211,7 +211,7 @@
         <listitem>
           <para>is the <application>Python</application> documentation
           tool.</para>
-          <indexterm zone="python pydoc2">
+          <indexterm zone="python2 pydoc2">
             <primary sortas="b-pydoc2">pydoc</primary>
           </indexterm>
         </listitem>
@@ -222,8 +222,8 @@
         <listitem>
           <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>
       </varlistentry>
@@ -233,7 +233,7 @@
         <listitem>
           <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>
         </listitem>
@@ -244,7 +244,7 @@
         <listitem>
           <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>
         </listitem>

Modified: trunk/BOOK/general/prog/spidermonkey.xml
===================================================================
--- trunk/BOOK/general/prog/spidermonkey.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/spidermonkey.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="nspr"/>,
-    <xref linkend="python"/> and
+    <xref linkend="python2"/> and
     <xref linkend="zip"/></para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/prog/subversion.xml
===================================================================
--- trunk/BOOK/general/prog/subversion.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/prog/subversion.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -81,7 +81,7 @@
     building any of the <application>APR-util</application> packages.</para>
 
     <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"/>,
     <xref linkend="cyrus-sasl"/>,
@@ -103,7 +103,7 @@
 
     <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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/sysutils/dbus-bindings.xml
===================================================================
--- trunk/BOOK/general/sysutils/dbus-bindings.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/general/sysutils/dbus-bindings.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -258,7 +258,7 @@
 
       <bridgehead renderas="sect5">Required</bridgehead>
       <para role="required">
-        <xref linkend="python"/> and
+        <xref linkend="python2"/> and
         <xref linkend="dbus-glib"/>
       </para>
 

Modified: trunk/BOOK/gnome/add/at-spi.xml
===================================================================
--- trunk/BOOK/gnome/add/at-spi.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/gnome/add/at-spi.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -64,7 +64,7 @@
     <para role="required"><xref linkend="GConf"/>,
     <xref linkend="gtk2"/>,
     <xref linkend="libbonobo"/>,
-    <xref linkend="python"/>, and
+    <xref linkend="python2"/>, and
     <xref linkend="xorg7-lib"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: trunk/BOOK/gnome/add/hamster-applet.xml
===================================================================
--- trunk/BOOK/gnome/add/hamster-applet.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/gnome/add/hamster-applet.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -60,7 +60,7 @@
     <bridgehead renderas="sect3">hamster-applet Dependencies</bridgehead>
 
     <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>
     <!--

Modified: trunk/BOOK/gnome/core/gnome-doc-utils.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-doc-utils.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/gnome/core/gnome-doc-utils.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -69,7 +69,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <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>
     <para role="recommended"><xref linkend="rarian"/></para>

Modified: trunk/BOOK/gnome/core/gnome-menus.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-menus.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/gnome/core/gnome-menus.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -66,7 +66,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="glib2"/>,
     <xref linkend="intltool"/>, and
-    <xref linkend="python"/></para>
+    <xref linkend="python2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gobject-introspection"/></para>

Modified: trunk/BOOK/gnome/otherlibs/libglade14.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/libglade14.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/gnome/otherlibs/libglade14.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -62,7 +62,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -90,6 +90,9 @@
         <listitem>
           <para>[ken] - add at-spi2-core-2.3.1 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - libassuan-2.0.3.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/kde/add/kdeutils.xml
===================================================================
--- trunk/BOOK/kde/add/kdeutils.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde/add/kdeutils.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -74,7 +74,7 @@
     <para role="optional">
       <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
       <xref linkend="doxygen"/>

Modified: trunk/BOOK/kde/devel/kdebindings.xml
===================================================================
--- trunk/BOOK/kde/devel/kdebindings.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde/devel/kdebindings.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -80,7 +80,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <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"/>,
     <xref linkend="seamonkey"/>,

Modified: trunk/BOOK/kde/devel/kdevelop.xml
===================================================================
--- trunk/BOOK/kde/devel/kdevelop.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde/devel/kdevelop.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -65,7 +65,7 @@
     <xref linkend="libxml2"/>.</para>
 
     <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
     <xref linkend="doxygen"/></para>

Modified: trunk/BOOK/kde4/add/kde4accessibility.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4accessibility.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde4/add/kde4accessibility.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -69,7 +69,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>

Modified: trunk/BOOK/kde4/add/kde4admin.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4admin.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde4/add/kde4admin.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -70,7 +70,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="kde4pimlibs"/>,
     <xref linkend="kde4bindings"/> (for pyKDE4), 
     <!-- libffi gobject-introspection pycairo pygobject pygtk pycups desktop-file-utils system-config-printer -->

Modified: trunk/BOOK/kde4/add/kde4pim.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4pim.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde4/add/kde4pim.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -71,7 +71,7 @@
 
     <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 -->
     </para>

Modified: trunk/BOOK/kde4/add/kde4pimruntime.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4pimruntime.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde4/add/kde4pimruntime.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -68,7 +68,7 @@
 
     <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 -->
     </para>

Modified: trunk/BOOK/kde4/add/kde4plasmaaddons.xml
===================================================================
--- trunk/BOOK/kde4/add/kde4plasmaaddons.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde4/add/kde4plasmaaddons.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -69,7 +69,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="qca"/>, 
     <xref linkend="kde4baseworkspace"/>, 
     </para>

Modified: trunk/BOOK/kde4/core/kde4bindings.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4bindings.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/kde4/core/kde4bindings.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -73,7 +73,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
     <xref linkend="ruby"/>, 
-    <xref linkend="python"/>, 
+    <xref linkend="python2"/>, 
     <xref linkend="qca"/>, 
     <xref linkend="qimageblitz"/>,
     <xref linkend="libdbusmenu-qt"/>,

Modified: trunk/BOOK/multimedia/libdriv/farsight2.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/farsight2.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/multimedia/libdriv/farsight2.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -61,7 +61,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <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>
     <para role="optional"><ulink

Modified: trunk/BOOK/multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins-base.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins-base.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -96,7 +96,7 @@
     <bridgehead renderas="sect4">Optional (Required to Rebuild the API
     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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins-good.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins-good.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -112,7 +112,7 @@
     <bridgehead renderas="sect4">Optional (Required to Rebuild the API
     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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins-ugly.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins-ugly.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -93,7 +93,7 @@
     <bridgehead renderas="sect4">Optional (Required to Rebuild the API
     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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/multimedia/libdriv/gstreamer.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gstreamer.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/multimedia/libdriv/gstreamer.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -84,7 +84,7 @@
     <bridgehead renderas="sect4">Optional (Required to build the API
     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
     url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/api-index-full.html">freedesktop.org</ulink>

Modified: trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/multimedia/libdriv/libmusicbrainz.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -78,7 +78,7 @@
 
     <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:
     <ulink url="&blfs-wiki;/libmusicbrainz"/></para>

Modified: trunk/BOOK/networking/mailnews/fetchmail.xml
===================================================================
--- trunk/BOOK/networking/mailnews/fetchmail.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/networking/mailnews/fetchmail.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -63,7 +63,7 @@
     (<xref linkend="procmail"/>)</para>
 
     <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:
     <ulink url="&blfs-wiki;/fetchmail"/></para>

Modified: trunk/BOOK/networking/netlibs/libproxy.xml
===================================================================
--- trunk/BOOK/networking/netlibs/libproxy.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/networking/netlibs/libproxy.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -68,7 +68,7 @@
 
     <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
     <ulink url="http://webkit.org/">WebKit</ulink>, and

Modified: trunk/BOOK/networking/netprogs/samba3.xml
===================================================================
--- trunk/BOOK/networking/netprogs/samba3.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/networking/netprogs/samba3.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -80,7 +80,7 @@
     <xref linkend="acl"/>,
     <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"/>,
     <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
@@ -96,7 +96,7 @@
 
     <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>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/networking/netutils/avahi.xml
===================================================================
--- trunk/BOOK/networking/netutils/avahi.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/networking/netutils/avahi.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -77,7 +77,7 @@
     <xref linkend="gtk3"/>,
     <xref linkend="libdaemon"/>,
     <xref linkend="libglade"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="pygtk"/>,
     <xref linkend="qt"/>, and
     <xref linkend="qt4"/></para>

Modified: trunk/BOOK/networking/netutils/wireshark.xml
===================================================================
--- trunk/BOOK/networking/netutils/wireshark.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/networking/netutils/wireshark.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -90,7 +90,7 @@
     <xref linkend="gtk2"/> (to build the GUI front-end),
     <xref linkend="openssl"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="pcre"/>,
     <xref linkend="gnutls"/>,
     <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,

Modified: trunk/BOOK/postlfs/editors/vim.xml
===================================================================
--- trunk/BOOK/postlfs/editors/vim.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/postlfs/editors/vim.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -87,7 +87,7 @@
     <para role="optional">
       <xref linkend="gtk2"/> or
       <xref linkend="lesstif"/>,
-      <xref linkend="python"/>,
+      <xref linkend="python2"/>,
       <xref linkend="tcl"/>,
       <xref linkend="ruby"/>, and
       <xref linkend="gpm"/>

Modified: trunk/BOOK/postlfs/security/cracklib.xml
===================================================================
--- trunk/BOOK/postlfs/security/cracklib.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/postlfs/security/cracklib.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -104,7 +104,7 @@
     <bridgehead renderas="sect3">CrackLib Dependencies</bridgehead>
 
     <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:
     <ulink url="&blfs-wiki;/cracklib"/></para>

Modified: trunk/BOOK/postlfs/virtualization/qemu-kvm.xml
===================================================================
--- trunk/BOOK/postlfs/virtualization/qemu-kvm.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/postlfs/virtualization/qemu-kvm.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -60,7 +60,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="python"/>,
+      <xref linkend="python2"/>,
       <xref linkend="sdl"/>, and
       <xref linkend="x-window-system"/>
     </para>

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/pst/printing/cups.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -79,7 +79,7 @@
       order), <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
       <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>,
       <ulink url="http://www.openslp.org/">OpenSLP</ulink>,

Modified: trunk/BOOK/server/databases/postgresql.xml
===================================================================
--- trunk/BOOK/server/databases/postgresql.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/server/databases/postgresql.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -68,7 +68,7 @@
     <bridgehead renderas="sect3">PostgreSQL Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/>,
+    <para role="optional"><xref linkend="python2"/>,
     <xref linkend="tcl"/>,
     <xref linkend="openssl"/>,
     <xref linkend="libxml2"/>,

Modified: trunk/BOOK/server/other/virtuoso.xml
===================================================================
--- trunk/BOOK/server/other/virtuoso.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/server/other/virtuoso.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -89,7 +89,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
     <xref linkend="imagemagick"/>,
-    <xref linkend="python"/>
+    <xref linkend="python2"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/x/installing/xcb-proto.xml
===================================================================
--- trunk/BOOK/x/installing/xcb-proto.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/x/installing/xcb-proto.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -61,7 +61,7 @@
     <bridgehead renderas="sect3">xcb-proto Dependencies</bridgehead>
 
     <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
     tests)</bridgehead>

Modified: trunk/BOOK/x/wm/xfce.xml
===================================================================
--- trunk/BOOK/x/wm/xfce.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/x/wm/xfce.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -414,7 +414,7 @@
     <para><parameter>--with-volume-manager=none</parameter>: disables <xref linkend="hal"/>
     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>
 
     <para><parameter>--enable-session-screenshots</parameter>: allows <xref linkend="xfce4-session"/>

Modified: trunk/BOOK/xsoft/other/xchat.xml
===================================================================
--- trunk/BOOK/xsoft/other/xchat.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/xsoft/other/xchat.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -75,7 +75,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="dbus-glib"/>,
     <xref linkend="openssl"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="tcl"/>,
     <xref linkend="GConf"/>, and
     <xref linkend="libsexy"/> or

Modified: trunk/BOOK/xsoft/suites/koffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/koffice.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/xsoft/suites/koffice.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -86,7 +86,7 @@
 
     <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"/>),
     <xref linkend="mysql"/> (plugin),

Modified: trunk/BOOK/xsoft/suites/openoffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/openoffice.xml	2012-02-17 14:11:03 UTC (rev 9450)
+++ trunk/BOOK/xsoft/suites/openoffice.xml	2012-02-17 14:43:28 UTC (rev 9451)
@@ -140,7 +140,7 @@
     <ulink url="http://lingucomponent.openoffice.org/thesaurus.html">MyThes</ulink>,
     <xref linkend="neon"/>,
     <xref linkend="openldap"/>,
-    <xref linkend="python"/>,
+    <xref linkend="python2"/>,
     <xref linkend="sane"/>,
     <xref linkend="startup-notification"/>, and
     <xref linkend="unixodbc"/></para>




More information about the blfs-book mailing list