diff --git a/build/binbuild.sh b/build/binbuild.sh
index 352a090045..15ee27ea7a 100755
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # 	
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/buildinfo.sh b/build/buildinfo.sh
index c3623a4812..6de75fa476 100755
--- a/build/buildinfo.sh
+++ b/build/buildinfo.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/fastgen.sh b/build/fastgen.sh
index b7e7835f71..28c6e57b2e 100755
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 #
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/get-version.sh b/build/get-version.sh
index 5cee69189f..e3ba69c513 100755
--- a/build/get-version.sh
+++ b/build/get-version.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2003-2004 The Apache Software Foundation
+# Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index 44cbb8bfd6..ca6860417d 100755
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/install.sh b/build/install.sh
index ba676624d7..6195768bd6 100755
--- a/build/install.sh
+++ b/build/install.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/instdso.sh b/build/instdso.sh
index 6b9e438636..c3e1b76df9 100755
--- a/build/instdso.sh
+++ b/build/instdso.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/mkdir.sh b/build/mkdir.sh
index a46c9a9aa0..889667b820 100755
--- a/build/mkdir.sh
+++ b/build/mkdir.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/build/pkg/buildpkg.sh b/build/pkg/buildpkg.sh
index 706fa36fdc..0e467d1adb 100755
--- a/build/pkg/buildpkg.sh
+++ b/build/pkg/buildpkg.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
-# Copyright 2000-2004 The Apache Software Foundation
-# 
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/build/rules.mk.in b/build/rules.mk.in
index 8e4aab3789..369b525990 100644
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml
index 2fc6fc59e7..c939818e46 100644
--- a/docs/manual/bind.xml
+++ b/docs/manual/bind.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index 9ec2a0526f..e5a05e716e 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index 2a2f1b2e13..500511403d 100644
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/custom-error.xml b/docs/manual/custom-error.xml
index 7e88b92d44..8777b36fab 100644
--- a/docs/manual/custom-error.xml
+++ b/docs/manual/custom-error.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/API.xml b/docs/manual/developer/API.xml
index 1740307593..de63ae1c1a 100644
--- a/docs/manual/developer/API.xml
+++ b/docs/manual/developer/API.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/debugging.xml b/docs/manual/developer/debugging.xml
index 644836861d..ab83b10131 100644
--- a/docs/manual/developer/debugging.xml
+++ b/docs/manual/developer/debugging.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/documenting.xml b/docs/manual/developer/documenting.xml
index 0937456112..d615583c3f 100644
--- a/docs/manual/developer/documenting.xml
+++ b/docs/manual/developer/documenting.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/filters.xml b/docs/manual/developer/filters.xml
index bf910473c9..5b4115b314 100644
--- a/docs/manual/developer/filters.xml
+++ b/docs/manual/developer/filters.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/hooks.xml b/docs/manual/developer/hooks.xml
index 4ee653df4d..2d262de9b2 100644
--- a/docs/manual/developer/hooks.xml
+++ b/docs/manual/developer/hooks.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/index.xml b/docs/manual/developer/index.xml
index be92878600..58ff7b542f 100644
--- a/docs/manual/developer/index.xml
+++ b/docs/manual/developer/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/modules.xml b/docs/manual/developer/modules.xml
index c0d63387be..4ddfbbedab 100644
--- a/docs/manual/developer/modules.xml
+++ b/docs/manual/developer/modules.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/request.xml b/docs/manual/developer/request.xml
index 5513a307cd..eae390f7fe 100644
--- a/docs/manual/developer/request.xml
+++ b/docs/manual/developer/request.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/developer/thread_safety.xml b/docs/manual/developer/thread_safety.xml
index 336afe5cc3..db8ff09c8b 100644
--- a/docs/manual/developer/thread_safety.xml
+++ b/docs/manual/developer/thread_safety.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml
index a1e3cc5146..a7d4a1da1c 100644
--- a/docs/manual/dns-caveats.xml
+++ b/docs/manual/dns-caveats.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/dso.xml b/docs/manual/dso.xml
index e53bb256d7..f9860a634e 100644
--- a/docs/manual/dso.xml
+++ b/docs/manual/dso.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index f49ef20f58..41875320b4 100644
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/faq/all_in_one.xml b/docs/manual/faq/all_in_one.xml
index f1b09b1f25..f4c210940d 100644
--- a/docs/manual/faq/all_in_one.xml
+++ b/docs/manual/faq/all_in_one.xml
@@ -6,8 +6,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/faq/categories.xml b/docs/manual/faq/categories.xml
index 124f543a1f..c4ce5856ee 100644
--- a/docs/manual/faq/categories.xml
+++ b/docs/manual/faq/categories.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/faq/error.xml b/docs/manual/faq/error.xml
index c24b6cc7fd..5eb0a20223 100644
--- a/docs/manual/faq/error.xml
+++ b/docs/manual/faq/error.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/faq/index.xml b/docs/manual/faq/index.xml
index d34b22e959..e0fc20a6e6 100644
--- a/docs/manual/faq/index.xml
+++ b/docs/manual/faq/index.xml
@@ -6,8 +6,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/faq/support.xml b/docs/manual/faq/support.xml
index f6a1ba064e..42f58f635b 100644
--- a/docs/manual/faq/support.xml
+++ b/docs/manual/faq/support.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/filter.xml b/docs/manual/filter.xml
index 9e7e0622aa..e5de3c0bfb 100644
--- a/docs/manual/filter.xml
+++ b/docs/manual/filter.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index 1798fb8c34..dca77df92e 100644
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/handler.xml b/docs/manual/handler.xml
index b5ba9cb4a9..4934b9baf7 100644
--- a/docs/manual/handler.xml
+++ b/docs/manual/handler.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 69d940290c..45cacae108 100644
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml
index 13d694dfec..b80c9e784e 100644
--- a/docs/manual/howto/cgi.xml
+++ b/docs/manual/howto/cgi.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index 7d3f4f8cbb..374030cd2d 100644
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/howto/index.xml b/docs/manual/howto/index.xml
index ff8760dbda..c81e72a1e6 100644
--- a/docs/manual/howto/index.xml
+++ b/docs/manual/howto/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml
index e866d7929c..18be56808b 100644
--- a/docs/manual/howto/public_html.xml
+++ b/docs/manual/howto/public_html.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/howto/ssi.xml b/docs/manual/howto/ssi.xml
index 1f8a0a6133..4c15196812 100644
--- a/docs/manual/howto/ssi.xml
+++ b/docs/manual/howto/ssi.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/index.xml b/docs/manual/index.xml
index 3df4d133b6..9fed3ad77f 100644
--- a/docs/manual/index.xml
+++ b/docs/manual/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index b4fd7d1ff1..86029d4d5c 100644
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/invoking.xml b/docs/manual/invoking.xml
index 1a0a6a4e2b..7fe03a19a6 100644
--- a/docs/manual/invoking.xml
+++ b/docs/manual/invoking.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/license.xml b/docs/manual/license.xml
index 71cf2cff52..95bfbac643 100644
--- a/docs/manual/license.xml
+++ b/docs/manual/license.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml
index b80c889223..b811b76a02 100644
--- a/docs/manual/logs.xml
+++ b/docs/manual/logs.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/misc/index.xml b/docs/manual/misc/index.xml
index 25665f1358..731945c9a4 100644
--- a/docs/manual/misc/index.xml
+++ b/docs/manual/misc/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml
index 13b068266d..e05e3beb78 100644
--- a/docs/manual/misc/perf-tuning.xml
+++ b/docs/manual/misc/perf-tuning.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/misc/relevant_standards.xml b/docs/manual/misc/relevant_standards.xml
index 25b7943fce..87c47749ea 100644
--- a/docs/manual/misc/relevant_standards.xml
+++ b/docs/manual/misc/relevant_standards.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/misc/rewriteguide.xml b/docs/manual/misc/rewriteguide.xml
index df4ade2718..c9f9fc98c6 100644
--- a/docs/manual/misc/rewriteguide.xml
+++ b/docs/manual/misc/rewriteguide.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/misc/security_tips.xml b/docs/manual/misc/security_tips.xml
index fe80597510..9ba3bb63c2 100644
--- a/docs/manual/misc/security_tips.xml
+++ b/docs/manual/misc/security_tips.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/beos.xml b/docs/manual/mod/beos.xml
index 6bae65c6c4..beeaffef75 100644
--- a/docs/manual/mod/beos.xml
+++ b/docs/manual/mod/beos.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index b6b3920acf..c3ecc06d80 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/directive-dict.xml b/docs/manual/mod/directive-dict.xml
index 6944919561..8ae121370f 100644
--- a/docs/manual/mod/directive-dict.xml
+++ b/docs/manual/mod/directive-dict.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/directives.xml b/docs/manual/mod/directives.xml
index 7888882f3d..4334944475 100644
--- a/docs/manual/mod/directives.xml
+++ b/docs/manual/mod/directives.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/index.xml b/docs/manual/mod/index.xml
index ce34ebd14a..ba22a592b1 100644
--- a/docs/manual/mod/index.xml
+++ b/docs/manual/mod/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/leader.xml b/docs/manual/mod/leader.xml
index c3b7e47f11..4224f5ea2a 100644
--- a/docs/manual/mod/leader.xml
+++ b/docs/manual/mod/leader.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_actions.xml b/docs/manual/mod/mod_actions.xml
index 94369cc738..4dfb90d486 100644
--- a/docs/manual/mod/mod_actions.xml
+++ b/docs/manual/mod/mod_actions.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index a5a48802b4..7bd327bbb4 100644
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_asis.xml b/docs/manual/mod/mod_asis.xml
index de5d534e0b..2f8fbd3ceb 100644
--- a/docs/manual/mod/mod_asis.xml
+++ b/docs/manual/mod/mod_asis.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_auth_basic.xml b/docs/manual/mod/mod_auth_basic.xml
index 71870cc3b8..a3fa5af59e 100644
--- a/docs/manual/mod/mod_auth_basic.xml
+++ b/docs/manual/mod/mod_auth_basic.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml
index eae330ec0f..d71b35f13a 100644
--- a/docs/manual/mod/mod_auth_digest.xml
+++ b/docs/manual/mod/mod_auth_digest.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authn_anon.xml b/docs/manual/mod/mod_authn_anon.xml
index d8ddb2b91c..82ab3667d7 100644
--- a/docs/manual/mod/mod_authn_anon.xml
+++ b/docs/manual/mod/mod_authn_anon.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml
index c30d4f38cf..ae9a2f1550 100644
--- a/docs/manual/mod/mod_authn_dbm.xml
+++ b/docs/manual/mod/mod_authn_dbm.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authn_default.xml b/docs/manual/mod/mod_authn_default.xml
index 5950fea29b..67d26388ea 100644
--- a/docs/manual/mod/mod_authn_default.xml
+++ b/docs/manual/mod/mod_authn_default.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authn_file.xml b/docs/manual/mod/mod_authn_file.xml
index 3c4cc5c2aa..d473122fc6 100644
--- a/docs/manual/mod/mod_authn_file.xml
+++ b/docs/manual/mod/mod_authn_file.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml
index 782cedeb18..c25f273f32 100644
--- a/docs/manual/mod/mod_authnz_ldap.xml
+++ b/docs/manual/mod/mod_authnz_ldap.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authz_dbm.xml b/docs/manual/mod/mod_authz_dbm.xml
index b577dde7bb..6d6ca04ff3 100644
--- a/docs/manual/mod/mod_authz_dbm.xml
+++ b/docs/manual/mod/mod_authz_dbm.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authz_default.xml b/docs/manual/mod/mod_authz_default.xml
index 326b5f8433..ba58eb5ff1 100644
--- a/docs/manual/mod/mod_authz_default.xml
+++ b/docs/manual/mod/mod_authz_default.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authz_groupfile.xml b/docs/manual/mod/mod_authz_groupfile.xml
index cab21ca5a4..d3aed88d66 100644
--- a/docs/manual/mod/mod_authz_groupfile.xml
+++ b/docs/manual/mod/mod_authz_groupfile.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authz_host.xml b/docs/manual/mod/mod_authz_host.xml
index f3db98744a..6d48ee2844 100644
--- a/docs/manual/mod/mod_authz_host.xml
+++ b/docs/manual/mod/mod_authz_host.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authz_owner.xml b/docs/manual/mod/mod_authz_owner.xml
index cf143e42ce..66e68954fe 100644
--- a/docs/manual/mod/mod_authz_owner.xml
+++ b/docs/manual/mod/mod_authz_owner.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_authz_user.xml b/docs/manual/mod/mod_authz_user.xml
index bb9bfe348a..c9d006971b 100644
--- a/docs/manual/mod/mod_authz_user.xml
+++ b/docs/manual/mod/mod_authz_user.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index 75e5b9e7dd..49e75e111a 100644
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index 78001a6ee2..cda4ea22d0 100644
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_cern_meta.xml b/docs/manual/mod/mod_cern_meta.xml
index 1250cb6222..0ada7882c3 100644
--- a/docs/manual/mod/mod_cern_meta.xml
+++ b/docs/manual/mod/mod_cern_meta.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_cgi.xml b/docs/manual/mod/mod_cgi.xml
index 29bb7db2e3..6f4158edf1 100644
--- a/docs/manual/mod/mod_cgi.xml
+++ b/docs/manual/mod/mod_cgi.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml
index 932eae1bd5..1d6c85aa5d 100644
--- a/docs/manual/mod/mod_cgid.xml
+++ b/docs/manual/mod/mod_cgid.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_charset_lite.xml b/docs/manual/mod/mod_charset_lite.xml
index 6c589f8a15..db8c7eec27 100644
--- a/docs/manual/mod/mod_charset_lite.xml
+++ b/docs/manual/mod/mod_charset_lite.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml
index 27fde10843..cd2d8f0259 100644
--- a/docs/manual/mod/mod_dav.xml
+++ b/docs/manual/mod/mod_dav.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_dav_fs.xml b/docs/manual/mod/mod_dav_fs.xml
index 3e4290789a..e595a2e230 100644
--- a/docs/manual/mod/mod_dav_fs.xml
+++ b/docs/manual/mod/mod_dav_fs.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_dav_lock.xml b/docs/manual/mod/mod_dav_lock.xml
index c6b673f588..1f44a297fe 100644
--- a/docs/manual/mod/mod_dav_lock.xml
+++ b/docs/manual/mod/mod_dav_lock.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml
index 5fdffad875..c1cbbf84b5 100644
--- a/docs/manual/mod/mod_deflate.xml
+++ b/docs/manual/mod/mod_deflate.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index 6437ae66db..af703ff116 100644
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_disk_cache.xml b/docs/manual/mod/mod_disk_cache.xml
index ddcb004658..a2880abbc3 100644
--- a/docs/manual/mod/mod_disk_cache.xml
+++ b/docs/manual/mod/mod_disk_cache.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_dumpio.xml b/docs/manual/mod/mod_dumpio.xml
index 73c0e36326..21b680b68b 100644
--- a/docs/manual/mod/mod_dumpio.xml
+++ b/docs/manual/mod/mod_dumpio.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_echo.xml b/docs/manual/mod/mod_echo.xml
index 037681d4b8..84c86cff11 100644
--- a/docs/manual/mod/mod_echo.xml
+++ b/docs/manual/mod/mod_echo.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml
index 27895f7c5a..b940b0da43 100644
--- a/docs/manual/mod/mod_env.xml
+++ b/docs/manual/mod/mod_env.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_example.xml b/docs/manual/mod/mod_example.xml
index 35c368b479..59db18296e 100644
--- a/docs/manual/mod/mod_example.xml
+++ b/docs/manual/mod/mod_example.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_expires.xml b/docs/manual/mod/mod_expires.xml
index 510950877b..6fdc12af69 100644
--- a/docs/manual/mod/mod_expires.xml
+++ b/docs/manual/mod/mod_expires.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_ext_filter.xml b/docs/manual/mod/mod_ext_filter.xml
index 4f64a177ff..61a62d803d 100644
--- a/docs/manual/mod/mod_ext_filter.xml
+++ b/docs/manual/mod/mod_ext_filter.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_file_cache.xml b/docs/manual/mod/mod_file_cache.xml
index a475c47e22..03d693a467 100644
--- a/docs/manual/mod/mod_file_cache.xml
+++ b/docs/manual/mod/mod_file_cache.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_filter.xml b/docs/manual/mod/mod_filter.xml
index 8d239b6a1e..8e2231ee06 100644
--- a/docs/manual/mod/mod_filter.xml
+++ b/docs/manual/mod/mod_filter.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 31c54e0ca7..965a1d9c5d 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_ident.xml b/docs/manual/mod/mod_ident.xml
index 6c09add0f6..79fcef794f 100644
--- a/docs/manual/mod/mod_ident.xml
+++ b/docs/manual/mod/mod_ident.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_imap.xml b/docs/manual/mod/mod_imap.xml
index 5625a45512..ab3d53d8f9 100644
--- a/docs/manual/mod/mod_imap.xml
+++ b/docs/manual/mod/mod_imap.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index aa281d85c1..435e2604d3 100644
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index 59dd6ae0b2..24696f6ad2 100644
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_isapi.xml b/docs/manual/mod/mod_isapi.xml
index 43c6321982..348ac71520 100644
--- a/docs/manual/mod/mod_isapi.xml
+++ b/docs/manual/mod/mod_isapi.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index 01cc87bc88..d60815be4f 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml
index 562d4c6044..b051a3d128 100644
--- a/docs/manual/mod/mod_log_config.xml
+++ b/docs/manual/mod/mod_log_config.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_log_forensic.xml b/docs/manual/mod/mod_log_forensic.xml
index be1a67f66e..c7fb2e0d7d 100644
--- a/docs/manual/mod/mod_log_forensic.xml
+++ b/docs/manual/mod/mod_log_forensic.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_logio.xml b/docs/manual/mod/mod_logio.xml
index e058beffd3..17dee1da71 100644
--- a/docs/manual/mod/mod_logio.xml
+++ b/docs/manual/mod/mod_logio.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_mem_cache.xml b/docs/manual/mod/mod_mem_cache.xml
index 53112e8c92..4007301eea 100644
--- a/docs/manual/mod/mod_mem_cache.xml
+++ b/docs/manual/mod/mod_mem_cache.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml
index 542fb9780a..fb517d63ef 100644
--- a/docs/manual/mod/mod_mime.xml
+++ b/docs/manual/mod/mod_mime.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_mime_magic.xml b/docs/manual/mod/mod_mime_magic.xml
index 4aa4324102..70d0068150 100644
--- a/docs/manual/mod/mod_mime_magic.xml
+++ b/docs/manual/mod/mod_mime_magic.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml
index 862b84ebd4..8a16763d97 100644
--- a/docs/manual/mod/mod_negotiation.xml
+++ b/docs/manual/mod/mod_negotiation.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_nw_ssl.xml b/docs/manual/mod/mod_nw_ssl.xml
index b7713ec1eb..cf3f427671 100644
--- a/docs/manual/mod/mod_nw_ssl.xml
+++ b/docs/manual/mod/mod_nw_ssl.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 34b3d6fcbf..d3cfc66ee2 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_proxy_ajp.xml b/docs/manual/mod/mod_proxy_ajp.xml
index 005f76cd20..326b91d692 100644
--- a/docs/manual/mod/mod_proxy_ajp.xml
+++ b/docs/manual/mod/mod_proxy_ajp.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_proxy_balancer.xml b/docs/manual/mod/mod_proxy_balancer.xml
index c0e5d7b227..6099bf8fa9 100644
--- a/docs/manual/mod/mod_proxy_balancer.xml
+++ b/docs/manual/mod/mod_proxy_balancer.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_proxy_connect.xml b/docs/manual/mod/mod_proxy_connect.xml
index 97443b61d4..332ff27032 100644
--- a/docs/manual/mod/mod_proxy_connect.xml
+++ b/docs/manual/mod/mod_proxy_connect.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_proxy_ftp.xml b/docs/manual/mod/mod_proxy_ftp.xml
index 3f008de4af..db6e09ebec 100644
--- a/docs/manual/mod/mod_proxy_ftp.xml
+++ b/docs/manual/mod/mod_proxy_ftp.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_proxy_http.xml b/docs/manual/mod/mod_proxy_http.xml
index 5c7dcac8d4..0d56fa1ad1 100644
--- a/docs/manual/mod/mod_proxy_http.xml
+++ b/docs/manual/mod/mod_proxy_http.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 76ba3b5c40..7f5107018a 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index b1b4454148..41d8ded11e 100644
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_so.xml b/docs/manual/mod/mod_so.xml
index 8057170d49..34e77d57fe 100644
--- a/docs/manual/mod/mod_so.xml
+++ b/docs/manual/mod/mod_so.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_speling.xml b/docs/manual/mod/mod_speling.xml
index 88fcc10576..58af9d8974 100644
--- a/docs/manual/mod/mod_speling.xml
+++ b/docs/manual/mod/mod_speling.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 0e0b939cbf..d32a6ca3aa 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml
index 27aa4e016f..f1bcb330f0 100644
--- a/docs/manual/mod/mod_status.xml
+++ b/docs/manual/mod/mod_status.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_suexec.xml b/docs/manual/mod/mod_suexec.xml
index 4747aad165..6a911e145b 100644
--- a/docs/manual/mod/mod_suexec.xml
+++ b/docs/manual/mod/mod_suexec.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_unique_id.xml b/docs/manual/mod/mod_unique_id.xml
index 9d27ecf6b5..47ece54a27 100644
--- a/docs/manual/mod/mod_unique_id.xml
+++ b/docs/manual/mod/mod_unique_id.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml
index 4ec584eaf0..8c050dfefc 100644
--- a/docs/manual/mod/mod_userdir.xml
+++ b/docs/manual/mod/mod_userdir.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_usertrack.xml b/docs/manual/mod/mod_usertrack.xml
index b5510885d4..31eace6786 100644
--- a/docs/manual/mod/mod_usertrack.xml
+++ b/docs/manual/mod/mod_usertrack.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_version.xml b/docs/manual/mod/mod_version.xml
index de1f663cb6..e96a2de3f0 100644
--- a/docs/manual/mod/mod_version.xml
+++ b/docs/manual/mod/mod_version.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mod_vhost_alias.xml b/docs/manual/mod/mod_vhost_alias.xml
index f7ebd93448..a378e17fc4 100644
--- a/docs/manual/mod/mod_vhost_alias.xml
+++ b/docs/manual/mod/mod_vhost_alias.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/module-dict.xml b/docs/manual/mod/module-dict.xml
index fbbf434723..cec5db15fa 100644
--- a/docs/manual/mod/module-dict.xml
+++ b/docs/manual/mod/module-dict.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index eee8d5041a..8bca7bbf10 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mpm_netware.xml b/docs/manual/mod/mpm_netware.xml
index 900d90e0fa..7985902c64 100644
--- a/docs/manual/mod/mpm_netware.xml
+++ b/docs/manual/mod/mpm_netware.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index 20b7fe9f7b..93f2ff88d3 100644
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/mpmt_os2.xml b/docs/manual/mod/mpmt_os2.xml
index 1d96a82efd..479c43990f 100644
--- a/docs/manual/mod/mpmt_os2.xml
+++ b/docs/manual/mod/mpmt_os2.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/perchild.xml b/docs/manual/mod/perchild.xml
index b1a4fcab93..f386849b15 100644
--- a/docs/manual/mod/perchild.xml
+++ b/docs/manual/mod/perchild.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/prefork.xml b/docs/manual/mod/prefork.xml
index 0955250781..10b9af1a20 100644
--- a/docs/manual/mod/prefork.xml
+++ b/docs/manual/mod/prefork.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/quickreference.xml b/docs/manual/mod/quickreference.xml
index cb61afb80e..f3f02002cc 100644
--- a/docs/manual/mod/quickreference.xml
+++ b/docs/manual/mod/quickreference.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/threadpool.xml b/docs/manual/mod/threadpool.xml
index 6a4296310e..2c4b6f7015 100644
--- a/docs/manual/mod/threadpool.xml
+++ b/docs/manual/mod/threadpool.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mod/worker.xml b/docs/manual/mod/worker.xml
index ce2ce2c076..f68520fdac 100644
--- a/docs/manual/mod/worker.xml
+++ b/docs/manual/mod/worker.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml
index 701fcd0e15..a2108bf939 100644
--- a/docs/manual/mpm.xml
+++ b/docs/manual/mpm.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml
index 944309b9b9..a9598506d0 100644
--- a/docs/manual/new_features_2_0.xml
+++ b/docs/manual/new_features_2_0.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index c58f8197ea..210efbd020 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/platform/ebcdic.xml b/docs/manual/platform/ebcdic.xml
index f565ad4ada..f91acb3af0 100644
--- a/docs/manual/platform/ebcdic.xml
+++ b/docs/manual/platform/ebcdic.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/platform/index.xml b/docs/manual/platform/index.xml
index 6a7362555e..c8cf35f3d4 100644
--- a/docs/manual/platform/index.xml
+++ b/docs/manual/platform/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml
index 9fc30ff88c..500c75db16 100644
--- a/docs/manual/platform/netware.xml
+++ b/docs/manual/platform/netware.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/platform/perf-hp.xml b/docs/manual/platform/perf-hp.xml
index b6d810fbcd..1554acc9dd 100644
--- a/docs/manual/platform/perf-hp.xml
+++ b/docs/manual/platform/perf-hp.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/platform/win_compiling.xml b/docs/manual/platform/win_compiling.xml
index e9be13a048..8b069606f9 100644
--- a/docs/manual/platform/win_compiling.xml
+++ b/docs/manual/platform/win_compiling.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index abfa4000c9..0872cbe87c 100644
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/ab.xml b/docs/manual/programs/ab.xml
index 84f2d70395..1aeec1b43a 100644
--- a/docs/manual/programs/ab.xml
+++ b/docs/manual/programs/ab.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/apachectl.xml b/docs/manual/programs/apachectl.xml
index 3e2516abfe..424dd951f6 100644
--- a/docs/manual/programs/apachectl.xml
+++ b/docs/manual/programs/apachectl.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/apxs.xml b/docs/manual/programs/apxs.xml
index 5bb20423e2..ba0e36afe5 100644
--- a/docs/manual/programs/apxs.xml
+++ b/docs/manual/programs/apxs.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index 2fc0d3bda9..8bd373018d 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/dbmmanage.xml b/docs/manual/programs/dbmmanage.xml
index f5c2e72fe1..14dd69820e 100644
--- a/docs/manual/programs/dbmmanage.xml
+++ b/docs/manual/programs/dbmmanage.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/htcacheclean.xml b/docs/manual/programs/htcacheclean.xml
index de09c73d28..19b835c87f 100644
--- a/docs/manual/programs/htcacheclean.xml
+++ b/docs/manual/programs/htcacheclean.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/htdigest.xml b/docs/manual/programs/htdigest.xml
index fb5cfd10c9..74cc97dc64 100644
--- a/docs/manual/programs/htdigest.xml
+++ b/docs/manual/programs/htdigest.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml
index c6e9d9fa91..294a1a02df 100644
--- a/docs/manual/programs/htpasswd.xml
+++ b/docs/manual/programs/htpasswd.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml
index 6783c2625d..4710eaf19b 100644
--- a/docs/manual/programs/httpd.xml
+++ b/docs/manual/programs/httpd.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/index.xml b/docs/manual/programs/index.xml
index f3c8baa129..c8a77d100a 100644
--- a/docs/manual/programs/index.xml
+++ b/docs/manual/programs/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/logresolve.xml b/docs/manual/programs/logresolve.xml
index 7b6a17adc5..bf226962a9 100644
--- a/docs/manual/programs/logresolve.xml
+++ b/docs/manual/programs/logresolve.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/other.xml b/docs/manual/programs/other.xml
index 293bc7ef18..8939827f36 100644
--- a/docs/manual/programs/other.xml
+++ b/docs/manual/programs/other.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/rotatelogs.xml b/docs/manual/programs/rotatelogs.xml
index bc7b18155a..d24268eb31 100644
--- a/docs/manual/programs/rotatelogs.xml
+++ b/docs/manual/programs/rotatelogs.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml
index adf967206d..14649f1225 100644
--- a/docs/manual/programs/suexec.xml
+++ b/docs/manual/programs/suexec.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml
index f035dfb9c6..0df64ee175 100644
--- a/docs/manual/sections.xml
+++ b/docs/manual/sections.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/server-wide.xml b/docs/manual/server-wide.xml
index f27deedd1e..57c31f48a5 100644
--- a/docs/manual/server-wide.xml
+++ b/docs/manual/server-wide.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index b4cc322af4..9b19754458 100644
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/ssl/index.xml b/docs/manual/ssl/index.xml
index 58fca4ddf2..0d0a65af6a 100644
--- a/docs/manual/ssl/index.xml
+++ b/docs/manual/ssl/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/ssl/ssl_compat.xml b/docs/manual/ssl/ssl_compat.xml
index 41baa3ea79..3f10971d8b 100644
--- a/docs/manual/ssl/ssl_compat.xml
+++ b/docs/manual/ssl/ssl_compat.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index 4a4d92cffd..7ffe81023a 100644
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml
index 1812e720ae..8273e8f6da 100644
--- a/docs/manual/ssl/ssl_howto.xml
+++ b/docs/manual/ssl/ssl_howto.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/ssl/ssl_intro.xml b/docs/manual/ssl/ssl_intro.xml
index e0f6676766..9dbeb078da 100644
--- a/docs/manual/ssl/ssl_intro.xml
+++ b/docs/manual/ssl/ssl_intro.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/stopping.xml b/docs/manual/stopping.xml
index 9c51709d12..c630b8083a 100644
--- a/docs/manual/stopping.xml
+++ b/docs/manual/stopping.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/description.xml b/docs/manual/style/description.xml
index bd31ac8bc4..a02cc1f8d2 100644
--- a/docs/manual/style/description.xml
+++ b/docs/manual/style/description.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang-targets.xml b/docs/manual/style/lang-targets.xml
index 735b076f7c..d8a09c05ef 100644
--- a/docs/manual/style/lang-targets.xml
+++ b/docs/manual/style/lang-targets.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index 6fcbce254c..2a95ccad44 100644
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -3,8 +3,8 @@
 <!-- English Revision: 106753 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 016f926d60..3bcd3769be 100644
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -3,8 +3,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/es.xml b/docs/manual/style/lang/es.xml
index e7990aed3a..b972403c86 100644
--- a/docs/manual/style/lang/es.xml
+++ b/docs/manual/style/lang/es.xml
@@ -3,8 +3,8 @@
 <!-- English revision: 106753 -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/fr.xml b/docs/manual/style/lang/fr.xml
