From 968b5e70f8476374caa115925e944a96e2c29e11 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Thu, 3 Jun 2010 07:08:08 +0000
Subject: [PATCH] Update for Berkeley DB 5

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@300152 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/dba/configure.xml | 11 +++++++----
 reference/dba/setup.xml     | 13 +++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/reference/dba/configure.xml b/reference/dba/configure.xml
index 924a74f6c1..6de7f2577d 100644
--- a/reference/dba/configure.xml
+++ b/reference/dba/configure.xml
@@ -79,7 +79,7 @@
       <entry><literal>db2</literal></entry>
       <entry>
        <para>
-       To enable support for db2 add
+       To enable support for Oracle Berkeley DB 2 add
        <option role="configure">--with-db2[=DIR]</option>.
        <note>
         <para>
@@ -94,7 +94,7 @@
       <entry><literal>db3</literal></entry>
       <entry>
        <para>
-       To enable support for db3 add
+       To enable support for Oracle Berkeley DB 3 add
        <option role="configure">--with-db3[=DIR]</option>.
        <note>
         <para>
@@ -109,7 +109,7 @@
       <entry><literal>db4</literal></entry>
       <entry>
        <para>
-       To enable support for db4 add
+       To enable support for Oracle Berkeley DB 4 or 5 add
        <option role="configure">--with-db4[=DIR]</option>.
        <note>
         <para>
@@ -118,12 +118,15 @@
        </note>
        <note>
         <para>
-         This was added in PHP 4.3.2. In earlier versions of PHP you need to use
+         The db4 option was added in PHP 4.3.2. In earlier versions of PHP you need to use
          <option role="configure">--with-db3=DIR</option> with DIR being the
          path to db4 library. It is not possible to use db versions starting 
          from 4.1 with PHP prior to version 4.3.0. Also, the db libraries with
          versions 4.1 through 4.1.24 cannot be used in any PHP version.
         </para>
+        <para>
+         Support for BDB 5 was added in PHP 5.3.3.
+        </para>
        </note>
       </para>
       </entry>
diff --git a/reference/dba/setup.xml b/reference/dba/setup.xml
index 91d99047e5..e8a0bdc844 100644
--- a/reference/dba/setup.xml
+++ b/reference/dba/setup.xml
@@ -54,8 +54,8 @@
      <row>
       <entry><literal>db2</literal></entry>
       <entry>
-       DB2 is <link xlink:href="&url.sleepycat;">Sleepycat Software's
-       DB2</link>. It is described as "a programmatic toolkit that
+       DB2 is for <link xlink:href="&url.sleepycat;">Oracle Berkeley
+       DB 2</link>. It is described as "a programmatic toolkit that
        provides high-performance built-in database support for both
        standalone and client/server applications.
       </entry>
@@ -64,16 +64,17 @@
      <row>
       <entry><literal>db3</literal></entry>
       <entry>
-       DB3 is <link xlink:href="&url.sleepycat;">Sleepycat Software's
-       DB3</link>.
+       DB3 is for <link xlink:href="&url.sleepycat;">Oracle Berkeley DB
+       3</link>.
       </entry>
      </row>
 
      <row>
       <entry><literal>db4</literal></entry>
       <entry>
-       DB4 is <link xlink:href="&url.sleepycat;">Sleepycat Software's
-       DB4</link>. This is available since PHP 4.3.2.
+       DB4 is for <link xlink:href="&url.sleepycat;">Oracle Berkeley DB
+       4 or 5</link>. This option is available from PHP 4.3.2.  It can
+       can be used with BDB 5 from PHP 5.3.3.
       </entry>
      </row>