X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=COPYRIGHT;h=adf32fd2a44b63202e38ebf977f2eab5a4ea083b;hb=a7c5307279c6cc5115b6215d0c64f6cba67b7dc4;hp=4a54b3f8ddb79582d8c059675aaa4b536bfc07e9;hpb=441d983b532245c054fb51d52a29a2adac596499;p=openldap

diff --git a/COPYRIGHT b/COPYRIGHT
index 4a54b3f8dd..adf32fd2a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,23 +1,26 @@
-Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2002 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 subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
-distribution.  Information concerning is available at
-    http://www.umich.edu/~dirsvcs/ldap/ldap.html.
+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.