From: Kurt Zeilenga <kurt@OpenLDAP.org>
Date: Tue, 29 Mar 2011 01:08:19 +0000 (-0700)
Subject: Update guide Copyright/License handling
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=cd1f718f014e09a315cb2f83d0581baccdbab64c

Update guide Copyright/License handling
Avoids redundant files.
And update various notices
---

diff --git a/contrib/ldapc++/COPYRIGHT b/contrib/ldapc++/COPYRIGHT
index a6af5d8e7f..48e91eb193 100644
--- a/contrib/ldapc++/COPYRIGHT
+++ b/contrib/ldapc++/COPYRIGHT
@@ -1,37 +1,6 @@
-Copyright 1998-2011 The OpenLDAP Foundation
-All rights reserved.
+Copyright 1998-2011 The OpenLDAP Foundation.  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 file LICENSE in the
-top-level directory of the distribution.
+COPYING RESTRICTIONS APPLY.
 
-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 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:
-    http://www.openldap.org/
-
-or by sending e-mail to:
-    info@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.
+See COPYRIGHT and LICENSE files in the top-level directory of this
+distribution (i.e., ../../COPYRIGHT and ../../LICENSE, respectively).
diff --git a/contrib/ldapc++/LICENSE b/contrib/ldapc++/LICENSE
deleted file mode 100644
index 641253ade2..0000000000
--- a/contrib/ldapc++/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-The OpenLDAP Public License
-  Version 2.7, 7 September 2001
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright statements
-   and notices,
-
-2. Redistributions in binary form must reproduce applicable copyright
-   statements and notices, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-The OpenLDAP Foundation may revise this license from time to time.
-Each revision is distinguished by a version number.  You may use
-this Software under terms of this license revision or under the
-terms of any subsequent revision of the license.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
-SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
-OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-The names of the authors and copyright holders must not be used in
-advertising or otherwise to promote the sale, use or other dealing
-in this Software without specific, written prior permission.  Title
-to copyright in this Software shall at all times remain with
-copyright holders.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.
diff --git a/contrib/ldapc++/Makefile.am b/contrib/ldapc++/Makefile.am
index 722e1fbc8e..cf4694b52d 100644
--- a/contrib/ldapc++/Makefile.am
+++ b/contrib/ldapc++/Makefile.am
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 
 ##
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 
diff --git a/contrib/ldapc++/Makefile.in b/contrib/ldapc++/Makefile.in
index 2ca7d510c7..3760cd9f63 100644
--- a/contrib/ldapc++/Makefile.in
+++ b/contrib/ldapc++/Makefile.in
@@ -16,7 +16,7 @@
 
 # $OpenLDAP$
 
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/contrib/ldapc++/configure.in b/contrib/ldapc++/configure.in
index eac8aeeaf1..1725c1ccd6 100644
--- a/contrib/ldapc++/configure.in
+++ b/contrib/ldapc++/configure.in
@@ -1,6 +1,6 @@
 dnl $OpenLDAP$
 
-dnl Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+dnl Copyright 2000-2011 The OpenLDAP Foundation. All Rights Reserved.
 dnl COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 dnl Process this file with autoconf to produce a configure script.
diff --git a/contrib/ldapc++/examples/Makefile.am b/contrib/ldapc++/examples/Makefile.am
index 5b6d1a3889..5923858c1f 100644
--- a/contrib/ldapc++/examples/Makefile.am
+++ b/contrib/ldapc++/examples/Makefile.am
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 
 ##
-# Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/contrib/ldapc++/examples/Makefile.in b/contrib/ldapc++/examples/Makefile.in
index fe7e9793c0..6044d900bf 100644
--- a/contrib/ldapc++/examples/Makefile.in
+++ b/contrib/ldapc++/examples/Makefile.in
@@ -198,7 +198,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
-# Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 AM_CPPFLAGS = -I$(top_srcdir)/src
 main_SOURCES = main.cpp
