Updated COPYRIGHT/LICENSE to be even less restrictive.

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index 6885cd07ea26394cb201b97e3ead556a54ac0153..3dbe303979014d7221f95bd0ff6b9c7fcd200782 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -5,7 +5,11 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP
 Public License.  A copy of this license is available at
 http://www.OpenLDAP.org/license.html or in file LICENSE in the
-top-level directory of the distribution.
+top-level directory of the distribution.  The name of the OpenLDAP
+Foundation may not be used to endorse or promote products derived
+from this work.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Individual files and/or contributed packages may be copyright by
 other parties and use subject to additional restrictions.

diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index f987ebdf891e72658d09af36f36aa44195cc10ac..094ff2517e58bc648a6b4cd700704275639904b0 100644 (file)
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,36 +1,31 @@
 The OpenLDAP Public License
-  Version 2.6, 14 June 2001
+  Version DRAFT, 5 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 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. 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, ITS CONTRIBUTORS, OR THE AUTHOR(S) OR
-OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+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
@@ -39,8 +34,8 @@ 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 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.

diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 50e489f9efcbfe062a38fe8e365439a8c2b4c592..7d27ce2d1fb590a6f0814f1526b5875d8dfc6537 100644 (file)
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -16,9 +16,13 @@ H2: OpenLDAP Copyright Notice
 All rights reserved.
 
 Redistribution and use in source and binary forms are permitted
-{{only as authorized}} by the OpenLDAP Public License.  A copy of this
-license is available at {{URL:http://www.OpenLDAP.org/license.html}}
-or in file {{F:LICENSE}} in the top-level directory of the distribution.
+{{only as authorized}} by the OpenLDAP Public License.  A copy of
+this license is available at {{URL:http://www.OpenLDAP.org/license.html}}
+or in file {{F:LICENSE}} in the top-level directory of the
+distribution.  The name of the OpenLDAP Foundation may not be used
+to endorse or promote products derived from this work.
+
+OpenLDAP is a trademark of the OpenLDAP Foundation.
 
 Individual files and/or contributed packages may be copyright by
 other parties and their use subject to additional restrictions.