Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 7dfb8c942d969dee71f4d0a5cb02c7ecf4c841dc)
+++ general/prog/subversion.xml	(revision 31ff9f72ba8e886cc7af82bb3092109d5f90db27)
@@ -88,6 +88,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="openssl"/> and
-      <xref linkend="serf"/> (for handling http:// and https:// URLs)
+      <xref linkend="openssl"/>,
+      <xref linkend="python2"/> (with sqlite support for the tests),
+      <xref linkend="serf"/> (for handling http:// and https:// URLs), and
+      <xref linkend="swig"/> (for building Perl, Python and optionally Ruby
+      bindings)
     </para>
 
@@ -112,5 +115,4 @@
       <xref linkend="dbus"/>,
       <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
-      <xref linkend="python2"/> (required to run the test suite) and
       <xref linkend="ruby"/>
     </para>
@@ -124,9 +126,4 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional (for the SWIG Bindings)</bridgehead>
-    <para role="optional">
-      <xref linkend="swig"/>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/subversion"/>
@@ -142,8 +139,12 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
+<screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in &amp;&amp;
+./configure --prefix=/usr    \
             --disable-static \
-            --with-apache-libexecdir=$(/usr/bin/apxs -q libexecdir) &amp;&amp;
-make</userinput></screen>
+            --with-apache-libexecdir &amp;&amp;
+make &amp;&amp;
+make swig-pl &amp;&amp;
+make swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</userinput></screen>
 
     <para>
@@ -160,5 +161,5 @@
 <screen><userinput>make javahl</userinput></screen>
 
-    <para>
+<!--    <para>
       If you have a multi core CPU and normally run <command>make</command> with
       multiple jobs (eg <command>make -j4</command>) then a bug in the
@@ -169,14 +170,10 @@
 
 <screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in</userinput></screen>
-
-    <para>
-      To compile the <application>Perl</application>,
-      <application>Python</application> or <application>Ruby</application>
-      bindings issue any of the following commands:
-    </para>
-<screen><userinput>make swig-pl &amp;&amp;
-make swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn      &amp;&amp;
-make swig-rb</userinput></screen>
+-->
+    <para>
+      To compile <application>Ruby</application>
+      bindings, issue the following command:
+    </para>
+<screen><userinput>make swig-rb</userinput></screen>
 
     <para>
@@ -205,4 +202,7 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+make install-swig-pl &amp;&amp;
+make install-swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn    \
+                     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn &amp;&amp;
 install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
 cp      -v -R       doc/* \
@@ -217,13 +217,11 @@
 
     <para>
-      If you built any of the <application>SWIG</application> bindings, issue
-      any of the following commands as the
-      <systemitem class="username">root</systemitem> user to install them:
-    </para>
-
-<screen role="root"><userinput>make install-swig-pl &amp;&amp;
-make install-swig-py swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn    \
-                     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn &amp;&amp;
-make install-swig-rb</userinput></screen>
+      If you built the <application>SWIG</application>
+      <application>Ruby</application> bindings, issue the following commands
+      as the <systemitem class="username">root</systemitem> user to install
+      them:
+    </para>
+
+<screen role="root"><userinput>make install-swig-rb</userinput></screen>
 
   </sect2>
@@ -232,11 +230,27 @@
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed -i 's#Makefile.PL.in$...</command>: Corrects a
+       bug in the <filename>Makefile</filename>, which prevents using
+       parallel jobs for Perl bindings.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
     <para>
-      <parameter>--with-apache-libexecdir=...</parameter>:
+      <parameter>--with-apache-libexecdir</parameter>:
       This switch sets <application>Apache HTTPD</application>
       module install dir.
+    </para>
+
+    <para>
+      <command>make swig-&lt;language&gt;</command>: Builds &lt;language&gt;
+      bindings.
+    </para>
+
+    <para>
+      <command>make install-swig-&lt;language&gt;</command>: Installs
+      &lt;language&gt; bindings.
     </para>
 
@@ -304,8 +318,8 @@
         <seg>
           /usr/include/subversion-1,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN (optional),
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN (optional),
-          /usr/lib/python&python2-majorver;/site-packages/libsvn (optional),
-          /usr/lib/python&python2-majorver;/site-packages/svn (optional),
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN,
+          /usr/lib/python&python2-majorver;/site-packages/libsvn,
+          /usr/lib/python&python2-majorver;/site-packages/svn,
           /usr/lib/ruby/site_ruby/&lt;x.y&gt;/i686-linux/svn (optional),
           /usr/lib/ruby/site_ruby/&lt;x.y&gt;/svn (optional),
