Index: general.ent
===================================================================
--- general.ent	(revision 22ab8c0b91db52951755aa43faf3707672adb6be)
+++ general.ent	(revision 1ea160c0aa6d638601147a9dc34af88ef98cf730)
@@ -576,5 +576,5 @@
 
 <!-- Chapter 21 -->
-<!ENTITY db-version                   "5.2.36">
+<!ENTITY db-version                   "5.3.15">
 <!ENTITY mysql-version                "5.5.17">
 <!ENTITY postgresql-version           "9.0.6">
@@ -615,5 +615,5 @@
 <!ENTITY qt-version                   "3.3.8d">
 <!ENTITY qt4-version                  "4.8.1">
-<!ENTITY qt-dir			      "$QTDIR">
+<!ENTITY qt-dir                       "$QTDIR">
 <!ENTITY cairo-version                "1.12.0">
 <!ENTITY cairomm-version              "1.10.0">
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 22ab8c0b91db52951755aa43faf3707672adb6be)
+++ server/databases/db.xml	(revision 1ea160c0aa6d638601147a9dc34af88ef98cf730)
@@ -5,10 +5,13 @@
   %general-entities;
 
-  <!ENTITY db-download-http " ">
+  <!ENTITY db-download-http
+    "http://download.oracle.com/berkeley-db/db-&db-version;.tar.gz">
   <!ENTITY db-download-ftp  "&gentoo-ftp-repo;/db-&db-version;.tar.gz">
-  <!ENTITY db-md5sum        "88466dd6c13d5d8cddb406be8a1d4d92">
+  <!ENTITY db-md5sum        "5493fb5f7cc3915887c836b096f18773">
   <!ENTITY db-size          "33 MB">
-  <!ENTITY db-buildsize     "181 MB (additional 100 MB to run parallel standard test suite)">
-  <!ENTITY db-time          "1.4 SBU (builds all bindings, add an additional 145 SBU to run parallel standard test suite)">
+  <!ENTITY db-buildsize     "264 MB (additional 100 MB to run parallel standard
+    test suite)">
+  <!ENTITY db-time          "0.8 SBU (add an additional 145 SBU to run parallel
+    standard test suite)">
 ]>
 
@@ -30,7 +33,8 @@
     <title>Introduction to Berkeley DB</title>
 
-    <para>The <application>Berkeley DB</application> package contains programs
-    and utilities used by many other applications for database related
-    functions.</para>
+    <para>
+      The <application>Berkeley DB</application> package contains programs and
+      utilities used by many other applications for database related functions.
+    </para>
 
     &lfs71_checked;
@@ -39,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&db-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&db-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &db-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &db-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &db-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &db-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&db-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&db-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &db-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &db-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &db-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &db-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,10 +80,10 @@
       <xref linkend="tcl"/>,
       <xref linkend="icedtea6"/> or <xref linkend="jdk"/>, and
-      <xref linkend='sharutils'/> (for the <command>uudecode</command> command)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/db"/></para>
-
+      <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/db"/>
+    </para>
   </sect2>
 
@@ -75,29 +91,36 @@
     <title>Testing Berkeley DB</title>
 
-    <para>You may want to skip ahead to <xref linkend="bdb-installation"/>. The
-    test suite can take up to 150 SBUs and has a few bugs causing a report of
-    <quote>Regression tests failed</quote>. However, running the test suite is
-    a very exhaustive test of your hardware, perhaps pushing your machine
-    harder (especially disk I/O) than it will ever see during production use.
-    Note that you must have <application>Tcl</application> installed to run the
-    test suite.</para>
-
-    <para>Build for the <application>Berkeley DB</application> test by running
-    the following commands:</para>
-
-<screen><userinput>cd build_unix &amp;&amp;
-../dist/configure --prefix=/usr \
-                  --enable-test \
-                  --enable-tcl  \
-                  --enable-dbm  \
+    <para>
+      If you can't wait 12 hours or so you may want to skip ahead to
+      <xref linkend="bdb-installation"/>. The test suite can take a long time
+      and has a few bugs causing a report of <quote>Regression tests
+      failed</quote>. However, running the test suite is a very exhaustive test
+      of your hardware, perhaps pushing your machine harder (especially disk
+      I/O) than it will ever see during production use. Note that you must have
+      <application>Tcl</application> installed to run the test suite.
+    </para>
+
+    <para>
+      Build for the <application>Berkeley DB</application> test by running the
+      following commands:
+    </para>
+
+<screen><userinput>cd build_unix                         &amp;&amp;
+../dist/configure --prefix=/usr       \
+                  --enable-test       \
+                  --enable-tcl        \
+                  --enable-dbm        \
                   --with-tcl=/usr/lib &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, start <command>tclsh</command>:</para>
