From 0937019e21615240c918b2a83ee39de086d7346f Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 19 Sep 2001 01:26:24 +0000 Subject: [PATCH] Misc. updates to release templates --- doc/guide/COPYRIGHT | 9 +++------ doc/guide/release/copyright-plain.sdf | 2 +- doc/guide/release/copyright.sdf | 18 +++++++----------- doc/guide/release/install.sdf | 2 +- doc/guide/release/license-plain.sdf | 2 +- doc/guide/release/license.sdf | 2 +- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT index eeee7eb9a5..178cc7611b 100644 --- a/doc/guide/COPYRIGHT +++ b/doc/guide/COPYRIGHT @@ -14,15 +14,12 @@ other parties and subject to additional restrictions. This work is derived from the University of Michigan LDAP v3.3 distribution. Information concerning this software is available -at: http://www.umich.edu/~dirsvcs/ldap/ +at . This work also contains materials derived from public sources. -Additional Information about OpenLDAP can be obtained at: - http://www.openldap.org/ - -or by sending e-mail to: - info@OpenLDAP.org +Additional information about OpenLDAP software can be obtained at +. --- diff --git a/doc/guide/release/copyright-plain.sdf b/doc/guide/release/copyright-plain.sdf index 68ebe9dd9e..4390045747 100644 --- a/doc/guide/release/copyright-plain.sdf +++ b/doc/guide/release/copyright-plain.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2001, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf index 7d27ce2d1f..9e6ec6c124 100644 --- a/doc/guide/release/copyright.sdf +++ b/doc/guide/release/copyright.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2001, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. !if OPT_PP_HTML @@ -19,25 +19,21 @@ Redistribution and use in source and binary forms are permitted {{only as authorized}} by the OpenLDAP Public License. A copy of this license is available at {{URL:http://www.OpenLDAP.org/license.html}} or in file {{F:LICENSE}} in the top-level directory of the -distribution. The name of the OpenLDAP Foundation may not be used -to endorse or promote products derived from this work. +distribution. -OpenLDAP is a trademark of the OpenLDAP Foundation. +OpenLDAP is a registered trademark of the OpenLDAP Foundation. Individual files and/or contributed packages may be copyright by other parties and their use subject to additional restrictions. This work is derived from the University of Michigan LDAP v3.3 -distribution. Information concerning this software is available at: -.{{URL:http://www.umich.edu/~dirsvcs/ldap/}}. +distribution. Information concerning this software is available +at <{{URL:http://www.umich.edu/~dirsvcs/ldap/}}>. This work also contains materials derived from public sources. -Additional Information about OpenLDAP can be obtained at: -.{{URL:http://www.OpenLDAP.org/}} - -or by sending e-mail to: -.{{EMAIL:info@OpenLDAP.org}} +Additional information about OpenLDAP software can be obtained at +<{{URL:http://www.OpenLDAP.org/}}>. H2: University of Michigan Copyright Notice diff --git a/doc/guide/release/install.sdf b/doc/guide/release/install.sdf index 3a454cbc5a..234d4141d0 100644 --- a/doc/guide/release/install.sdf +++ b/doc/guide/release/install.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2001, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. P1: Making and Installing the OpenLDAP Distribution diff --git a/doc/guide/release/license-plain.sdf b/doc/guide/release/license-plain.sdf index c920e4d74e..8f0426ddde 100644 --- a/doc/guide/release/license-plain.sdf +++ b/doc/guide/release/license-plain.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2001, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf index f870c6137d..b930b09c34 100644 --- a/doc/guide/release/license.sdf +++ b/doc/guide/release/license.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 2000, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 2000-2001, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: The OpenLDAP Public License -- 2.39.5