index 19ecd05a66..cb71ff5227 100644
--- a/docs/manual/style/lang/fr.xml
+++ b/docs/manual/style/lang/fr.xml
@@ -3,8 +3,8 @@
 <!-- English revision: 106753 -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index 9cc9b7e0cf..37ba31dd10 100644
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -3,8 +3,8 @@
 <!-- English revision: 106753 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 8dec9e1e18..5bbd0295af 100644
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -3,8 +3,8 @@
 <!-- English revision: 106753 -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index b1b37770f9..1ed52c23df 100644
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -3,8 +3,8 @@
 <!-- English revision: 106753 -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/common.xsl b/docs/manual/style/latex/common.xsl
index 2f9857ecdf..3a18352705 100644
--- a/docs/manual/style/latex/common.xsl
+++ b/docs/manual/style/latex/common.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/directiveindex.xsl b/docs/manual/style/latex/directiveindex.xsl
index 7490986591..0ed5eb5744 100644
--- a/docs/manual/style/latex/directiveindex.xsl
+++ b/docs/manual/style/latex/directiveindex.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/faq.xsl b/docs/manual/style/latex/faq.xsl
index 4b7361f188..9271da4fea 100644
--- a/docs/manual/style/latex/faq.xsl
+++ b/docs/manual/style/latex/faq.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/html.xsl b/docs/manual/style/latex/html.xsl
index 5684244f28..a8a5eb8a4b 100644
--- a/docs/manual/style/latex/html.xsl
+++ b/docs/manual/style/latex/html.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl
index dd2c3bea3f..59002e2c27 100644
--- a/docs/manual/style/latex/latex.xsl
+++ b/docs/manual/style/latex/latex.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/manualpage.xsl b/docs/manual/style/latex/manualpage.xsl
index e84f5a5d05..ddf912c569 100644
--- a/docs/manual/style/latex/manualpage.xsl
+++ b/docs/manual/style/latex/manualpage.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/moduleindex.xsl b/docs/manual/style/latex/moduleindex.xsl
index 1cc2d2b82a..54714f1865 100644
--- a/docs/manual/style/latex/moduleindex.xsl
+++ b/docs/manual/style/latex/moduleindex.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/quickreference.xsl b/docs/manual/style/latex/quickreference.xsl
index 97f27b7563..16017a0676 100644
--- a/docs/manual/style/latex/quickreference.xsl
+++ b/docs/manual/style/latex/quickreference.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/latex/synopsis.xsl b/docs/manual/style/latex/synopsis.xsl
index f3e0985fc4..cae6785a32 100644
--- a/docs/manual/style/latex/synopsis.xsl
+++ b/docs/manual/style/latex/synopsis.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.de.xsl b/docs/manual/style/manual.de.xsl
index 3cfaca1274..2e932500af 100644
--- a/docs/manual/style/manual.de.xsl
+++ b/docs/manual/style/manual.de.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.en.xsl b/docs/manual/style/manual.en.xsl
index 7853e3fd64..25bfc1e020 100644
--- a/docs/manual/style/manual.en.xsl
+++ b/docs/manual/style/manual.en.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.es.xsl b/docs/manual/style/manual.es.xsl
index 9f815edf7b..abd3deb341 100644
--- a/docs/manual/style/manual.es.xsl
+++ b/docs/manual/style/manual.es.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.fr.xsl b/docs/manual/style/manual.fr.xsl
index e74ef4205b..1a7e2b94e5 100644
--- a/docs/manual/style/manual.fr.xsl
+++ b/docs/manual/style/manual.fr.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.ja.xsl b/docs/manual/style/manual.ja.xsl
index 430f02cbf5..bc38303c9c 100644
--- a/docs/manual/style/manual.ja.xsl
+++ b/docs/manual/style/manual.ja.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.ko.xsl b/docs/manual/style/manual.ko.xsl
index 5056f0142e..06c12ed4d7 100644
--- a/docs/manual/style/manual.ko.xsl
+++ b/docs/manual/style/manual.ko.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.pt-br.xsl b/docs/manual/style/manual.pt-br.xsl
index e64d746970..41457227a1 100644
--- a/docs/manual/style/manual.pt-br.xsl
+++ b/docs/manual/style/manual.pt-br.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/manual.ru.xsl b/docs/manual/style/manual.ru.xsl
index 4aa1f85aec..f55f8ba420 100644
--- a/docs/manual/style/manual.ru.xsl
+++ b/docs/manual/style/manual.ru.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 3c0454a63b..55d4bafa2c 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index a9dfb646ce..e923e3a665 100644
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ b/docs/manual/style/xsl/directiveindex.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/faq.xsl b/docs/manual/style/xsl/faq.xsl
index 247c4925dc..05ebd0fe0d 100644
--- a/docs/manual/style/xsl/faq.xsl
+++ b/docs/manual/style/xsl/faq.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/hhc.xsl b/docs/manual/style/xsl/hhc.xsl
index eae66df65e..5b5dbfbd56 100644
--- a/docs/manual/style/xsl/hhc.xsl
+++ b/docs/manual/style/xsl/hhc.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/hhp.xsl b/docs/manual/style/xsl/hhp.xsl
index c5a5d24e32..58aad47515 100644
--- a/docs/manual/style/xsl/hhp.xsl
+++ b/docs/manual/style/xsl/hhp.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl
index 724552c460..71a2f9dd54 100644
--- a/docs/manual/style/xsl/indexpage.xsl
+++ b/docs/manual/style/xsl/indexpage.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/language.xsl b/docs/manual/style/xsl/language.xsl
index bb3c9b1d93..6c25bd2a08 100644
--- a/docs/manual/style/xsl/language.xsl
+++ b/docs/manual/style/xsl/language.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/maf.xsl b/docs/manual/style/xsl/maf.xsl
index 39413e460c..2f308b389b 100644
--- a/docs/manual/style/xsl/maf.xsl
+++ b/docs/manual/style/xsl/maf.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl
index 078e853393..d2e0fdff8f 100644
--- a/docs/manual/style/xsl/manualpage.xsl
+++ b/docs/manual/style/xsl/manualpage.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
index a1e604ce08..6c413794c0 100644
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ b/docs/manual/style/xsl/moduleindex.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/nroff.xsl b/docs/manual/style/xsl/nroff.xsl
index 0f18d7a1dd..47d4680211 100644
--- a/docs/manual/style/xsl/nroff.xsl
+++ b/docs/manual/style/xsl/nroff.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index 65c131849f..7b94886d2c 100644
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
index c1f6d78c64..d3712498a1 100644
--- a/docs/manual/style/xsl/sitemap.xsl
+++ b/docs/manual/style/xsl/sitemap.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index 4713909247..ee9319b56d 100644
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/typemap.xsl b/docs/manual/style/xsl/typemap.xsl
index de38fd8e5e..4b14e98ad4 100644
--- a/docs/manual/style/xsl/typemap.xsl
+++ b/docs/manual/style/xsl/typemap.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/style/xsl/util/modtrans.xsl b/docs/manual/style/xsl/util/modtrans.xsl
index 984695e542..7f8c82f2e9 100644
--- a/docs/manual/style/xsl/util/modtrans.xsl
+++ b/docs/manual/style/xsl/util/modtrans.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml
index 8e8979522f..b007d0fddd 100644
--- a/docs/manual/suexec.xml
+++ b/docs/manual/suexec.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 7568f14acd..d88d9df3bd 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 24f52be5e6..bde7e69476 100644
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml
index 423c5d7dae..2da46607a7 100644
--- a/docs/manual/vhosts/details.xml
+++ b/docs/manual/vhosts/details.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml
index 653112728d..5f4b1a26b7 100644
--- a/docs/manual/vhosts/examples.xml
+++ b/docs/manual/vhosts/examples.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/fd-limits.xml b/docs/manual/vhosts/fd-limits.xml
index 50f7c10479..54a3563aba 100644
--- a/docs/manual/vhosts/fd-limits.xml
+++ b/docs/manual/vhosts/fd-limits.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/index.xml b/docs/manual/vhosts/index.xml
index 664852881a..3e73056adc 100644
--- a/docs/manual/vhosts/index.xml
+++ b/docs/manual/vhosts/index.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml
index a89919622e..23a64f7c5e 100644
--- a/docs/manual/vhosts/ip-based.xml
+++ b/docs/manual/vhosts/ip-based.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml
index 8ba84d1935..8e3dc063e1 100644
--- a/docs/manual/vhosts/mass.xml
+++ b/docs/manual/vhosts/mass.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml
index 7dd71eaf6e..567b3faba1 100644
--- a/docs/manual/vhosts/name-based.xml
+++ b/docs/manual/vhosts/name-based.xml
@@ -4,8 +4,8 @@
 <!-- $LastChangedRevision$ -->
 
 <!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/include/ap_compat.h b/include/ap_compat.h
