Sync with HEAD

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index d9edce66c242bdafd4c19686e1186d4587d1c140..350e05dead1312c1498f72e156b796c63d9ec0ba 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -3,9 +3,11 @@ All rights reserved.
 
 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 the file LICENSE in the
-top-level directory of the distribution.
+Public License.
+
+A copy of this license is available in the file LICENSE in the
+top-level directory of the distribution or, alternatively, at
+<http://www.OpenLDAP.org/license.html>.
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
@@ -14,19 +16,29 @@ other parties and 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/>.
 
 This work also contains materials derived from public sources.
 
-Additional information about OpenLDAP can be obtained at:
-    http://www.openldap.org/
+Additional information about OpenLDAP can be obtained at
+<http://www.openldap.org/>.
 
 ---
 
 Portions Copyright 1998-2003 Kurt D. Zeilenga.
 Portions Copyright 1998-2003 Net Boolean Incorporated.
+Portions Copyright 2001-2003 IBM Corporation.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+Public License.
+
+---
+
 Portions Copyright 1999-2003 Howard Y.H. Chu.
 Portions Copyright 1999-2003 Symas Corporation.
+Portions Copyright 1998-2003 Hallvard B. Furuseth.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without