Clean up syntaxes and matching rules

[openldap] / doc / guide / release / copyright.sdf

diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 14c45be1043dd31a61b8227637819b4ca1306a04..cab3254e4e57eef456995374157423b6b2d8f6d2 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-2003, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
 !if OPT_PP_HTML
@@ -8,35 +8,35 @@
 !define copyright 'Copyright'
 !endif
 
-H1: OpenLDAP Software Copyrights
+H1: OpenLDAP Software Copyright Notices
 
-H2: OpenLDAP Copyright
+H2: OpenLDAP Copyright Notice
 
-[[copyright]] 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+[[copyright]] 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
 All rights reserved.
 
 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/}} or in file
-LICENSE in the top-level directory of the distribution.
+{{only as authorized}} by the {{SECT: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.
+
+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 is available at:
-.{{URL:http://www.umich.edu/~dirsvcs/ldap/ldap.html}}.
+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
+H2: University of Michigan Copyright Notice
 
 Portions [[copyright]] 1992-1996 Regents of the University of Michigan.
 All rights reserved.