Really fix the fix to the past commit

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 708f6d80ad827a02ed7ff1344abe00c5d6b40ec7..eeee7eb9a5ef35f87304be5f62b712b79a7b3fc0 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,13 +1,16 @@
-Copyright 1998-2000 The OpenLDAP Foundation
+Copyright 1998-2001 The OpenLDAP Foundation
 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 http://www.OpenLDAP.org/license.html or
-in file LICENSE in the top-level directory of the distribution.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+Public License.  A copy of this license is available at
+http://www.OpenLDAP.org/license.html or in file 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 use subject to additional restrictions.
+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
@@ -32,6 +35,3 @@ to the University of Michigan at Ann Arbor. The name of the University
 may not be used to endorse or promote products derived from this
 software without specific prior written permission. This software
 is provided ``as is'' without express or implied warranty.
-
----
-$OpenLDAP$