Commit cd97b44d authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Sync with HEAD

parent b8788429
...@@ -39,8 +39,8 @@ Public License. ...@@ -39,8 +39,8 @@ Public License.
Portions Copyright 1999-2007 Howard Y.H. Chu. Portions Copyright 1999-2007 Howard Y.H. Chu.
Portions Copyright 1999-2007 Symas Corporation. Portions Copyright 1999-2007 Symas Corporation.
Portions Copyright 1998-2003 Hallvard B. Furuseth. Portions Copyright 1998-2003 Hallvard B. Furuseth.
Portions Copyright 2008 Gavin Henry Portions Copyright 2008 Gavin Henry.
Portions Copyright 2008 Suretec Systems Portions Copyright 2008 Suretec Systems.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
......
...@@ -25,7 +25,7 @@ Additional information about OpenLDAP can be obtained at ...@@ -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 1998-2006 Net Boolean Incorporated.
Portions Copyright 2001-2006 IBM Corporation. Portions Copyright 2001-2006 IBM Corporation.
All rights reserved. All rights reserved.
...@@ -39,8 +39,8 @@ Public License. ...@@ -39,8 +39,8 @@ Public License.
Portions Copyright 1999-2007 Howard Y.H. Chu. Portions Copyright 1999-2007 Howard Y.H. Chu.
Portions Copyright 1999-2007 Symas Corporation. Portions Copyright 1999-2007 Symas Corporation.
Portions Copyright 1998-2003 Hallvard B. Furuseth. Portions Copyright 1998-2003 Hallvard B. Furuseth.
Portions Copyright 2007-2008 Gavin Henry Portions Copyright 2008 Gavin Henry.
Portions Copyright 2007-2008 Suretec Systems Limited. Portions Copyright 2008 Suretec Systems.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
......
...@@ -9,7 +9,7 @@ P1: Preface ...@@ -9,7 +9,7 @@ P1: Preface
# document's copyright # document's copyright
P2[notoc] 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}}. 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}}. ...@@ -19,6 +19,9 @@ Software Copyright Notices}} and the {{SECT:OpenLDAP Public License}}.
Complete copies of the notices and associated license can be found Complete copies of the notices and associated license can be found
in Appendix K and L, respectively. 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 P2[notoc] Scope of this Document
......
...@@ -40,7 +40,7 @@ Additional information about OpenLDAP software can be obtained at ...@@ -40,7 +40,7 @@ Additional information about OpenLDAP software can be obtained at
<{{URL:http://www.OpenLDAP.org/}}>. <{{URL:http://www.OpenLDAP.org/}}>.
H2: Additional Copyright Notice H2: Additional Copyright Notices
!block nofill !block nofill
Portions [[copyright]] 1998-2008 Kurt D. Zeilenga. Portions [[copyright]] 1998-2008 Kurt D. Zeilenga.
...@@ -58,7 +58,7 @@ Public License}}. ...@@ -58,7 +58,7 @@ Public License}}.
Portions [[copyright]] 1999-2007 Howard Y.H. Chu. Portions [[copyright]] 1999-2007 Howard Y.H. Chu.
Portions [[copyright]] 1999-2007 Symas Corporation. Portions [[copyright]] 1999-2007 Symas Corporation.
Portions [[copyright]] 1998-2003 Hallvard B. Furuseth. 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. Portions [[copyright]] 2007-2008 Suretec Systems Limited.
{{All rights reserved.}} {{All rights reserved.}}
!endblock !endblock
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment