From 2676c2fde1a43d8149dc93ff957112101ec019d5 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 16 Apr 2004 02:09:39 +0000 Subject: [PATCH] for 2.2 --- doc/guide/preamble.sdf | 6 +++--- doc/guide/release/copyright.sdf | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf index 5edc2e1521..3974a5f149 100644 --- a/doc/guide/preamble.sdf +++ b/doc/guide/preamble.sdf @@ -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 @@

________________
-© Copyright 2003, OpenLDAP Foundation, info@OpenLDAP.org +© Copyright 2004, OpenLDAP Foundation, info@OpenLDAP.org !endblock !endmacro diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf index a78ea57eab..8ecca93d93 100644 --- a/doc/guide/release/copyright.sdf +++ b/doc/guide/release/copyright.sdf @@ -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 -- 2.39.5