Fix all the License issues. Including:

s/Apache Group/Apache Software Foundation/ s/1999/2000/ s/Sascha's license/ASF license git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
author: Ryan Bloom <rbb@apache.org> 2000-03-10 01:07:37 +0100
committer: Ryan Bloom <rbb@apache.org> 2000-03-10 01:07:37 +0100
commit: b1c26f031a9196baae7b4a3a38388d8303588a7d (patch)
tree: 3247a76f29ed6b44f2c530a69e23ae5335e67fb3 /server
parent: PR: (diff)
download: apache2-b1c26f031a9196baae7b4a3a38388d8303588a7d.tar.xz
apache2-b1c26f031a9196baae7b4a3a38388d8303588a7d.zip
35 files changed, 319 insertions, 319 deletions
diff --git a/server/buildmark.c b/server/buildmark.c
index 575b9731a0..ce12303b8a 100644
--- a/server/buildmark.c
+++ b/server/buildmark.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/config.c b/server/config.c
index cc3c8e3618..4ab6437671 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/connection.c b/server/connection.c
index 3a94d14020..f79a148480 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/listen.c b/server/listen.c
index 478ddbed40..3994fd067b 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1998-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1998-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/log.c b/server/log.c
index 8dd2c8c6f8..244cf611d4 100644
--- a/server/log.c
+++ b/server/log.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/main.c b/server/main.c
index 42ef83e906..c2e1ca2266 100644
--- a/server/main.c
+++ b/server/main.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index fa4ed627fe..32c6d2837d 100644
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/dexter/mpm_default.h b/server/mpm/dexter/mpm_default.h
index ed22c7d2f1..6944e3b369 100644
--- a/server/mpm/dexter/mpm_default.h
+++ b/server/mpm/dexter/mpm_default.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/dexter/scoreboard.c b/server/mpm/dexter/scoreboard.c
index d80e038ae5..25eb0db694 100644
--- a/server/mpm/dexter/scoreboard.c
+++ b/server/mpm/dexter/scoreboard.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/dexter/scoreboard.h b/server/mpm/dexter/scoreboard.h
index b5dd259026..17d06a157d 100644
--- a/server/mpm/dexter/scoreboard.h
+++ b/server/mpm/dexter/scoreboard.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/mpmt_beos/mpm_default.h b/server/mpm/mpmt_beos/mpm_default.h
index 02a4b2459f..67b6f8599e 100644
--- a/server/mpm/mpmt_beos/mpm_default.h
+++ b/server/mpm/mpmt_beos/mpm_default.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index ea1ab5d870..b57a4d7b6e 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/mpmt_beos/mpmt_beos.h b/server/mpm/mpmt_beos/mpmt_beos.h
index 76260c1fbe..93ad2d47c3 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.h
+++ b/server/mpm/mpmt_beos/mpmt_beos.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/mpmt_beos/scoreboard.h b/server/mpm/mpmt_beos/scoreboard.h
index a4aab5a7c6..ea09fc61b9 100644
--- a/server/mpm/mpmt_beos/scoreboard.h
+++ b/server/mpm/mpmt_beos/scoreboard.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/mpm/mpmt_pthread/mpm_default.h b/server/mpm/mpmt_pthread/mpm_default.h
index d45efd5929..b239d85468 100644
--- a/server/mpm/mpmt_pthread/mpm_default.h
+++ b/server/mpm/mpmt_pthread/mpm_default.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index e7a0ea21b3..d9fb9d4082 100644
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/mpmt_pthread/scoreboard.h b/server/mpm/mpmt_pthread/scoreboard.h
index 4a367f3fdb..d23300f764 100644
--- a/server/mpm/mpmt_pthread/scoreboard.h
+++ b/server/mpm/mpmt_pthread/scoreboard.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/mpm/prefork/mpm_default.h b/server/mpm/prefork/mpm_default.h
index 131b516cac..8081a5fd5d 100644
--- a/server/mpm/prefork/mpm_default.h
+++ b/server/mpm/prefork/mpm_default.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 7369755a7b..e374e88529 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/mpm/prefork/scoreboard.h b/server/mpm/prefork/scoreboard.h
index 8bf2bb695b..73ef6d9799 100644
--- a/server/mpm/prefork/scoreboard.h
+++ b/server/mpm/prefork/scoreboard.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/mpm/spmt_os2/mpm_default.h b/server/mpm/spmt_os2/mpm_default.h
index 78d527efbf..0765e0db54 100644
--- a/server/mpm/spmt_os2/mpm_default.h
+++ b/server/mpm/spmt_os2/mpm_default.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/spmt_os2/scoreboard.h b/server/mpm/spmt_os2/scoreboard.h
index 82693e2c37..3fcfb19a4b 100644
--- a/server/mpm/spmt_os2/scoreboard.h
+++ b/server/mpm/spmt_os2/scoreboard.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 1b484d951e..4869d0b3a6 100644
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/mpm/winnt/mpm_default.h b/server/mpm/winnt/mpm_default.h
index deb1ceb6ae..c4ef432814 100644
--- a/server/mpm/winnt/mpm_default.h
+++ b/server/mpm/winnt/mpm_default.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 2e6afe40ac..775a9dd5cd 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 32d9d1408b..28bf5f2d3f 100644
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c
index fd9f96437a..82ebac5cd0 100644
--- a/server/mpm/winnt/registry.c
+++ b/server/mpm/winnt/registry.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
@@ -65,7 +65,7 @@
  * Apache's registry information is stored in the HKEY_LOCAL_MACHINE
  * key, under
  *