index 97599110b8..4c25b0ad9d 100644
--- a/include/ap_compat.h
+++ b/include/ap_compat.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_config.h b/include/ap_config.h
index 6c0fd50a4b..cfcd04ac95 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_listen.h b/include/ap_listen.h
index edac2a1fa9..bdcea6a53d 100644
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 3356661a13..e58f094656 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 758c694a2f..b1e303fe05 100644
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_provider.h b/include/ap_provider.h
index c704058d8a..c05da554c5 100644
--- a/include/ap_provider.h
+++ b/include/ap_provider.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_regkey.h b/include/ap_regkey.h
index 5d79b631c1..1964ccd2d3 100644
--- a/include/ap_regkey.h
+++ b/include/ap_regkey.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/ap_release.h b/include/ap_release.h
index 90fd7b01fc..f52646aa06 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_config.h b/include/http_config.h
index 23b2179957..b09f0da16c 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_connection.h b/include/http_connection.h
index 75d614f372..8ade757b1d 100644
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_core.h b/include/http_core.h
index fbc2b8d258..cac4b0e223 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_log.h b/include/http_log.h
index dca4527e89..1e96f97b85 100644
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_main.h b/include/http_main.h
index cfe3f81d27..fcd6236dcf 100644
--- a/include/http_main.h
+++ b/include/http_main.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_protocol.h b/include/http_protocol.h
index 434f182171..45e3d66c05 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_request.h b/include/http_request.h
index 529f703b24..f5651388e7 100644
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/http_vhost.h b/include/http_vhost.h
index 7c72368af3..ffd2a89a97 100644
--- a/include/http_vhost.h
+++ b/include/http_vhost.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/httpd.h b/include/httpd.h
index ff38d076be..c8a118f08b 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/mpm_common.h b/include/mpm_common.h
index e10f840c3d..1fdac30671 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/scoreboard.h b/include/scoreboard.h
index 2c41e86405..724cc315c4 100644
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_cfgtree.h b/include/util_cfgtree.h
index 828cc6e6e3..4257e3605b 100644
--- a/include/util_cfgtree.h
+++ b/include/util_cfgtree.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_charset.h b/include/util_charset.h
index 233f20b35c..bfc743b0c5 100644
--- a/include/util_charset.h
+++ b/include/util_charset.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_ebcdic.h b/include/util_ebcdic.h
index 39d2e14a3b..70dbd2ee00 100644
--- a/include/util_ebcdic.h
+++ b/include/util_ebcdic.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_filter.h b/include/util_filter.h
index 45a2e39d33..81f86fe985 100644
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_ldap.h b/include/util_ldap.h
index dccb777e5a..e6c35c3436 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_md5.h b/include/util_md5.h
index 8db1e1a359..16b0e0144c 100644
--- a/include/util_md5.h
+++ b/include/util_md5.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_script.h b/include/util_script.h
index bdffb2b221..8ee1ea6722 100644
--- a/include/util_script.h
+++ b/include/util_script.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_time.h b/include/util_time.h
index 5fcd0078bf..2e34388d52 100644
--- a/include/util_time.h
+++ b/include/util_time.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/include/util_xml.h b/include/util_xml.h
index 126d7f4b97..b97da2c1e0 100644
--- a/include/util_xml.h
+++ b/include/util_xml.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_auth.h b/modules/aaa/mod_auth.h
index 5633641f26..fcc172ee71 100644
--- a/modules/aaa/mod_auth.h
+++ b/modules/aaa/mod_auth.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
index a6abd73fa7..fc27b71a16 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 44c1060cbc..2e02f38b05 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authn_anon.c b/modules/aaa/mod_authn_anon.c
index 3622c8275d..6353b3eb44 100644
--- a/modules/aaa/mod_authn_anon.c
+++ b/modules/aaa/mod_authn_anon.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authn_dbm.c b/modules/aaa/mod_authn_dbm.c
index 76e55d841f..2f66203212 100644
--- a/modules/aaa/mod_authn_dbm.c
+++ b/modules/aaa/mod_authn_dbm.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authn_default.c b/modules/aaa/mod_authn_default.c
index ab41ad308f..babeebd3e6 100644
--- a/modules/aaa/mod_authn_default.c
+++ b/modules/aaa/mod_authn_default.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
index aa4dbe161a..726ed46494 100644
--- a/modules/aaa/mod_authn_file.c
+++ b/modules/aaa/mod_authn_file.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index 904f99a103..59a0222f44 100644
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authz_dbm.c b/modules/aaa/mod_authz_dbm.c
index f9a8efbbd2..436c42a6f7 100644
--- a/modules/aaa/mod_authz_dbm.c
+++ b/modules/aaa/mod_authz_dbm.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authz_default.c b/modules/aaa/mod_authz_default.c
index 2c54c813e6..88859b2061 100644
--- a/modules/aaa/mod_authz_default.c
+++ b/modules/aaa/mod_authz_default.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c
index eb5a14d89a..6f02d06d9d 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c
index 7fe9c30b9a..b817b9eb12 100644
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_authz_host.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authz_owner.c b/modules/aaa/mod_authz_owner.c
index 9652de01ce..8f56879545 100644
--- a/modules/aaa/mod_authz_owner.c
+++ b/modules/aaa/mod_authz_owner.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/aaa/mod_authz_user.c b/modules/aaa/mod_authz_user.c
index 69347ec7a4..3478359593 100644
--- a/modules/aaa/mod_authz_user.c
+++ b/modules/aaa/mod_authz_user.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/arch/netware/libprews.c b/modules/arch/netware/libprews.c
index e0cc65c4fd..7255c75215 100644
--- a/modules/arch/netware/libprews.c
+++ b/modules/arch/netware/libprews.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/arch/netware/mod_netware.c b/modules/arch/netware/mod_netware.c
index 7538dc7287..f7fd0b0594 100644
--- a/modules/arch/netware/mod_netware.c
+++ b/modules/arch/netware/mod_netware.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c
index 108deb8a5b..7ad3abae12 100644
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index e097c3d9d6..dd6c40ccaa 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/arch/win32/mod_isapi.h b/modules/arch/win32/mod_isapi.h
index 48563ded3b..a932d507f8 100644
--- a/modules/arch/win32/mod_isapi.h
+++ b/modules/arch/win32/mod_isapi.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/arch/win32/mod_win32.c b/modules/arch/win32/mod_win32.c
index ab1c90cb1a..14c5efb963 100644
--- a/modules/arch/win32/mod_win32.c
+++ b/modules/arch/win32/mod_win32.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_cache.c b/modules/cache/cache_cache.c
index 2305370c23..16237986a7 100644
--- a/modules/cache/cache_cache.c
+++ b/modules/cache/cache_cache.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_cache.h b/modules/cache/cache_cache.h
index acc94a7dee..011cea825f 100644
--- a/modules/cache/cache_cache.h
+++ b/modules/cache/cache_cache.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_hash.c b/modules/cache/cache_hash.c
index c51e48e53e..8c5e0c1594 100644
--- a/modules/cache/cache_hash.c
+++ b/modules/cache/cache_hash.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_hash.h b/modules/cache/cache_hash.h
index 798f45964c..f945deed86 100644
--- a/modules/cache/cache_hash.h
+++ b/modules/cache/cache_hash.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_pqueue.c b/modules/cache/cache_pqueue.c
index 0ea3d794d4..97d0133bf6 100644
--- a/modules/cache/cache_pqueue.c
+++ b/modules/cache/cache_pqueue.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_pqueue.h b/modules/cache/cache_pqueue.h
index f01473f332..d9559ebff5 100644
--- a/modules/cache/cache_pqueue.h
+++ b/modules/cache/cache_pqueue.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index a300bcb334..0802f9113f 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index 7c7dc59395..3442df0e2f 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index c0afe5a474..1d821d3b36 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
index 8d711be00b..61bcaa85a1 100644
--- a/modules/cache/mod_cache.h
+++ b/modules/cache/mod_cache.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index 48613b04fc..e42c372824 100644
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 269c6dda4e..a23eb6ecde 100644
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c
index db7cedd5cd..89ccb99851 100644
--- a/modules/cache/mod_mem_cache.c
+++ b/modules/cache/mod_mem_cache.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c
index 9512290f46..c5493fcf1c 100644
--- a/modules/dav/fs/dbm.c
+++ b/modules/dav/fs/dbm.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
index 96ca534321..c3f071c5b8 100644
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/fs/mod_dav_fs.c b/modules/dav/fs/mod_dav_fs.c
index fdc4073f2a..2f3197d2f9 100644
--- a/modules/dav/fs/mod_dav_fs.c
+++ b/modules/dav/fs/mod_dav_fs.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
index fa28d0521c..9c3e974e1e 100644
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/fs/repos.h b/modules/dav/fs/repos.h
index 7959ddbe09..1e19de4892 100644
--- a/modules/dav/fs/repos.h
+++ b/modules/dav/fs/repos.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/lock/locks.c b/modules/dav/lock/locks.c
index 64e3ae9a05..a9eefeef66 100644
--- a/modules/dav/lock/locks.c
+++ b/modules/dav/lock/locks.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/lock/locks.h b/modules/dav/lock/locks.h
index 5e6eff1c0e..71f59974ee 100644
--- a/modules/dav/lock/locks.h
+++ b/modules/dav/lock/locks.h
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/lock/mod_dav_lock.c b/modules/dav/lock/mod_dav_lock.c
index e8b6f72665..08019a907b 100644
--- a/modules/dav/lock/mod_dav_lock.c
+++ b/modules/dav/lock/mod_dav_lock.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/liveprop.c b/modules/dav/main/liveprop.c
index 42f68a051f..191d5a9d1c 100644
--- a/modules/dav/main/liveprop.c
+++ b/modules/dav/main/liveprop.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 38d67b0bf5..71bdaea53d 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h
index 4ce7889fc3..c814492de2 100644
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c
index c1ea75550d..12ac4a2c98 100644
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/providers.c b/modules/dav/main/providers.c
index 8a0d411971..42e794c084 100644
--- a/modules/dav/main/providers.c
+++ b/modules/dav/main/providers.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/std_liveprop.c b/modules/dav/main/std_liveprop.c
index d19e142aa9..b502a0a57b 100644
--- a/modules/dav/main/std_liveprop.c
+++ b/modules/dav/main/std_liveprop.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index c1bc5f92b1..fbc129cfa6 100644
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/dav/main/util_lock.c b/modules/dav/main/util_lock.c
index 8ec2b136ae..1571407956 100644
--- a/modules/dav/main/util_lock.c
+++ b/modules/dav/main/util_lock.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/debug/mod_bucketeer.c b/modules/debug/mod_bucketeer.c
index cbcd00cc1c..215617e6bf 100644
--- a/modules/debug/mod_bucketeer.c
+++ b/modules/debug/mod_bucketeer.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c
index 111f312122..9d223f8b85 100644
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/experimental/mod_case_filter.c b/modules/experimental/mod_case_filter.c
index 89e1e33d3b..8a3b08457c 100644
--- a/modules/experimental/mod_case_filter.c
+++ b/modules/experimental/mod_case_filter.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/experimental/mod_case_filter_in.c b/modules/experimental/mod_case_filter_in.c
index c894cda920..2b1d42075e 100644
--- a/modules/experimental/mod_case_filter_in.c
+++ b/modules/experimental/mod_case_filter_in.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index 08440557ee..66b8ef0793 100644
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/experimental/mod_example.c b/modules/experimental/mod_example.c
index 62946fd516..507c525032 100644
--- a/modules/experimental/mod_example.c
+++ b/modules/experimental/mod_example.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 550b514ae8..eb2225f69d 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/filters/mod_ext_filter.c b/modules/filters/mod_ext_filter.c
index d83d7303e6..0fbb0f61d8 100644
--- a/modules/filters/mod_ext_filter.c
+++ b/modules/filters/mod_ext_filter.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index ca68b45389..aa07faf4b1 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/filters/mod_include.h b/modules/filters/mod_include.h
index e890d7cb83..12e2ca1cb1 100644
--- a/modules/filters/mod_include.h
+++ b/modules/filters/mod_include.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_asis.c b/modules/generators/mod_asis.c
index 8102e736bd..4887d43bc9 100644
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 6c09d8a899..8f2a0c0594 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 36a43bf828..8c11071f75 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_cgi.h b/modules/generators/mod_cgi.h
index 96fbe09f0c..1429efadf3 100644
--- a/modules/generators/mod_cgi.h
+++ b/modules/generators/mod_cgi.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index eb91134acb..997445972a 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index aa8b454e00..cbf6742c1a 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 367dff4265..52171323f6 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_status.h b/modules/generators/mod_status.h
index 97aee13558..03041825e2 100644
--- a/modules/generators/mod_status.h
+++ b/modules/generators/mod_status.h
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_suexec.c b/modules/generators/mod_suexec.c
index af66dfc1c3..080c51d959 100644
--- a/modules/generators/mod_suexec.c
+++ b/modules/generators/mod_suexec.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/generators/mod_suexec.h b/modules/generators/mod_suexec.h
index 248d1bbe42..5169beeee9 100644
--- a/modules/generators/mod_suexec.h
+++ b/modules/generators/mod_suexec.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/byterange_filter.c b/modules/http/byterange_filter.c
index fa520df4ba..9446cf6b70 100644
--- a/modules/http/byterange_filter.c
+++ b/modules/http/byterange_filter.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/chunk_filter.c b/modules/http/chunk_filter.c
index 7426a1aa6b..c5175e6ee3 100644
--- a/modules/http/chunk_filter.c
+++ b/modules/http/chunk_filter.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 773f68fa0d..9dcee75697 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/http_etag.c b/modules/http/http_etag.c
index b26d303c3d..765ee9704f 100644
--- a/modules/http/http_etag.c
+++ b/modules/http/http_etag.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 0f6a037534..3c7570fbb4 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 83efcc2260..df330c0c87 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 3c7787805e..22c23af6da 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/mod_core.h b/modules/http/mod_core.h
index fa1a124752..a7db95c51e 100644
--- a/modules/http/mod_core.h
+++ b/modules/http/mod_core.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index cfbb737c3c..0937f2eab2 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 730da2a2b1..b6d60ca73b 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ldap/util_ldap_cache.c b/modules/ldap/util_ldap_cache.c
index 0d2692b6c7..97cb83d613 100644
--- a/modules/ldap/util_ldap_cache.c
+++ b/modules/ldap/util_ldap_cache.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ldap/util_ldap_cache.h b/modules/ldap/util_ldap_cache.h
index 9c08901850..478fbfc186 100644
--- a/modules/ldap/util_ldap_cache.h
+++ b/modules/ldap/util_ldap_cache.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c
index 69523a8d2f..092e21f62b 100644
--- a/modules/ldap/util_ldap_cache_mgr.c
+++ b/modules/ldap/util_ldap_cache_mgr.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 96df3fa434..1845999e33 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/loggers/mod_log_config.h b/modules/loggers/mod_log_config.h
index d3d3590cda..1b7e8ba7d9 100644
--- a/modules/loggers/mod_log_config.h
+++ b/modules/loggers/mod_log_config.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 3154bb87ba..a5290c0704 100644
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_actions.c b/modules/mappers/mod_actions.c
index 7dbba915f7..473a9681ed 100644
--- a/modules/mappers/mod_actions.c
+++ b/modules/mappers/mod_actions.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index aaf339c2dd..df971504d8 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index c6e7f0d506..b0bc39a7dd 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c
index a5faf7b410..d5f2a955ad 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 1a8f89695f..0e94210bf4 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 4c949f6fec..2fa46ea541 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h
index 9fdaf702f4..08f8735854 100644
--- a/modules/mappers/mod_rewrite.h
+++ b/modules/mappers/mod_rewrite.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index 079296b8e4..58e1a4444d 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 32d7d4500f..a89bf449ee 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 93d34ae0c6..455b150d51 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/mappers/mod_vhost_alias.c b/modules/mappers/mod_vhost_alias.c
index 83839d5e3b..c05860a3db 100644
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c
index 435d01f766..ebe5933154 100644
--- a/modules/metadata/mod_cern_meta.c
+++ b/modules/metadata/mod_cern_meta.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_env.c b/modules/metadata/mod_env.c
index 5886f946e9..abaed0192d 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 1a9ae87c1b..510136e99a 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index 988473f8c4..7c4c2c0b64 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_ident.c b/modules/metadata/mod_ident.c
index bdf09d4307..ccce9b0b3b 100644
--- a/modules/metadata/mod_ident.c
+++ b/modules/metadata/mod_ident.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 41065ca549..4cb096ea61 100644
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index bf2e0ec02e..22eae46cba 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 21d232f88a..7783b3cfe0 100644
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index 958ba6eaac..642996feca 100644
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/ajp.h b/modules/proxy/ajp.h
index dd5ccf1272..29f67bff6c 100644
--- a/modules/proxy/ajp.h
+++ b/modules/proxy/ajp.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index 44c666e843..6237769aca 100644
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -1,17 +1,17 @@
-/*
- *  Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include "ajp_header.h"
diff --git a/modules/proxy/ajp_header.h b/modules/proxy/ajp_header.h
index ff2b3f4c01..35ac2e50f5 100644
--- a/modules/proxy/ajp_header.h
+++ b/modules/proxy/ajp_header.h
@@ -1,17 +1,17 @@
-/*
- *  Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 #ifndef AJP_HEADER_H
 #define AJP_HEADER_H
diff --git a/modules/proxy/ajp_link.c b/modules/proxy/ajp_link.c
index 3e7941b5a3..bbbbec418e 100644
--- a/modules/proxy/ajp_link.c
+++ b/modules/proxy/ajp_link.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/ajp_msg.c b/modules/proxy/ajp_msg.c
index dec58502f4..0696f9c7fd 100644
--- a/modules/proxy/ajp_msg.c
+++ b/modules/proxy/ajp_msg.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 735d3e9168..c97717773d 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 8e56b23cc6..3739de443c 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 0e92715236..5bf32e50fe 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 96774b8b01..7956b41f35 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index fda3172211..8bc1694980 100644
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index bcd793f5dc..60216f4551 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 76d7e6ac9a..a69751efa2 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 0c5c846afd..68c3bca32e 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/Makefile.in b/modules/ssl/Makefile.in
index 836ad3e5a5..2a64d5b380 100644
--- a/modules/ssl/Makefile.in
+++ b/modules/ssl/Makefile.in
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 4fa39008ad..8e0512367a 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index c52ec3b723..67761c7813 100644
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 85831ea45f..c6572216e2 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_dh.c b/modules/ssl/ssl_engine_dh.c
index 3121b65631..48884d241b 100644
--- a/modules/ssl/ssl_engine_dh.c
+++ b/modules/ssl/ssl_engine_dh.c
@@ -2,7 +2,8 @@
 =pod
 #endif
 
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index bcc0d388f5..90094df44f 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 6d1cb17f82..1699897470 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 7e94a45a7c..efa7230b17 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_log.c b/modules/ssl/ssl_engine_log.c
index 0e16e1c3bc..0c1d1cc2d0 100644
--- a/modules/ssl/ssl_engine_log.c
+++ b/modules/ssl/ssl_engine_log.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c
index a441724064..65924d269e 100644
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index af8bc72a2f..7f0e4b6949 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_rand.c b/modules/ssl/ssl_engine_rand.c
index 6836d76caf..486759c702 100644
--- a/modules/ssl/ssl_engine_rand.c
+++ b/modules/ssl/ssl_engine_rand.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index a4f1722063..568ebb20b0 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_expr.c b/modules/ssl/ssl_expr.c
index 6da0c6eb0f..f45d959d67 100644
--- a/modules/ssl/ssl_expr.c
+++ b/modules/ssl/ssl_expr.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_expr.h b/modules/ssl/ssl_expr.h
index 8399159c2b..55f2e18230 100644
--- a/modules/ssl/ssl_expr.h
+++ b/modules/ssl/ssl_expr.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_expr_eval.c b/modules/ssl/ssl_expr_eval.c
index 8e3275803f..d57200abdf 100644
--- a/modules/ssl/ssl_expr_eval.c
+++ b/modules/ssl/ssl_expr_eval.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_expr_scan.c b/modules/ssl/ssl_expr_scan.c
index 3e4f0af1dc..d535c07b13 100644
--- a/modules/ssl/ssl_expr_scan.c
+++ b/modules/ssl/ssl_expr_scan.c
@@ -446,7 +446,8 @@ static char *yy_last_accepting_cpos;
 char *yytext;
 #line 1 "ssl_expr_scan.l"
 #define INITIAL 0
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 19f9d8a9ce..de8c376ccd 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c
index 2d787a268e..877dc0779d 100644
--- a/modules/ssl/ssl_scache.c
+++ b/modules/ssl/ssl_scache.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_scache_dbm.c b/modules/ssl/ssl_scache_dbm.c
index 4dbfacbf87..aa345b5711 100644
--- a/modules/ssl/ssl_scache_dbm.c
+++ b/modules/ssl/ssl_scache_dbm.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_scache_shmcb.c b/modules/ssl/ssl_scache_shmcb.c
index a23aa0214f..45ca10002e 100644
--- a/modules/ssl/ssl_scache_shmcb.c
+++ b/modules/ssl/ssl_scache_shmcb.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 367e12e60d..80b38cc4d9 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index e675d3929c..bd6c2c8e81 100644
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index b5d36ba2a5..ef8eb6668b 100644
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/ssl/ssl_util_ssl.h b/modules/ssl/ssl_util_ssl.h
index 9256f65c83..a4bdd85856 100644
--- a/modules/ssl/ssl_util_ssl.h
+++ b/modules/ssl/ssl_util_ssl.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/test/mod_optional_fn_export.c b/modules/test/mod_optional_fn_export.c
index d7bdd6111d..c03224d820 100644
--- a/modules/test/mod_optional_fn_export.c
+++ b/modules/test/mod_optional_fn_export.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/test/mod_optional_fn_export.h b/modules/test/mod_optional_fn_export.h
index c6a22cbb49..fd3a59d7c1 100644
--- a/modules/test/mod_optional_fn_export.h
+++ b/modules/test/mod_optional_fn_export.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/test/mod_optional_fn_import.c b/modules/test/mod_optional_fn_import.c
index cc7de63c48..9346d1a270 100644
--- a/modules/test/mod_optional_fn_import.c
+++ b/modules/test/mod_optional_fn_import.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/test/mod_optional_hook_export.c b/modules/test/mod_optional_hook_export.c
index fbe8362fc1..896ad52cca 100644
--- a/modules/test/mod_optional_hook_export.c
+++ b/modules/test/mod_optional_hook_export.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/test/mod_optional_hook_export.h b/modules/test/mod_optional_hook_export.h
index 8a7fef5e8c..4dd40db78f 100644
--- a/modules/test/mod_optional_hook_export.h
+++ b/modules/test/mod_optional_hook_export.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/modules/test/mod_optional_hook_import.c b/modules/test/mod_optional_hook_import.c
index b72ea493f4..7bca53a679 100644
--- a/modules/test/mod_optional_hook_import.c
+++ b/modules/test/mod_optional_hook_import.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/beos/beosd.c b/os/beos/beosd.c
index 03ce825889..901c9a66de 100644
--- a/os/beos/beosd.c
+++ b/os/beos/beosd.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/beos/beosd.h b/os/beos/beosd.h
index 4d4695735a..9d1f0dfe38 100644
--- a/os/beos/beosd.h
+++ b/os/beos/beosd.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/beos/os.c b/os/beos/os.c
index 6095370519..57ef38657c 100644
--- a/os/beos/os.c
+++ b/os/beos/os.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/beos/os.h b/os/beos/os.h
index 66c8767620..8d09f1ad02 100644
--- a/os/beos/os.h
+++ b/os/beos/os.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/bs2000/ebcdic.c b/os/bs2000/ebcdic.c
index 6a675ebfb2..8bdde8bf3e 100644
--- a/os/bs2000/ebcdic.c
+++ b/os/bs2000/ebcdic.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/bs2000/ebcdic.h b/os/bs2000/ebcdic.h
index 053d04961a..b094feef53 100644
--- a/os/bs2000/ebcdic.h
+++ b/os/bs2000/ebcdic.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index de151cdd38..cd2407f8d9 100644
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/bs2000/os.h b/os/bs2000/os.h
index ec81c5e097..48692b7b78 100644
--- a/os/bs2000/os.h
+++ b/os/bs2000/os.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/netware/modules.c b/os/netware/modules.c
index 0115cc8f4e..bcd0f8d161 100644
--- a/os/netware/modules.c
+++ b/os/netware/modules.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/netware/os.h b/os/netware/os.h
index 774bb3fb4d..a721a5a831 100644
--- a/os/netware/os.h
+++ b/os/netware/os.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/netware/pre_nw.h b/os/netware/pre_nw.h
index 0f2a9327a9..899a7b4399 100644
--- a/os/netware/pre_nw.h
+++ b/os/netware/pre_nw.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/netware/util_nw.c b/os/netware/util_nw.c
index 78ad9ca0b2..02f574bf67 100644
--- a/os/netware/util_nw.c
+++ b/os/netware/util_nw.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/os2/os.h b/os/os2/os.h
index c67fdfb0a3..3b7b596751 100644
--- a/os/os2/os.h
+++ b/os/os2/os.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/os2/util_os2.c b/os/os2/util_os2.c
index ee95471ec4..e8d402d4e7 100644
--- a/os/os2/util_os2.c
+++ b/os/os2/util_os2.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/tpf/ebcdic.c b/os/tpf/ebcdic.c
index 3b8723e909..e71928eeda 100644
--- a/os/tpf/ebcdic.c
+++ b/os/tpf/ebcdic.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/tpf/ebcdic.h b/os/tpf/ebcdic.h
index 5958a66bdc..2c6036b874 100644
--- a/os/tpf/ebcdic.h
+++ b/os/tpf/ebcdic.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/tpf/os.c b/os/tpf/os.c
index cb6a8423a4..9b9bacc1c7 100644
--- a/os/tpf/os.c
+++ b/os/tpf/os.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/tpf/os.h b/os/tpf/os.h
index 521d2bfa30..10d5874aee 100644
--- a/os/tpf/os.h
+++ b/os/tpf/os.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/unix/os.h b/os/unix/os.h
index bf44cd6e00..4370c22931 100644
--- a/os/unix/os.h
+++ b/os/unix/os.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 3521718d1c..b2f65e30a3 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/unix/unixd.h b/os/unix/unixd.h
index a96ecbc861..483a101057 100644
--- a/os/unix/unixd.h
+++ b/os/unix/unixd.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/win32/ap_regkey.c b/os/win32/ap_regkey.c
index d19f619ad7..4f3a5061e2 100644
--- a/os/win32/ap_regkey.c
+++ b/os/win32/ap_regkey.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/win32/modules.c b/os/win32/modules.c
index 447f9cd886..ba5f889aab 100644
--- a/os/win32/modules.c
+++ b/os/win32/modules.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/win32/os.h b/os/win32/os.h
index 1a0fafcbdb..bf23a478fd 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index c456e444f1..36d99d6bc7 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/buildmark.c b/server/buildmark.c
index 62cccdf487..ba727e4aba 100644
--- a/server/buildmark.c
+++ b/server/buildmark.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/config.c b/server/config.c
index 24841a61ca..9c5238a223 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/connection.c b/server/connection.c
index b444c0b758..9f59497910 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/core.c b/server/core.c
index 988acd0f23..98ce62cec5 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/core_filters.c b/server/core_filters.c
index 24330b60aa..88fee552fa 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/eoc_bucket.c b/server/eoc_bucket.c
index 4d99d2351d..047e9c8b05 100644
--- a/server/eoc_bucket.c
+++ b/server/eoc_bucket.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/error_bucket.c b/server/error_bucket.c
index a9f01a0849..280750a895 100644
--- a/server/error_bucket.c
+++ b/server/error_bucket.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/gen_test_char.c b/server/gen_test_char.c
index d3c1ab85b6..81c67f55ef 100644
--- a/server/gen_test_char.c
+++ b/server/gen_test_char.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/listen.c b/server/listen.c
index 4ac6734f93..b5b4490a93 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/log.c b/server/log.c
index 423fae7135..da5ecbc230 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/main.c b/server/main.c
index fd828fbdc7..2fd47ce98a 100644
--- a/server/main.c
+++ b/server/main.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 17d45c8e04..d8be566172 100644
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/beos/beos.h b/server/mpm/beos/beos.h
index 8ca7d0dd34..9f6b1caffc 100644
--- a/server/mpm/beos/beos.h
+++ b/server/mpm/beos/beos.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/beos/mpm.h b/server/mpm/beos/mpm.h
index 3e35434f20..99704e6108 100644
--- a/server/mpm/beos/mpm.h
+++ b/server/mpm/beos/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/beos/mpm_default.h b/server/mpm/beos/mpm_default.h
index 17c2733ddd..03d4233c18 100644
--- a/server/mpm/beos/mpm_default.h
+++ b/server/mpm/beos/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index ac2a4fc5f2..b7ac420fb6 100644
--- a/server/mpm/experimental/event/event.c
+++ b/server/mpm/experimental/event/event.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/fdqueue.c b/server/mpm/experimental/event/fdqueue.c
index 8802daf7a5..b016d7e969 100644
--- a/server/mpm/experimental/event/fdqueue.c
+++ b/server/mpm/experimental/event/fdqueue.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/fdqueue.h b/server/mpm/experimental/event/fdqueue.h
index 6913daa400..5c9a021524 100644
--- a/server/mpm/experimental/event/fdqueue.h
+++ b/server/mpm/experimental/event/fdqueue.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/mpm.h b/server/mpm/experimental/event/mpm.h
index e36eda78b5..67f544eb06 100644
--- a/server/mpm/experimental/event/mpm.h
+++ b/server/mpm/experimental/event/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/mpm_default.h b/server/mpm/experimental/event/mpm_default.h
index 2d3869e4fc..cb93433208 100644
--- a/server/mpm/experimental/event/mpm_default.h
+++ b/server/mpm/experimental/event/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/pod.c b/server/mpm/experimental/event/pod.c
index c292a0de0e..7b635d4f8d 100644
--- a/server/mpm/experimental/event/pod.c
+++ b/server/mpm/experimental/event/pod.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/event/pod.h b/server/mpm/experimental/event/pod.h
index 181133c11a..ce9b97e8ea 100644
--- a/server/mpm/experimental/event/pod.h
+++ b/server/mpm/experimental/event/pod.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index 88d24b9851..fb21911889 100644
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/leader/mpm.h b/server/mpm/experimental/leader/mpm.h
index 9ad7da214f..78b1048e84 100644
--- a/server/mpm/experimental/leader/mpm.h
+++ b/server/mpm/experimental/leader/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/leader/mpm_default.h b/server/mpm/experimental/leader/mpm_default.h
index 5aaebd324f..c35cf09da1 100644
--- a/server/mpm/experimental/leader/mpm_default.h
+++ b/server/mpm/experimental/leader/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/perchild/mpm.h b/server/mpm/experimental/perchild/mpm.h
index cb17ba9bc5..87734a575f 100644
--- a/server/mpm/experimental/perchild/mpm.h
+++ b/server/mpm/experimental/perchild/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/perchild/mpm_default.h b/server/mpm/experimental/perchild/mpm_default.h
index d779e052c6..cc79f7f038 100644
--- a/server/mpm/experimental/perchild/mpm_default.h
+++ b/server/mpm/experimental/perchild/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index c2bd609dca..bf38a7c5fc 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/threadpool/mpm.h b/server/mpm/experimental/threadpool/mpm.h
index ff631b067f..d7853f29be 100644
--- a/server/mpm/experimental/threadpool/mpm.h
+++ b/server/mpm/experimental/threadpool/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/threadpool/mpm_default.h b/server/mpm/experimental/threadpool/mpm_default.h
index 5aaebd324f..c35cf09da1 100644
--- a/server/mpm/experimental/threadpool/mpm_default.h
+++ b/server/mpm/experimental/threadpool/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/threadpool/pod.c b/server/mpm/experimental/threadpool/pod.c
index 7248768793..0da8bba157 100644
--- a/server/mpm/experimental/threadpool/pod.c
+++ b/server/mpm/experimental/threadpool/pod.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/threadpool/pod.h b/server/mpm/experimental/threadpool/pod.h
index f2204a4850..04a2359e59 100644
--- a/server/mpm/experimental/threadpool/pod.h
+++ b/server/mpm/experimental/threadpool/pod.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index 299088c22a..1b6031dc7e 100644
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/mpmt_os2/mpm.h b/server/mpm/mpmt_os2/mpm.h
index 3b8944040e..a5b3973069 100644
--- a/server/mpm/mpmt_os2/mpm.h
+++ b/server/mpm/mpmt_os2/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/mpmt_os2/mpm_default.h b/server/mpm/mpmt_os2/mpm_default.h
index 640b01360c..24a98ad9b9 100644
--- a/server/mpm/mpmt_os2/mpm_default.h
+++ b/server/mpm/mpmt_os2/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c
index 90e774a2fe..3c8a57e87c 100644
--- a/server/mpm/mpmt_os2/mpmt_os2.c
+++ b/server/mpm/mpmt_os2/mpmt_os2.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
index b69d9f2f9a..95dd515fc9 100644
--- a/server/mpm/mpmt_os2/mpmt_os2_child.c
+++ b/server/mpm/mpmt_os2/mpmt_os2_child.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/netware/mpm.h b/server/mpm/netware/mpm.h
index 68528ff131..98f15c774c 100644
--- a/server/mpm/netware/mpm.h
+++ b/server/mpm/netware/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/netware/mpm_default.h b/server/mpm/netware/mpm_default.h
index f0bddbd0d8..c5fb9e8ead 100644
--- a/server/mpm/netware/mpm_default.h
+++ b/server/mpm/netware/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index c8526e27fe..4ce78d6adf 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h
index 64c1114866..811703b160 100644
--- a/server/mpm/prefork/mpm.h
+++ b/server/mpm/prefork/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/prefork/mpm_default.h b/server/mpm/prefork/mpm_default.h
index 03f62b32e1..46cd2018d4 100644
--- a/server/mpm/prefork/mpm_default.h
+++ b/server/mpm/prefork/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 7acd04b976..0afe6f0bdd 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/Win9xConHook.c b/server/mpm/winnt/Win9xConHook.c
index 862ec9c435..8a07801059 100644
--- a/server/mpm/winnt/Win9xConHook.c
+++ b/server/mpm/winnt/Win9xConHook.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/Win9xConHook.h b/server/mpm/winnt/Win9xConHook.h
index 5c8c599d4c..0fc8c1231c 100644
--- a/server/mpm/winnt/Win9xConHook.h
+++ b/server/mpm/winnt/Win9xConHook.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 2c4a8af029..2fe7ee8e7b 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/mpm.h b/server/mpm/winnt/mpm.h
index 9d4ed5a9a8..50417bb8bd 100644
--- a/server/mpm/winnt/mpm.h
+++ b/server/mpm/winnt/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/mpm_default.h b/server/mpm/winnt/mpm_default.h
index 65c264c7c5..e70283de06 100644
--- a/server/mpm/winnt/mpm_default.h
+++ b/server/mpm/winnt/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 5a943f9711..3afdf8d26f 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index cfe7635d85..f1b1ab7088 100644
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/nt_eventlog.c b/server/mpm/winnt/nt_eventlog.c
index 79abcaea4b..1bfedb383c 100644
--- a/server/mpm/winnt/nt_eventlog.c
+++ b/server/mpm/winnt/nt_eventlog.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index 5e4e5ba7b3..08f0487ee5 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/fdqueue.c b/server/mpm/worker/fdqueue.c
index d2d271513a..155e3ec734 100644
--- a/server/mpm/worker/fdqueue.c
+++ b/server/mpm/worker/fdqueue.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/fdqueue.h b/server/mpm/worker/fdqueue.h
index 13e7c5710b..9dd8c582f5 100644
--- a/server/mpm/worker/fdqueue.h
+++ b/server/mpm/worker/fdqueue.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/mpm.h b/server/mpm/worker/mpm.h
index f84cbcf661..29c9f452fe 100644
--- a/server/mpm/worker/mpm.h
+++ b/server/mpm/worker/mpm.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/mpm_default.h b/server/mpm/worker/mpm_default.h
index 2d3869e4fc..cb93433208 100644
--- a/server/mpm/worker/mpm_default.h
+++ b/server/mpm/worker/mpm_default.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/pod.c b/server/mpm/worker/pod.c
index 2c3117bf03..5c7cceee33 100644
--- a/server/mpm/worker/pod.c
+++ b/server/mpm/worker/pod.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/pod.h b/server/mpm/worker/pod.h
index f2204a4850..04a2359e59 100644
--- a/server/mpm/worker/pod.h
+++ b/server/mpm/worker/pod.h
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 764036b834..1f5deb7f55 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/mpm_common.c b/server/mpm_common.c
index e2f9adb8a8..3e03f05be5 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/protocol.c b/server/protocol.c
index 4355d9fcde..1950068182 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/provider.c b/server/provider.c
index 87fbaade5f..97d2a0f9f4 100644
--- a/server/provider.c
+++ b/server/provider.c
@@ -1,4 +1,5 @@
-/* Copyright 2002-2004 The Apache Software Foundation
+/* Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/request.c b/server/request.c
index 11cad1bc4a..6ee335e160 100644
--- a/server/request.c
+++ b/server/request.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 325a1fcb89..c7832fdcd4 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util.c b/server/util.c
index a7d0d51cde..f605eaaf12 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_cfgtree.c b/server/util_cfgtree.c
index 984a1ce751..b3bff04085 100644
--- a/server/util_cfgtree.c
+++ b/server/util_cfgtree.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_charset.c b/server/util_charset.c
index 7c329018b7..3be2a3922b 100644
--- a/server/util_charset.c
+++ b/server/util_charset.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_debug.c b/server/util_debug.c
index 37a92ab634..7fbdc947cb 100644
--- a/server/util_debug.c
+++ b/server/util_debug.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c
index b47f9b28dd..4062db051f 100644
--- a/server/util_ebcdic.c
+++ b/server/util_ebcdic.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_filter.c b/server/util_filter.c
index b6fc91912e..baeaf48d2a 100644
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_md5.c b/server/util_md5.c
index 67805f9d7e..744f3f283a 100644
--- a/server/util_md5.c
+++ b/server/util_md5.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_script.c b/server/util_script.c
index f7788926b3..dcf418ddc4 100644
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_time.c b/server/util_time.c
index 42d1db751e..f04e158485 100644
--- a/server/util_time.c
+++ b/server/util_time.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/util_xml.c b/server/util_xml.c
index 2019917c2d..09f2c1344b 100644
--- a/server/util_xml.c
+++ b/server/util_xml.c
@@ -1,4 +1,5 @@
-/* Copyright 2000-2004 The Apache Software Foundation
+/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/vhost.c b/server/vhost.c
index 86119e4834..199465de9e 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/ab.c b/support/ab.c
index 343fd6aabd..03face7d24 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -1,5 +1,5 @@
-/* Copyright 1996-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
+/* Copyright 1996-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/apachectl.in b/support/apachectl.in
index eb9be2052e..062f6c9b89 100644
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# Copyright 2000-2004 The Apache Software Foundation
+# Copyright 2000-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/apxs.in b/support/apxs.in
index d82b9a0333..c0314d477f 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -1,6 +1,7 @@
 #!@perlbin@ -w
 #
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/checkgid.c b/support/checkgid.c
index a667fa310d..704ac57f23 100644
--- a/support/checkgid.c
+++ b/support/checkgid.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/dbmmanage.in b/support/dbmmanage.in
index c4cd5c7277..2db00afe6c 100644
--- a/support/dbmmanage.in
+++ b/support/dbmmanage.in
@@ -1,6 +1,7 @@
 #!@perlbin@
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/envvars-std.in b/support/envvars-std.in
index c276665d08..762231c92b 100644
--- a/support/envvars-std.in
+++ b/support/envvars-std.in
@@ -1,4 +1,5 @@
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index cca2889a3d..39294cf23b 100644
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/htdbm.c b/support/htdbm.c
index cdb317e3f7..69c0d2db82 100644
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/htdigest.c b/support/htdigest.c
index b3cc07875f..0d525c0000 100644
--- a/support/htdigest.c
+++ b/support/htdigest.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/htpasswd.c b/support/htpasswd.c
index af03b11c1f..a139a3ddd8 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/log_server_status.in b/support/log_server_status.in
index 95ebcaedb2..ed07510f8c 100644
--- a/support/log_server_status.in
+++ b/support/log_server_status.in
@@ -1,6 +1,7 @@
 #!@perlbin@
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/logresolve.c b/support/logresolve.c
index 024371132c..5576fd1ea0 100644
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/logresolve.pl.in b/support/logresolve.pl.in
index 086febd6fd..eb143e9723 100644
--- a/support/logresolve.pl.in
+++ b/support/logresolve.pl.in
@@ -1,6 +1,7 @@
 #!@perlbin@
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/phf_abuse_log.cgi.in b/support/phf_abuse_log.cgi.in
index 5bc118df03..b004b15010 100644
--- a/support/phf_abuse_log.cgi.in
+++ b/support/phf_abuse_log.cgi.in
@@ -1,6 +1,7 @@
 #!@perlbin@
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/rotatelogs.c b/support/rotatelogs.c
index 5f17dd534a..14a56e8a64 100644
--- a/support/rotatelogs.c
+++ b/support/rotatelogs.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/split-logfile.in b/support/split-logfile.in
index 9375495d65..37f639d41b 100644
--- a/support/split-logfile.in
+++ b/support/split-logfile.in
@@ -1,6 +1,7 @@
 #!@perlbin@
 #
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/support/suexec.c b/support/suexec.c
index 25e39bea66..ed69226e10 100644
--- a/support/suexec.c
+++ b/support/suexec.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/suexec.h b/support/suexec.h
index e76a3bb731..a1b5f81323 100644
--- a/support/suexec.h
+++ b/support/suexec.h
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 1c4120b537..78579e07f3 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/win32/ApacheMonitor.h b/support/win32/ApacheMonitor.h
index db44acdb1a..190295477d 100644
--- a/support/win32/ApacheMonitor.h
+++ b/support/win32/ApacheMonitor.h
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/support/win32/wintty.c b/support/win32/wintty.c
index 1c67d54c68..01a354b4a3 100644
--- a/support/win32/wintty.c
+++ b/support/win32/wintty.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 The Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/cls.c b/test/cls.c
index 4f7a555105..f2b0192929 100644
--- a/test/cls.c
+++ b/test/cls.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test-writev.c b/test/test-writev.c
index 9705f671f8..072689a3c5 100644
--- a/test/test-writev.c
+++ b/test/test-writev.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test_find.c b/test/test_find.c
index a2cda710bd..1c4346dc58 100644
--- a/test/test_find.c
+++ b/test/test_find.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test_parser.c b/test/test_parser.c
index 4ba031813d..a7a4a740a6 100644
--- a/test/test_parser.c
+++ b/test/test_parser.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/test_select.c b/test/test_select.c
index f7b1edc178..c0c5adc566 100644
--- a/test/test_select.c
+++ b/test/test_select.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/time-sem.c b/test/time-sem.c
index d53cab6c0d..6f6e5da556 100644
--- a/test/time-sem.c
+++ b/test/time-sem.c
@@ -1,4 +1,5 @@
-/* Copyright 1999-2004 The Apache Software Foundation
+/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.