Leave dn2ufn.

[openldap] / doc / guide / LICENSE

diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index f4fc4ae57dd8fd14fb1da36a0077541ccf7735e1..ca4afcf2fb14bc24810a99edb1f9d7c24bd2aa0a 100644 (file)
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,5 +1,5 @@
 The OpenLDAP Public License
 The OpenLDAP Public License

-  Version 2.3, 28 July 2000
+  Version 2.5, 11 May 2001

 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided


@@ -15,18 +15,14 @@ with the distribution.
 
 3. Redistributions must contain a verbatim copy of this document.
 
 
 3. Redistributions must contain a verbatim copy of this document.
 

-4. The name "OpenLDAP" must not be used to endorse or promote
-products derived from this Software without prior written permission
-of the OpenLDAP Foundation.
+4. The names and trademarks 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.

 
 

-5. 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.
+5. Due credit should be given to the authors of the Software.

 
 

-6. Due credit should be given to the OpenLDAP Project
-(http://www.openldap.org/).
-
-7. The OpenLDAP Foundation may revise this license from time to
+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.
 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.


@@ -35,18 +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
 ``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.
 
 
 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.
 California, USA.  All Rights Reserved.  Permission to copy and
 distributed verbatim copies of this document is granted.

-