Import changes made to 1.1 that belonged in 1.2.

diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT
index 9aa33e932473e43d20e1efb42029ef91abd63f76..311d5518ba1e1fc109bf092a26972dceeb030d15 100644 (file)
--- a/ANNOUNCEMENT
+++ b/ANNOUNCEMENT
@@ -1,9 +1,9 @@
        A N N O U N C E M E N T
 
-       OpenLDAP 1.1
+       OpenLDAP 1.2
 
        The OpenLDAP Project is pleased to announce the availability
-       of OpenLDAP release 1.1, a suite of the Lightweight Weight
+       of OpenLDAP release 1.2, a suite of the Lightweight Weight
        Directory Protocol servers, clients, utilities, and development tools.
 
        OpenLDAP is derived from University of Michigan LDAP release 3.3.
@@ -33,6 +33,11 @@
        - whois++d - a WHOIS++-to-LDAP gateway
 
 CHANGES
+       Changes from OpenLDAP 1.1
+       - ldappasswd tool, password prompting, salted MD5/SHA1 support
+       - platforms updates, and
+       - numerous bug fixes and build changes.
+
        Changes from OpenLDAP 1.0
        - improved build environment with dynamic library support,
        - externally configurable client library support: ldap.conf(5),

diff --git a/CHANGES b/CHANGES
index e44f2c9f6d2ed3edc6a48bd555b58a33ef72ab40..58be0030172a7262f8ca874da0d8a59d0b9a4cdd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ Changes included in OpenLDAP 1.1.3
        Updated slapd to use pthread_detach()
        Updated slapd thread initialization
        Updated slapd shutdown code to use condition wait
+       Updated slapd alias deref to be optional
        Build environment
                Added DB2 patch information
                Added distclean target