X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=COPYRIGHT;h=adf32fd2a44b63202e38ebf977f2eab5a4ea083b;hb=c5b6a86502dc0c16027cd87e3d9544e9078083db;hp=2a2265a38cc853a97d14da46497949d003bb9b3c;hpb=806557a5ad59804ef3a44d5abfbe91d706b0791f;p=openldap

diff --git a/COPYRIGHT b/COPYRIGHT
index 2a2265a38c..adf32fd2a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,24 +1,34 @@
-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.
 
-University of Michagan LDAP v3.3 Copyright Notice
-	Copyright (c) 1992-1996 Regents of the University of Michigan.
-	All rights reserved.
+Additional information about OpenLDAP can be obtained at:
+    http://www.openldap.org/
+
+---
+
+Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+All rights reserved.
 
-	Redistribution and use in source and binary forms are permitted
-	provided that this notice is preserved and that due credit is given
-	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.
+Redistribution and use in source and binary forms are permitted
+provided that this notice is preserved and that due credit is given
+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.