Fix IRIX sc_mask conflict

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 73e3b057b8d9d670b1cd043d31a13c6139bfa063..adf32fd2a44b63202e38ebf977f2eab5a4ea083b 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright 1998-2001 The OpenLDAP Foundation
+Copyright 1998-2002 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -7,20 +7,20 @@ 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.
 
-Individual files and/or contributed packages may contain material
-copyright by other parties and use subject to additional restrictions.
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Individual files and/or contributed packages may be copyright by
+other parties and subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
-software <http://www.umich.edu/~dirsvcs/ldap/>.
+distribution.  Information concerning this software is available
+at: http://www.umich.edu/~dirsvcs/ldap/
 
 This work also contains materials derived from public sources.
 
-Additional Information about OpenLDAP can be obtained at:
+Additional information about OpenLDAP can be obtained at:
     http://www.openldap.org/
 
-or by sending e-mail to:
-    info@OpenLDAP.org
-
 ---
 
 Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
@@ -32,6 +32,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$