From cd97b44d66be2c3835db1c92bbe8c5bb38865337 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 27 May 2008 23:56:55 +0000 Subject: [PATCH] Sync with HEAD --- COPYRIGHT | 4 ++-- doc/guide/COPYRIGHT | 6 +++--- doc/guide/admin/preface.sdf | 5 ++++- doc/guide/release/copyright.sdf | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 96b841777d..63e03eadb8 100644 --- 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 08dd4a4359..63e03eadb8 100644 --- 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,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 2007-2008 Gavin Henry -Portions Copyright 2007-2008 Suretec Systems Limited. +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 192b683bf2..34cf480ffb 100644 --- a/doc/guide/admin/preface.sdf +++ b/doc/guide/admin/preface.sdf @@ -9,7 +9,7 @@ P1: Preface # document's copyright P2[notoc] Copyright -Copyright 1998-2007, The {{ORG[expand]OLF}}, {{All Rights Reserved}}. +Copyright 1998-2008, The {{ORG[expand]OLF}}, {{All Rights Reserved}}. Copyright 1992-1996, Regents of the {{ORG[expand]UM}}, {{All Rights Reserved}}. @@ -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 OpenLDAP Software and this document may be copyright +by other parties and/or subject to additional restrictions. Individual +source files should be consulted for additional copyright notices. P2[notoc] Scope of this Document diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf index bd128f674f..600087ac38 100644 --- 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 -- 2.39.2