Misc. updates

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index 178cc7611bbe076b93f5e0b5304e6d9ff443333a..ea66006b56943eccd22f83dbf5be39f00dada3d7 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -3,9 +3,11 @@ All rights reserved.
 
 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.
+Public License.
+
+A copy of this license is available in file LICENSE in the
+top-level directory of the distribution or, alternatively, at
+<http://www.OpenLDAP.org/license.html>
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
@@ -23,6 +25,31 @@ Additional information about OpenLDAP software can be obtained at
 
 ---
 
+Portions Copyright 1998-2003 Kurt D. Zeilenga.
+Portions Copyright 1998-2003 Net Boolean Incorporated.
+Portions Copyright 2001-2003 IBM Corporation.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+Public License.
+
+---
+
+Portions Copyright 1999-2003 Howard Y.H. Chu.
+Portions Copyright 1999-2003 Symas Corporation.
+Portions Copyright 1998-2003 Hallvard B. Furuseth.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that this notice is preserved.
+The names of the copyright holders may not be used to endorse or
+promote products derived from this software without their specific
+prior written permission.  This software is provided ``as is''
+without express or implied warranty.
+
+---
+
 Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
 All rights reserved.
 

diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
index 05ad7571e448b9d83ead5d4691274d9484574714..df50fee0ac508f87f2712cab1ecbb6e464823d13 100644 (file)
--- a/doc/guide/LICENSE
+++ b/doc/guide/LICENSE
@@ -1,5 +1,5 @@
 The OpenLDAP Public License
-  Version 2.8, 17 August 2003
+  Version 2.8.1, 25 November 2003
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
@@ -43,5 +43,5 @@ holders.
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
+California, USA.  All rights reserved.  Permission to copy and
 distribute verbatim copies of this document is granted.

diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 4464a652e6cef594b7c770aa5d8fe1a0c178e0a7..a78ea57eab70230e178e054844532863d4489563 100644 (file)
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -15,12 +15,13 @@ H2: OpenLDAP Copyright Notice
 [[copyright]] 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
 All rights reserved.
 
-Redistribution and use in source and binary forms are permitted
-{{only as authorized}} by the {{SECT:OpenLDAP Public License}}.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted {{only as authorized}} by the {{SECT:OpenLDAP
+Public License}}.
 
 A copy of this license is available in file {{F:LICENSE}} in the
-top-level directory of the distribution or, alternatively, at at
-{{URL:http://www.OpenLDAP.org/license.html}}
+top-level directory of the distribution or, alternatively, at
+<{{URL:http://www.OpenLDAP.org/license.html}}>.
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
@@ -37,6 +38,31 @@ Additional information about OpenLDAP software can be obtained at
 <{{URL:http://www.OpenLDAP.org/}}>.
 
 
+H2: Additional Copyright Notice
+
+Portions [[copyright]] 1998-2003 Kurt D. Zeilenga.
+Portions [[copyright]] 1998-2003 Net Boolean Incorporated.
+Portions [[copyright]] 2001-2003 IBM Corporation.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+Public License.
+
+
+Portions [[copyright]] 1999-2003 Howard Y.H. Chu.
+Portions [[copyright]] 1999-2003 Symas Corporation.
+Portions [[copyright]] 1998-2003 Hallvard B. Furuseth.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that this notice is preserved.
+The names of the copyright holders may not be used to endorse or
+promote products derived from this software without their specific
+prior written permission.  This software is provided ``as is''
+without express or implied warranty.
+
+
 H2: University of Michigan Copyright Notice
 
 Portions [[copyright]] 1992-1996 Regents of the University of Michigan.
@@ -48,3 +74,4 @@ to the University of Michigan at Ann Arbor. The name of the University
 may not be used to endorse or promote products derived from this
 software without specific prior written permission. This software
 is provided ``as is'' without express or implied warranty.
+