fix name of The Apache Software Foundation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68

140 files changed, 141 insertions, 141 deletions

diff --git a/modules/aaa/mod_auth.h b/modules/aaa/mod_auth.h
index ef27ffe857..5633641f26 100644
--- a/modules/aaa/mod_auth.h
+++ b/modules/aaa/mod_auth.h
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 ac29c101d8..8be9d31203 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 5260aae4e0..b9d963a6cd 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 69c29dc6d2..3622c8275d 100644
--- a/modules/aaa/mod_authn_anon.c
+++ b/modules/aaa/mod_authn_anon.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 9f8c4ec561..76e55d841f 100644
--- a/modules/aaa/mod_authn_dbm.c
+++ b/modules/aaa/mod_authn_dbm.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 3997ceb304..ab41ad308f 100644
--- a/modules/aaa/mod_authn_default.c
+++ b/modules/aaa/mod_authn_default.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 a51266c0b7..aa4dbe161a 100644
--- a/modules/aaa/mod_authn_file.c
+++ b/modules/aaa/mod_authn_file.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 6939f00e12..f9a8efbbd2 100644
--- a/modules/aaa/mod_authz_dbm.c
+++ b/modules/aaa/mod_authz_dbm.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 988eb1583a..2c54c813e6 100644
--- a/modules/aaa/mod_authz_default.c
+++ b/modules/aaa/mod_authz_default.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 0c26fa83cb..eb5a14d89a 100644
--- a/modules/aaa/mod_authz_groupfile.c
+++ b/modules/aaa/mod_authz_groupfile.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 7e9ccffa55..7fe9c30b9a 100644
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_authz_host.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 b30b79675f..9652de01ce 100644
--- a/modules/aaa/mod_authz_owner.c
+++ b/modules/aaa/mod_authz_owner.c
@@ -1,4 +1,4 @@
-/* Copyright 2003-2004 Apache Software Foundation
+/* Copyright 2003-2004 The Apache Software Foundation
  *
  * Licensed 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 21dab0be09..69347ec7a4 100644
--- a/modules/aaa/mod_authz_user.c
+++ b/modules/aaa/mod_authz_user.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 6c77d22fcf..e0cc65c4fd 100644
--- a/modules/arch/netware/libprews.c
+++ b/modules/arch/netware/libprews.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 5e86a3620d..1440457745 100644
--- a/modules/arch/netware/mod_netware.c
+++ b/modules/arch/netware/mod_netware.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 2bd23f657d..1ef27f4db7 100644
--- a/modules/arch/netware/mod_nw_ssl.c
+++ b/modules/arch/netware/mod_nw_ssl.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 0443bf9d23..ac4b6c7d6a 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 d8dee55f94..48563ded3b 100644
--- a/modules/arch/win32/mod_isapi.h
+++ b/modules/arch/win32/mod_isapi.h
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 7d1ad23bbd..b7edf65bfb 100644
--- a/modules/arch/win32/mod_win32.c
+++ b/modules/arch/win32/mod_win32.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 f2949143a1..269c6dda4e 100644
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 4f7e336b31..9512290f46 100644
--- a/modules/dav/fs/dbm.c
+++ b/modules/dav/fs/dbm.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 9e6628e66a..775b9f9065 100644
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 e24bf9b61e..fdc4073f2a 100644
--- a/modules/dav/fs/mod_dav_fs.c
+++ b/modules/dav/fs/mod_dav_fs.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 399bcbc1a7..ba57c4d723 100644
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 da34628ecc..7959ddbe09 100644
--- a/modules/dav/fs/repos.h
+++ b/modules/dav/fs/repos.h
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 dad72a2161..64e3ae9a05 100644
--- a/modules/dav/lock/locks.c
+++ b/modules/dav/lock/locks.c
@@ -1,4 +1,4 @@
-/* Copyright 2003-2004 Apache Software Foundation
+/* Copyright 2003-2004 The Apache Software Foundation
  *
  * Licensed 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 7aab9f60d6..5e6eff1c0e 100644
--- a/modules/dav/lock/locks.h
+++ b/modules/dav/lock/locks.h
@@ -1,4 +1,4 @@
-/* Copyright 2003-2004 Apache Software Foundation
+/* Copyright 2003-2004 The Apache Software Foundation
  *
  * Licensed 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 94388b522c..e8b6f72665 100644
--- a/modules/dav/lock/mod_dav_lock.c
+++ b/modules/dav/lock/mod_dav_lock.c
@@ -1,4 +1,4 @@
-/* Copyright 2003-2004 Apache Software Foundation
+/* Copyright 2003-2004 The Apache Software Foundation
  *
  * Licensed 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 b42590bcf1..42f68a051f 100644
--- a/modules/dav/main/liveprop.c
+++ b/modules/dav/main/liveprop.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 d3e776690f..7cedd53486 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 c1b33dbfbe..4ce7889fc3 100644
--- a/modules/dav/main/mod_dav.h
+++ b/modules/dav/main/mod_dav.h
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 fb7cd008ac..c1ea75550d 100644
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 3b0818ae0f..8a0d411971 100644
--- a/modules/dav/main/providers.c
+++ b/modules/dav/main/providers.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 b4f03021cb..d19e142aa9 100644
--- a/modules/dav/main/std_liveprop.c
+++ b/modules/dav/main/std_liveprop.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 4e9b89e484..1f2f66cad2 100644
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 402cb5bf62..8ec2b136ae 100644
--- a/modules/dav/main/util_lock.c
+++ b/modules/dav/main/util_lock.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 df116aa974..f3adbc96f7 100644
--- a/modules/echo/mod_echo.c
+++ b/modules/echo/mod_echo.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_cache.c b/modules/experimental/cache_cache.c
index b590317132..2305370c23 100644
--- a/modules/experimental/cache_cache.c
+++ b/modules/experimental/cache_cache.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_cache.h b/modules/experimental/cache_cache.h
index d43d7453cf..acc94a7dee 100644
--- a/modules/experimental/cache_cache.h
+++ b/modules/experimental/cache_cache.h
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_hash.c b/modules/experimental/cache_hash.c
index d6c61b2c4b..c51e48e53e 100644
--- a/modules/experimental/cache_hash.c
+++ b/modules/experimental/cache_hash.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_hash.h b/modules/experimental/cache_hash.h
index 1488c3ef4b..798f45964c 100644
--- a/modules/experimental/cache_hash.h
+++ b/modules/experimental/cache_hash.h
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_pqueue.c b/modules/experimental/cache_pqueue.c
index 8aba022220..0ea3d794d4 100644
--- a/modules/experimental/cache_pqueue.c
+++ b/modules/experimental/cache_pqueue.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_pqueue.h b/modules/experimental/cache_pqueue.h
index 8d165d4144..f01473f332 100644
--- a/modules/experimental/cache_pqueue.h
+++ b/modules/experimental/cache_pqueue.h
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_storage.c b/modules/experimental/cache_storage.c
index 84baff8d48..c0d6f28619 100644
--- a/modules/experimental/cache_storage.c
+++ b/modules/experimental/cache_storage.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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/cache_util.c b/modules/experimental/cache_util.c
index 56dd1fcdef..074f56651e 100644
--- a/modules/experimental/cache_util.c
+++ b/modules/experimental/cache_util.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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_auth_ldap.c b/modules/experimental/mod_auth_ldap.c
index 31a7615fa8..e11b524889 100644
--- a/modules/experimental/mod_auth_ldap.c
+++ b/modules/experimental/mod_auth_ldap.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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_cache.c b/modules/experimental/mod_cache.c
index 07d04fb996..d271a33e4a 100644
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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_cache.h b/modules/experimental/mod_cache.h
index 2338a3e330..3d6cddcc61 100644
--- a/modules/experimental/mod_cache.h
+++ b/modules/experimental/mod_cache.h
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 0ac2e6b0f0..89e1e33d3b 100644
--- a/modules/experimental/mod_case_filter.c
+++ b/modules/experimental/mod_case_filter.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 92a4c389c8..c894cda920 100644
--- a/modules/experimental/mod_case_filter_in.c
+++ b/modules/experimental/mod_case_filter_in.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 2e8d5fc190..a2de2cd493 100644
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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_disk_cache.c b/modules/experimental/mod_disk_cache.c
index a4ed19078a..7e3de8aa87 100644
--- a/modules/experimental/mod_disk_cache.c
+++ b/modules/experimental/mod_disk_cache.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 05df05583e..7e02213266 100644
--- a/modules/experimental/mod_example.c
+++ b/modules/experimental/mod_example.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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_mem_cache.c b/modules/experimental/mod_mem_cache.c
index 1333a42a18..637ce169e4 100644
--- a/modules/experimental/mod_mem_cache.c
+++ b/modules/experimental/mod_mem_cache.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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/util_ldap.c b/modules/experimental/util_ldap.c
index b50d16330e..6746d74a7c 100644
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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/util_ldap_cache.c b/modules/experimental/util_ldap_cache.c
index 41fe6a8467..ac40694480 100644
--- a/modules/experimental/util_ldap_cache.c
+++ b/modules/experimental/util_ldap_cache.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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/util_ldap_cache.h b/modules/experimental/util_ldap_cache.h
index 34e1c8db1b..06f179eb4a 100644
--- a/modules/experimental/util_ldap_cache.h
+++ b/modules/experimental/util_ldap_cache.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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/util_ldap_cache_mgr.c b/modules/experimental/util_ldap_cache_mgr.c
index b9ff709134..8eedcf8a6f 100644
--- a/modules/experimental/util_ldap_cache_mgr.c
+++ b/modules/experimental/util_ldap_cache_mgr.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 00bbc014ad..f90e85b7e4 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 92ccd3bdea..d83d7303e6 100644
--- a/modules/filters/mod_ext_filter.c
+++ b/modules/filters/mod_ext_filter.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 9a5710b517..71b7a98331 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 98c180f030..e890d7cb83 100644
--- a/modules/filters/mod_include.h
+++ b/modules/filters/mod_include.h
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 449b98110b..8102e736bd 100644
--- a/modules/generators/mod_asis.c
+++ b/modules/generators/mod_asis.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 de46a58cb4..6ddf50d15e 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 6725dfc59e..1c828a3a74 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 8d21113b53..c28b486bfc 100644
--- a/modules/generators/mod_cgi.h
+++ b/modules/generators/mod_cgi.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 39edfc0b2c..ec337baf8b 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 bf8bba849e..ec985b26ee 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 888f60c238..dd4d283ab4 100644
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 0d95313f4a..97aee13558 100644
--- a/modules/generators/mod_status.h
+++ b/modules/generators/mod_status.h
@@ -1,4 +1,4 @@
-/* Copyright 2003-2004 Apache Software Foundation
+/* Copyright 2003-2004 The Apache Software Foundation
  *
  * Licensed 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 000d152609..af66dfc1c3 100644
--- a/modules/generators/mod_suexec.c
+++ b/modules/generators/mod_suexec.c
@@ -1,4 +1,4 @@
-/* Copyright 2000-2004 Apache Software Foundation
+/* Copyright 2000-2004 The Apache Software Foundation
  *
  * Licensed 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 47003b7839..248d1bbe42 100644
--- a/modules/generators/mod_suexec.h
+++ b/modules/generators/mod_suexec.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 5313cbcd08..bf6a6febc6 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 e46b64a6a0..bbd15dcbca 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 c9b0dbdf5b..933c8241e7 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 944f39089b..790c36e76c 100644
--- a/modules/http/mod_core.h
+++ b/modules/http/mod_core.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 9d1f951bb3..cfbb737c3c 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 37f6327021..1ea9318a6e 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 f68ef274cf..d3d3590cda 100644
--- a/modules/loggers/mod_log_config.h
+++ b/modules/loggers/mod_log_config.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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_forensic.c b/modules/loggers/mod_log_forensic.c
index 85b511087b..f660b24722 100644
--- a/modules/loggers/mod_log_forensic.c
+++ b/modules/loggers/mod_log_forensic.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Apache Software Foundation
+/* Copyright 2004 The Apache Software Foundation
  *
  * Licensed 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 324b7db54b..6d57c3ce1d 100644
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 499d8bf0fc..7dbba915f7 100644
--- a/modules/mappers/mod_actions.c
+++ b/modules/mappers/mod_actions.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 e3d24fc746..2cb4c11ef5 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 a3041cb0d8..8bd5b9e60b 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 e12f55a138..a5faf7b410 100644
--- a/modules/mappers/mod_imap.c
+++ b/modules/mappers/mod_imap.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 1a47e02dff..fc6d10c3d2 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 59969fbf90..94ef586bc3 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 3a389b13b0..9fdaf702f4 100644
--- a/modules/mappers/mod_rewrite.h
+++ b/modules/mappers/mod_rewrite.h
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 7fd4e6d545..32dfe16c59 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 d06164c405..32d7d4500f 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 6cc3f92a50..d916a95e12 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 1e71dc99e6..83839d5e3b 100644
--- a/modules/mappers/mod_vhost_alias.c
+++ b/modules/mappers/mod_vhost_alias.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 33db6b88d5..398f185194 100644
--- a/modules/metadata/mod_cern_meta.c
+++ b/modules/metadata/mod_cern_meta.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 53c18bf050..5886f946e9 100644
--- a/modules/metadata/mod_env.c
+++ b/modules/metadata/mod_env.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 ad86e94c7d..283c45f7ec 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 777081c9d6..f8bf58b0aa 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 1ab10402c7..bdf09d4307 100644
--- a/modules/metadata/mod_ident.c
+++ b/modules/metadata/mod_ident.c
@@ -1,4 +1,4 @@
-/* Copyright 2003-2004 Apache Software Foundation
+/* Copyright 2003-2004 The Apache Software Foundation
  *
  * Licensed 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 f44c8c0af5..41065ca549 100644
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 786550cfec..2f19d7c96f 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 47f22dde21..21d232f88a 100644
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 4703c7abf7..7408e79b3c 100644
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 ec2619aafd..78a0e12ce4 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 0d63f8be5f..ec7e1759e3 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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_connect.c b/modules/proxy/proxy_connect.c
index 4ca479c2b3..fae03dc773 100644
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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_ftp.c b/modules/proxy/proxy_ftp.c
index 09a294e308..f376ba96b9 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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_http.c b/modules/proxy/proxy_http.c
index 7c04d4f8b0..c45549d331 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 033ebc0e1f..718d49237c 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2004 Apache Software Foundation
+/* Copyright 1999-2004 The Apache Software Foundation
  *
  * Licensed 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 38a1fcd755..49df762cd1 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 0a42ad7eb4..32ade98038 100644
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 f8161fd78d..68e5810c2b 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 194f63272f..c321db946e 100644
--- a/modules/ssl/ssl_engine_dh.c
+++ b/modules/ssl/ssl_engine_dh.c
@@ -2,7 +2,7 @@
 =pod
 #endif
 
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 82ff634e47..770116cf6d 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 8fd3f133e7..9656195137 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 750539c63a..2e607289b0 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 be5ef65b64..0c15fd2926 100644
--- a/modules/ssl/ssl_engine_log.c
+++ b/modules/ssl/ssl_engine_log.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 4e81d9d252..84ce9b2069 100644
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 899893d208..41ae57d66f 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 9b0e8b0098..b2df987378 100644
--- a/modules/ssl/ssl_engine_rand.c
+++ b/modules/ssl/ssl_engine_rand.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 0ca00be8d2..76b35461a6 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 d296bc55f2..15a58f0d16 100644
--- a/modules/ssl/ssl_expr.c
+++ b/modules/ssl/ssl_expr.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 6cdf2fe0bf..8399159c2b 100644
--- a/modules/ssl/ssl_expr.h
+++ b/modules/ssl/ssl_expr.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 cc541cb11f..da576e5273 100644
--- a/modules/ssl/ssl_expr_eval.c
+++ b/modules/ssl/ssl_expr_eval.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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_parse.y b/modules/ssl/ssl_expr_parse.y
index 93dfb7b276..f0c9db5f3b 100644
--- a/modules/ssl/ssl_expr_parse.y
+++ b/modules/ssl/ssl_expr_parse.y
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 0aec85d21a..912aed6012 100644
--- a/modules/ssl/ssl_expr_scan.c
+++ b/modules/ssl/ssl_expr_scan.c
@@ -18,7 +18,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/striker/cvs2svn/dumps/httpd-2.0/../../httpd-2.0/modules/ssl/ssl_expr_scan.c,v 1.17 2004/02/08 12:52:25 nd Exp $
+ * $Header: /home/striker/cvs2svn/dumps/httpd-2.0/../../httpd-2.0/modules/ssl/ssl_expr_scan.c,v 1.18 2004/02/09 20:29:22 nd Exp $
  */
 
 #define FLEX_SCANNER