+    <para>
+      To test the results, start <command>tclsh</command>:
+    </para>
 
 <screen><userinput>tclsh</userinput></screen>
 
-    <para>From the <command>tclsh</command> prompt (<prompt>%&nbsp;</prompt>),
-    run:</para>
+    <para>
+      From the <command>tclsh</command> prompt (<prompt>%&nbsp;</prompt>), run:
+    </para>
 
 <screen><userinput>source ../test/tcl/test.tcl
@@ -105,17 +128,22 @@
 exit</userinput></screen>
 
-    <para>Clean up the source tree with the following command:</para>
+    <para>
+      Clean up the source tree with the following command:
+    </para>
 
 <screen><userinput>make realclean &amp;&amp;
 cd ..</userinput></screen>
 
-    <note><para>Test127.f and Repmgr026.c are known to fail.</para></note>
-
-    <para>There are additional testing suites in the <filename
-    class='directory'>test/c</filename> and <filename
-    class='directory'>test/cxx</filename> directories.  See the
-    <filename>README</filename> in each directory for instructions on how to
-    run the tests.</para>
-
+    <note><para>
+      Test127.f and Repmgr026.c are known to fail.
+    </para></note>
+
+    <para>
+      There are additional testing suites in the
+      <filename class="directory">test/c</filename> and
+      <filename class="directory">test/cxx</filename> directories.  See the
+      <filename>README</filename> in each directory for instructions on how to
+      run the tests.
+    </para>
   </sect2>
 
@@ -124,41 +152,48 @@
 
     <note>
-      <para>If you plan on installing <application>Berkeley DB</application>
-      with Java support, you should check the system for certain versions
-      of <xref linkend="jdk"/> and <xref linkend="gmime"/>. Specifically, if
-      <application>JDK</application>-6 Update X and the
-      <command>uudecode</command> program from the
-      <application>GMime</application> program is on the system, the build will
-      fail (unless you run the modified <command>./configure</command> command
-      shown below). You can run two commands (<command>javac -version</command>
-      and <command>uudecode --version</command>) to determine what versions are
-      installed. You can also download and run a shell script from
-      <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert
-      you to a non-working condition. If the identified programs exist on the
-      system, you must modify the
-      <command>./configure</command> command as shown below.</para>
+      <para>
+        If you plan on installing <application>Berkeley DB</application> with
+        Java support, you should check the system for certain versions of
+        <xref linkend="jdk"/> and <xref linkend="gmime"/>. Specifically, if
+        <application>JDK</application>-6 Update X and the
+        <command>uudecode</command> program from the
+        <application>GMime</application> program is on the system, the build
+        will fail (unless you run the modified <command>./configure</command>
+        command shown below). You can run two commands
+        (<command>javac -version</command> and
+        <command>uudecode --version</command>) to determine what versions are
+        installed. You can also download and run a shell script from
+        <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert you
+        to a non-working condition. If the identified programs exist on the
+        system, you must modify the <command>./configure</command> command as
+        shown below.
+      </para>
 
 <screen><userinput>uudecode="no" ../dist/configure --(use the parameters shown below)</userinput></screen>
     </note>
 
-    <para>Install <application>Berkeley DB</application> by running the
-    following commands:</para>
-
-<screen><userinput>cd build_unix &amp;&amp;
-../dist/configure --prefix=/usr \
+    <para>
+      Install <application>Berkeley DB</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>cd build_unix                        &amp;&amp;
+../dist/configure --prefix=/usr      \
                   --enable-compat185 \
