Misc. updates to release templates

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index eeee7eb9a5ef35f87304be5f62b712b79a7b3fc0..178cc7611bbe076b93f5e0b5304e6d9ff443333a 100644 (file)
--- 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 <http://www.umich.edu/~dirsvcs/ldap/>.
 
 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
+<http://www.openldap.org/>.
 
 ---
 

diff --git a/doc/guide/release/copyright-plain.sdf b/doc/guide/release/copyright-plain.sdf
index 68ebe9dd9e964184773776861c027b711be74008..43900457474c36d85f614fb84f15dbfa667f4cba 100644 (file)
--- 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 7d27ce2d1fb590a6f0814f1526b5875d8dfc6537..9e6ec6c124ad4a243442c3a76baa09e644100ad2 100644 (file)
--- 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 3a454cbc5aceef0ea0251b83f4b2eb155fdeb204..234d4141d06ca9496473d0442f4a9ae839bb9bbe 100644 (file)
--- 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 c920e4d74e32512b414ea38b144f97b7488273b9..8f0426ddde82e87a1941c340313522d368cee94c 100644 (file)
--- 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 f870c6137d589b4d506ffffe90e3c43e26683c5d..b930b09c34f3d00a5b92b439bb752d74b131631f 100644 (file)
--- 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