Sync with devel

diff --git a/COPYRIGHT b/COPYRIGHT
index 149fcacba39a84a63022a30ff1d1e948adf629c9..e11bb1fbb7c090643e7218f74fedf5fd0c679cb6 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,15 +1,17 @@
-Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2000 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
+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.
 
+Individual files and/or contributed packages may be copyright by
+other parties and use 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 or from
-ldap-support@umich.edu. 
+distribution.  Information concerning this software is available
+at <http://www.umich.edu/~dirsvcs/ldap/>.
 
 This work also contains materials derived from public sources.