Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision d0a1a90db053c269aa20726de57f1c3dac837eef)
+++ basicnet/netprogs/subversion.xml	(revision 4d6e546556031cbba4655a381bdad412e179c2b5)
@@ -7,8 +7,8 @@
   <!ENTITY subversion-download-http "http://subversion.tigris.org/tarballs/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "a09c2b2fa1a09566c024547954a48478">
+  <!ENTITY subversion-md5sum        "6e557ae65b6b8d7577cc7704ede85a23">
   <!ENTITY subversion-size          "6.7 MB">
-  <!ENTITY subversion-buildsize     "663 MB">
-  <!ENTITY subversion-time          "1.44 SBU (additional 7.51 SBU to run test suite)">
+  <!ENTITY subversion-buildsize     "182 MB (additional 577 MB to run all test suites)">
+  <!ENTITY subversion-time          "1.24 SBU (add 0.90 SBU for SWIG bindings and 6.45 SBU to run test suites)">
   <!ENTITY svn-neon-version         "0.24.7">
 ]>
@@ -56,26 +56,44 @@
 <sect3><title><application>Subversion</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="libxml2"/></para>
+<para><xref linkend="libxml2"/> (only if using the bundled version of 
+<application>neon</application>)</para>
 </sect4>
 
 <sect4><title>Optional</title>
+<para><xref linkend="python"/> (required to run the full test suite), 
+<xref linkend="apache"/>, 
+<xref linkend="openssh"/> (runtime only), 
+<ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>, 
+<xref linkend="j2sdk"/> (to build the <application>JAVA</application> 
+bindings), 
+<ulink url="http://www.junit.org/">JUnit</ulink> (for running the 
+<application>JAVA</application> bindings test suite and requires 
+<xref linkend="unzip"/>), 
+<ulink url="http://www.inet.no/dante/">Dante</ulink> (alternate 
+<application>JAVA</application> compiler), 
+<ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">
+Jikes</ulink> (another alternate 
+<application>JAVA</application> compiler) and 
+inetd or <xref linkend="xinetd"/> (server only)</para>
+</sect4>
+
+<sect4><title>Optional for the bundled version of 
+<application>neon</application></title>
 <para><xref linkend="expat"/>, 
 <xref linkend="pkgconfig"/>, 
-<xref linkend="db"/>, 
-<xref linkend="gdbm"/>, 
-<xref linkend="python"/>, 
-<xref linkend="apache"/>, 
-<xref linkend="j2sdk"/>, 
 <xref linkend="openssl"/>, 
-<xref linkend="openssh"/>, 
-<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
-<ulink url="http://www.swig.org">SWIG</ulink>, 
-<ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>, 
-<ulink url="http://www.junit.org/">JUnit</ulink> (requires 
-<xref linkend="unzip"/>), 
-<ulink url="http://www.inet.no/dante/">Dante</ulink>, 
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">
-Jikes</ulink> and 
-inetd or <xref linkend="xinetd"/> (server only)</para>
+<xref linkend="heimdal"/> or <xref linkend="mitkrb"/></para>
+</sect4>
+
+<sect4><title>Optional for the bundled version of 
+<application>Apache Portable Runtime</application></title>
+<para><xref linkend="expat"/> and 
+<xref linkend="gdbm"/></para>
+</sect4>
+
+<sect4><title>Optional to build the <application>SWIG</application> 
+bindings</title>
+<para><ulink url="http://www.swig.org">SWIG</ulink> and 
+<xref linkend="python"/></para>
 </sect4>
 </sect3>
@@ -91,4 +109,21 @@
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make</command></userinput></screen>
+
+<para>If you passed the <option>--enable-javahl</option> parameter to 
+<command>configure</command> and wish to build the 
+<application>JAVA</application> <application>Subversion</application> 
+bindings, issue the following command:</para>
+
+<screen><userinput><command>make javahl</command></userinput></screen>
+
+<para>If you passed the <option>--with-swig</option> and 
+<option>--enable-swig-bindings</option> parameters to 
+<command>configure</command> and wish to build the 
+<application>SWIG</application> <application>Perl</application> and 
+<application>Python</application> <application>Subversion</application> 
+bindings, issue the following commands:</para>
+
+<screen><userinput><command>make swig-pl &amp;&amp;
+make swig-py</command></userinput></screen>
 
 <para>Now, as the root user:</para>
@@ -99,11 +134,28 @@
 
 <note><para>If you have <application>Apache</application> installed, pass
-the <parameter>--with-apr=/usr</parameter> and
-<parameter>--with-apr-util=/usr</parameter> switches to the
-<command>configure</command> script. Otherwise,
+the <option>--with-apr=/usr</option> and <option>--with-apr-util=/usr</option> 
+switches to the <command>configure</command> script. Otherwise, 
 <application>Subversion</application> will overwrite
 <acronym>APR</acronym> and <acronym>APR</acronym>-utils from the 
 <application>Apache</application> installation with its own
