Import ITS#2717 SASL_MECH fix from HEAD

[openldap] / README

diff --git a/README b/README
index 78a7df4d4a354e2b899a75b39ce9827c95dce72b..605662901fc570d90c243110fcb68db4eb997ad2 100644 (file)
--- a/README
+++ b/README
@@ -1,11 +1,12 @@
-OpenLDAP 2.1 ALPHA README
-       
-       For a description of what this distribution contains, see the
-       ANNOUNCEMENT file in this directory.
+OpenLDAP 2.1 README
 
-       This is a 2.1 alpha release.
-       It is NOT intended for general use.
+    For a description of what this distribution contains, see the
+    ANNOUNCEMENT file in this directory.  For a description of
+    changes from previous releases, see the CHANGES file in this
+    directory.
 
+    This is 2.1 release.  2.1 releases includes significant changes
+    from prior releases.
 
 REQUIRED SOFTWARE
        Build OpenLDAP requires a number of software packages to be
@@ -14,13 +15,14 @@ REQUIRED SOFTWARE
 
        Base system (libraries and tools):
                Standard C compiler (required)
-               Cyrus SASL 1.5 (recommended)
+               Cyrus SASL 1.5.x or 2.1.3+ (recommended)
                OpenSSL 0.9 (recommended)
                POSIX REGEX software (required)
 
        SLAPD:
-               BDB backend requires Sleepycat Berkeley DB 4.0 or better 
-               LDBM backend supports this and other compatible database managers
+               BDB backend requires Sleepycat Berkeley DB 4.1
+               LDBM backend requires a compatible database manager
+                       [Berkeley DB, GDBM, etc.]
 
        SLURPD:
                LTHREAD compatible thread package
@@ -61,10 +63,21 @@ SUPPORT / FEEDBACK / PROBLEM REPORTS / DISCUSSIONS
        the answer, please enquire on the OpenLDAP-software list.
 
        Issues, such as bug reports, should be reported using our
-       our Issue Tracking System <http://www.OpenLDAP.com/its/> or
-       by sending mail to OpenLDAP-its@OpenLDAP.org.  Do not use
+       our Issue Tracking System <http://www.OpenLDAP.org/its/> or
+       by sending mail to <OpenLDAP-its@OpenLDAP.org>.  Do not use
        this system for software enquiries.  Please direct these
        to an appropriate mailing list.
 
+
+CONTRIBUTING
+
+       See http://www.openldap.org/devel/contributing.html for how to
+       contribute code or documentation to OpenLDAP.  Use the Issue Tracking
+       System <http://www.openldap.org/its/> to submit contributions.
+       While you are encouraged to coordinate and discuss the development
+       activities on the openldap-devel@openldap.org mailing list prior
+       to submission, it is noted that contributions must be submitted
+       using the Issue Tracking System to be considered.
+
 ---
 $OpenLDAP$