diff --git a/contrib/ldapc++/examples/main.cpp b/contrib/ldapc++/examples/main.cpp
index 7290a6ee93..6ab917df32 100644
--- a/contrib/ldapc++/examples/main.cpp
+++ b/contrib/ldapc++/examples/main.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/examples/readSchema.cpp b/contrib/ldapc++/examples/readSchema.cpp
index b6645c7c46..15b68bd55b 100644
--- a/contrib/ldapc++/examples/readSchema.cpp
+++ b/contrib/ldapc++/examples/readSchema.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/examples/startTls.cpp b/contrib/ldapc++/examples/startTls.cpp
index 3d9a471b12..a1a69e647c 100644
--- a/contrib/ldapc++/examples/startTls.cpp
+++ b/contrib/ldapc++/examples/startTls.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/examples/urlTest.cpp b/contrib/ldapc++/examples/urlTest.cpp
index e5f3af18e3..09dae429bc 100644
--- a/contrib/ldapc++/examples/urlTest.cpp
+++ b/contrib/ldapc++/examples/urlTest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAddRequest.cpp b/contrib/ldapc++/src/LDAPAddRequest.cpp
index 45606e35cf..067b48ecb7 100644
--- a/contrib/ldapc++/src/LDAPAddRequest.cpp
+++ b/contrib/ldapc++/src/LDAPAddRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAddRequest.h b/contrib/ldapc++/src/LDAPAddRequest.h
index 0231ea9cdf..4cac9416cd 100644
--- a/contrib/ldapc++/src/LDAPAddRequest.h
+++ b/contrib/ldapc++/src/LDAPAddRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAsynConnection.cpp b/contrib/ldapc++/src/LDAPAsynConnection.cpp
index 21242364e1..15bd01ead2 100644
--- a/contrib/ldapc++/src/LDAPAsynConnection.cpp
+++ b/contrib/ldapc++/src/LDAPAsynConnection.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2006, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAsynConnection.h b/contrib/ldapc++/src/LDAPAsynConnection.h
index 48e16e0e23..12cf9d803f 100644
--- a/contrib/ldapc++/src/LDAPAsynConnection.h
+++ b/contrib/ldapc++/src/LDAPAsynConnection.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttrType.cpp b/contrib/ldapc++/src/LDAPAttrType.cpp
index d7650002a4..7f102c3179 100644
--- a/contrib/ldapc++/src/LDAPAttrType.cpp
+++ b/contrib/ldapc++/src/LDAPAttrType.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttrType.h b/contrib/ldapc++/src/LDAPAttrType.h
index 8af09f9d15..32f67f16ef 100644
--- a/contrib/ldapc++/src/LDAPAttrType.h
+++ b/contrib/ldapc++/src/LDAPAttrType.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttribute.cpp b/contrib/ldapc++/src/LDAPAttribute.cpp
index 39afcf3dfa..372a369139 100644
--- a/contrib/ldapc++/src/LDAPAttribute.cpp
+++ b/contrib/ldapc++/src/LDAPAttribute.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttribute.h b/contrib/ldapc++/src/LDAPAttribute.h
index 834f2ee545..6da14451ff 100644
--- a/contrib/ldapc++/src/LDAPAttribute.h
+++ b/contrib/ldapc++/src/LDAPAttribute.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2002, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttributeList.cpp b/contrib/ldapc++/src/LDAPAttributeList.cpp
index de17579a55..daa5b150ff 100644
--- a/contrib/ldapc++/src/LDAPAttributeList.cpp
+++ b/contrib/ldapc++/src/LDAPAttributeList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPAttributeList.h b/contrib/ldapc++/src/LDAPAttributeList.h
index 1e6ba6d51e..78a7462ef9 100644
--- a/contrib/ldapc++/src/LDAPAttributeList.h
+++ b/contrib/ldapc++/src/LDAPAttributeList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2002, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPBindRequest.cpp b/contrib/ldapc++/src/LDAPBindRequest.cpp
index 549ff7d458..a2b0f9d601 100644
--- a/contrib/ldapc++/src/LDAPBindRequest.cpp
+++ b/contrib/ldapc++/src/LDAPBindRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPBindRequest.h b/contrib/ldapc++/src/LDAPBindRequest.h
index fd3af97bcb..338c1d6c15 100644
--- a/contrib/ldapc++/src/LDAPBindRequest.h
+++ b/contrib/ldapc++/src/LDAPBindRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPCompareRequest.cpp b/contrib/ldapc++/src/LDAPCompareRequest.cpp
index ca35b112ef..d115baaec8 100644
--- a/contrib/ldapc++/src/LDAPCompareRequest.cpp
+++ b/contrib/ldapc++/src/LDAPCompareRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPCompareRequest.h b/contrib/ldapc++/src/LDAPCompareRequest.h
index 361eab16af..62ba122d78 100644
--- a/contrib/ldapc++/src/LDAPCompareRequest.h
+++ b/contrib/ldapc++/src/LDAPCompareRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConnection.cpp b/contrib/ldapc++/src/LDAPConnection.cpp
index d226f46fc9..b0ba527a25 100644
--- a/contrib/ldapc++/src/LDAPConnection.cpp
+++ b/contrib/ldapc++/src/LDAPConnection.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConnection.h b/contrib/ldapc++/src/LDAPConnection.h
index c83313fd34..4d7e15daf8 100644
--- a/contrib/ldapc++/src/LDAPConnection.h
+++ b/contrib/ldapc++/src/LDAPConnection.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConstraints.cpp b/contrib/ldapc++/src/LDAPConstraints.cpp
index c265761ecb..2f9175e5a7 100644
--- a/contrib/ldapc++/src/LDAPConstraints.cpp
+++ b/contrib/ldapc++/src/LDAPConstraints.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPConstraints.h b/contrib/ldapc++/src/LDAPConstraints.h
index dfc90ec834..e1db4198b6 100644
--- a/contrib/ldapc++/src/LDAPConstraints.h
+++ b/contrib/ldapc++/src/LDAPConstraints.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControl.cpp b/contrib/ldapc++/src/LDAPControl.cpp
index b995a35f69..409e30413c 100644
--- a/contrib/ldapc++/src/LDAPControl.cpp
+++ b/contrib/ldapc++/src/LDAPControl.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControl.h b/contrib/ldapc++/src/LDAPControl.h
index 002591429f..25d242d7c8 100644
--- a/contrib/ldapc++/src/LDAPControl.h
+++ b/contrib/ldapc++/src/LDAPControl.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControlSet.cpp b/contrib/ldapc++/src/LDAPControlSet.cpp
index 806edd63b7..e1db135680 100644
--- a/contrib/ldapc++/src/LDAPControlSet.cpp
+++ b/contrib/ldapc++/src/LDAPControlSet.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPControlSet.h b/contrib/ldapc++/src/LDAPControlSet.h
index 43b7f00834..f782035e69 100644
--- a/contrib/ldapc++/src/LDAPControlSet.h
+++ b/contrib/ldapc++/src/LDAPControlSet.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.cpp b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
index 6a7ced5b7c..4ccb39944a 100644
--- a/contrib/ldapc++/src/LDAPDeleteRequest.cpp
+++ b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.h b/contrib/ldapc++/src/LDAPDeleteRequest.h
index 1ab442b092..6ab5fae654 100644
--- a/contrib/ldapc++/src/LDAPDeleteRequest.h
+++ b/contrib/ldapc++/src/LDAPDeleteRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntry.cpp b/contrib/ldapc++/src/LDAPEntry.cpp
index bdf7fa8f2e..1d97a4d065 100644
--- a/contrib/ldapc++/src/LDAPEntry.cpp
+++ b/contrib/ldapc++/src/LDAPEntry.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntry.h b/contrib/ldapc++/src/LDAPEntry.h
index 9f2aaf0257..c61022f28a 100644
--- a/contrib/ldapc++/src/LDAPEntry.h
+++ b/contrib/ldapc++/src/LDAPEntry.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntryList.cpp b/contrib/ldapc++/src/LDAPEntryList.cpp
index 987ff9016c..7d21976b8a 100644
--- a/contrib/ldapc++/src/LDAPEntryList.cpp
+++ b/contrib/ldapc++/src/LDAPEntryList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPEntryList.h b/contrib/ldapc++/src/LDAPEntryList.h
index ceddb44f20..1eae1058d2 100644
--- a/contrib/ldapc++/src/LDAPEntryList.h
+++ b/contrib/ldapc++/src/LDAPEntryList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPException.cpp b/contrib/ldapc++/src/LDAPException.cpp
index 9c7815f845..6c310900f2 100644
--- a/contrib/ldapc++/src/LDAPException.cpp
+++ b/contrib/ldapc++/src/LDAPException.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPException.h b/contrib/ldapc++/src/LDAPException.h
index ed612ad702..20044eaa15 100644
--- a/contrib/ldapc++/src/LDAPException.h
+++ b/contrib/ldapc++/src/LDAPException.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtRequest.cpp b/contrib/ldapc++/src/LDAPExtRequest.cpp
index c4896a8ac8..ddf7d88ef7 100644
--- a/contrib/ldapc++/src/LDAPExtRequest.cpp
+++ b/contrib/ldapc++/src/LDAPExtRequest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtRequest.h b/contrib/ldapc++/src/LDAPExtRequest.h
index 2448079d8c..2b18fa8a19 100644
--- a/contrib/ldapc++/src/LDAPExtRequest.h
+++ b/contrib/ldapc++/src/LDAPExtRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtResult.cpp b/contrib/ldapc++/src/LDAPExtResult.cpp
index 6a0ec71adc..3d014eb71e 100644
--- a/contrib/ldapc++/src/LDAPExtResult.cpp
+++ b/contrib/ldapc++/src/LDAPExtResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPExtResult.h b/contrib/ldapc++/src/LDAPExtResult.h
index af56d15f20..4b03c2bb84 100644
--- a/contrib/ldapc++/src/LDAPExtResult.h
+++ b/contrib/ldapc++/src/LDAPExtResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessage.cpp b/contrib/ldapc++/src/LDAPMessage.cpp
index b0608fc158..881f8a1153 100644
--- a/contrib/ldapc++/src/LDAPMessage.cpp
+++ b/contrib/ldapc++/src/LDAPMessage.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessage.h b/contrib/ldapc++/src/LDAPMessage.h
index 8ddcf40551..55dae1f638 100644
--- a/contrib/ldapc++/src/LDAPMessage.h
+++ b/contrib/ldapc++/src/LDAPMessage.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessageQueue.cpp b/contrib/ldapc++/src/LDAPMessageQueue.cpp
index ac52eaf15e..efc34a44b3 100644
--- a/contrib/ldapc++/src/LDAPMessageQueue.cpp
+++ b/contrib/ldapc++/src/LDAPMessageQueue.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPMessageQueue.h b/contrib/ldapc++/src/LDAPMessageQueue.h
index d05e84dc43..9936c452b1 100644
--- a/contrib/ldapc++/src/LDAPMessageQueue.h
+++ b/contrib/ldapc++/src/LDAPMessageQueue.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModDNRequest.cpp b/contrib/ldapc++/src/LDAPModDNRequest.cpp
index 5312c860bb..7c0ee78b29 100644
--- a/contrib/ldapc++/src/LDAPModDNRequest.cpp
+++ b/contrib/ldapc++/src/LDAPModDNRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModDNRequest.h b/contrib/ldapc++/src/LDAPModDNRequest.h
index 87254c5eed..5ad8f03f09 100644
--- a/contrib/ldapc++/src/LDAPModDNRequest.h
+++ b/contrib/ldapc++/src/LDAPModDNRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModList.cpp b/contrib/ldapc++/src/LDAPModList.cpp
index 9d822c99e3..ca729d6139 100644
--- a/contrib/ldapc++/src/LDAPModList.cpp
+++ b/contrib/ldapc++/src/LDAPModList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModList.h b/contrib/ldapc++/src/LDAPModList.h
index 2da4d99911..01c996386c 100644
--- a/contrib/ldapc++/src/LDAPModList.h
+++ b/contrib/ldapc++/src/LDAPModList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModification.cpp b/contrib/ldapc++/src/LDAPModification.cpp
index 86b13672f0..7445e12b2e 100644
--- a/contrib/ldapc++/src/LDAPModification.cpp
+++ b/contrib/ldapc++/src/LDAPModification.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModification.h b/contrib/ldapc++/src/LDAPModification.h
index 662a08ddb2..94cacb2a11 100644
--- a/contrib/ldapc++/src/LDAPModification.h
+++ b/contrib/ldapc++/src/LDAPModification.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModifyRequest.cpp b/contrib/ldapc++/src/LDAPModifyRequest.cpp
index 2c6e712180..538bd5d62c 100644
--- a/contrib/ldapc++/src/LDAPModifyRequest.cpp
+++ b/contrib/ldapc++/src/LDAPModifyRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPModifyRequest.h b/contrib/ldapc++/src/LDAPModifyRequest.h
index 6060a91ad0..2da8d7c789 100644
--- a/contrib/ldapc++/src/LDAPModifyRequest.h
+++ b/contrib/ldapc++/src/LDAPModifyRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPObjClass.cpp b/contrib/ldapc++/src/LDAPObjClass.cpp
index 978e7ec4c4..77f505c2d6 100644
--- a/contrib/ldapc++/src/LDAPObjClass.cpp
+++ b/contrib/ldapc++/src/LDAPObjClass.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPObjClass.h b/contrib/ldapc++/src/LDAPObjClass.h
index b4221eb788..624c37f275 100644
--- a/contrib/ldapc++/src/LDAPObjClass.h
+++ b/contrib/ldapc++/src/LDAPObjClass.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebind.cpp b/contrib/ldapc++/src/LDAPRebind.cpp
index c42deb817e..89f46aade4 100644
--- a/contrib/ldapc++/src/LDAPRebind.cpp
+++ b/contrib/ldapc++/src/LDAPRebind.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebind.h b/contrib/ldapc++/src/LDAPRebind.h
index a2d9747918..f530baa19c 100644
--- a/contrib/ldapc++/src/LDAPRebind.h
+++ b/contrib/ldapc++/src/LDAPRebind.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebindAuth.cpp b/contrib/ldapc++/src/LDAPRebindAuth.cpp
index a77d8839a8..de09b63248 100644
--- a/contrib/ldapc++/src/LDAPRebindAuth.cpp
+++ b/contrib/ldapc++/src/LDAPRebindAuth.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRebindAuth.h b/contrib/ldapc++/src/LDAPRebindAuth.h
index b5afbd121f..5491beba98 100644
--- a/contrib/ldapc++/src/LDAPRebindAuth.h
+++ b/contrib/ldapc++/src/LDAPRebindAuth.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPReferenceList.cpp b/contrib/ldapc++/src/LDAPReferenceList.cpp
index 43032e8ad9..1d4d724900 100644
--- a/contrib/ldapc++/src/LDAPReferenceList.cpp
+++ b/contrib/ldapc++/src/LDAPReferenceList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPReferenceList.h b/contrib/ldapc++/src/LDAPReferenceList.h
index f3c03c18cc..34af7473cd 100644
--- a/contrib/ldapc++/src/LDAPReferenceList.h
+++ b/contrib/ldapc++/src/LDAPReferenceList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRequest.cpp b/contrib/ldapc++/src/LDAPRequest.cpp
index 1023eb1da5..8ee156d26a 100644
--- a/contrib/ldapc++/src/LDAPRequest.cpp
+++ b/contrib/ldapc++/src/LDAPRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPRequest.h b/contrib/ldapc++/src/LDAPRequest.h
index c263e90f92..46c3f87943 100644
--- a/contrib/ldapc++/src/LDAPRequest.h
+++ b/contrib/ldapc++/src/LDAPRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPResult.cpp b/contrib/ldapc++/src/LDAPResult.cpp
index 55a0d7a818..c081baeb97 100644
--- a/contrib/ldapc++/src/LDAPResult.cpp
+++ b/contrib/ldapc++/src/LDAPResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPResult.h b/contrib/ldapc++/src/LDAPResult.h
index 368050b544..7f73ac7715 100644
--- a/contrib/ldapc++/src/LDAPResult.h
+++ b/contrib/ldapc++/src/LDAPResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSaslBindResult.cpp b/contrib/ldapc++/src/LDAPSaslBindResult.cpp
index e2d6363522..1fe75caa29 100644
--- a/contrib/ldapc++/src/LDAPSaslBindResult.cpp
+++ b/contrib/ldapc++/src/LDAPSaslBindResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSaslBindResult.h b/contrib/ldapc++/src/LDAPSaslBindResult.h
index b6a82ddff1..397a208584 100644
--- a/contrib/ldapc++/src/LDAPSaslBindResult.h
+++ b/contrib/ldapc++/src/LDAPSaslBindResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSchema.cpp b/contrib/ldapc++/src/LDAPSchema.cpp
index 435cf25612..03be0f967b 100644
--- a/contrib/ldapc++/src/LDAPSchema.cpp
+++ b/contrib/ldapc++/src/LDAPSchema.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSchema.h b/contrib/ldapc++/src/LDAPSchema.h
index 9fe0839b60..8380eb0389 100644
--- a/contrib/ldapc++/src/LDAPSchema.h
+++ b/contrib/ldapc++/src/LDAPSchema.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2003, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2003-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchReference.cpp b/contrib/ldapc++/src/LDAPSearchReference.cpp
index 4c6a681743..66234f21a1 100644
--- a/contrib/ldapc++/src/LDAPSearchReference.cpp
+++ b/contrib/ldapc++/src/LDAPSearchReference.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchReference.h b/contrib/ldapc++/src/LDAPSearchReference.h
index c4573981a6..064599fb9b 100644
--- a/contrib/ldapc++/src/LDAPSearchReference.h
+++ b/contrib/ldapc++/src/LDAPSearchReference.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchRequest.cpp b/contrib/ldapc++/src/LDAPSearchRequest.cpp
index 8fa36f730f..575c0c4c51 100644
--- a/contrib/ldapc++/src/LDAPSearchRequest.cpp
+++ b/contrib/ldapc++/src/LDAPSearchRequest.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchRequest.h b/contrib/ldapc++/src/LDAPSearchRequest.h
index 0cb83b4e72..7e01d7dcc4 100644
--- a/contrib/ldapc++/src/LDAPSearchRequest.h
+++ b/contrib/ldapc++/src/LDAPSearchRequest.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResult.cpp b/contrib/ldapc++/src/LDAPSearchResult.cpp
index da56a621fe..240dc70f4b 100644
--- a/contrib/ldapc++/src/LDAPSearchResult.cpp
+++ b/contrib/ldapc++/src/LDAPSearchResult.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResult.h b/contrib/ldapc++/src/LDAPSearchResult.h
index 5800845749..829b88934d 100644
--- a/contrib/ldapc++/src/LDAPSearchResult.h
+++ b/contrib/ldapc++/src/LDAPSearchResult.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResults.cpp b/contrib/ldapc++/src/LDAPSearchResults.cpp
index 168dac9374..66f810d9ed 100644
--- a/contrib/ldapc++/src/LDAPSearchResults.cpp
+++ b/contrib/ldapc++/src/LDAPSearchResults.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPSearchResults.h b/contrib/ldapc++/src/LDAPSearchResults.h
index a444415250..7a3bebe90b 100644
--- a/contrib/ldapc++/src/LDAPSearchResults.h
+++ b/contrib/ldapc++/src/LDAPSearchResults.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrl.cpp b/contrib/ldapc++/src/LDAPUrl.cpp
index 0ff8c7e582..21bdf66f5e 100644
--- a/contrib/ldapc++/src/LDAPUrl.cpp
+++ b/contrib/ldapc++/src/LDAPUrl.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2006, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrl.h b/contrib/ldapc++/src/LDAPUrl.h
index b9b17ad2d3..fbbef6c23f 100644
--- a/contrib/ldapc++/src/LDAPUrl.h
+++ b/contrib/ldapc++/src/LDAPUrl.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2006, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrlList.cpp b/contrib/ldapc++/src/LDAPUrlList.cpp
index a968905b3a..6481dcee84 100644
--- a/contrib/ldapc++/src/LDAPUrlList.cpp
+++ b/contrib/ldapc++/src/LDAPUrlList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2002 OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LDAPUrlList.h b/contrib/ldapc++/src/LDAPUrlList.h
index aa883cae9f..df42316d13 100644
--- a/contrib/ldapc++/src/LDAPUrlList.h
+++ b/contrib/ldapc++/src/LDAPUrlList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifReader.cpp b/contrib/ldapc++/src/LdifReader.cpp
index 31cf76baa1..6dd4876212 100644
--- a/contrib/ldapc++/src/LdifReader.cpp
+++ b/contrib/ldapc++/src/LdifReader.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifReader.h b/contrib/ldapc++/src/LdifReader.h
index fe35648c8b..d80b6a3aad 100644
--- a/contrib/ldapc++/src/LdifReader.h
+++ b/contrib/ldapc++/src/LdifReader.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifWriter.cpp b/contrib/ldapc++/src/LdifWriter.cpp
index 089484ee93..e0ab94b0e5 100644
--- a/contrib/ldapc++/src/LdifWriter.cpp
+++ b/contrib/ldapc++/src/LdifWriter.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/LdifWriter.h b/contrib/ldapc++/src/LdifWriter.h
index ef07775ec9..e7636d41ef 100644
--- a/contrib/ldapc++/src/LdifWriter.h
+++ b/contrib/ldapc++/src/LdifWriter.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2008-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/Makefile.am b/contrib/ldapc++/src/Makefile.am
index ae715e68f4..2ccc7b242e 100644
--- a/contrib/ldapc++/src/Makefile.am
+++ b/contrib/ldapc++/src/Makefile.am
@@ -1,7 +1,7 @@
 # $OpenLDAP$
 
 ###
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 
diff --git a/contrib/ldapc++/src/Makefile.in b/contrib/ldapc++/src/Makefile.in
index 09aeda938b..71393a3214 100644
--- a/contrib/ldapc++/src/Makefile.in
+++ b/contrib/ldapc++/src/Makefile.in
@@ -18,7 +18,7 @@
 # $OpenLDAP$
 
 ###
-# Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 
diff --git a/contrib/ldapc++/src/SaslInteraction.cpp b/contrib/ldapc++/src/SaslInteraction.cpp
index 3549a45077..5417e75ff2 100644
--- a/contrib/ldapc++/src/SaslInteraction.cpp
+++ b/contrib/ldapc++/src/SaslInteraction.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/SaslInteraction.h b/contrib/ldapc++/src/SaslInteraction.h
index c19c6f561e..9d0f8040fd 100644
--- a/contrib/ldapc++/src/SaslInteraction.h
+++ b/contrib/ldapc++/src/SaslInteraction.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/SaslInteractionHandler.cpp b/contrib/ldapc++/src/SaslInteractionHandler.cpp
index 35ae364033..2710ebfd30 100644
--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp
+++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/SaslInteractionHandler.h b/contrib/ldapc++/src/SaslInteractionHandler.h
index 47437202ae..481d177bb6 100644
--- a/contrib/ldapc++/src/SaslInteractionHandler.h
+++ b/contrib/ldapc++/src/SaslInteractionHandler.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2007-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/StringList.cpp b/contrib/ldapc++/src/StringList.cpp
index 1f0852e72b..44dd1ed879 100644
--- a/contrib/ldapc++/src/StringList.cpp
+++ b/contrib/ldapc++/src/StringList.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000-2007, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/StringList.h b/contrib/ldapc++/src/StringList.h
index 0e2c5b1f7f..591dbb5782 100644
--- a/contrib/ldapc++/src/StringList.h
+++ b/contrib/ldapc++/src/StringList.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/TlsOptions.cpp b/contrib/ldapc++/src/TlsOptions.cpp
index 3da227f874..9db8f7a2fa 100644
--- a/contrib/ldapc++/src/TlsOptions.cpp
+++ b/contrib/ldapc++/src/TlsOptions.cpp
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/src/TlsOptions.h b/contrib/ldapc++/src/TlsOptions.h
index 0865fb240c..b7a8f231b5 100644
--- a/contrib/ldapc++/src/TlsOptions.h
+++ b/contrib/ldapc++/src/TlsOptions.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2010, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2010-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #ifndef TLS_OPTIONS_H
diff --git a/contrib/ldapc++/src/debug.h b/contrib/ldapc++/src/debug.h
index 9aec5a78dd..a2af50fc49 100644
--- a/contrib/ldapc++/src/debug.h
+++ b/contrib/ldapc++/src/debug.h
@@ -1,6 +1,6 @@
 // $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
