X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=doc%2Fguide%2FLICENSE;h=65a3a21abf2a83e34d71fc6ff390472b63449aea;hb=379e0e9d501f0f6532266d4d30757cb46f2d345f;hp=9fa81e0c83639bf7d56b947bca2d02320a9ee1b6;hpb=c86fd7d61ca1e9b7598613ccee987645ada65bdb;p=openldap

diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index 9fa81e0c83..65a3a21abf 100644
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,46 +1,47 @@
 The OpenLDAP Public License
-  Version 2.4, 8 December 2000
+  Version 2.7, 7 September 2001
 
 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.
+   and notices,
 
 2. Redistributions in binary form must reproduce applicable copyright
-statements and notices, this list of conditions, and the following
-disclaimer in the documentation and/or other materials provided
-with the distribution.
+   statements and notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution, and
 
 3. Redistributions must contain a verbatim copy of this document.
 
-4. The names of the authors and copyright holders must not be used
-to endorse or promote products derived from this Software without
-their specific prior written permission.
-
-5. Due credit should be given to the OpenLDAP Project.
-
-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
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-THE OPENLDAP FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) 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,
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number.  You may use
+this 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 ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
+
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission.  Title
+to copyright in this Software shall at all times remain with
+copyright holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Copyright 1999-2001 The OpenLDAP Foundation, Redwood City,
 California, USA.  All Rights Reserved.  Permission to copy and
-distributed verbatim copies of this document is granted.
+distribute verbatim copies of this document is granted.