-                  --enable-dbm  \
-                  --enable-cxx &amp;&amp;
+                  --enable-dbm       \
+                  --disable-static   \
+                  --enable-cxx       &amp;&amp;
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
-chown -v -R root:root \
-      /usr/bin/db_* \
-      /usr/include/db{,_185,_cxx}.h \
-      /usr/lib/libdb*.{so,a,la} \
+chown -v -R root:root                        \
+      /usr/bin/db_*                          \
+      /usr/include/db{,_185,_cxx}.h          \
+      /usr/lib/libdb*.{so,la}                \
       /usr/share/doc/db-&db-version;</userinput></screen>
-
   </sect2>
 
@@ -166,36 +201,50 @@
     <title>Command Explanations</title>
 
-    <para><command>cd build_unix &amp;&amp;
-    ../dist/configure --prefix=/usr...</command>:
-    This replaces the normal <command>./configure</command> command, as
-    <application>Berkeley DB</application> comes with various
-    build directories for different platforms.</para>
-
-    <para><parameter>--enable-compat185</parameter>: This switch enables
-    building the DB-1.85 compatibility API.</para>
-
-    <para><parameter>--enable-cxx</parameter>: This switch enables building
-    C++ API libraries.</para>
-
-    <para><parameter>--enable-tcl --with-tcl=/usr/lib</parameter>:
-    Enables <application>Tcl</application> support in DB and creates the
-    <filename class="libraryfile">libdb_tcl</filename> libraries.</para>
-
-    <para><parameter>--enable-dbm</parameter>: Enables legacy interface support
-    support needed by some older packages.</para>
-
-    <para><parameter>--enable-java</parameter>: Enables
-    <application>Java</application> support in DB and creates the
-    <filename class='libraryfile'>libdb_java</filename> libraries.</para>
-
-    <para><command>make docdir=/usr/share/doc/db-&db-version;
-    install</command>: This installs the documentation in
-    the standard location instead of
-    <filename class='directory'>/usr/docs</filename>.</para>
-
-    <para><command>chown -v -R root:root ...</command>:This command changes
-    the ownership of various installed files from the uid:gid of the
-    builder to root:root.</para>
-
+    <para>
+      <command>cd build_unix &amp;&amp; ../dist/configure
+      --prefix=/usr...</command>: This replaces the normal
+      <command>./configure</command> command, as
+      <application>Berkeley DB</application> comes with various build
+      directories for different platforms.
+    </para>
+
+    <para>
+      <parameter>--enable-compat185</parameter>: This switch enables building
+      the DB-1.85 compatibility API.
+    </para>
+
+    <para>
+      <parameter>--enable-cxx</parameter>: This switch enables building C++ API
+      libraries.
+    </para>
+
+    <para>
+      <parameter>--enable-tcl --with-tcl=/usr/lib</parameter>: Enables
+      <application>Tcl</application> support in DB and creates the
+      <filename class="libraryfile">libdb_tcl</filename> libraries.
+    </para>
+
+    <para>
+      <parameter>--enable-dbm</parameter>: Enables legacy interface support
+      needed by some older packages.
+    </para>
+
+    <para>
+      <parameter>--enable-java</parameter>: Enables
+      <application>Java</application> support in DB and creates the
+      <filename class="libraryfile">libdb_java</filename> libraries.
+    </para>
+
+    <para>
+      <command>make docdir=/usr/share/doc/db-&db-version; install</command>:
+      This installs the documentation in the standard location instead of
+      <filename class="directory">/usr/docs</filename>.
+    </para>
+
+    <para>
+      <command>chown -v -R root:root ...</command>:This command changes the
+      ownership of various installed files from the uid:gid of the builder to
+      root:root.
+    </para>
   </sect2>
 
@@ -209,8 +258,12 @@
 
       <seglistitem>
-        <seg>db_archive, db_checkpoint, db_deadlock, db_dump,
-        db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify</seg>
-        <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java.{so,a},
-        libdb_tcl.{so,a} and db.jar</seg>
+        <seg>
+          db_archive, db_checkpoint, db_deadlock, db_dump, db_hotbackup,
+          db_load, db_log_verify, db_printlog, db_recover, db_replicate,
+          db_stat, db_tuner, db_upgrade and db_verify.
+        </seg>
+        <seg>
+          libdb.so, libdb_cxx.so, libdb_java.so, libdb_tcl.so and db.jar.
+        </seg>
         <seg>/usr/share/doc/db-&db-version;</seg>
       </seglistitem>
