Commit 2676c2fd authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

for 2.2

parent 765a6bd5
......@@ -6,14 +6,14 @@
# Preamble for all OpenLDAP SDF documents
#
!default VERSION 2.1
!default VERSION 2.2
#
# Paths are relative to the main subdirectories
#
!define DOC_AUTHOR "The OpenLDAP Project <{{URL:http://www.openldap.org/}}>"
!define DOC_NAME "OpenLDAP 2.1"
!define DOC_NAME "OpenLDAP 2.2"
!define DOC_TYPE "Guide"
!define DOC_LOGO "../images/LDAPlogo.gif"
......@@ -54,7 +54,7 @@
<P>
<FONT COLOR="#808080" FACE="Arial,Verdana,Helvetica" SIZE="1"><B>
________________<BR>
<SMALL>&copy; Copyright 2003, <A HREF="http://www.OpenLDAP.org/foundation/">OpenLDAP Foundation</A>, <A HREF="mailto:info@OpenLDAP.org">info@OpenLDAP.org</A></SMALL></B></FONT>
<SMALL>&copy; Copyright 2004, <A HREF="http://www.OpenLDAP.org/foundation/">OpenLDAP Foundation</A>, <A HREF="mailto:info@OpenLDAP.org">info@OpenLDAP.org</A></SMALL></B></FONT>
!endblock
!endmacro
......
......@@ -12,8 +12,10 @@ H1: OpenLDAP Software Copyright Notices
H2: OpenLDAP Copyright Notice
[[copyright]] 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
All rights reserved.
!block nofill
[[copyright]] 1998-2003 The OpenLDAP Foundation.
{{All rights reserved.}}
!endblock
Redistribution and use in source and binary forms, with or without
modification, are permitted {{only as authorized}} by the {{SECT:OpenLDAP
......@@ -40,20 +42,24 @@ Additional information about OpenLDAP software can be obtained at
H2: Additional Copyright Notice
!block nofill
Portions [[copyright]] 1998-2003 Kurt D. Zeilenga.
Portions [[copyright]] 1998-2003 Net Boolean Incorporated.
Portions [[copyright]] 2001-2003 IBM Corporation.
All rights reserved.
{{All rights reserved.}}
!endblock
Redistribution and use in source and binary forms, with or without
modification, are permitted only as authorized by the OpenLDAP
Public License.
modification, are permitted only as authorized by the {{SECT:OpenLDAP
Public License}}.
!block nofill
Portions [[copyright]] 1999-2003 Howard Y.H. Chu.
Portions [[copyright]] 1999-2003 Symas Corporation.
Portions [[copyright]] 1998-2003 Hallvard B. Furuseth.
All rights reserved.
{{All rights reserved.}}
!endblock
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that this notice is preserved.
......@@ -65,8 +71,10 @@ without express or implied warranty.
H2: University of Michigan Copyright Notice
!block nofill
Portions [[copyright]] 1992-1996 Regents of the University of Michigan.
All rights reserved.
{{All rights reserved.}}
!endblock
Redistribution and use in source and binary forms are permitted
provided that this notice is preserved and that due credit is given
......
Markdown is supported
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