Add "with or without modification" to COPYRIGHT

Remove clause 5 (due credit) from LICENSE

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index 53856a21bcb7a2bfdb2a391a2d549cac03da6d05..7e7acc17e7ce6bdef22a76ac565e1855606cd364 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -1,10 +1,11 @@
 Copyright 1998-2000 The OpenLDAP Foundation
 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 http://www.OpenLDAP.org/license.html or
-in file LICENSE in the top-level directory of the distribution.
+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.
 
 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 ca4afcf2fb14bc24810a99edb1f9d7c24bd2aa0a..f987ebdf891e72658d09af36f36aa44195cc10ac 100644 (file)
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,5 +1,5 @@
 The OpenLDAP Public License
-  Version 2.5, 11 May 2001
+  Version 2.6, 14 June 2001
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
@@ -20,9 +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 authors of the Software.
-
-6. The OpenLDAP Foundation may revise this license from time to
+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.