Import copyright/readme from devel

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index 5450dd0d1d1307fee1eb6d3a6f1bcb5f6bc08537..305fc2609f351d4c717ed156657123c95a4bc882 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2000 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms are permitted only

diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index 09bf414a02b9eab997626d09c604aa199b28e14a..123dfc37aeee60d5977a6d8b883fe1fbd9caea4e 100644 (file)
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,35 +1,35 @@
 The OpenLDAP Public License
-
-  Version 2.0, 7 June 1999
-  Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA.
-  All Rights Reserved.
+  Version 2.2.1, 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 registered
-trademark of the OpenLDAP Foundation.
+permission of the OpenLDAP Foundation.
 
 5. Due credit should be given to the OpenLDAP Project
 (http://www.openldap.org/).
 
+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 revision of the license.
+
 THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND CONTRIBUTORS
 ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
 NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -42,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.
+