diff --git a/contrib/ldapc++/version.sh b/contrib/ldapc++/version.sh
index 7a5e4c3622..16495a1d8c 100755
--- a/contrib/ldapc++/version.sh
+++ b/contrib/ldapc++/version.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 # $OpenLDAP$
 #
-# Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 DIR=`dirname $0`
 . $DIR/version.var
diff --git a/contrib/ldapc++/version.var b/contrib/ldapc++/version.var
index a03fa4da7f..fc7bf17591 100644
--- a/contrib/ldapc++/version.var
+++ b/contrib/ldapc++/version.var
@@ -1,7 +1,7 @@
 #! /bin/sh
 # $OpenLDAP$
 #
-# Copyright 2008, OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2008-2011 The OpenLDAP Foundation. All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 ol_cpp_api_rel_major=0
diff --git a/contrib/ldaptcl/COPYRIGHT b/contrib/ldaptcl/COPYRIGHT
index e9be9a737c..56f8331940 100644
--- a/contrib/ldaptcl/COPYRIGHT
+++ b/contrib/ldaptcl/COPYRIGHT
@@ -1,3 +1,11 @@
+Copyright 1998-2011 The OpenLDAP Foundation.  All rights reserved.
+
+COPYING RESTRICTIONS APPLY.
+
+See COPYRIGHT and LICENSE files in the top-level directory of this
+distribution (i.e., ../../COPYRIGHT and ../../LICENSE, respectively).
+
+---
 NeoSoft Tcl client extensions to Lightweight Directory Access Protocol.
 
 Copyright (c) 1998-1999 NeoSoft, Inc.  
diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
deleted file mode 100644
index 22c4a1fa24..0000000000
--- a/doc/guide/COPYRIGHT
+++ /dev/null
@@ -1,64 +0,0 @@
-Copyright 1998-2011 The OpenLDAP Foundation
-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 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.
-
-Individual files and/or contributed packages may be copyright by
-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/ldap.html>.
-
-This work also contains materials derived from public sources.
-
-Additional information about OpenLDAP can be obtained at
-<http://www.openldap.org/>.
-
----
-
-Portions Copyright 1998-2008 Kurt D. Zeilenga.
-Portions Copyright 1998-2006 Net Boolean Incorporated.
-Portions Copyright 2001-2006 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-2008 Howard Y.H. Chu.
-Portions Copyright 1999-2008 Symas Corporation.
-Portions Copyright 1998-2003 Hallvard B. Furuseth.
-Portions Copyright 2008-2009 Gavin Henry.
-Portions Copyright 2008-2009 Suretec Systems Ltd.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that this notice is preserved.
-The names of the copyright holders may not be used to endorse or
-promote products derived from this software without their specific
-prior written permission.  This software is provided ``as is''
-without express or implied warranty.
-
----
-
-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.
-
diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE
deleted file mode 100644
index 05ad7571e4..0000000000
--- a/doc/guide/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-The OpenLDAP Public License
-  Version 2.8, 17 August 2003
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions in source form must retain copyright statements
-   and notices,
-
-2. Redistributions in binary form must reproduce applicable copyright
-   statements and notices, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-The OpenLDAP Foundation may revise this license from time to time.
-Each revision is distinguished by a version number.  You may use
-this Software under terms of this license revision or under the
-terms of any subsequent revision of the license.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
-SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
-OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-The names of the authors and copyright holders must not be used in
-advertising or otherwise to promote the sale, use or other dealing
-in this Software without specific, written prior permission.  Title
-to copyright in this Software shall at all times remain with copyright
-holders.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.
diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 1662d8d62b..6fa9ac8797 100644
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -2,6 +2,8 @@
 # Copyright 1999-2011 The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
