diff --git a/hash/doc/Jamfile.v2 b/hash/doc/Jamfile.v2
index 7f55cd5..9b7bdb7 100644
--- a/hash/doc/Jamfile.v2
+++ b/hash/doc/Jamfile.v2
@@ -1,6 +1,6 @@
 
-# Copyright Daniel James 2005. Use, modification, and distribution are
-# subject to the Boost Software License, Version 1.0. (See accompanying
+# Copyright 2005 Daniel James.
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 using quickbook ;
diff --git a/hash/examples/books.cpp b/hash/examples/books.cpp
index 4c31ff1..7297ea0 100644
--- a/hash/examples/books.cpp
+++ b/hash/examples/books.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./books.hpp"
 #include <boost/functional/hash.hpp>
diff --git a/hash/examples/books.hpp b/hash/examples/books.hpp
index 774dab2..27990ad 100644
--- a/hash/examples/books.hpp
+++ b/hash/examples/books.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This example illustrates how to use boost::hash with a custom hash function.
 // The implementation is contained in books.cpp
diff --git a/hash/examples/point.cpp b/hash/examples/point.cpp
index 4beb93d..6943342 100644
--- a/hash/examples/point.cpp
+++ b/hash/examples/point.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/hash.hpp>
 #include <cassert>
diff --git a/hash/examples/portable.cpp b/hash/examples/portable.cpp
index ddb9220..636825d 100644
--- a/hash/examples/portable.cpp
+++ b/hash/examples/portable.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/hash.hpp>
 #include <cassert>
diff --git a/hash/test/Jamfile b/hash/test/Jamfile
index 5bb62ec..9894854 100644
--- a/hash/test/Jamfile
+++ b/hash/test/Jamfile
@@ -1,7 +1,7 @@
 
-#  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-#  subject to the Boost Software License, Version 1.0. (See accompanying
-#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+# Copyright 2005-2006 Daniel James.
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 subproject libs/functional/hash/test ;
 
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 4ea69be..d816295 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -1,7 +1,7 @@
 
-#  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-#  subject to the Boost Software License, Version 1.0. (See accompanying
-#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+# Copyright 2005-2006 Daniel James.
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 import testing ;
 
diff --git a/hash/test/compile_time.hpp b/hash/test/compile_time.hpp
index 25ba441..6169ead 100644
--- a/hash/test/compile_time.hpp
+++ b/hash/test/compile_time.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
diff --git a/hash/test/config.hpp b/hash/test/config.hpp
index 1f3739f..3afee7d 100644
--- a/hash/test/config.hpp
+++ b/hash/test/config.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if defined(TEST_STD)
 #  define TEST_STD_INCLUDES
diff --git a/hash/test/container_fwd_test.cpp b/hash/test/container_fwd_test.cpp
index 684e16b..3c294a9 100644
--- a/hash/test/container_fwd_test.cpp
+++ b/hash/test/container_fwd_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/detail/container_fwd.hpp>
 
diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index f7789d1..f410876 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_complex_test.cpp b/hash/test/hash_complex_test.cpp
index da5226f..4439c84 100644
--- a/hash/test/hash_complex_test.cpp
+++ b/hash/test/hash_complex_test.cpp
@@ -1,8 +1,7 @@
 
-//  (C) Copyright Daniel James 2005.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
@@ -91,6 +90,8 @@ int main()
     complex_integral_tests((unsigned short*) 0);
     complex_integral_tests((unsigned int*) 0);
     complex_integral_tests((unsigned long*) 0);
+
+    return boost::report_errors();
 }
 
 #endif
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 1af95f8..27848bd 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
 #include <cstddef>
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index 9994a92..b8aa164 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index d9bdc8e..2f964b9 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_friend_test.cpp b/hash/test/hash_friend_test.cpp
index 362a9cb..d8e592d 100644
--- a/hash/test/hash_friend_test.cpp
+++ b/hash/test/hash_friend_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
 #include <cstddef>
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index 92c8769..3d9473f 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_fwd_test.hpp b/hash/test/hash_fwd_test.hpp
index 017b85d..5f581b2 100644
--- a/hash/test/hash_fwd_test.hpp
+++ b/hash/test/hash_fwd_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_fwd_test_1.cpp b/hash/test/hash_fwd_test_1.cpp
index 9d401ec..f2bc20c 100644
--- a/hash/test/hash_fwd_test_1.cpp
+++ b/hash/test/hash_fwd_test_1.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This checks that template code implemented using hash_fwd will work.
 
diff --git a/hash/test/hash_fwd_test_2.cpp b/hash/test/hash_fwd_test_2.cpp
index d29569b..775f8c9 100644
--- a/hash/test/hash_fwd_test_2.cpp
+++ b/hash/test/hash_fwd_test_2.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This test just makes sure a header which uses hash_fwd can compile without
 // the main hash headers.