- *  HKLM\SOFTWARE\Apache Group\Apache\version
+ *  HKLM\SOFTWARE\Apache Software Foundation\Apache\version
  *
  * These keys are defined in this file. The definition of the "version" part
  * will need updating each time Apache moves from beta to non-beta or from a
@@ -93,7 +93,7 @@
  * major release, but will change when the final release is made.
  */
 
-#define VENDOR   "Apache Group"
+#define VENDOR   "Apache Software Foundation"
 #define SOFTWARE "Apache"
 #define VERSION  "2.0"
 
@@ -351,7 +351,7 @@ char *ap_registry_parse_key(int index, char *key)
 
 /*
  * ap_registry_create_apache_key() creates the Apache registry key
- * (HLKM\SOFTWARE\Apache Group\Apache\version, as defined at the start
+ * (HLKM\SOFTWARE\Apache Software Foundation\Apache\version, as defined at the start
  * of this file), if it does not already exist. It will be called by
  * ap_registry_store_key_int() if it cannot open this key. This 
  * function is intended to be called by ap_registry_store_key_int() if
diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index ebb708a4f0..fad1007d59 100644
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions 
@@ -15,27 +15,27 @@
  * 
  * 3. All advertising materials mentioning features or use of this 
  *    software must display the following acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * 4. The names "Apache Server" and "Apache Group" must not be used to 
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to 
  *    endorse or promote products derived from this software without 
  *    prior written permission. For written permission, please contact 
  *    apache@apache.org. 
  * 
  * 5. Products derived from this software may not be called "Apache" 
  *    nor may "Apache" appear in their names without prior written 
- *    permission of the Apache Group. 
+ *    permission of the Apache Software Foundation. 
  * 
  * 6. Redistributions of any form whatsoever must retain the following 
  *    acknowledgment: 
- *    "This product includes software developed by the Apache Group 
+ *    "This product includes software developed by the Apache Software Foundation 
  *    for use in the Apache HTTP server project (http://www.apache.org/)." 
  * 
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY 
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY 
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR 
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR 
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
@@ -47,10 +47,10 @@
  * ==================================================================== 
  * 
  * This software consists of voluntary contributions made by many 
- * individuals on behalf of the Apache Group and was originally based 
+ * individuals on behalf of the Apache Software Foundation and was originally based 
  * on public domain software written at the National Center for 
  * Supercomputing Applications, University of Illinois, Urbana-Champaign. 
- * For more information on the Apache Group and the Apache HTTP server 
+ * For more information on the Apache Software Foundation and the Apache HTTP server 
  * project, please see <http://www.apache.org/>. 
  * 
  */ 
diff --git a/server/rfc1413.c b/server/rfc1413.c
index 80ceb19eec..65f202a05c 100644
--- a/server/rfc1413.c
+++ b/server/rfc1413.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/util.c b/server/util.c
index 3acf2bb9fe..dd0a11c5f1 100644
--- a/server/util.c
+++ b/server/util.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
@@ -59,7 +59,7 @@
  * util.c: string utility things
  * 
  * 3/21/93 Rob McCool
- * 1995-96 Many changes by the Apache Group
+ * 1995-96 Many changes by the Apache Software Foundation
  * 
  */
 
diff --git a/server/util_date.c b/server/util_date.c
index f8809e9def..5fdc314fc7 100644
--- a/server/util_date.c
+++ b/server/util_date.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1996-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1996-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/util_md5.c b/server/util_md5.c
index 3b71c15ee9..b63986d41b 100644
--- a/server/util_md5.c
+++ b/server/util_md5.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/util_script.c b/server/util_script.c
index f5c1fc1e2c..aa01f84f3c 100644
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/util_uri.c b/server/util_uri.c
index 0e5102955e..7e3278901a 100644
--- a/server/util_uri.c
+++ b/server/util_uri.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1998-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1998-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,26 +15,26 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -46,10 +46,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
diff --git a/server/vhost.c b/server/vhost.c
index 7b8574bd12..2b7a4a7148 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
+ * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,27 +15,27 @@
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * 4. The names "Apache Server" and "Apache Software Foundation" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
- *    "This product includes software developed by the Apache Group
+ *    "This product includes software developed by the Apache Software Foundation
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
  *
- * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE Apache Software Foundation OR
  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -47,10 +47,10 @@
  * ====================================================================
  *
  * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Group and was originally based
+ * individuals on behalf of the Apache Software Foundation and was originally based
  * on public domain software written at the National Center for
  * Supercomputing Applications, University of Illinois, Urbana-Champaign.
- * For more information on the Apache Group and the Apache HTTP server
+ * For more information on the Apache Software Foundation and the Apache HTTP server
  * project, please see <http://www.apache.org/>.
  *
  */
author	Ryan Bloom <rbb@apache.org>	2000-03-10 01:07:37 +0100
committer	Ryan Bloom <rbb@apache.org>	2000-03-10 01:07:37 +0100
commit	b1c26f031a9196baae7b4a3a38388d8303588a7d (patch)
tree	3247a76f29ed6b44f2c530a69e23ae5335e67fb3 /server
parent	PR: (diff)
download	apache2-b1c26f031a9196baae7b4a3a38388d8303588a7d.tar.xz apache2-b1c26f031a9196baae7b4a3a38388d8303588a7d.zip