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

10 files changed, 90 insertions, 90 deletions

diff --git a/docs/man/ab.8 b/docs/man/ab.8
index 62da21cf83..12076bab38 100644
--- a/docs/man/ab.8
+++ b/docs/man/ab.8
@@ -1,5 +1,5 @@
 .TH ab 1 "March 1998"
-.\" 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/>.
 .SH NAME
 ab \- Apache HTTP server benchmarking tool
diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8
index 72300eb98b..f231c59c34 100644
--- a/docs/man/apachectl.8
+++ b/docs/man/apachectl.8
@@ -1,5 +1,5 @@
 .TH apachectl 1 "September 1997"
-.\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
+.\" Copyright (c) 1997-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/>.
 .SH NAME
 apachectl \- Apache HTTP server control interface
diff --git a/docs/man/apxs.8 b/docs/man/apxs.8
index 464766c75f..44ccb3602d 100644
--- a/docs/man/apxs.8
+++ b/docs/man/apxs.8
@@ -1,5 +1,5 @@
 .TH apxs 8 "April 1998"
-.\" 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/>.
 .SH NAME
 apxs \- APache eXtenSion tool
diff --git a/docs/man/dbmmanage.1 b/docs/man/dbmmanage.1
index 06380ff0f5..58f7135664 100644
--- a/docs/man/dbmmanage.1
+++ b/docs/man/dbmmanage.1
@@ -1,5 +1,5 @@
 .TH dbmmanage 1 "March 1998"
-.\" 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/>.
 .SH NAME
 dbmmanage \- Create and update user authentication files in DBM format
diff --git a/docs/man/htdigest.1 b/docs/man/htdigest.1
index c719e456ce..651d6b82a6 100644
--- a/docs/man/htdigest.1
+++ b/docs/man/htdigest.1
@@ -1,5 +1,5 @@
 .TH htdigest 1 "March 1998"
-.\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
+.\" Copyright (c) 1997-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/>.
 .SH NAME
 htdigest \- Create and update user authentication files
diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index 1687cde41c..a8386c5e2a 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -1,5 +1,5 @@
 .TH htpasswd 1 "February 1997"
-.\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
+.\" Copyright (c) 1997-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/>.
 .SH NAME
 htpasswd \- Create and update user authentication files
diff --git a/docs/man/httpd.8 b/docs/man/httpd.8
index ae320bad2a..b948fe4475 100644
--- a/docs/man/httpd.8
+++ b/docs/man/httpd.8
@@ -1,6 +1,6 @@
 .TH httpd 8 "February 1997"
 .\" Copyright (c) 1995-1997 David Robinson. All rights reserved.
-.\" Copyright (c) 1997-1999 The Apache Group. All rights reserved.
+.\" Copyright (c) 1997-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
@@ -16,27 +16,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;
@@ -48,10 +48,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/>.
 .SH NAME
 httpd \- Apache hypertext transfer protocol server
diff --git a/docs/man/logresolve.8 b/docs/man/logresolve.8
index 4851269ad6..020a3ea153 100644
--- a/docs/man/logresolve.8
+++ b/docs/man/logresolve.8
@@ -1,5 +1,5 @@
 .TH logresolve 8 "March 1998"
-.\" 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/>.
 .SH NAME
 logresolve \- resolve hostnames for IP-adresses in Apache logfiles
diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8
index aee02e11ec..fea0defc05 100644
--- a/docs/man/rotatelogs.8
+++ b/docs/man/rotatelogs.8
@@ -1,5 +1,5 @@
 .TH rotatelogs 8 "March 1998"
-.\" 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/>.
 .SH NAME
 rotatelogs \- rotate Apache logs without having to kill the server
diff --git a/docs/man/suexec.8 b/docs/man/suexec.8
index 801d7abce9..9d25e55e76 100644
--- a/docs/man/suexec.8
+++ b/docs/man/suexec.8
@@ -1,5 +1,5 @@
 .TH suexec 8 "March 1998"
-.\" 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/>.
 .SH NAME
 suexec \- Switch User For Exec