Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / README

diff --git a/README b/README
index 5db66004039f3b69c9773811597c812cfd98ff03..54a299a51de92369e8bf154633dac598a7ac5fe0 100644 (file)
--- a/README
+++ b/README
@@ -16,13 +16,12 @@ REQUIRED SOFTWARE
         Standard C compiler (required)
         Cyrus SASL 2.1.21+ (recommended)
         OpenSSL 0.9.7+ (recommended)
         Standard C compiler (required)
         Cyrus SASL 2.1.21+ (recommended)
         OpenSSL 0.9.7+ (recommended)

-        POSIX REGEX software (required)
+        Reentrant POSIX REGEX software (required)

 
     SLAPD:
 
     SLAPD:

-        BDB and HDB backends require Oracle Berkeley DB 4.4, 4.5,
-        4.6, or 4.7.  It is highly recommended to apply the patches
-        from Oracle for a given release.  In addition, for BDB 4.7,
-        it is advised to also use the supplied build/db.4.7.25.patch.
+        BDB and HDB backends require Oracle Berkeley DB 4.4 - 4.8,
+       or 5.0 - 5.1.  It is highly recommended to apply the
+        patches from Oracle for a given release.

 
     CLIENTS/CONTRIB ware:
         Depends on package.  See per package README.
 
     CLIENTS/CONTRIB ware:
         Depends on package.  See per package README.


@@ -58,7 +57,7 @@ SUPPORT / FEEDBACK / PROBLEM REPORTS / DISCUSSIONS
     <http://www.openldap.org/lists/>.  If you cannot find the answer,
     please enquire on the OpenLDAP-software list.
 
     <http://www.openldap.org/lists/>.  If you cannot find the answer,
     please enquire on the OpenLDAP-software list.
 

-    Issues, such as bug reports, should be reported using our our
+    Issues, such as bug reports, should be reported using our

     Issue Tracking System <http://www.OpenLDAP.org/its/>.  Do not
     use this system for software enquiries.  Please direct these
     to an appropriate mailing list.
     Issue Tracking System <http://www.OpenLDAP.org/its/>.  Do not
     use this system for software enquiries.  Please direct these
     to an appropriate mailing list.


@@ -79,7 +78,7 @@ $OpenLDAP$
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 

-Copyright 1998-2009 The OpenLDAP Foundation.
+Copyright 1998-2013 The OpenLDAP Foundation.

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without