diff --git a/hash/test/hash_global_namespace_test.cpp b/hash/test/hash_global_namespace_test.cpp
index fa84d49..93b6e67 100644
--- a/hash/test/hash_global_namespace_test.cpp
+++ b/hash/test/hash_global_namespace_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This test demonstrates an ADL bug in Borland 5.5 where ADL isn't performed
 // in the global namespace.
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index f6df2ad..46158e5 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index 6c15499..0d98f58 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index 7ab13ea..3483974 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
diff --git a/hash/test/hash_no_ext_fail_test.cpp b/hash/test/hash_no_ext_fail_test.cpp
index 597473a..b857480 100644
--- a/hash/test/hash_no_ext_fail_test.cpp
+++ b/hash/test/hash_no_ext_fail_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 
diff --git a/hash/test/hash_no_ext_macro_1.cpp b/hash/test/hash_no_ext_macro_1.cpp
index 5924f4e..bd98669 100644
--- a/hash/test/hash_no_ext_macro_1.cpp
+++ b/hash/test/hash_no_ext_macro_1.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
diff --git a/hash/test/hash_no_ext_macro_2.cpp b/hash/test/hash_no_ext_macro_2.cpp
index 53c6e8b..de77552 100644
--- a/hash/test/hash_no_ext_macro_2.cpp
+++ b/hash/test/hash_no_ext_macro_2.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index eb6d5dd..2008313 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index e38c31d..ee1b741 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index fc56ced..28d193e 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index 7668125..177ed93 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index e29334c..25bdbc7 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 26ea1af..b711a50 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index 85adacc..2e40731 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index 02444d8..0786c32 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // On some compilers hash_value isn't available for arrays, so I test it
 // separately from the main array tests.
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index 60bac31..83cfb63 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
diff --git a/hash/test/link_ext_test.cpp b/hash/test/link_ext_test.cpp
index eeb1160..86073c5 100644
--- a/hash/test/link_ext_test.cpp
+++ b/hash/test/link_ext_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
diff --git a/hash/test/link_no_ext_test.cpp b/hash/test/link_no_ext_test.cpp
index ab2701c..70500ef 100644
--- a/hash/test/link_no_ext_test.cpp
+++ b/hash/test/link_no_ext_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS
diff --git a/hash/test/link_test.cpp b/hash/test/link_test.cpp
index fae30cd..6f868ab 100644
--- a/hash/test/link_test.cpp
+++ b/hash/test/link_test.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/hash.hpp>
 
diff --git a/hash/test/link_test_2.cpp b/hash/test/link_test_2.cpp
index 57d6528..ea547d2 100644
--- a/hash/test/link_test_2.cpp
+++ b/hash/test/link_test_2.cpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/hash.hpp>
 
diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index d30bef3..fa095c6 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(BOOST_DETAIL_CONTAINER_FWD_HPP)
 #define BOOST_DETAIL_CONTAINER_FWD_HPP
diff --git a/include/boost/functional/detail/float_functions.hpp b/include/boost/functional/detail/float_functions.hpp
index 34b8251..fd92255 100644
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP)
 #define BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP
diff --git a/include/boost/functional/detail/hash_float.hpp b/include/boost/functional/detail/hash_float.hpp
index 8ffe0e6..1dbe15e 100644
--- a/include/boost/functional/detail/hash_float.hpp
+++ b/include/boost/functional/detail/hash_float.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash.hpp b/include/boost/functional/hash.hpp
index 65e19b1..4bd1ee0 100644
--- a/include/boost/functional/hash.hpp
+++ b/include/boost/functional/hash.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/Attic/deque.hpp b/include/boost/functional/hash/Attic/deque.hpp
index 0f688cd..4503941 100644
--- a/include/boost/functional/hash/Attic/deque.hpp
+++ b/include/boost/functional/hash/Attic/deque.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/Attic/list.hpp b/include/boost/functional/hash/Attic/list.hpp
index f332462..80e0932 100644
--- a/include/boost/functional/hash/Attic/list.hpp
+++ b/include/boost/functional/hash/Attic/list.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/Attic/map.hpp b/include/boost/functional/hash/Attic/map.hpp
index 10526a1..34cd7eb 100644
--- a/include/boost/functional/hash/Attic/map.hpp
+++ b/include/boost/functional/hash/Attic/map.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/Attic/pair.hpp b/include/boost/functional/hash/Attic/pair.hpp
index 9c54671..69a5483 100644
--- a/include/boost/functional/hash/Attic/pair.hpp
+++ b/include/boost/functional/hash/Attic/pair.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/Attic/set.hpp b/include/boost/functional/hash/Attic/set.hpp
index 53923e1..9a7f866 100644
--- a/include/boost/functional/hash/Attic/set.hpp
+++ b/include/boost/functional/hash/Attic/set.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/Attic/vector.hpp b/include/boost/functional/hash/Attic/vector.hpp
index 5a75f8c..298b9ef 100644
--- a/include/boost/functional/hash/Attic/vector.hpp
+++ b/include/boost/functional/hash/Attic/vector.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
index 0f688cd..4503941 100644
--- a/include/boost/functional/hash/deque.hpp
+++ b/include/boost/functional/hash/deque.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 689b82a..ba1a830 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
index f332462..80e0932 100644
--- a/include/boost/functional/hash/list.hpp
+++ b/include/boost/functional/hash/list.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
index 10526a1..34cd7eb 100644
--- a/include/boost/functional/hash/map.hpp
+++ b/include/boost/functional/hash/map.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
index 9c54671..69a5483 100644
--- a/include/boost/functional/hash/pair.hpp
+++ b/include/boost/functional/hash/pair.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
index 53923e1..9a7f866 100644
--- a/include/boost/functional/hash/set.hpp
+++ b/include/boost/functional/hash/set.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
index 5a75f8c..298b9ef 100644
--- a/include/boost/functional/hash/vector.hpp
+++ b/include/boost/functional/hash/vector.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf
diff --git a/include/boost/functional/hash_fwd.hpp b/include/boost/functional/hash_fwd.hpp
index dcbe659..688630b 100644
--- a/include/boost/functional/hash_fwd.hpp
+++ b/include/boost/functional/hash_fwd.hpp
@@ -1,7 +1,7 @@
 
-//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
-//  subject to the Boost Software License, Version 1.0. (See accompanying
-//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Based on Peter Dimov's proposal
 //  http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1756.pdf