Sync with HEAD

diff --git a/COPYRIGHT b/COPYRIGHT
index 4677202145f08ca3129c35ce8abc6952f5afb139..a7a81febadb06a579d3ad1e520b32abe3bae6207 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -12,11 +12,11 @@ top-level directory of the distribution or, alternatively, at
 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.
+other parties and/or subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
 distribution.  Information concerning this software is available
-at <http://www.umich.edu/~dirsvcs/ldap/>.
+at <http://www.umich.edu/~dirsvcs/ldap/ldap.html>.
 
 This work also contains materials derived from public sources.