-files.</para></note>
+files. You may also need to pass <option>--with-apxs=/usr/sbin/apxs</option> 
+as <command>apxs</command> might not be in an unprivileged user's 
+<envar>PATH</envar> and won't be properly discovered.</para></note>
+
+<para>If you built the <application>JAVA</application> 
+<application>Subversion</application> bindings, issue the following command 
+as the root user to install them:</para>
+
+<screen><userinput role='root'><command>make install-javahl</command></userinput></screen>
+
+<para>If you built the <application>SWIG</application> 
+<application>Perl</application> and <application>Python</application> 
+<application>Subversion</application> bindings, issue the following commands 
+as the root user to install them:</para>
+
+<screen><userinput role='root'><command>make install-swig-pl &amp;&amp;
+make install-swig-py &amp;&amp;
+echo /usr/lib/svn-python \
+    > /usr/lib/python2.4/site-packages/subversion.pth</command></userinput></screen>
 
 </sect2>
@@ -114,5 +166,6 @@
 <para><option>--with-ssl</option>: This switch enables 
 <application>Open<acronym>SSL</acronym></application> support in 
-<application>neon</application>.</para>
+<application>neon</application> (only required if you use the bundled version 
+of <application>neon</application>).</para>
 
 </sect2>
@@ -156,8 +209,11 @@
 <seg>svn, svnadmin, svndumpfilter, svnlook, svnserve, svnversion and 
 optionally, neon-config</seg>
-<seg>libsvn_*.[so,a] and optionally, libneon.[so,a] and the mod_dav_svn.so 
+<seg>libsvn*.[so,a] and optionally, libneon.[so,a] and the mod_dav_svn.so 
 and mod_authz_svn.so <application>Apache 
 <acronym>HTTP</acronym></application> <acronym>DSO</acronym> modules</seg>
 <seg>/etc/subversion, /usr/include/neon (optional), /usr/include/subversion-1, 
+/usr/lib/perl5/site_perl/5.8.6/i686-linux/auto/SVN (optional), 
+/usr/lib/perl5/site_perl/5.8.6/i686-linux/SVN (optional), 
+/usr/lib/svn-javahl (optional), /usr/lib/svn-python (optional), 
 /usr/share/doc/neon-&svn-neon-version; (optional) and 
 /usr/share/doc/subversion-&subversion-version;</seg>
Index: general.ent
===================================================================
--- general.ent	(revision d0a1a90db053c269aa20726de57f1c3dac837eef)
+++ general.ent	(revision 4d6e546556031cbba4655a381bdad412e179c2b5)
@@ -213,5 +213,5 @@
 <!ENTITY rsync-version                "2.6.3"> 
 <!ENTITY cvs-version                  "1.11.18">  
-<!ENTITY subversion-version           "1.1.3">
+<!ENTITY subversion-version           "1.1.4">
 <!ENTITY wget-version                 "1.9.1">  
 <!ENTITY tcpwrappers-version          "7.6">  
Index: general/genlib/slib.xml
===================================================================
--- general/genlib/slib.xml	(revision d0a1a90db053c269aa20726de57f1c3dac837eef)
+++ general/genlib/slib.xml	(revision 4d6e546556031cbba4655a381bdad412e179c2b5)
@@ -9,6 +9,6 @@
 <!ENTITY slib-md5sum        "dc1aa0ffb9e2414223ceefc315f6baf9">
 <!ENTITY slib-size          "705 KB">
-<!ENTITY slib-buildsize     "8.5 MB">
-<!ENTITY slib-time          "0.02 SBU">
+<!ENTITY slib-buildsize     "8.6 MB">
+<!ENTITY slib-time          "0.01 SBU">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d0a1a90db053c269aa20726de57f1c3dac837eef)
+++ introduction/welcome/changelog.xml	(revision 4d6e546556031cbba4655a381bdad412e179c2b5)
@@ -26,7 +26,7 @@
 Configuration' page.</para></listitem>
 
-<listitem><para>April 11th, 2005 [randy]: Updated to Nail-11.22 and 
-Guile-1.6.7; moved Guile instructions from 'Chapter 8 - General Libraries' 
-to 'Chapter 12 - Programming'.</para></listitem>
+<listitem><para>April 11th, 2005 [randy]: Updated to Nail-11.22, 
+Guile-1.6.7 and Subversion-1.1.4; moved Guile instructions from 'Chapter 8 - 
+General Libraries' to 'Chapter 12 - Programming'.</para></listitem>
 
 <listitem><para>April 10th, 2005 [randy]: Updated to NASM-0.98.39 and 