@@ -225,6 +278,7 @@
         <term><command>db_archive</command></term>
         <listitem>
-          <para>prints the pathnames of log files that are no longer in
-          use.</para>
+          <para>
+            prints the pathnames of log files that are no longer in use.
+          </para>
           <indexterm zone="db db_archive">
             <primary sortas="b-db_archive">db_archive</primary>
@@ -236,6 +290,7 @@
         <term><command>db_checkpoint</command></term>
         <listitem>
-          <para>is a daemon process used to monitor and checkpoint database
-          logs.</para>
+          <para>
+            is a daemon process used to monitor and checkpoint database logs.
+          </para>
           <indexterm zone="db db_checkpoint">
             <primary sortas="b-db_checkpoint">db_checkpoint</primary>
@@ -247,6 +302,7 @@
         <term><command>db_deadlock</command></term>
         <listitem>
-          <para>is used to abort lock requests when deadlocks are
-          detected.</para>
+          <para>
+            is used to abort lock requests when deadlocks are detected.
+          </para>
           <indexterm zone="db db_deadlock">
             <primary sortas="b-db_deadlock">db_deadlock</primary>
@@ -258,6 +314,8 @@
         <term><command>db_dump</command></term>
         <listitem>
-          <para>converts database files to a flat file format readable by
-          <command>db_load</command>.</para>
+          <para>
+            converts database files to a flat file format readable by
+            <command>db_load</command>.
+          </para>
           <indexterm zone="db db_dump">
             <primary sortas="b-db_dump">db_dump</primary>
@@ -266,11 +324,36 @@
       </varlistentry>
 
+      <varlistentry id="db_hotbackup">
+        <term><command>db_hotbackup</command></term>
+        <listitem>
+          <para>
+            creates "hot backup" or "hot failover" snapshots of Berkeley DB
+            databases.
+          </para>
+          <indexterm zone="db db_hotbackup">
+            <primary sortas="b-db_hotbackup">db_hotbackup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="db_load">
         <term><command>db_load</command></term>
         <listitem>
-          <para>is used to create database files from flat files created with
-          <command>db_dump</command>.</para>
+          <para>
+            is used to create database files from flat files created with
+            <command>db_dump</command>.
+          </para>
           <indexterm zone="db db_load">
             <primary sortas="b-db_load">db_load</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="db_log_verify">
+        <term><command>db_log_verify</command></term>
+        <listitem>
+          <para>verifies the log files of a database.</para>
+          <indexterm zone="db db_log_verify">
+            <primary sortas="b-db_log_verify">db_log_verify</primary>
           </indexterm>
         </listitem>
@@ -290,8 +373,22 @@
         <term><command>db_recover</command></term>
         <listitem>
-          <para>is used to restore a database to a consistent state after a
-          failure.</para>
+          <para>
+            is used to restore a database to a consistent state after a failure.
+          </para>
           <indexterm zone="db db_recover">
             <primary sortas="b-db_recover">db_recover</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="db_replicate">
+        <term><command>db_replicate</command></term>
+        <listitem>
+          <para>
+            is a daemon process that provides replication/HA services on a
+            transactional environment.
+          </para>
+          <indexterm zone="db db_replicate">
+            <primary sortas="b-db_replicate">db_replicate</primary>
           </indexterm>
         </listitem>
@@ -308,9 +405,24 @@
       </varlistentry>
 
+      <varlistentry id="db_tuner">
+        <term><command>db_tuner</command></term>
+        <listitem>
+          <para>
+            analyzes the data in a btree database, and suggests a page size that
+            is likely to deliver optimal operation.
+          </para>
+          <indexterm zone="db db_tuner">
+            <primary sortas="b-db_tuner">db_tuner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="db_upgrade">
         <term><command>db_upgrade</command></term>
         <listitem>
-          <para>is used to upgrade database files to a newer version of
-          <application>Berkeley DB</application>.</para>
+          <para>
+            is used to upgrade database files to a newer version of
+            <application>Berkeley DB</application>.
+          </para>
           <indexterm zone="db db_upgrade">
             <primary sortas="b-db_upgrade">db_upgrade</primary>
@@ -328,8 +440,5 @@
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>
