Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
+++ general/prog/subversion.xml	(revision af73a2809420deca5c35dd06fd8abd0d84f666e2)
@@ -8,8 +8,8 @@
   "http://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "454b9f398415c3504435bf8c3f6ed127">
-  <!ENTITY subversion-size          "5.8 MB">
-  <!ENTITY subversion-buildsize     "115 MB (additional 585 MB for tests)">
-  <!ENTITY subversion-time          "0.9 SBU (additional 19 SBU for tests)">
+  <!ENTITY subversion-md5sum        "4088a77e14232876c9b4ff1541e6e200">
+  <!ENTITY subversion-size          "5.7 MB">
+  <!ENTITY subversion-buildsize     "127 MB (additional 586 MB for tests)">
+  <!ENTITY subversion-time          "0.8 SBU (additional 20 SBU for tests)">
 ]>
 
@@ -90,27 +90,30 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="sqlite"/>,
-      <xref linkend="apr-util"/> and
+      <xref linkend="apr-util"/>,
       <xref linkend="neon"/> or
-      <ulink url="http://code.google.com/p/serf/">serf</ulink>
-    </para>
-
-    <para>
-      If you require the <application>Berkeley DB</application> back-end hooks
-      in <application>Subversion</application> to build or support BDB based
-      repositories, you must have <application>APR-util</application> linked to
-      the <application>Berkeley DB</application> library.
-    </para>
+      <ulink url="http://code.google.com/p/serf/">serf</ulink>, and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <note>
+      <para>
+        If you require the <application>Berkeley DB</application> back-end hooks
+        in <application>Subversion</application> to build or support BDB based
+        repositories, you must have <application>APR-util</application> linked to
+        the <application>Berkeley DB</application> library.
+      </para>
+    </note>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="python2"/> (required to run the test suite),
+      <xref linkend="apache"/>
       <xref linkend="db"/>,
       <xref linkend="cyrus-sasl"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="gnome-keyring"/>,
-      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support) and
-      <xref linkend="apache"/>
+      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
+      <xref linkend="openssl"/>,
+      <xref linkend="python2"/> (required to run the test suite) and
+      <xref linkend="ruby"/> (version 1.8.x)
     </para>
 
@@ -118,5 +121,5 @@
     <para role="optional">
       One of <xref linkend="openjdk"/>,
-      <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
+      <ulink url="http://www.inet.no/dante/">Dante</ulink> or
       <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
       and <xref linkend="junit"/> (to test the Java bindings)
@@ -125,6 +128,5 @@
     <bridgehead renderas="sect4">Optional (for the SWIG Bindings)</bridgehead>
     <para role="optional">
-      <ulink url="http://www.swig.org">SWIG</ulink> and
-      <xref linkend="python2"/>
+      <ulink url="http://www.swig.org">SWIG</ulink>
     </para>
 
@@ -157,9 +159,4 @@
 
 <screen><userinput>make javahl</userinput></screen>
-
-    <para>
-      <application>Perl</application> and/or <application>Python</application>
-      <!-- ruby is currently b0rken <application>Ruby</application> -->
-    </para>
 
     <para>
@@ -174,13 +171,11 @@
 
     <para>
-      To compile the <application>Perl</application> and/or
-      <application>Python</application> bindings issue any or all of the
-      following commands:
+      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</userinput></screen>
-
-<!-- &amp;&amp;
-make swig-rb -->
+make swig-py &amp;&amp;
+make swig-rb</userinput></screen>
 
     <para>
@@ -195,13 +190,11 @@
 
     <para>
-      To test the results of any or all of the <application>SWIG</application>
-      bindings, you can use the following commands:
+      To test the results of any of the <application>SWIG</application>
+      bindings, you can use any of the following commands:
     </para>
 
 <screen><userinput>make check-swig-pl &amp;&amp;
-make check-swig-py</userinput></screen>
-
-<!-- &amp;&amp;
-make check-swig-rb -->
+make check-swig-py &amp;&amp;
+make check-swig-rb </userinput></screen>
 
     <para>
@@ -223,13 +216,11 @@
     <para>
       If you built any of the <application>SWIG</application> bindings, issue
-      any or all of the following commands as the
+      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</userinput></screen>
-
-<!-- &amp;&amp;
-make install-swig-rb -->
+make install-swig-py &amp;&amp;
+make install-swig-rb</userinput></screen>
 
     <para>
@@ -308,9 +299,9 @@
       <seglistitem>
         <seg>
-          svn, svnadmin, svndumpfilter, svnlook, svnserve, svnsync and
+          svn, svnadmin, svndumpfilter, svnlook, svnrdump, svnserve, svnsync and
           svnversion
         </seg>
         <seg>
-          libsvn*.so and optionally, a Java library, the mod_dav_svn.so, and
+          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
           and mod_authz_svn.so <application>Apache HTTP</application> DSO
           modules and various <application>Perl</application> and
@@ -439,6 +430,6 @@
       </varlistentry>
 
-      <varlistentry id="libsvn_star">
-        <term><filename class="libraryfile">libsvn_*.so</filename></term>
+      <varlistentry id="libsvn_star-1">
+        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
         <listitem>
           <para>
@@ -446,6 +437,6 @@
             <application>Subversion</application> programs.
           </para>
-          <indexterm zone="subversion libsvn_star">
-            <primary sortas="c-libsvn_star">libsvn_*.so</primary>
+          <indexterm zone="subversion libsvn_star-1">
+            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
           </indexterm>
         </listitem>
