Copyright notice cleanup

diff --git a/COPYRIGHT b/COPYRIGHT
index 96b841777d7b899b0a2372c3abbc7e983f6a4111..63e03eadb86141a9ad537a24766e4c7c986a9568 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -39,8 +39,8 @@ Public License.
 Portions Copyright 1999-2007 Howard Y.H. Chu.
 Portions Copyright 1999-2007 Symas Corporation.
 Portions Copyright 1998-2003 Hallvard B. Furuseth.
-Portions Copyright 2008 Gavin Henry
-Portions Copyright 2008 Suretec Systems
+Portions Copyright 2008 Gavin Henry.
+Portions Copyright 2008 Suretec Systems.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index 7121017fa3ed33999bf0726f9463fec4264336fc..63e03eadb86141a9ad537a24766e4c7c986a9568 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -25,7 +25,7 @@ Additional information about OpenLDAP can be obtained at
 
 ---
 
-Portions Copyright 1998-2006 Kurt D. Zeilenga.
+Portions Copyright 1998-2008 Kurt D. Zeilenga.
 Portions Copyright 1998-2006 Net Boolean Incorporated.
 Portions Copyright 2001-2006 IBM Corporation.
 All rights reserved.
@@ -39,9 +39,8 @@ Public License.
 Portions Copyright 1999-2007 Howard Y.H. Chu.
 Portions Copyright 1999-2007 Symas Corporation.
 Portions Copyright 1998-2003 Hallvard B. Furuseth.
-Portions Copyright 2007-2008 Gavin Henry.
-Portions Copyright 2007-2008 Suretec Systems Limited.
-Portions Copyright 2008 Andrew Findlay.
+Portions Copyright 2008 Gavin Henry.
+Portions Copyright 2008 Suretec Systems.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index 11b98076126039a8b0e2fc1189b88db259adb5e4..97a0d443d75409348f31b38d4fb2ff9f3e8738aa 100644 (file)
--- a/doc/guide/admin/preface.sdf
+++ b/doc/guide/admin/preface.sdf
@@ -19,6 +19,9 @@ Software Copyright Notices}} and the {{SECT:OpenLDAP Public License}}.
 Complete copies of the notices and associated license can be found
 in Appendix K and L, respectively.
 
+Portions of this document are copyright by others as reflected in
+the {{SECT:Additional Copyright Notices}} section and/or individual
+source files.
 
 P2[notoc] Scope of this Document
 

diff --git a/doc/guide/admin/security.sdf b/doc/guide/admin/security.sdf
index bb7a39aa58e22ef5bf10237b86eeba42f8fc564f..10f11d7b45a9035936d7c8ffa32dbc080b6e9cdb 100644 (file)
--- a/doc/guide/admin/security.sdf
+++ b/doc/guide/admin/security.sdf
@@ -1,5 +1,6 @@
 # $OpenLDAP$
 # Copyright 1999-2008 The OpenLDAP Foundation, All Rights Reserved.
+# Portions Copyright 2008 Andrew Findlay.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 H1: Security Considerations

diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index bd128f674fb1fee2e22d1c3d0892eaa6da2b56a6..600087ac3895a984a009dd8da04accfedc4d73d4 100644 (file)
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -40,7 +40,7 @@ Additional information about OpenLDAP software can be obtained at
 <{{URL:http://www.OpenLDAP.org/}}>.
 
 
-H2: Additional Copyright Notice
+H2: Additional Copyright Notices
 
 !block nofill
 Portions [[copyright]] 1998-2008 Kurt D. Zeilenga.
@@ -58,7 +58,7 @@ Public License}}.
 Portions [[copyright]] 1999-2007 Howard Y.H. Chu.
 Portions [[copyright]] 1999-2007 Symas Corporation.
 Portions [[copyright]] 1998-2003 Hallvard B. Furuseth.
-Portions [[copyright]] 2007-2008 Gavin Henry
+Portions [[copyright]] 2007-2008 Gavin Henry.
 Portions [[copyright]] 2007-2008 Suretec Systems Limited.
 {{All rights reserved.}}
 !endblock