+# This file should match ../../../COPYRIGHT (except in formating)
+
 !if OPT_PP_HTML
 !define	copyright '[[c]] Copyright'
 !else
@@ -13,7 +15,7 @@ H1: OpenLDAP Software Copyright Notices
 H2: OpenLDAP Copyright Notice
 
 !block nofill
-[[copyright]] 1998-2008 The OpenLDAP Foundation.
+[[copyright]] 1998-2011 The OpenLDAP Foundation.
 {{All rights reserved.}}
 !endblock
 
@@ -43,7 +45,7 @@ Additional information about OpenLDAP software can be obtained at
 H2: Additional Copyright Notices
 
 !block nofill
-Portions [[copyright]] 1998-2008 Kurt D. Zeilenga.
+Portions [[copyright]] 1998-2011 Kurt D. Zeilenga.
 Portions [[copyright]] 1998-2006 Net Boolean Incorporated.
 Portions [[copyright]] 2001-2006 IBM Corporation.
 {{All rights reserved.}}
@@ -55,8 +57,8 @@ Public License}}.
 
 
 !block nofill
-Portions [[copyright]] 1999-2007 Howard Y.H. Chu.
-Portions [[copyright]] 1999-2007 Symas Corporation.
+Portions [[copyright]] 1999-2008 Howard Y.H. Chu.
+Portions [[copyright]] 1999-2008 Symas Corporation.
 Portions [[copyright]] 1998-2003 Hallvard B. Furuseth.
 Portions [[copyright]] 2007-2011 Gavin Henry.
 Portions [[copyright]] 2007-2011 Suretec Systems Limited.
diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf
index f59cc50e4d..36113a5669 100644
--- a/doc/guide/release/license.sdf
+++ b/doc/guide/release/license.sdf
@@ -8,7 +8,7 @@ H1: OpenLDAP Public License
 #<FONT FACE="Courier">
 #!endblock
 
-!include "../LICENSE" ; verbatim
+!include "../../../LICENSE" ; verbatim
 
 #!block inline
 #</FONT>