From fbb7925ea2f41775cded5425857a5a068a90b5a2 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 15 Jun 2001 02:34:03 +0000 Subject: [PATCH] Add "with or without modification" to COPYRIGHT Remove clause 5 (due credit) from LICENSE --- doc/guide/COPYRIGHT | 9 +++++---- doc/guide/LICENSE | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT index 53856a21bc..7e7acc17e7 100644 --- 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 ca4afcf2fb..f987ebdf89 100644 --- 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. -- 2.39.5