diff --git a/doc/function.xml b/doc/function.xml
index d6fedc3..e675f25 100644
--- a/doc/function.xml
+++ b/doc/function.xml
@@ -8,13 +8,14 @@
   <author>
     <firstname>Douglas</firstname>
     <surname>Gregor</surname>
-     <email>gregod@cs.rpi.edu</email>
+    <email>dgregor -at- cs.indiana.edu</email>
   </author>
 
   <copyright>
     <year>2001</year>
     <year>2002</year>
     <year>2003</year>
+    <year>2004</year>
     <holder>Douglas Gregor</holder>
   </copyright>
 
diff --git a/example/bind1st.cpp b/example/bind1st.cpp
index a7d23f4..b9622c7 100644
--- a/example/bind1st.cpp
+++ b/example/bind1st.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library examples
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/example/int_div.cpp b/example/int_div.cpp
index 3812d15..7218bd0 100644
--- a/example/int_div.cpp
+++ b/example/int_div.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library examples
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/example/sum_avg.cpp b/example/sum_avg.cpp
index 8dba3e2..8831ef1 100644
--- a/example/sum_avg.cpp
+++ b/example/sum_avg.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library examples
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d5cff48..cc0448a 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,6 +1,6 @@
 # Function library
 
-# Copyright Doug Gregor 2001-2003. Use, modification and
+# Copyright Douglas Gregor 2001-2003. Use, modification and
 # distribution is 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)
@@ -58,4 +58,4 @@ import testing ;
    
  ;
 }
-      
\ No newline at end of file
+      
diff --git a/test/allocator_test.cpp b/test/allocator_test.cpp
index 12fa448..643ffb9 100644
--- a/test/allocator_test.cpp
+++ b/test/allocator_test.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/contains_test.cpp b/test/contains_test.cpp
index 0153339..89cf836 100644
--- a/test/contains_test.cpp
+++ b/test/contains_test.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2004. Use, modification and
+//  Copyright Douglas Gregor 2004. Use, modification and
 //  distribution is 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)
diff --git a/test/function_30.cpp b/test/function_30.cpp
index b6630c7..0b91b75 100644
--- a/test/function_30.cpp
+++ b/test/function_30.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2002-2003. Use, modification and
+//  Copyright Douglas Gregor 2002-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/function_n_test.cpp b/test/function_n_test.cpp
index e993c39..4fc40e3 100644
--- a/test/function_n_test.cpp
+++ b/test/function_n_test.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/function_test.cpp b/test/function_test.cpp
index d92b4ae..b21840f 100644
--- a/test/function_test.cpp
+++ b/test/function_test.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/function_test_fail1.cpp b/test/function_test_fail1.cpp
index bd933b3..0735e22 100644
--- a/test/function_test_fail1.cpp
+++ b/test/function_test_fail1.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/function_test_fail2.cpp b/test/function_test_fail2.cpp
index 0038b31..f2d158e 100644
--- a/test/function_test_fail2.cpp
+++ b/test/function_test_fail2.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/lambda_test.cpp b/test/lambda_test.cpp
index 89be06c..97fa7f8 100644
--- a/test/lambda_test.cpp
+++ b/test/lambda_test.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2002-2003. Use, modification and
+//  Copyright Douglas Gregor 2002-2003. Use, modification and
 //  distribution is 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)
diff --git a/test/stateless_test.cpp b/test/stateless_test.cpp
index 54859e7..cd97054 100644
--- a/test/stateless_test.cpp
+++ b/test/stateless_test.cpp
@@ -1,6 +1,6 @@
 // Boost.Function library
 
-//  Copyright Doug Gregor 2001-2003. Use, modification and
+//  Copyright Douglas Gregor 2001-2003. Use, modification and
 //  distribution is 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)