More copyright cleanup.

24 files changed, 96 insertions, 74 deletions

diff --git a/AUTHORS b/AUTHORS
index c6da2d63818..5a67734db28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1 @@
-Copyright (c) 2008-2011 WiredTiger, Inc.
-All rights reserved.
+WiredTiger, Inc.
diff --git a/build_posix/aclocal/options.m4 b/build_posix/aclocal/options.m4
index 065b5346695..16b250cae07 100644
--- a/build_posix/aclocal/options.m4
+++ b/build_posix/aclocal/options.m4
@@ -1,6 +1,3 @@
-# Copyright (c) 2008-2011 WiredTiger, Inc.
-#	All rights reserved.
-
 # Optional configuration.
 AC_DEFUN([AM_OPTIONS], [
 
diff --git a/build_posix/aclocal/types.m4 b/build_posix/aclocal/types.m4
index 639ebe6f3c8..844c8eadc73 100644
--- a/build_posix/aclocal/types.m4
+++ b/build_posix/aclocal/types.m4
@@ -1,6 +1,3 @@
-# Copyright (c) 2008-2011 WiredTiger, Inc.
-#	All rights reserved.
-
 # AM_SIGNED_TYPES, AM_UNSIGNED_TYPES --
 #	Search standard type names for something of the same size and
 #	signed-ness as the type we want to declare.
diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in
index bd19c05b79e..8cc5419a690 100644
--- a/build_posix/configure.ac.in
+++ b/build_posix/configure.ac.in
@@ -1,6 +1,3 @@
-# Copyright (c) 2008-2011 WiredTiger, Inc.
-#	All rights reserved.
-
 PACKAGE=wiredtiger
 AC_INIT(WiredTiger, m4_normalize(m4_include([build_posix/aclocal/version.m4])),
 	[support@wiredtiger.com])
diff --git a/build_posix/makemake b/build_posix/makemake
index 2737138322f..5db0e484174 100755
--- a/build_posix/makemake
+++ b/build_posix/makemake
@@ -1,8 +1,5 @@
 #! /bin/sh
 #
-# Copyright (c) 2008-2011 WiredTiger, Inc.
-#	All rights reserved.
-
 # Build Makefile.am
 
 # Process Make.base, insert subdirs that exist from Make.subdirs
diff --git a/build_posix/reconf b/build_posix/reconf
index ee6533241de..506625f6864 100755
--- a/build_posix/reconf
+++ b/build_posix/reconf
@@ -1,7 +1,4 @@
 #! /bin/sh
-#
-# Copyright (c) 2008-2011 WiredTiger, Inc.
-#	All rights reserved.
 
 t=/tmp/__configure.$$
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
diff --git a/dist/s_copyright b/dist/s_copyright
index 1ecfb3720f5..62db9ac6f0b 100644
--- a/dist/s_copyright
+++ b/dist/s_copyright
@@ -29,7 +29,7 @@ cat > $c2 <<ENDOFTEXT
 ENDOFTEXT
 
 cat > $c3 <<ENDOFTEXT
-#!/usr/bin/env python
+#!
 #
 # Copyright (c) 2008-2012 WiredTiger, Inc.
 #
@@ -50,7 +50,8 @@ check()
 	if `sed -e 4q ../$1 | diff - $c2 > /dev/null` ; then
 		return;
 	fi
-	if `sed -e 5q ../$1 | diff - $c3 > /dev/null` ; then
+	if `sed -e 's/#!.*/#!/' \
+		-e 5q ../$1 | diff - $c3 > /dev/null` ; then
 		return;
 	fi
 
@@ -58,11 +59,17 @@ check()
 }
 
 l="`cd .. && \
-    echo examples/c/*.c \
+    echo LICENSE \
+	 COPYING \
+	 examples/c/*.c \
+	 examples/python/*.py \
 	 src/include/*.[hi] \
 	 src/include/*.in \
-	 src/utilities/*.c \
-	 test/suite/*.py`"
+	 src/utilities/*.[ch] \
+	 test/format/*.[ch] \
+	 test/salvage/*.[ch] \
+	 test/suite/*.py \
+	 test/thread/*.[ch]`"
 
 l="$l `sed -e 's/^add	\(.*\)/\1/p' -e d s_copyright.list`"
 for i in $l `sed -e '/^[a-z]/! d' filelist`; do
@@ -70,10 +77,20 @@ for i in $l `sed -e '/^[a-z]/! d' filelist`; do
 done
 
 # The documentation copyright appears in two files.
-s="Copyright (c) 2008-$year WiredTiger, Inc.  All rights reserved."
-f="../docs/build-javadoc.sh ../docs/style/footer.html"
+s="Copyright (c) 2008-$year WiredTiger, Inc."
+f="docs/build-javadoc.sh docs/style/footer.html"
 for i in $f; do
-	if `grep "$s" $i > /dev/null`; then
+	if `grep "$s" ../$i > /dev/null`; then
+		continue;
+	fi
+	echo "$i: copyright information is incorrect"
+done
+
+# The wt utility has a copyright it displays.
+s="printf.*Copyright (c) 2008-$year WiredTiger, Inc."
+f="src/utilities/util_cpyright.c"
+for i in $f; do
+	if `grep "$s" ../$i > /dev/null`; then
 		continue;
 	fi
 	echo "$i: copyright information is incorrect"
diff --git a/examples/python/ex_access.py b/examples/python/ex_access.py
index 5fb0abdbc9e..5ae7f672651 100755
--- a/examples/python/ex_access.py
+++ b/examples/python/ex_access.py
@@ -1,9 +1,29 @@
 #!/usr/bin/env PYTHONPATH=../../lang/python:../../lang/python/src python
 #
-# See the file LICENSE for redistribution information.
+# Copyright (c) 2008-2012 WiredTiger, Inc.
 #
-# Copyright (c) 2008-2011 WiredTiger, Inc.
-#	All rights reserved.
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
 #
 # ex_access.py
 # 	demonstrates how to create and access a simple table.
diff --git a/lang/python/src/server.py b/lang/python/src/server.py
index c8fcaa7f889..0aa5e1fa8f6 100644
--- a/lang/python/src/server.py
+++ b/lang/python/src/server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-
+#
 # WiredTiger Python RPC server for testing and tutorials.
-# Copyright (c) 2011 WiredTiger, Inc.  All rights reserved.
+#
 
 import sys
 
diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i
index 0e1a5e8498d..fa8f62225ea 100644
--- a/lang/python/wiredtiger.i
+++ b/lang/python/wiredtiger.i
@@ -1,12 +1,6 @@
-/*
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2011-2012 WiredTiger, Inc.
- *	All rights reserved.
- *
+/*-
  * wiredtiger.i
  * 	The SWIG interface file defining the wiredtiger python API.
- *
  */
 
 %define DOCSTRING
diff --git a/src/utilities/util_cpyright.c b/src/utilities/util_cpyright.c
index 4c5c09a82ac..7297dff19f5 100644
--- a/src/utilities/util_cpyright.c
+++ b/src/utilities/util_cpyright.c
@@ -10,7 +10,7 @@
 void
 util_copyright(void)
 {
-	printf("%s\n", "Copyright (c) 2008-2011 WiredTiger, Inc.");
+	printf("%s\n", "Copyright (c) 2008-2012 WiredTiger, Inc.");
 	printf("%s\n\n", "All rights reserved.");
 
 	printf("%s\n\n",
diff --git a/test/format/bdb.c b/test/format/bdb.c
index 679275bd738..70633817661 100644
--- a/test/format/bdb.c
+++ b/test/format/bdb.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #define	BDB	1			/* Berkeley DB header files */
diff --git a/test/format/config.c b/test/format/config.c
index f44df62b1d2..1c9c2bc920e 100644
--- a/test/format/config.c
+++ b/test/format/config.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "format.h"
diff --git a/test/format/config.h b/test/format/config.h
index abac446ccd9..90d641d00e7 100644
--- a/test/format/config.h
+++ b/test/format/config.h
@@ -1,3 +1,10 @@
+/*-
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
+ *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
+ */
+
 /*
  * Configuration for the wts program is an array of string-based paramters.
  * This is the structure used to declare them.
diff --git a/test/format/format.h b/test/format/format.h
index e747f7f4a87..2f3bac9dd3b 100644
--- a/test/format/format.h
+++ b/test/format/format.h
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include <sys/types.h>
diff --git a/test/format/t.c b/test/format/t.c
index c303259e579..32d05f4e56d 100644
--- a/test/format/t.c
+++ b/test/format/t.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "format.h"
diff --git a/test/format/util.c b/test/format/util.c
index 688e62821e3..16b6377601b 100644
--- a/test/format/util.c
+++ b/test/format/util.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "format.h"
diff --git a/test/format/wts.c b/test/format/wts.c
index a95a00ccab6..b1dd4f197a5 100644
--- a/test/format/wts.c
+++ b/test/format/wts.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "format.h"
diff --git a/test/salvage/salvage.c b/test/salvage/salvage.c
index 3d5e7e204c5..daaa3bf4acc 100644
--- a/test/salvage/salvage.c
+++ b/test/salvage/salvage.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "wt_internal.h"
diff --git a/test/thread/load.c b/test/thread/load.c
index 1450a848919..71450ac973a 100644
--- a/test/thread/load.c
+++ b/test/thread/load.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "thread.h"
diff --git a/test/thread/run.c b/test/thread/run.c
index 2b44f2e1a47..ee9f7b3d8b9 100644
--- a/test/thread/run.c
+++ b/test/thread/run.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "thread.h"
diff --git a/test/thread/stats.c b/test/thread/stats.c
index fcc61566fd1..108b4bbe2ad 100644
--- a/test/thread/stats.c
+++ b/test/thread/stats.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "thread.h"
diff --git a/test/thread/t.c b/test/thread/t.c
index a4d72f468ed..f35012f382b 100644
--- a/test/thread/t.c
+++ b/test/thread/t.c
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include "thread.h"
diff --git a/test/thread/thread.h b/test/thread/thread.h
index 49c2c626139..d3c4715be29 100644
--- a/test/thread/thread.h
+++ b/test/thread/thread.h
@@ -1,8 +1,8 @@
 /*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2008-2011 WiredTiger, Inc.
+ * Copyright (c) 2008-2012 WiredTiger, Inc.
  *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
  */
 
 #include <sys/types.h>