From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 18 May 2001 02:46:24 +0000 (+0000)
Subject: Update to 2.5 (from guide)
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1396
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6852b9d90022e8593c98205413380536b1b5a7cf;p=openldap

Update to 2.5 (from guide)
---

diff --git a/LICENSE b/LICENSE
index 2812f2e07a..ca4afcf2fb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 The OpenLDAP Public License
-  Version 2.4, 8 December 2000
+  Version 2.5, 11 May 2001
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
@@ -20,7 +20,7 @@ must not be used in advertising or otherwise to promote the sale,
 use or other dealing in this Software without specific, written
 prior permission.
 
-5. Due credit should be given to the OpenLDAP Project.
+5. Due credit should be given to the authors of the Software.
 
 6. The OpenLDAP Foundation may revise this license from time to
 time.  Each revision is distinguished by a version number.  You
@@ -31,17 +31,18 @@ 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.
+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.
 
 OpenLDAP is a trademark of the OpenLDAP Foundation.
 
-Copyright 1999-2000 The OpenLDAP Foundation, Redwood City,
+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.