@@ -446,7 +446,7 @@ static char *yy_last_accepting_cpos;
 char *yytext;
 #line 1 "ssl_expr_scan.l"
 #define INITIAL 0
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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.l b/modules/ssl/ssl_expr_scan.l
index 6be1daefb4..4fc559e77a 100644
--- a/modules/ssl/ssl_expr_scan.l
+++ b/modules/ssl/ssl_expr_scan.l
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 97a76d8ca3..b39da8b621 100644
--- a/modules/ssl/ssl_scache.c
+++ b/modules/ssl/ssl_scache.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 d78db76e45..95f4ba898c 100644
--- a/modules/ssl/ssl_scache_dbm.c
+++ b/modules/ssl/ssl_scache_dbm.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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_dc.c b/modules/ssl/ssl_scache_dc.c
index 77e87e098e..ef152605cb 100644
--- a/modules/ssl/ssl_scache_dc.c
+++ b/modules/ssl/ssl_scache_dc.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Apache Software Foundation
+/* Copyright 2004 The Apache Software Foundation
  *
  * Licensed 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 b77fd6e292..63cdee4c19 100644
--- a/modules/ssl/ssl_scache_shmcb.c
+++ b/modules/ssl/ssl_scache_shmcb.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 e901257cec..8e14042990 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 2377d39a39..9346332058 100644
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 d3b04588eb..1917e62d51 100644
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 c615e88361..9256f65c83 100644
--- a/modules/ssl/ssl_util_ssl.h
+++ b/modules/ssl/ssl_util_ssl.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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_bucketeer.c b/modules/test/mod_bucketeer.c
index fa84021041..cbcd00cc1c 100644
--- a/modules/test/mod_bucketeer.c
+++ b/modules/test/mod_bucketeer.c
@@ -1,4 +1,4 @@
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2004 The Apache Software Foundation
  *
  * Licensed 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 50e84b9946..d7bdd6111d 100644
--- a/modules/test/mod_optional_fn_export.c
+++ b/modules/test/mod_optional_fn_export.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 98777ff571..c6a22cbb49 100644
--- a/modules/test/mod_optional_fn_export.h
+++ b/modules/test/mod_optional_fn_export.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 e14b416705..cc7de63c48 100644
--- a/modules/test/mod_optional_fn_import.c
+++ b/modules/test/mod_optional_fn_import.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 0ebd21f6ca..fbe8362fc1 100644
--- a/modules/test/mod_optional_hook_export.c
+++ b/modules/test/mod_optional_hook_export.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 69707415b6..8a7fef5e8c 100644
--- a/modules/test/mod_optional_hook_export.h
+++ b/modules/test/mod_optional_hook_export.h
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed 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 40e0f5a3d5..b72ea493f4 100644
--- a/modules/test/mod_optional_hook_import.c
+++ b/modules/test/mod_optional_hook_import.c
@@ -1,4 +1,4 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.