Add permission to make verbatim copies of license document. Move

notice to bottom of document.  Reformat paragraph.  Separate
trademark statement from terms.  This edit do not change the
licensing terms.

diff --git a/LICENSE b/LICENSE
index 7887b8f11a177e8ef11bcb07501503ae7c68aa45..ba18e423606f45ba5d2f83a20ecc1d228e3ebdee 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,31 +1,26 @@
 The OpenLDAP Public License
-
-  Version 2.1, 29 February 2000
-  Copyright 1999-2000, The OpenLDAP Foundation, Redwood City, California, USA.
-  All Rights Reserved.
+  Version 2.2, 1 March 2000
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 that the following conditions are met:
 
-1. Redistributions of source code must retain copyright
-statements and notices.  Redistributions must also contain a
-copy of this document.
+1. Redistributions of source code must retain copyright statements
+and notices.  Redistributions must also contain a copy of this
+document.
 
-2. Redistributions in binary form must reproduce the
-above copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other
-materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+distribution.
 
 3. The name "OpenLDAP" must not be used to endorse or promote
-products derived from this Software without prior written
-permission of the OpenLDAP Foundation.  For written permission,
-please contact foundation@openldap.org.
+products derived from this Software without prior written permission
+of the OpenLDAP Foundation.
 
 4. Products derived from this Software may not be called "OpenLDAP"
 nor may "OpenLDAP" appear in their names without prior written
-permission of the OpenLDAP Foundation.  OpenLDAP is a trademark
-of the OpenLDAP Foundation.
+permission of the OpenLDAP Foundation.
 
 5. Due credit should be given to the OpenLDAP Project
 (http://www.openldap.org/).
@@ -33,7 +28,7 @@ of the OpenLDAP Foundation.
 6. The OpenLDAP Foundation may revise this license from time to
 time.  Each revision is distinguished by a version number.  You
 may use the Software under terms of this license revision or under
-the terms of any subsequent license revision.
+the terms of any subsequent the license.
 
 THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND CONTRIBUTORS
 ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
@@ -47,3 +42,10 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
+
+OpenLDAP is a trademark of the OpenLDAP Foundation.
+
+Copyright 1999-2000, The OpenLDAP Foundation, Redwood City,
+California, USA.  All Rights Reserved.  Permission to copy and
+distributed verbatim copies of this document is granted.
+