httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/support ab.8 ab.c apachectl apachectl.8 apxs.8 apxs.pl dbmmanage dbmmanage.1 htdigest.1 htdigest.c htpasswd.1 htpasswd.c httpd.8 log_server_status logresolve.8 logresolve.pl rotatelogs.8 split-logfile suexec.8 suexec.c suexec.h
Date Fri, 10 Mar 2000 00:07:42 GMT
rbb         00/03/09 16:07:40

  Modified:    .        ABOUT_APACHE Announcement LICENSE Makefile.tmpl
                        README-WIN32.TXT
               src      buildmark.c
               src/ap   ap_base64.c ap_sha1.c
               src/build build.mk build2.mk fastgen.sh library.mk ltlib.mk
                        program.mk rules.mk special.mk
               src/helpers GuessOS binbuild.sh
               src/include ap.h ap_ac_config.h ap_buf.h ap_config.h
                        ap_ctype.h ap_iol.h ap_listen.h ap_md5.h ap_mmn.h
                        ap_mpm.h ap_sha1.h buff.h http_conf_globals.h
                        http_config.h http_connection.h http_core.h
                        http_log.h http_main.h http_protocol.h
                        http_request.h http_vhost.h httpd.h mpm_status.h
                        rfc1413.h util_date.h util_md5.h util_script.h
                        util_uri.h
               src/lib/apr/file_io/beos file_io_common.c readwrite.c
               src/lib/apr/file_io/os2 dir.c fileacc.c filedup.c fileio.h
                        filestat.c maperrorcode.c open.c pipe.c readwrite.c
                        seek.c
               src/lib/apr/file_io/unix dir.c fileacc.c filedup.c fileio.h
                        filestat.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/file_io/win32 dir.c fileacc.c filedup.c fileio.h
                        filestat.c open.c pipe.c readwrite.c seek.c
               src/lib/apr/include apr_errno.h apr_file_io.h apr_fnmatch.h
                        apr_general.h apr_getopt.h apr_iconv.h apr_lib.h
                        apr_lock.h apr_md5.h apr_mmap.h apr_network_io.h
                        apr_pools.h apr_portable.h apr_shmem.h apr_signal.h
                        apr_thread_proc.h apr_time.h apr_win.h
                        apr_winconfig.h
               src/lib/apr/lib apr_cpystrn.c apr_execve.c apr_getpass.c
                        apr_md5.c apr_pools.c apr_signal.c apr_slack.c
                        apr_snprintf.c apr_tables.c
               src/lib/apr/locks/beos crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/locks/os2 locks.c locks.h
               src/lib/apr/locks/unix crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/locks/win32 locks.c locks.h
               src/lib/apr/misc/beos misc.h start.c
               src/lib/apr/misc/os2 misc.h
               src/lib/apr/misc/unix misc.h start.c
               src/lib/apr/misc/win32 misc.h names.c start.c timetest.c
               src/lib/apr/mmap/beos mmap.c mmap_h.h
               src/lib/apr/mmap/unix common.c mmap.c mmap_h.h
               src/lib/apr/network_io/beos networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/network_io/os2 networkio.h os2calls.c os2calls.h
                        poll.c sendrecv.c sockets.c sockopt.c
               src/lib/apr/network_io/unix networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/network_io/win32 networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/shmem/unix shmem.c
               src/lib/apr/shmem/unix/mm configure mm.3 shtool
               src/lib/apr/test ab_apr.c client.c htdigest.c htpasswd.c
                        server.c suexec.c testargs.c testcontext.c
                        testfile.c testmmap.c testpipe.c testproc.c
                        testproc.rbb testshmem.c testsock.c testthread.c
                        testtime.c
               src/lib/apr/threadproc/beos proc.c procsup.c signals.c
                        thread.c threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/os2 proc.c signals.c thread.c
                        threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/unix proc.c procsup.c signals.c
                        thread.c threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/win32 proc.c signals.c thread.c
                        threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/time/unix atime.h time.c timestr.c
               src/lib/apr/time/win32 access.c atime.h time.c timestr.c
               src/lib/expat-lite CHANGES
               src/main buff.c http_config.c http_connection.c http_core.c
                        http_log.c http_main.c http_protocol.c
                        http_request.c http_vhost.c iol_file.c listen.c
                        rfc1413.c util.c util_date.c util_md5.c
                        util_script.c util_uri.c
               src/modules/example mod_example.c
               src/modules/experimental mod_mmap_static.c
               src/modules/mpm/dexter dexter.c dexter.h mpm_default.h
                        scoreboard.c scoreboard.h
               src/modules/mpm/mpmt_beos acceptlock.c acceptlock.h
                        mpm_default.h mpmt_beos.c mpmt_beos.h scoreboard.h
               src/modules/mpm/mpmt_pthread mpm_default.h mpmt_pthread.c
                        mpmt_pthread.h scoreboard.h
               src/modules/mpm/prefork mpm_default.h prefork.c scoreboard.h
               src/modules/mpm/spmt_os2 mpm_default.h scoreboard.h
                        spmt_os2.c
               src/modules/mpm/winnt mpm_default.h winnt.c winnt.h
               src/modules/proxy mod_proxy.c mod_proxy.h proxy_cache.c
                        proxy_connect.c proxy_ftp.c proxy_http.c
                        proxy_util.c
               src/modules/standard mod_access.c mod_actions.c mod_alias.c
                        mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c
                        mod_auth_dbm.c mod_auth_digest.c mod_autoindex.c
                        mod_cern_meta.c mod_cgi.c mod_cgid.c mod_digest.c
                        mod_dir.c mod_env.c mod_expires.c mod_headers.c
                        mod_imap.c mod_include.c mod_info.c mod_log_agent.c
                        mod_log_config.c mod_log_referer.c mod_mime.c
                        mod_mime_magic.c mod_negotiation.c mod_rewrite.c
                        mod_rewrite.h mod_setenvif.c mod_so.c mod_speling.c
                        mod_status.c mod_unique_id.c mod_userdir.c
                        mod_usertrack.c mod_vhost_alias.c
               src/modules/test mod_rndchunk.c mod_test_util_uri.c
               src/os/beos beosd.c beosd.h iol_socket.c iol_socket.h os.h
               src/os/bs2000 bs2login.c ebcdic.c os.c
               src/os/os2 iol_socket.c iol_socket.h
               src/os/tpf ebcdic.c os.c
               src/os/unix iol_socket.c iol_socket.h os-aix-dso.c os.c os.h
                        unixd.c unixd.h
               src/os/win32 iol_socket.c iol_socket.h main_win32.c
                        mod_dll.c mod_isapi.c os.h registry.c registry.h
                        service.c util_win32.c
               src/os/win32/installer apache.iwz
               src/os/win32/installer/installdll/test test.rc
               src/support ab.8 ab.c apachectl apachectl.8 apxs.8 apxs.pl
                        dbmmanage dbmmanage.1 htdigest.1 htdigest.c
                        htpasswd.1 htpasswd.c httpd.8 log_server_status
                        logresolve.8 logresolve.pl rotatelogs.8
                        split-logfile suexec.8 suexec.c suexec.h
  Log:
  Fix all the License issues.  Including:
  s/Apache Group/Apache Software Foundation/
  s/1999/2000/
  s/Sascha's license/ASF license
  
  Revision  Changes    Path
  1.2       +6 -6      apache-2.0/ABOUT_APACHE
  
  Index: ABOUT_APACHE
  ===================================================================
  RCS file: /home/cvs/apache-2.0/ABOUT_APACHE,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ABOUT_APACHE	1999/08/24 05:33:35	1.1
  +++ ABOUT_APACHE	2000/03/10 00:05:46	1.2
  @@ -10,10 +10,10 @@
   source code implementation of an HTTP (Web) server.  The project is
   jointly managed by a group of volunteers located around the world, using
   the Internet and the Web to communicate, plan, and develop the server and
  -its related documentation.  These volunteers are known as the Apache Group.
  +its related documentation.  These volunteers are known as the Apache Software Foundation.
   In addition, hundreds of users have contributed ideas, code, and
   documentation to the project.  This file is intended to briefly describe
  -the history of the Apache Group, recognize the many contributors, and
  +the history of the Apache Software Foundation, recognize the many contributors, and
   explain how you can join the fun too.
   
   In February of 1995, the most popular server software on the Web was the
  @@ -28,7 +28,7 @@
   and logins for the core developers on a machine in the California Bay Area,
   with bandwidth and diskspace donated by HotWired and Organic Online.
   By the end of February, eight core contributors formed the foundation
  -of the original Apache Group:
  +of the original Apache Software Foundation:
   
      Brian Behlendorf        Roy T. Fielding          Rob Hartill
      David Robinson          Cliff Skolnick           Randy Terbush
  @@ -70,7 +70,7 @@
   
    ============================================================================
   
  -Current Apache Group in alphabetical order as of 14 February 1999:
  +Current Apache Software Foundation in alphabetical order as of 14 February 1999:
   
      Brian Behlendorf       O'Reilly and Associates, California 
      Ken Coar               IBM Corporation, Research Triangle Park, NC, USA
  @@ -158,7 +158,7 @@
   to time when core members nominate outstanding contributors and the
   rest of the core members agree.  The core group focus is more on
   "business" issues and limited-circulation things like security problems
  -than on mainstream code development.  The term "The Apache Group"
  +than on mainstream code development.  The term "The Apache Software Foundation"
   technically refers to this core of project contributors.
   
   The Apache project is a meritocracy -- the more work you have done, the more
  @@ -183,7 +183,7 @@
   who are known to be experts on that part of the server.  Vetoes must be
   accompanied by a convincing explanation.
   
  -New members of the Apache Group are added when a frequent contributor is
  +New members of the Apache Software Foundation are added when a frequent contributor is
   nominated by one member and unanimously approved by the voting members.
   In most cases, this "new" member has been actively contributing to the
   group's work for over six months, so it's usually an easy decision.
  
  
  
  1.2       +1 -1      apache-2.0/Announcement
  
  Index: Announcement
  ===================================================================
  RCS file: /home/cvs/apache-2.0/Announcement,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Announcement	1999/08/24 05:33:35	1.1
  +++ Announcement	2000/03/10 00:05:46	1.2
  @@ -1,7 +1,7 @@
   Apache 1.3.6 Released
   =====================
   
  -The Apache Group is pleased to announce the release of version
  +The Apache Software Foundation is pleased to announce the release of version
   1.3.6 of the Apache HTTP server.
   
   This new Apache version incorporates over 60 significant improvements
  
  
  
  1.2       +9 -9      apache-2.0/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/apache-2.0/LICENSE,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LICENSE	1999/08/24 05:33:35	1.1
  +++ LICENSE	2000/03/10 00:05:46	1.2
  @@ -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/>.
    *
    */
  
  
  
  1.3       +10 -10    apache-2.0/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1999/11/18 09:57:35	1.2
  +++ Makefile.tmpl	2000/03/10 00:05:46	1.3
  @@ -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/>.
   ##
   
  @@ -237,7 +237,7 @@
   		echo "|                                                        |"; \
   		echo "|   $(sbindir)/$${apachectl} start"; \
   		echo "|                                                        |"; \
  -		echo "| Thanks for using Apache.       The Apache Group        |"; \
  +		echo "| Thanks for using Apache.       The Apache Software Foundation        |"; \
   		echo "|                                http://www.apache.org/  |"; \
   		echo "+--------------------------------------------------------+"; \
   	fi
  
  
  
  1.2       +1 -1      apache-2.0/README-WIN32.TXT
  
  Index: README-WIN32.TXT
  ===================================================================
  RCS file: /home/cvs/apache-2.0/README-WIN32.TXT,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README-WIN32.TXT	2000/03/06 18:36:37	1.1
  +++ README-WIN32.TXT	2000/03/10 00:05:46	1.2
  @@ -48,5 +48,5 @@
   error), please proceed and post the bug (with the fix, if available) to
   http://bugs.apache.org/ so the issue can be addressed.
   
  -The NT port was started with code provided to the Apache Group
  +The NT port was started with code provided to the Apache Software Foundation
   by Ambarish Malpani of ValiCert, Inc. (http://www.valicert.com/).
  
  
  
  1.2       +9 -9      apache-2.0/src/buildmark.c
  
  Index: buildmark.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/buildmark.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildmark.c	1999/08/24 05:34:15	1.1
  +++ buildmark.c	2000/03/10 00:05:47	1.2
  @@ -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/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/ap/ap_base64.c
  
  Index: ap_base64.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_base64.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_base64.c	2000/01/19 01:14:21	1.3
  +++ ap_base64.c	2000/03/10 00:05:47	1.4
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/ap/ap_sha1.c
  
  Index: ap_sha1.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap_sha1.c	2000/01/28 18:00:35	1.4
  +++ ap_sha1.c	2000/03/10 00:05:47	1.5
  @@ -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/>.
    *
    * The exported function:
  
  
  
  1.6       +53 -18    apache-2.0/src/build/build.mk
  
  Index: build.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/build.mk,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.mk	2000/03/03 14:41:00	1.5
  +++ build.mk	2000/03/10 00:05:48	1.6
  @@ -1,27 +1,62 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
  -# are met:
  +# modification, are permitted provided that the following conditions            * are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:                        *    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       *
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#/
  +
  +# The build environment was provided by Sascha Schumann.
   #
  -##############################################################################
  -# $Id: build.mk,v 1.5 2000/03/03 14:41:00 bjh Exp $ 
  +
   #
   # Makefile to generate build tools
   #
  
  
  
  1.6       +54 -17    apache-2.0/src/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build2.mk	2000/03/04 15:49:16	1.5
  +++ build2.mk	2000/03/10 00:05:48	1.6
  @@ -1,27 +1,64 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
  +# modification, are permitted provided that the following conditions            
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:                        
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
  +#
  +# The build environment was provided by Sascha Schumann.
   #
  -##############################################################################
  -# $Id: build2.mk,v 1.5 2000/03/04 15:49:16 dreid Exp $
   
   include generated_lists
   
  
  
  
  1.2       +52 -17    apache-2.0/src/build/fastgen.sh
  
  Index: fastgen.sh
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/fastgen.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fastgen.sh	2000/01/11 13:10:58	1.1
  +++ fastgen.sh	2000/03/10 00:05:48	1.2
  @@ -1,29 +1,64 @@
   #! /bin/sh
  +# ====================================================================
  +# Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.
   #
  -# Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
  -#
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
   #
  -##############################################################################
  -# $Id: fastgen.sh,v 1.1 2000/01/11 13:10:58 sascha Exp $ 
  +# The build environment was provided by Sascha Schumann.
   #
   
   srcdir=$1
  
  
  
  1.2       +52 -16    apache-2.0/src/build/library.mk
  
  Index: library.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/library.mk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- library.mk	2000/01/11 13:10:58	1.1
  +++ library.mk	2000/03/10 00:05:48	1.2
  @@ -1,27 +1,63 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
   #
  -##############################################################################
  -# $Id: library.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ 
  +# The build environment was provided by Sascha Schumann.
   #
   
   LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo)
  
  
  
  1.2       +52 -16    apache-2.0/src/build/ltlib.mk
  
  Index: ltlib.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/ltlib.mk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ltlib.mk	2000/01/11 13:10:58	1.1
  +++ ltlib.mk	2000/03/10 00:05:48	1.2
  @@ -1,27 +1,63 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
   #
  -##############################################################################
  -# $Id: ltlib.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ 
  +# The build environment was provided by Sascha Schumann.
   #
   
   targets = $(LTLIBRARY_NAME)
  
  
  
  1.2       +52 -16    apache-2.0/src/build/program.mk
  
  Index: program.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/program.mk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- program.mk	2000/01/11 13:10:59	1.1
  +++ program.mk	2000/03/10 00:05:48	1.2
  @@ -1,27 +1,63 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
   #
  -##############################################################################
  -# $Id: program.mk,v 1.1 2000/01/11 13:10:59 sascha Exp $ 
  +# The build environment was provided by Sascha Schumann.
   #
   
   PROGRAM_OBJECTS = $(PROGRAM_SOURCES:.c=.lo)
  
  
  
  1.4       +52 -16    apache-2.0/src/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rules.mk	2000/02/17 22:32:29	1.3
  +++ rules.mk	2000/03/10 00:05:48	1.4
  @@ -1,27 +1,63 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
   #
  -##############################################################################
  -# $Id: rules.mk,v 1.3 2000/02/17 22:32:29 rbb Exp $ 
  +# The build environment was provided by Sascha Schumann.
   #
   
   include $(DEPTH)/config_vars.mk
  
  
  
  1.2       +52 -16    apache-2.0/src/build/special.mk
  
  Index: special.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/special.mk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- special.mk	2000/01/11 13:10:59	1.1
  +++ special.mk	2000/03/10 00:05:48	1.2
  @@ -1,27 +1,63 @@
  -# Copyright (c) 1999, 2000 Sascha Schumann. 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
   # are met:
  +#
   # 1. Redistributions of source code must retain the above copyright
   #    notice, this list of conditions and the following disclaimer.
  +#
   # 2. Redistributions in binary form must reproduce the above copyright
  -#    notice, this list of conditions and the following disclaimer in the
  -#    documentation and/or other materials provided with the distribution.
  -# 
  -# THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY EXPRESS 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 SASCHA SCHUMANN BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +#    notice, this list of conditions and the following disclaimer in
  +#    the documentation and/or other materials provided with the
  +#    distribution.
  +#
  +# 3. All advertising materials mentioning features or use of this
  +#    software must display the following acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."
  +#
  +# 4. The names "Apache Server" and "Apache Software Foundation" must not be use
  +# 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 Software Foundation.
  +#
  +# 6. Redistributions of any form whatsoever must retain the following
  +#    acknowledgment:
  +#    "This product includes software developed by the Apache Software Foundatio
  +#
  +#    for use in the Apache HTTP server project (http://www.apache.org/)."       #
  +# 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 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;
  +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  +# OF THE POSSIBILITY OF SUCH DAMAGE.
  +# ====================================================================
  +#
  +# This software consists of voluntary contributions made by many
  +# 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 Software Foundation and the Apache HTTP server
  +# project, please see <http://www.apache.org/>.
  +#
  +#
   #
  -##############################################################################
  -# $Id: special.mk,v 1.1 2000/01/11 13:10:59 sascha Exp $ 
  +# The build environment was provided by Sascha Schumann.
   #
   
   
  
  
  
  1.2       +1 -1      apache-2.0/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/helpers/GuessOS,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GuessOS	1999/08/24 05:50:35	1.1
  +++ GuessOS	2000/03/10 00:05:49	1.2
  @@ -5,7 +5,7 @@
   # Apache, it follows under Apache's regular licensing
   # (see http://www.apache.org/docs/LICENSE)  with one specific
   # addition: Any changes or additions to this script should be
  -# Emailed to the Apache group (apache@apache.org).
  +# Emailed to the Apache Software Foundation (apache@apache.org).
   #
   # Initially written by Jim Jagielski for the Apache configuration mechanism
   #
  
  
  
  1.2       +2 -2      apache-2.0/src/helpers/binbuild.sh
  
  Index: binbuild.sh
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/helpers/binbuild.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- binbuild.sh	1999/08/24 05:50:36	1.1
  +++ binbuild.sh	2000/03/10 00:05:49	1.2
  @@ -86,7 +86,7 @@
     echo "See \"INSTALL.bindist\" on how to install the distribution." && \
     echo " " && \
     echo "NOTE: Please do not send support-related mails to the address mentioned" && \
  -  echo "      above or to any member of the Apache Group! Support questions" && \
  +  echo "      above or to any member of the Apache Software Foundation! Support questions" && \
     echo "      should be directed to the \"comp.infosystems.www.servers.unix\"" && \
     echo "      or \"comp.infosystems.www.servers.ms-windows\" newsgroup" && \
     echo "      (as appropriate for the platform you use), where some of the" && \
  @@ -239,7 +239,7 @@
     echo "echo \" |                                                        |\"" && \
     echo "echo \" |   \$SR/bin/apachectl start \"" &&\
     echo "echo \" |                                                        |\"" && \
  -  echo "echo \" | Thanks for using Apache.       The Apache Group        |\"" && \
  +  echo "echo \" | Thanks for using Apache.       The Apache Software Foundation        |\"" && \
     echo "echo \" |                                http://www.apache.org/  |\"" && \
     echo "echo \" +--------------------------------------------------------+\"" && \
     echo "echo \" \"" \
  
  
  
  1.9       +9 -9      apache-2.0/src/include/ap.h
  
  Index: ap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap.h	2000/01/19 01:14:26	1.8
  +++ ap.h	2000/03/10 00:05:50	1.9
  @@ -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/>.
    *
    * The ap_vsnprintf/ap_snprintf functions are based on, and used with the
  
  
  
  1.9       +9 -9      apache-2.0/src/include/ap_ac_config.h
  
  Index: ap_ac_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap_ac_config.h	2000/02/10 23:16:12	1.8
  +++ ap_ac_config.h	2000/03/10 00:05:50	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/include/ap_buf.h
  
  Index: ap_buf.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_buf.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_buf.h	2000/01/19 02:08:56	1.3
  +++ ap_buf.h	2000/03/10 00:05:50	1.4
  @@ -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/>.
    *
    */
  
  
  
  1.15      +9 -9      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_config.h	1999/12/24 18:40:27	1.14
  +++ ap_config.h	2000/03/10 00:05:50	1.15
  @@ -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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/include/ap_ctype.h
  
  Index: ap_ctype.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_ctype.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_ctype.h	1999/08/24 05:50:43	1.1
  +++ ap_ctype.h	2000/03/10 00:05:50	1.2
  @@ -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/>.
    *
    */
  
  
  
  1.13      +9 -9      apache-2.0/src/include/ap_iol.h
  
  Index: ap_iol.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_iol.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ap_iol.h	2000/03/02 11:05:15	1.12
  +++ ap_iol.h	2000/03/10 00:05:50	1.13
  @@ -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/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/include/ap_listen.h
  
  Index: ap_listen.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_listen.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap_listen.h	1999/10/08 19:06:55	1.9
  +++ ap_listen.h	2000/03/10 00:05:50	1.10
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/include/ap_md5.h
  
  Index: ap_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_md5.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_md5.h	1999/11/03 06:17:16	1.2
  +++ ap_md5.h	2000/03/10 00:05:50	1.3
  @@ -29,7 +29,7 @@
    */
   
   /* ====================================================================
  - * 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
  @@ -45,27 +45,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;
  @@ -77,10 +77,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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mmn.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_mmn.h	1999/08/24 05:50:43	1.1
  +++ ap_mmn.h	2000/03/10 00:05:50	1.2
  @@ -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/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mpm.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap_mpm.h	1999/12/20 19:07:23	1.8
  +++ ap_mpm.h	2000/03/10 00:05:50	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/include/ap_sha1.h
  
  Index: ap_sha1.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_sha1.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ap_sha1.h	1999/08/24 05:50:44	1.1
  +++ ap_sha1.h	2000/03/10 00:05:50	1.2
  @@ -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/>.
    *
    * NIST Secure Hash Algorithm
  
  
  
  1.14      +9 -9      apache-2.0/src/include/buff.h
  
  Index: buff.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- buff.h	2000/01/19 02:08:57	1.13
  +++ buff.h	2000/03/10 00:05:50	1.14
  @@ -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/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/include/http_conf_globals.h
  
  Index: http_conf_globals.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_conf_globals.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- http_conf_globals.h	2000/01/19 01:14:28	1.3
  +++ http_conf_globals.h	2000/03/10 00:05:50	1.4
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- http_config.h	1999/10/07 20:47:48	1.6
  +++ http_config.h	2000/03/10 00:05:50	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/include/http_connection.h
  
  Index: http_connection.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_connection.h	2000/01/19 01:14:29	1.10
  +++ http_connection.h	2000/03/10 00:05:51	1.11
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_core.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_core.h	2000/01/21 18:42:45	1.5
  +++ http_core.h	2000/03/10 00:05:51	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.12      +9 -9      apache-2.0/src/include/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_log.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- http_log.h	2000/01/19 01:14:30	1.11
  +++ http_log.h	2000/03/10 00:05:51	1.12
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_main.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_main.h	1999/10/13 20:27:42	1.4
  +++ http_main.h	2000/03/10 00:05:51	1.5
  @@ -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/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/include/http_protocol.h
  
  Index: http_protocol.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- http_protocol.h	2000/01/09 05:18:16	1.10
  +++ http_protocol.h	2000/03/10 00:05:51	1.11
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/include/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- http_request.h	2000/01/09 05:18:16	1.5
  +++ http_request.h	2000/03/10 00:05:51	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/include/http_vhost.h
  
  Index: http_vhost.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_vhost.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- http_vhost.h	1999/08/31 05:32:19	1.2
  +++ http_vhost.h	2000/03/10 00:05:51	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.26      +9 -9      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- httpd.h	2000/02/16 15:08:45	1.25
  +++ httpd.h	2000/03/10 00:05:51	1.26
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/include/mpm_status.h
  
  Index: mpm_status.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/mpm_status.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_status.h	1999/10/13 22:40:09	1.2
  +++ mpm_status.h	2000/03/10 00:05:52	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/include/rfc1413.h
  
  Index: rfc1413.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/rfc1413.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rfc1413.h	1999/08/24 05:50:48	1.1
  +++ rfc1413.h	2000/03/10 00:05:52	1.2
  @@ -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/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/include/util_date.h
  
  Index: util_date.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- util_date.h	2000/01/19 02:08:57	1.8
  +++ util_date.h	2000/03/10 00:05:52	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/include/util_md5.h
  
  Index: util_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_md5.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- util_md5.h	2000/01/19 01:14:32	1.6
  +++ util_md5.h	2000/03/10 00:05:52	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/include/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_script.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_script.h	1999/12/31 01:27:35	1.5
  +++ util_script.h	2000/03/10 00:05:52	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/include/util_uri.h
  
  Index: util_uri.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_uri.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_uri.h	1999/08/31 05:32:20	1.2
  +++ util_uri.h	2000/03/10 00:05:52	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/file_io/beos/file_io_common.c
  
  Index: file_io_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/file_io_common.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- file_io_common.c	1999/12/12 17:08:42	1.1
  +++ file_io_common.c	2000/03/10 00:05:56	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/file_io/beos/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/readwrite.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- readwrite.c	2000/03/07 11:43:16	1.9
  +++ readwrite.c	2000/03/10 00:05:56	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dir.c	2000/03/03 14:51:30	1.5
  +++ dir.c	2000/03/10 00:05:56	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/file_io/os2/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileacc.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- fileacc.c	2000/01/10 15:35:44	1.6
  +++ fileacc.c	2000/03/10 00:05:57	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- filedup.c	2000/03/03 14:57:00	1.7
  +++ filedup.c	2000/03/10 00:05:57	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- fileio.h	2000/03/03 14:57:00	1.9
  +++ fileio.h	2000/03/10 00:05:57	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filestat.c	2000/01/10 15:35:45	1.3
  +++ filestat.c	2000/03/10 00:05:57	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/file_io/os2/maperrorcode.c
  
  Index: maperrorcode.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/maperrorcode.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maperrorcode.c	1999/11/01 11:11:40	1.4
  +++ maperrorcode.c	2000/03/10 00:05:57	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.16      +9 -9      apache-2.0/src/lib/apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- open.c	2000/03/03 14:57:00	1.15
  +++ open.c	2000/03/10 00:05:57	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- pipe.c	2000/03/03 14:57:00	1.7
  +++ pipe.c	2000/03/10 00:05:57	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- readwrite.c	2000/03/03 05:26:40	1.13
  +++ readwrite.c	2000/03/10 00:05:57	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/file_io/os2/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/seek.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- seek.c	2000/01/10 15:35:45	1.3
  +++ seek.c	2000/03/10 00:05:57	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.19      +9 -9      apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- dir.c	1999/12/03 15:18:22	1.18
  +++ dir.c	2000/03/10 00:05:58	1.19
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.15      +9 -9      apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- fileacc.c	2000/01/10 15:35:47	1.14
  +++ fileacc.c	2000/03/10 00:05:58	1.15
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- filedup.c	2000/01/06 14:43:07	1.8
  +++ filedup.c	2000/03/10 00:05:58	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- fileio.h	2000/02/21 16:41:40	1.8
  +++ fileio.h	2000/03/10 00:05:58	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- filestat.c	2000/03/07 23:29:21	1.13
  +++ filestat.c	2000/03/10 00:05:59	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.32      +9 -9      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- open.c	2000/01/06 14:43:09	1.31
  +++ open.c	2000/03/10 00:05:59	1.32
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.13      +9 -9      apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- pipe.c	2000/03/01 16:21:14	1.12
  +++ pipe.c	2000/03/10 00:05:59	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.25      +9 -9      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- readwrite.c	2000/03/02 18:48:36	1.24
  +++ readwrite.c	2000/03/10 00:05:59	1.25
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/seek.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- seek.c	1999/12/03 15:18:23	1.3
  +++ seek.c	2000/03/10 00:05:59	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.12      +9 -9      apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- dir.c	2000/02/01 00:51:45	1.11
  +++ dir.c	2000/03/10 00:06:05	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/file_io/win32/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileacc.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- fileacc.c	2000/01/17 19:37:52	1.10
  +++ fileacc.c	2000/03/10 00:06:05	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- filedup.c	2000/02/17 19:03:52	1.8
  +++ filedup.c	2000/03/10 00:06:06	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- fileio.h	2000/02/21 16:41:40	1.7
  +++ fileio.h	2000/03/10 00:06:06	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- filestat.c	2000/02/01 00:15:11	1.6
  +++ filestat.c	2000/03/10 00:06:06	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.20      +9 -9      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- open.c	2000/02/16 03:32:49	1.19
  +++ open.c	2000/03/10 00:06:06	1.20
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pipe.c	2000/03/06 18:12:06	1.6
  +++ pipe.c	2000/03/10 00:06:06	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- readwrite.c	2000/02/21 16:41:40	1.13
  +++ readwrite.c	2000/03/10 00:06:06	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/file_io/win32/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/seek.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- seek.c	2000/02/01 00:57:34	1.2
  +++ seek.c	2000/03/10 00:06:06	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_errno.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apr_errno.h	2000/01/27 23:49:27	1.13
  +++ apr_errno.h	2000/03/10 00:06:09	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.32      +9 -9      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- apr_file_io.h	2000/02/21 16:41:41	1.31
  +++ apr_file_io.h	2000/03/10 00:06:09	1.32
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/include/apr_fnmatch.h
  
  Index: apr_fnmatch.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_fnmatch.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_fnmatch.h	1999/12/01 18:39:14	1.5
  +++ apr_fnmatch.h	2000/03/10 00:06:09	1.6
  @@ -33,7 +33,7 @@
    *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
    */
   
  -/* This file has been modified by the Apache Group. */
  +/* This file has been modified by the Apache Software Foundation. */
   #ifndef	_APR_FNMATCH_H_
   #define	_APR_FNMATCH_H_
   
  
  
  
  1.17      +9 -9      apache-2.0/src/lib/apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- apr_general.h	2000/01/28 17:42:52	1.16
  +++ apr_general.h	2000/03/10 00:06:09	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/include/apr_getopt.h
  
  Index: apr_getopt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_getopt.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_getopt.h	1999/11/22 14:52:11	1.2
  +++ apr_getopt.h	2000/03/10 00:06:09	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/include/apr_iconv.h
  
  Index: apr_iconv.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_iconv.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_iconv.h	2000/01/14 18:24:03	1.1
  +++ apr_iconv.h	2000/03/10 00:06:09	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.22      +9 -9      apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr_lib.h	1999/12/13 20:42:02	1.21
  +++ apr_lib.h	2000/03/10 00:06:09	1.22
  @@ -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/>.
    *
    * The ap_vsnprintf/ap_snprintf functions are based on, and used with the
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lock.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_lock.h	1999/10/08 20:03:47	1.5
  +++ apr_lock.h	2000/03/10 00:06:09	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/include/apr_md5.h
  
  Index: apr_md5.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_md5.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_md5.h	1999/12/01 18:39:18	1.5
  +++ apr_md5.h	2000/03/10 00:06:09	1.6
  @@ -29,7 +29,7 @@
    */
   
   /* ====================================================================
  - * 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
  @@ -45,27 +45,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;
  @@ -77,10 +77,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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_mmap.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_mmap.h	1999/11/13 00:07:12	1.4
  +++ apr_mmap.h	2000/03/10 00:06:09	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.22      +9 -9      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr_network_io.h	2000/01/26 05:56:38	1.21
  +++ apr_network_io.h	2000/03/10 00:06:09	1.22
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_pools.h	1999/12/13 20:42:05	1.8
  +++ apr_pools.h	2000/03/10 00:06:09	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.22      +9 -9      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- apr_portable.h	2000/01/25 23:04:23	1.21
  +++ apr_portable.h	2000/03/10 00:06:09	1.22
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/include/apr_shmem.h
  
  Index: apr_shmem.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_shmem.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_shmem.h	2000/01/27 23:49:27	1.3
  +++ apr_shmem.h	2000/03/10 00:06:09	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/include/apr_signal.h
  
  Index: apr_signal.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_signal.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_signal.h	1999/08/17 15:59:37	1.1
  +++ apr_signal.h	2000/03/10 00:06:09	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.12      +9 -9      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_thread_proc.h	1999/12/02 18:36:26	1.11
  +++ apr_thread_proc.h	2000/03/10 00:06:09	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.13      +9 -9      apache-2.0/src/lib/apr/include/apr_time.h
  
  Index: apr_time.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_time.h	2000/01/17 19:37:53	1.12
  +++ apr_time.h	2000/03/10 00:06:09	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.16      +9 -9      apache-2.0/src/lib/apr/include/apr_win.h
  
  Index: apr_win.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_win.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_win.h	2000/01/28 03:10:49	1.15
  +++ apr_win.h	2000/03/10 00:06:10	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/include/apr_winconfig.h
  
  Index: apr_winconfig.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_winconfig.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_winconfig.h	2000/01/28 03:10:49	1.4
  +++ apr_winconfig.h	2000/03/10 00:06:10	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/lib/apr_cpystrn.c
  
  Index: apr_cpystrn.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_cpystrn.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_cpystrn.c	1999/12/09 21:00:41	1.9
  +++ apr_cpystrn.c	2000/03/10 00:06:12	1.10
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/lib/apr_execve.c
  
  Index: apr_execve.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_execve.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_execve.c	1999/11/23 21:22:45	1.5
  +++ apr_execve.c	2000/03/10 00:06:12	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/lib/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_getpass.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_getpass.c	1999/12/09 21:00:42	1.9
  +++ apr_getpass.c	2000/03/10 00:06:12	1.10
  @@ -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/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/lib/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_md5.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_md5.c	1999/12/30 22:18:19	1.7
  +++ apr_md5.c	2000/03/10 00:06:12	1.8
  @@ -32,7 +32,7 @@
    */
   
   /* ====================================================================
  - * 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
  @@ -48,27 +48,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;
  @@ -80,10 +80,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/>.
    *
    */
  
  
  
  1.33      +9 -9      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- apr_pools.c	2000/02/28 19:14:35	1.32
  +++ apr_pools.c	2000/03/10 00:06:12	1.33
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/lib/apr_signal.c
  
  Index: apr_signal.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_signal.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_signal.c	1999/12/31 04:15:08	1.4
  +++ apr_signal.c	2000/03/10 00:06:13	1.5
  @@ -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/>.
    *
    */
  
  
  
  1.5       +10 -10    apache-2.0/src/lib/apr/lib/apr_slack.c
  
  Index: apr_slack.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_slack.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_slack.c	1999/12/09 21:00:44	1.4
  +++ apr_slack.c	2000/03/10 00:06:13	1.5
  @@ -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 @@
    * ap_slack.c: File descriptor preallocation
    * 
    * 3/21/93 Rob McCool
  - * 1995-96 Many changes by the Apache Group
  + * 1995-96 Many changes by the Apache Software Foundation
    * 
    */
   
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/lib/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_snprintf.c	2000/01/21 02:04:09	1.10
  +++ apr_snprintf.c	2000/03/10 00:06:13	1.11
  @@ -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/>.
    *
    * This code is based on, and used with the permission of, the
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_tables.c	1999/12/09 21:00:45	1.8
  +++ apr_tables.c	2000/03/10 00:06:13	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/locks/beos/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- crossproc.c	1999/12/15 13:07:22	1.4
  +++ crossproc.c	2000/03/10 00:06:14	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/locks/beos/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/intraproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- intraproc.c	1999/12/15 13:07:22	1.4
  +++ intraproc.c	2000/03/10 00:06:14	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/locks/beos/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- locks.c	1999/12/15 13:07:22	1.7
  +++ locks.c	2000/03/10 00:06:15	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/locks/beos/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- locks.h	1999/12/15 13:07:22	1.2
  +++ locks.h	2000/03/10 00:06:15	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/locks/os2/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- locks.c	2000/03/03 14:01:07	1.6
  +++ locks.c	2000/03/10 00:06:16	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/locks/os2/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- locks.h	2000/03/03 14:01:07	1.2
  +++ locks.h	2000/03/10 00:06:16	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.13      +9 -9      apache-2.0/src/lib/apr/locks/unix/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- crossproc.c	2000/01/25 23:04:27	1.12
  +++ crossproc.c	2000/03/10 00:06:17	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/locks/unix/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/intraproc.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- intraproc.c	1999/12/22 20:29:18	1.9
  +++ intraproc.c	2000/03/10 00:06:18	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.19      +9 -9      apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- locks.c	2000/03/02 22:35:51	1.18
  +++ locks.c	2000/03/10 00:06:18	1.19
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.12      +9 -9      apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- locks.h	2000/01/25 23:04:27	1.11
  +++ locks.h	2000/03/10 00:06:18	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.13      +9 -9      apache-2.0/src/lib/apr/locks/win32/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- locks.c	1999/11/05 21:26:15	1.12
  +++ locks.c	2000/03/10 00:06:19	1.13
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/locks/win32/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- locks.h	1999/10/05 01:07:56	1.2
  +++ locks.h	2000/03/10 00:06:19	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/misc/beos/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- misc.h	1999/12/12 17:08:45	1.6
  +++ misc.h	2000/03/10 00:06:19	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/misc/beos/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- start.c	1999/12/12 17:08:45	1.9
  +++ start.c	2000/03/10 00:06:19	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/misc/os2/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/misc.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- misc.h	1999/12/08 01:00:38	1.4
  +++ misc.h	2000/03/10 00:06:20	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/misc/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- misc.h	1999/12/03 15:18:30	1.6
  +++ misc.h	2000/03/10 00:06:20	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.19      +9 -9      apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- start.c	2000/02/07 21:19:50	1.18
  +++ start.c	2000/03/10 00:06:20	1.19
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/misc/win32/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- misc.h	1999/11/29 23:29:27	1.5
  +++ misc.h	2000/03/10 00:06:21	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/misc/win32/names.c
  
  Index: names.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- names.c	1999/12/09 21:00:50	1.2
  +++ names.c	2000/03/10 00:06:21	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.12      +9 -9      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- start.c	1999/12/09 21:00:51	1.11
  +++ start.c	2000/03/10 00:06:21	1.12
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/misc/win32/timetest.c
  
  Index: timetest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/timetest.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- timetest.c	1999/08/17 15:59:42	1.1
  +++ timetest.c	2000/03/10 00:06:21	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/mmap/beos/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mmap.c	1999/12/15 13:07:24	1.6
  +++ mmap.c	2000/03/10 00:06:22	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/mmap/beos/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap_h.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mmap_h.h	1999/12/15 13:07:24	1.4
  +++ mmap_h.h	2000/03/10 00:06:22	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/mmap/unix/common.c
  
  Index: common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- common.c	2000/01/03 13:41:06	1.7
  +++ common.c	2000/03/10 00:06:22	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mmap.c	1999/12/03 15:18:31	1.9
  +++ mmap.c	2000/03/10 00:06:22	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/mmap/unix/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap_h.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mmap_h.h	1999/12/03 15:18:32	1.5
  +++ mmap_h.h	2000/03/10 00:06:23	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/network_io/beos/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- networkio.h	1999/12/15 13:07:26	1.8
  +++ networkio.h	2000/03/10 00:06:23	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- poll.c	1999/12/15 13:07:26	1.7
  +++ poll.c	2000/03/10 00:06:23	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sendrecv.c	1999/12/15 13:07:26	1.3
  +++ sendrecv.c	2000/03/10 00:06:24	1.4
  @@ -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/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockaddr.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sockaddr.c	1999/12/15 13:07:27	1.3
  +++ sockaddr.c	2000/03/10 00:06:24	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.17      +9 -9      apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- sockets.c	1999/12/15 13:07:27	1.16
  +++ sockets.c	2000/03/10 00:06:24	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sockopt.c	1999/12/15 13:07:28	1.10
  +++ sockopt.c	2000/03/10 00:06:24	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/network_io/os2/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/networkio.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- networkio.h	1999/11/03 14:03:25	1.6
  +++ networkio.h	2000/03/10 00:06:25	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/network_io/os2/os2calls.c
  
  Index: os2calls.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/os2calls.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- os2calls.c	1999/10/29 14:21:01	1.1
  +++ os2calls.c	2000/03/10 00:06:25	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/network_io/os2/os2calls.h
  
  Index: os2calls.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/os2calls.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- os2calls.h	1999/10/29 14:21:01	1.1
  +++ os2calls.h	2000/03/10 00:06:25	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/network_io/os2/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- poll.c	1999/10/29 14:21:01	1.7
  +++ poll.c	2000/03/10 00:06:25	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/network_io/os2/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sendrecv.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sendrecv.c	2000/02/14 14:01:42	1.7
  +++ sendrecv.c	2000/03/10 00:06:25	1.8
  @@ -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/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sockets.c	1999/11/03 14:03:25	1.10
  +++ sockets.c	2000/03/10 00:06:25	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sockopt.c	1999/11/03 14:03:25	1.7
  +++ sockopt.c	2000/03/10 00:06:26	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.16      +9 -9      apache-2.0/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- networkio.h	2000/01/21 01:25:34	1.15
  +++ networkio.h	2000/03/10 00:06:28	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.17      +9 -9      apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- poll.c	1999/12/03 15:18:33	1.16
  +++ poll.c	2000/03/10 00:06:28	1.17
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- sendrecv.c	2000/03/02 11:04:33	1.13
  +++ sendrecv.c	2000/03/10 00:06:28	1.14
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sockaddr.c	2000/01/21 01:25:36	1.4
  +++ sockaddr.c	2000/03/10 00:06:28	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.29      +9 -9      apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- sockets.c	2000/03/09 10:18:53	1.28
  +++ sockets.c	2000/03/10 00:06:28	1.29
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.15      +9 -9      apache-2.0/src/lib/apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- sockopt.c	1999/12/03 15:18:34	1.14
  +++ sockopt.c	2000/03/10 00:06:28	1.15
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/network_io/win32/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/networkio.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- networkio.h	1999/10/25 23:55:30	1.4
  +++ networkio.h	2000/03/10 00:06:29	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- poll.c	1999/10/15 14:20:14	1.7
  +++ poll.c	2000/03/10 00:06:29	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sendrecv.c	2000/02/04 19:22:55	1.9
  +++ sendrecv.c	2000/03/10 00:06:29	1.10
  @@ -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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sockaddr.c	1999/10/25 23:55:30	1.1
  +++ sockaddr.c	2000/03/10 00:06:29	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.18      +9 -9      apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- sockets.c	2000/01/27 05:57:38	1.17
  +++ sockets.c	2000/03/10 00:06:30	1.18
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sockopt.c	2000/02/01 00:10:12	1.6
  +++ sockopt.c	2000/03/10 00:06:30	1.7
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/shmem.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- shmem.c	2000/02/10 23:46:29	1.5
  +++ shmem.c	2000/03/10 00:06:31	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +444 -75   apache-2.0/src/lib/apr/shmem/unix/mm/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/configure,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- configure	1999/09/27 07:42:03	1.2
  +++ configure	2000/03/10 00:06:31	1.3
  @@ -20,7 +20,7 @@
   
   
   # Guess values for system-dependent variables and create Makefiles.
  -# Generated automatically using autoconf version 2.14 
  +# Generated automatically using autoconf version 2.14.1 
   # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
   #
   # This configure script is free software; the Free Software Foundation
  @@ -365,7 +365,7 @@
       verbose=yes ;;
   
     -version | --version | --versio | --versi | --vers)
  -    echo "configure generated by autoconf version 2.14"
  +    echo "configure generated by autoconf version 2.14.1"
       exit 0 ;;
   
     -with-* | --with-*)
  @@ -525,7 +525,7 @@
   
   if test -r "$cache_file"; then
     echo "loading cache $cache_file"
  -  . $cache_file
  +      test -f "$cache_file" && . $cache_file
   else
     echo "creating cache $cache_file"
     > $cache_file
  @@ -574,7 +574,7 @@
   set dummy gcc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   echo "configure:577: checking for $ac_word" >&5
  -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$CC"; then
  @@ -604,7 +604,7 @@
   set dummy cc; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   echo "configure:607: checking for $ac_word" >&5
  -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$CC"; then
  @@ -650,12 +650,12 @@
   
     if test -z "$CC"; then
       case "`uname -s`" in
  -    *win32* | *WIN32*)
  +    *win32* | *WIN32* | *CYGWIN*)
         # Extract the first word of "cl", so it can be a program name with args.
   set dummy cl; ac_word=$2
   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
   echo "configure:658: checking for $ac_word" >&5
  -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     if test -n "$CC"; then
  @@ -685,8 +685,8 @@
     test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
   fi
   
  -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
  -echo "configure:690: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
  +echo "configure:690: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
   
   ac_ext=c
   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  @@ -727,14 +727,14 @@
   if test $ac_cv_prog_cc_works = no; then
     { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
   fi
  -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
  -echo "configure:732: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
  +echo "configure:732: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
   cross_compiling=$ac_cv_prog_cc_cross
   
   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
   echo "configure:737: checking whether we are using GNU C" >&5
  -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.c <<EOF
  @@ -762,7 +762,7 @@
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
   echo "configure:765: checking whether ${CC-cc} accepts -g" >&5
  -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     echo 'void f(){}' > conftest.c
  @@ -799,7 +799,7 @@
     CPP=
   fi
   if test -z "$CPP"; then
  -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
       # This must be in double quotes, not single quotes, because CPP may get
  @@ -915,7 +915,7 @@
   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
   echo "configure:917: checking whether ${MAKE-make} sets \${MAKE}" >&5
   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftestmake <<\EOF
  @@ -983,7 +983,7 @@
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
   echo "configure:986: checking for $ac_hdr" >&5
  -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1073,7 +1073,7 @@
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
   echo "configure:1076: checking for $ac_hdr" >&5
  -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1112,7 +1112,7 @@
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
   echo "configure:1115: checking for $ac_func" >&5
  -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1166,7 +1166,7 @@
   
   echo $ac_n "checking for _POSIX_PATH_MAX in limits.h""... $ac_c" 1>&6
   echo "configure:1169: checking for _POSIX_PATH_MAX in limits.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define__POSIX_PATH_MAX'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_define__POSIX_PATH_MAX+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1198,7 +1198,7 @@
   echo "$ac_t""$ac_cv_define__POSIX_PATH_MAX" 1>&6
   echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6
   echo "configure:1201: checking for PATH_MAX in limits.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_PATH_MAX'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_define_PATH_MAX+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1230,7 +1230,7 @@
   echo "$ac_t""$ac_cv_define_PATH_MAX" 1>&6
   echo $ac_n "checking for MAXPATHLEN in sys/param.h""... $ac_c" 1>&6
   echo "configure:1233: checking for MAXPATHLEN in sys/param.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_MAXPATHLEN'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_define_MAXPATHLEN+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1262,7 +1262,7 @@
   echo "$ac_t""$ac_cv_define_MAXPATHLEN" 1>&6
   echo $ac_n "checking for _POSIX_CHILD_MAX in limits.h""... $ac_c" 1>&6
   echo "configure:1265: checking for _POSIX_CHILD_MAX in limits.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define__POSIX_CHILD_MAX'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_define__POSIX_CHILD_MAX+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1294,7 +1294,7 @@
   echo "$ac_t""$ac_cv_define__POSIX_CHILD_MAX" 1>&6
   echo $ac_n "checking for CHILD_MAX in limits.h""... $ac_c" 1>&6
   echo "configure:1297: checking for CHILD_MAX in limits.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_CHILD_MAX'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_define_CHILD_MAX+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1342,7 +1342,7 @@
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
   echo "configure:1345: checking for $ac_hdr" >&5
  -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1381,7 +1381,7 @@
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
   echo "configure:1384: checking for $ac_func" >&5
  -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1435,7 +1435,7 @@
   
   echo $ac_n "checking for _SC_PAGESIZE in unistd.h""... $ac_c" 1>&6
   echo "configure:1438: checking for _SC_PAGESIZE in unistd.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define__SC_PAGESIZE'+set}'`\" = set"; then
  +if eval "test \"\${ac_cv_define__SC_PAGESIZE+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  @@ -1465,6 +1465,78 @@
   fi
   
   echo "$ac_t""$ac_cv_define__SC_PAGESIZE" 1>&6
  +for ac_hdr in kernel/OS.h
  +do
  +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  +echo "configure:1473: checking for $ac_hdr" >&5
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 1478 "configure"
  +#include "confdefs.h"
  +#include <$ac_hdr>
  +EOF
  +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  +{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +if test -z "$ac_err"; then
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=yes"
  +else
  +  echo "$ac_err" >&5
  +  echo "configure: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=no"
  +fi
  +rm -f conftest*
  +fi
  +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  +  echo "$ac_t""yes" 1>&6
  +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
  +  cat >> confdefs.h <<EOF
  +#define $ac_tr_hdr 1
  +EOF
  + 
  +else
  +  echo "$ac_t""no" 1>&6
  +fi
  +done
  +
  +echo $ac_n "checking for B_PAGE_SIZE in kernel/OS.h""... $ac_c" 1>&6
  +echo "configure:1510: checking for B_PAGE_SIZE in kernel/OS.h" >&5
  +if eval "test \"\${ac_cv_define_B_PAGE_SIZE+set}\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 1515 "configure"
  +#include "confdefs.h"
  +
  +#include <kernel/OS.h>
  +#ifdef B_PAGE_SIZE
  +YES_IS_DEFINED
  +#endif
  +
  +EOF
  +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  +  egrep "YES_IS_DEFINED" >/dev/null 2>&1; then
  +  rm -rf conftest*
  +  ac_cv_define_B_PAGE_SIZE=yes; cat >> confdefs.h <<\EOF
  +#define HAVE_B_PAGE_SIZE 1
  +EOF
  +
  +else
  +  rm -rf conftest*
  +  ac_cv_define_B_PAGE_SIZE=no
  +fi
  +rm -f conftest*
  +
  +
  +fi
  +
  +echo "$ac_t""$ac_cv_define_B_PAGE_SIZE" 1>&6
   
   ac_decision_item='memory page size determination'
   ac_decision_msg='FAILED'
  @@ -1540,6 +1612,41 @@
       
   fi
   
  +ac_rc=yes
  +for ac_spec in header:kernel/OS.h define:B_PAGE_SIZE; do
  +    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
  +    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
  +    case $ac_type in
  +        header )
  +            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
  +            ac_var="ac_cv_header_$ac_item"
  +            ;;
  +        file )
  +            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
  +            ac_var="ac_cv_file_$ac_item"
  +            ;;
  +        func )   ac_var="ac_cv_func_$ac_item"   ;;
  +        define ) ac_var="ac_cv_define_$ac_item" ;;
  +        custom ) ac_var="$ac_item" ;;
  +    esac
  +    eval "ac_val=\$$ac_var"
  +    if test ".$ac_val" != .yes; then
  +        ac_rc=no
  +        break
  +    fi
  +done
  +if test ".$ac_rc" = .yes; then
  +    :
  +    ac_decision='MM_VMPS_BEOS'
  +ac_decision_msg='BeOS B_PAGE_SIZE'
  +ac_decision_MM_VMPS_BEOS=yes
  +ac_decision_MM_VMPS_BEOS_msg='BeOS B_PAGE_SIZE'
  +
  +else
  +    :
  +    
  +fi
  + 
   if test ".$ac_decision" = .; then
       echo "$0:Error: decision on $ac_decision_item failed" 1>&2
       exit 1
  @@ -1564,17 +1671,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1568: checking for $ac_hdr" >&5
  -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +echo "configure:1675: checking for $ac_hdr" >&5
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1573 "configure"
  +#line 1680 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1601,12 +1708,12 @@
   done
   
   echo $ac_n "checking for MAP_ANON in sys/mman.h""... $ac_c" 1>&6
  -echo "configure:1605: checking for MAP_ANON in sys/mman.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_MAP_ANON'+set}'`\" = set"; then
  +echo "configure:1712: checking for MAP_ANON in sys/mman.h" >&5
  +if eval "test \"\${ac_cv_define_MAP_ANON+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1610 "configure"
  +#line 1717 "configure"
   #include "confdefs.h"
   
   #include <sys/mman.h>
  @@ -1635,12 +1742,12 @@
   for ac_func in mmap munmap shm_open shm_unlink
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1639: checking for $ac_func" >&5
  -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  +echo "configure:1746: checking for $ac_func" >&5
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1644 "configure"
  +#line 1751 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1664,7 +1771,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1691,8 +1798,8 @@
   
   ac_safe=`echo "/dev/zero" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for /dev/zero""... $ac_c" 1>&6
  -echo "configure:1695: checking for /dev/zero" >&5
  -if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
  +echo "configure:1802: checking for /dev/zero" >&5
  +if eval "test \"\${ac_cv_file_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     
  @@ -1715,17 +1822,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:1719: checking for $ac_hdr" >&5
  -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +echo "configure:1826: checking for $ac_hdr" >&5
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1724 "configure"
  +#line 1831 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:1836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -1753,13 +1860,109 @@
   
   for ac_func in shmget shmat shmdt shmctl
   do
  +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  +echo "configure:1865: checking for $ac_func" >&5
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 1870 "configure"
  +#include "confdefs.h"
  +/* System header to define __stub macros and hopefully few prototypes,
  +    which can conflict with char $ac_func(); below.  */
  +#include <assert.h>
  +/* Override any gcc2 internal prototype to avoid an error.  */
  +/* We use char because int might match the return type of a gcc2
  +    builtin and then its argument prototype would still apply.  */
  +char $ac_func();
  +char (*f)();
  +
  +int main() {
  +
  +/* The GNU C library defines this for functions which it implements
  +    to always fail with ENOSYS.  Some functions are actually named
  +    something starting with __ and the normal name is an alias.  */
  +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  +choke me
  +#else
  +f = $ac_func;
  +#endif
  +
  +; return 0; }
  +EOF
  +if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +  rm -rf conftest*
  +  eval "ac_cv_func_$ac_func=yes"
  +else
  +  echo "configure: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  rm -rf conftest*
  +  eval "ac_cv_func_$ac_func=no"
  +fi
  +rm -f conftest*
  +fi
  +
  +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
  +  echo "$ac_t""yes" 1>&6
  +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
  +  cat >> confdefs.h <<EOF
  +#define $ac_tr_func 1
  +EOF
  + 
  +else
  +  echo "$ac_t""no" 1>&6
  +fi
  +done
  +
  +for ac_hdr in kernel/OS.h
  +do
  +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  +echo "configure:1922: checking for $ac_hdr" >&5
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 1927 "configure"
  +#include "confdefs.h"
  +#include <$ac_hdr>
  +EOF
  +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  +{ (eval echo configure:1932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +if test -z "$ac_err"; then
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=yes"
  +else
  +  echo "$ac_err" >&5
  +  echo "configure: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=no"
  +fi
  +rm -f conftest*
  +fi
  +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  +  echo "$ac_t""yes" 1>&6
  +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
  +  cat >> confdefs.h <<EOF
  +#define $ac_tr_hdr 1
  +EOF
  + 
  +else
  +  echo "$ac_t""no" 1>&6
  +fi
  +done
  +
  +for ac_func in create_area
  +do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:1758: checking for $ac_func" >&5
  -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  +echo "configure:1961: checking for $ac_func" >&5
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 1763 "configure"
  +#line 1966 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -1783,7 +1986,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -1987,6 +2190,41 @@
       
   fi
   
  +ac_rc=yes
  +for ac_spec in header:kernel/OS.h func:create_area; do
  +    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
  +    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
  +    case $ac_type in
  +        header )
  +            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
  +            ac_var="ac_cv_header_$ac_item"
  +            ;;
  +        file )
  +            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
  +            ac_var="ac_cv_file_$ac_item"
  +            ;;
  +        func )   ac_var="ac_cv_func_$ac_item"   ;;
  +        define ) ac_var="ac_cv_define_$ac_item" ;;
  +        custom ) ac_var="$ac_item" ;;
  +    esac
  +    eval "ac_val=\$$ac_var"
  +    if test ".$ac_val" != .yes; then
  +        ac_rc=no
  +        break
  +    fi
  +done
  +if test ".$ac_rc" = .yes; then
  +    :
  +    ac_decision='MM_SHMT_BEOS'
  +ac_decision_msg='BeOS areas'
  +ac_decision_MM_SHMT_BEOS=yes
  +ac_decision_MM_SHMT_BEOS_msg='BeOS areas'
  +
  +else
  +    :
  +    
  +fi
  +
   case $PLATFORM in
       *-*-linux* ) 
           #   Linux has problems with MM_SHMT_MMANON
  @@ -2025,7 +2263,7 @@
   
   
   echo $ac_n "checking for shared memory maximum segment size""... $ac_c" 1>&6
  -echo "configure:2029: checking for shared memory maximum segment size" >&5
  +echo "configure:2267: checking for shared memory maximum segment size" >&5
   OCFLAGS="$CFLAGS"
   case "$ac_decision" in
       MM_SHMT_MM*    ) CFLAGS="-DTEST_MMAP   $CFLAGS" ;;
  @@ -2038,7 +2276,7 @@
   
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2042 "configure"
  +#line 2280 "configure"
   #include "confdefs.h"
   
   #include <stdio.h>
  @@ -2143,7 +2381,7 @@
   
   
   EOF
  -if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  +if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
   then
     
   MM_SHM_MAXSEGSIZE="`cat conftestval`"
  @@ -2190,17 +2428,17 @@
   do
   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  -echo "configure:2194: checking for $ac_hdr" >&5
  -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  +echo "configure:2432: checking for $ac_hdr" >&5
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2199 "configure"
  +#line 2437 "configure"
   #include "confdefs.h"
   #include <$ac_hdr>
   EOF
   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  -{ (eval echo configure:2204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +{ (eval echo configure:2442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
   if test -z "$ac_err"; then
     rm -rf conftest*
  @@ -2229,12 +2467,12 @@
   for ac_func in semget semctl
   do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  -echo "configure:2233: checking for $ac_func" >&5
  -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
  +echo "configure:2471: checking for $ac_func" >&5
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2238 "configure"
  +#line 2476 "configure"
   #include "confdefs.h"
   /* System header to define __stub macros and hopefully few prototypes,
       which can conflict with char $ac_func(); below.  */
  @@ -2258,7 +2496,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +if { (eval echo configure:2500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     rm -rf conftest*
     eval "ac_cv_func_$ac_func=yes"
   else
  @@ -2283,12 +2521,12 @@
   done
   
   echo $ac_n "checking for LOCK_EX in sys/file.h""... $ac_c" 1>&6
  -echo "configure:2287: checking for LOCK_EX in sys/file.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_LOCK_EX'+set}'`\" = set"; then
  +echo "configure:2525: checking for LOCK_EX in sys/file.h" >&5
  +if eval "test \"\${ac_cv_define_LOCK_EX+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2292 "configure"
  +#line 2530 "configure"
   #include "confdefs.h"
   
   #include <sys/file.h>
  @@ -2315,12 +2553,12 @@
   
   echo "$ac_t""$ac_cv_define_LOCK_EX" 1>&6
   echo $ac_n "checking for F_SETLK in fcntl.h""... $ac_c" 1>&6
  -echo "configure:2319: checking for F_SETLK in fcntl.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_F_SETLK'+set}'`\" = set"; then
  +echo "configure:2557: checking for F_SETLK in fcntl.h" >&5
  +if eval "test \"\${ac_cv_define_F_SETLK+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2324 "configure"
  +#line 2562 "configure"
   #include "confdefs.h"
   
   #include <fcntl.h>
  @@ -2347,12 +2585,12 @@
   
   echo "$ac_t""$ac_cv_define_F_SETLK" 1>&6
   echo $ac_n "checking for IPC_PRIVATE in sys/ipc.h""... $ac_c" 1>&6
  -echo "configure:2351: checking for IPC_PRIVATE in sys/ipc.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_IPC_PRIVATE'+set}'`\" = set"; then
  +echo "configure:2589: checking for IPC_PRIVATE in sys/ipc.h" >&5
  +if eval "test \"\${ac_cv_define_IPC_PRIVATE+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2356 "configure"
  +#line 2594 "configure"
   #include "confdefs.h"
   
   #include <sys/ipc.h>
  @@ -2379,12 +2617,12 @@
   
   echo "$ac_t""$ac_cv_define_IPC_PRIVATE" 1>&6
   echo $ac_n "checking for SEM_UNDO in sys/sem.h""... $ac_c" 1>&6
  -echo "configure:2383: checking for SEM_UNDO in sys/sem.h" >&5
  -if eval "test \"`echo '$''{'ac_cv_define_SEM_UNDO'+set}'`\" = set"; then
  +echo "configure:2621: checking for SEM_UNDO in sys/sem.h" >&5
  +if eval "test \"\${ac_cv_define_SEM_UNDO+set}\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     cat > conftest.$ac_ext <<EOF
  -#line 2388 "configure"
  +#line 2626 "configure"
   #include "confdefs.h"
   
   #include <sys/sem.h>
  @@ -2410,11 +2648,107 @@
   fi
   
   echo "$ac_t""$ac_cv_define_SEM_UNDO" 1>&6
  +for ac_hdr in kernel/OS.h
  +do
  +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  +echo "configure:2656: checking for $ac_hdr" >&5
  +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 2661 "configure"
  +#include "confdefs.h"
  +#include <$ac_hdr>
  +EOF
  +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
  +{ (eval echo configure:2666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  +if test -z "$ac_err"; then
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=yes"
  +else
  +  echo "$ac_err" >&5
  +  echo "configure: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  rm -rf conftest*
  +  eval "ac_cv_header_$ac_safe=no"
  +fi
  +rm -f conftest*
  +fi
  +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  +  echo "$ac_t""yes" 1>&6
  +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
  +  cat >> confdefs.h <<EOF
  +#define $ac_tr_hdr 1
  +EOF
  + 
  +else
  +  echo "$ac_t""no" 1>&6
  +fi
  +done
   
  +for ac_func in create_sem
  +do
  +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
  +echo "configure:2695: checking for $ac_func" >&5
  +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
  +  echo $ac_n "(cached) $ac_c" 1>&6
  +else
  +  cat > conftest.$ac_ext <<EOF
  +#line 2700 "configure"
  +#include "confdefs.h"
  +/* System header to define __stub macros and hopefully few prototypes,
  +    which can conflict with char $ac_func(); below.  */
  +#include <assert.h>
  +/* Override any gcc2 internal prototype to avoid an error.  */
  +/* We use char because int might match the return type of a gcc2
  +    builtin and then its argument prototype would still apply.  */
  +char $ac_func();
  +char (*f)();
  +
  +int main() {
  +
  +/* The GNU C library defines this for functions which it implements
  +    to always fail with ENOSYS.  Some functions are actually named
  +    something starting with __ and the normal name is an alias.  */
  +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  +choke me
  +#else
  +f = $ac_func;
  +#endif
  +
  +; return 0; }
  +EOF
  +if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  +  rm -rf conftest*
  +  eval "ac_cv_func_$ac_func=yes"
  +else
  +  echo "configure: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +  rm -rf conftest*
  +  eval "ac_cv_func_$ac_func=no"
  +fi
  +rm -f conftest*
  +fi
  +
  +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
  +  echo "$ac_t""yes" 1>&6
  +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
  +  cat >> confdefs.h <<EOF
  +#define $ac_tr_func 1
  +EOF
  + kernel/OS.h
  +else
  +  echo "$ac_t""no" 1>&6
  +fi
  +done
  +
  +
   echo $ac_n "checking whether union semun is defined in sys/sem.h""... $ac_c" 1>&6
  -echo "configure:2416: checking whether union semun is defined in sys/sem.h" >&5
  +echo "configure:2750: checking whether union semun is defined in sys/sem.h" >&5
   cat > conftest.$ac_ext <<EOF
  -#line 2418 "configure"
  +#line 2752 "configure"
   #include "confdefs.h"
   
   #include <sys/types.h>
  @@ -2428,7 +2762,7 @@
   
   ; return 0; }
   EOF
  -if { (eval echo configure:2432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  +if { (eval echo configure:2766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     rm -rf conftest*
     cat >> confdefs.h <<\EOF
   #define HAVE_UNION_SEMUN 1
  @@ -2553,6 +2887,41 @@
       
   fi
   
  +ac_rc=yes
  +for ac_spec in header:kernel/OS.h func:create_sem; do
  +    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
  +    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
  +    case $ac_type in
  +        header )
  +            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
  +            ac_var="ac_cv_header_$ac_item"
  +            ;;
  +        file )
  +            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
  +            ac_var="ac_cv_file_$ac_item"
  +            ;;
  +        func )   ac_var="ac_cv_func_$ac_item"   ;;
  +        define ) ac_var="ac_cv_define_$ac_item" ;;
  +        custom ) ac_var="$ac_item" ;;
  +    esac
  +    eval "ac_val=\$$ac_var"
  +    if test ".$ac_val" != .yes; then
  +        ac_rc=no
  +        break
  +    fi
  +done
  +if test ".$ac_rc" = .yes; then
  +    :
  +    ac_decision='MM_SEMT_BEOS'
  +ac_decision_msg='BeOS semaphores/benaphores'
  +ac_decision_MM_SEMT_BEOS=yes
  +ac_decision_MM_SEMT_BEOS_msg='BeOS semaphores/benaphores'
  +
  +else
  +    :
  +    
  +fi
  +
   # Check whether --with-sem or --without-sem was given.
   if test "${with_sem+set}" = set; then
     withval="$with_sem"
  @@ -2671,7 +3040,7 @@
       echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
       exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
     -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
  -    echo "$CONFIG_STATUS generated by autoconf version 2.14"
  +    echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
       exit 0 ;;
     -help | --help | --hel | --he | --h)
       echo "\$ac_cs_usage"; exit 0 ;;
  @@ -2932,7 +3301,7 @@
   EOF
   chmod +x $CONFIG_STATUS
   rm -fr confdefs* $ac_clean_files
  -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
  +test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
   
   if test ".$enable_batch" != .yes; then
       echo ""
  
  
  
  1.3       +0 -0      apache-2.0/src/lib/apr/shmem/unix/mm/mm.3
  
  Index: mm.3
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.3,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mm.3	1999/09/27 07:42:07	1.2
  +++ mm.3	2000/03/10 00:06:32	1.3
  @@ -1,9 +1,12 @@
   .rn '' }`
  -''' $RCSfile: mm.3,v $$Revision: 1.2 $$Date: 1999/09/27 07:42:07 $
  +''' $RCSfile: mm.3,v $$Revision: 1.3 $$Date: 2000/03/10 00:06:32 $
   '''
   ''' $Log: mm.3,v $
  -''' Revision 1.2  1999/09/27 07:42:07  rse
  -''' Update the MM version APR contains to a more recent one.
  +''' Revision 1.3  2000/03/10 00:06:32  rbb
  +''' Fix all the License issues.  Including:
  +''' s/Apache Group/Apache Software Foundation/
  +''' s/1999/2000/
  +''' s/Sascha's license/ASF license
   '''
   '''
   .de Sh
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/shmem/unix/mm/shtool
  
  Index: shtool
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/shtool,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- shtool	1999/09/27 07:42:10	1.2
  +++ shtool	2000/03/10 00:06:32	1.3
  @@ -1613,7 +1613,7 @@
   guessos )
       ##
       ##  guessos -- Simple OS/platform guesser
  -    ##  Copyright (c) 1996-1999 The Apache Group, http://www.apache.org/
  +    ##  Copyright (c) 1996-2000 The Apache Software Foundation, http://www.apache.org/
       ##  The Apache license applies (see http://www.apache.org/docs/LICENSE)
       ##  Originally written for Apache
       ##
  @@ -2518,7 +2518,7 @@
   const char @PREFIX@_Hello[]      = "This is @NAME@, Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
   const char @PREFIX@_GNUVersion[] = "@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   const char @PREFIX@_WhatID[]     = "@(#)@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
  -const char @PREFIX@_RCSIdentID[] = "$Id: shtool,v 1.2 1999/09/27 07:42:10 rse Exp $";
  +const char @PREFIX@_RCSIdentID[] = "$Id: shtool,v 1.3 2000/03/10 00:06:32 rbb Exp $";
   const char @PREFIX@_WebID[]      = "@NAME@/@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   const char @PREFIX@_PlainID[]    = "@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   
  @@ -2537,7 +2537,7 @@
   $@PREFIX@_Hello      = "This is @NAME@, Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
   $@PREFIX@_GNUVersion = "@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   $@PREFIX@_WhatID     = "@(#)@NAME@ Version @VERSION@.@REVISION@@BPTYPE@@BPLEVEL@ (@DAY@-@MONTH@-@YEAR@)";
  -$@PREFIX@_RCSIdentID = "\$Id: shtool,v 1.2 1999/09/27 07:42:10 rse Exp $/";
  +$@PREFIX@_RCSIdentID = "\$Id: shtool,v 1.3 2000/03/10 00:06:32 rbb Exp $/";
   $@PREFIX@_WebID      = "@NAME@/@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   $@PREFIX@_PlainID    = "@VERSION@.@REVISION@@BPTYPE@@BPLEVEL@";
   
  
  
  
  1.17      +11 -11    apache-2.0/src/lib/apr/test/ab_apr.c
  
  Index: ab_apr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ab_apr.c	2000/01/26 07:01:10	1.16
  +++ ab_apr.c	2000/03/10 00:06:33	1.17
  @@ -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/>.
    *
    */
  @@ -784,14 +784,14 @@
       if (!use_html) {
           printf("This is ApacheBench, Version %s\n", VERSION);
           printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
  -        printf("Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/\n");
  +        printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
           printf("\n");
       }
       else {
           printf("<p>\n");
           printf(" This is ApacheBench, Version %s<br>\n", VERSION);
           printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
  -        printf(" Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/<br>\n");
  +        printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
           printf("</p>\n<p>\n");
       }
   }
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/test/client.c
  
  Index: client.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/client.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- client.c	1999/10/24 05:59:17	1.5
  +++ client.c	2000/03/10 00:06:33	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.13      +9 -9      apache-2.0/src/lib/apr/test/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- htdigest.c	1999/12/31 04:15:10	1.12
  +++ htdigest.c	2000/03/10 00:06:33	1.13
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/test/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htpasswd.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htpasswd.c	1999/12/31 04:15:11	1.2
  +++ htpasswd.c	2000/03/10 00:06:33	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/test/server.c
  
  Index: server.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/server.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- server.c	1999/10/24 13:08:26	1.7
  +++ server.c	2000/03/10 00:06:33	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/test/suexec.c
  
  Index: suexec.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/suexec.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- suexec.c	1999/08/18 20:19:42	1.2
  +++ suexec.c	2000/03/10 00:06:33	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/test/testargs.c
  
  Index: testargs.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testargs.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- testargs.c	1999/12/03 15:18:36	1.7
  +++ testargs.c	2000/03/10 00:06:33	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/test/testcontext.c
  
  Index: testcontext.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testcontext.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testcontext.c	1999/10/15 14:20:18	1.4
  +++ testcontext.c	2000/03/10 00:06:34	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- testfile.c	2000/01/04 19:00:49	1.8
  +++ testfile.c	2000/03/10 00:06:34	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/test/testmmap.c
  
  Index: testmmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testmmap.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- testmmap.c	2000/03/07 23:29:22	1.7
  +++ testmmap.c	2000/03/10 00:06:34	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/test/testpipe.c
  
  Index: testpipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testpipe.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testpipe.c	2000/03/01 16:21:18	1.1
  +++ testpipe.c	2000/03/10 00:06:34	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- testproc.c	2000/01/10 16:01:57	1.10
  +++ testproc.c	2000/03/10 00:06:34	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/test/testproc.rbb
  
  Index: testproc.rbb
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.rbb,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testproc.rbb	1999/08/17 15:59:46	1.1
  +++ testproc.rbb	2000/03/10 00:06:34	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/test/testshmem.c
  
  Index: testshmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testshmem.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testshmem.c	2000/01/27 23:49:36	1.1
  +++ testshmem.c	2000/03/10 00:06:34	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/test/testsock.c
  
  Index: testsock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsock.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testsock.c	1999/10/11 17:52:02	1.4
  +++ testsock.c	2000/03/10 00:06:34	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/test/testthread.c
  
  Index: testthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testthread.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- testthread.c	2000/01/25 23:04:42	1.7
  +++ testthread.c	2000/03/10 00:06:34	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/test/testtime.c
  
  Index: testtime.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testtime.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testtime.c	2000/01/09 05:18:20	1.5
  +++ testtime.c	2000/03/10 00:06:34	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.16      +9 -9      apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- proc.c	2000/03/07 23:29:22	1.15
  +++ proc.c	2000/03/10 00:06:37	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- procsup.c	1999/12/15 13:07:30	1.7
  +++ procsup.c	2000/03/10 00:06:37	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/threadproc/beos/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/signals.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- signals.c	1999/12/15 13:07:31	1.2
  +++ signals.c	2000/03/10 00:06:37	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread.c	1999/12/15 13:07:31	1.5
  +++ thread.c	2000/03/10 00:06:37	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadcancel.c	1999/12/15 13:07:31	1.3
  +++ threadcancel.c	2000/03/10 00:06:37	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadpriv.c	1999/12/15 13:07:31	1.4
  +++ threadpriv.c	2000/03/10 00:06:37	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/threadproc/beos/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadproc.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadproc.h	1999/12/15 13:07:31	1.5
  +++ threadproc.h	2000/03/10 00:06:37	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/lib/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- proc.c	2000/01/10 06:21:12	1.13
  +++ proc.c	2000/03/10 00:06:39	1.14
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/threadproc/os2/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/signals.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- signals.c	1999/08/17 15:59:50	1.1
  +++ signals.c	2000/03/10 00:06:39	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/threadproc/os2/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread.c	1999/10/14 02:53:16	1.5
  +++ thread.c	2000/03/10 00:06:40	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadcancel.c	1999/10/11 17:52:13	1.2
  +++ threadcancel.c	2000/03/10 00:06:40	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadpriv.c	1999/10/11 17:52:14	1.3
  +++ threadpriv.c	2000/03/10 00:06:40	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/threadproc/os2/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadproc.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadproc.h	1999/10/11 14:44:25	1.2
  +++ threadproc.h	2000/03/10 00:06:40	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.16      +9 -9      apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- proc.c	2000/01/28 02:29:04	1.15
  +++ proc.c	2000/03/10 00:06:42	1.16
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- procsup.c	1999/12/03 15:18:39	1.9
  +++ procsup.c	2000/03/10 00:06:43	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/signals.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- signals.c	1999/12/03 15:18:41	1.3
  +++ signals.c	2000/03/10 00:06:43	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- thread.c	1999/12/06 15:47:45	1.10
  +++ thread.c	2000/03/10 00:06:43	1.11
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadcancel.c	1999/12/03 15:18:41	1.5
  +++ threadcancel.c	2000/03/10 00:06:44	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- threadpriv.c	1999/12/03 15:18:42	1.9
  +++ threadpriv.c	2000/03/10 00:06:44	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadproc.h	1999/12/03 15:18:42	1.5
  +++ threadproc.h	2000/03/10 00:06:44	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.18      +9 -9      apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- proc.c	2000/03/03 06:06:58	1.17
  +++ proc.c	2000/03/10 00:06:45	1.18
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/lib/apr/threadproc/win32/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/signals.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- signals.c	1999/08/17 15:59:50	1.1
  +++ signals.c	2000/03/10 00:06:45	1.2
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- thread.c	1999/12/09 21:00:56	1.9
  +++ thread.c	2000/03/10 00:06:45	1.10
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/threadproc/win32/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadcancel.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadcancel.c	1999/10/11 17:52:22	1.2
  +++ threadcancel.c	2000/03/10 00:06:46	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- threadpriv.c	1999/10/15 14:20:27	1.8
  +++ threadpriv.c	2000/03/10 00:06:46	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/lib/apr/threadproc/win32/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadproc.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadproc.h	2000/03/03 06:06:58	1.3
  +++ threadproc.h	2000/03/10 00:06:46	1.4
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/lib/apr/time/unix/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/atime.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- atime.h	1999/12/20 16:10:16	1.4
  +++ atime.h	2000/03/10 00:06:47	1.5
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.20      +9 -9      apache-2.0/src/lib/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- time.c	2000/03/02 11:14:17	1.19
  +++ time.c	2000/03/10 00:06:47	1.20
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/time/unix/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- timestr.c	2000/01/23 01:13:47	1.8
  +++ timestr.c	2000/03/10 00:06:47	1.9
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/lib/apr/time/win32/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/access.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- access.c	1999/10/15 14:20:30	1.5
  +++ access.c	2000/03/10 00:06:49	1.6
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/time/win32/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/atime.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- atime.h	1999/12/09 21:01:02	1.2
  +++ atime.h	2000/03/10 00:06:50	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/lib/apr/time/win32/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/time.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- time.c	2000/02/01 00:08:25	1.7
  +++ time.c	2000/03/10 00:06:50	1.8
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/lib/apr/time/win32/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/timestr.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- timestr.c	2000/01/19 01:51:31	1.2
  +++ timestr.c	2000/03/10 00:06:50	1.3
  @@ -1,5 +1,5 @@
   /* ====================================================================
  - * Copyright (c) 1999 The Apache Group.  All rights reserved.
  + * Copyright (c) 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,8 +47,8 @@
    * ====================================================================
    *
    * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Group.
  - * For more information on the Apache Group and the Apache HTTP server
  + * individuals on behalf of the Apache Software Foundation.
  + * For more information on the Apache Software Foundation and the Apache HTTP server
    * project, please see <http://www.apache.org/>.
    *
    */
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/expat-lite/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/expat-lite/CHANGES,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CHANGES	1999/06/18 18:39:24	1.1
  +++ CHANGES	2000/03/10 00:06:51	1.2
  @@ -1,6 +1,6 @@
   === PURPOSE ===
   
  -This file documents the changes made by the Apache Group to James
  +This file documents the changes made by the Apache Software Foundation to James
   Clark's Expat parser. The original Expat distribution can be found at
   http://www.jclark.com/xml/expat.html.
   
  @@ -38,4 +38,4 @@
   
   The files, in their original state from the Expat distribution, have
   been tagged within CVS with the "EXPAT_1_1" tag. That tag may be used
  -as a reference for changes made by the Apache Group.
  +as a reference for changes made by the Apache Software Foundation.
  
  
  
  1.33      +9 -9      apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- buff.c	2000/03/02 09:45:07	1.32
  +++ buff.c	2000/03/10 00:06:52	1.33
  @@ -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/>.
    *
    */
  
  
  
  1.26      +9 -9      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- http_config.c	2000/02/22 16:02:29	1.25
  +++ http_config.c	2000/03/10 00:06:52	1.26
  @@ -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/>.
    *
    */
  
  
  
  1.27      +9 -9      apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- http_connection.c	2000/01/28 18:01:09	1.26
  +++ http_connection.c	2000/03/10 00:06:52	1.27
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.35      +9 -9      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- http_core.c	2000/01/28 18:01:11	1.34
  +++ http_core.c	2000/03/10 00:06:53	1.35
  @@ -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/>.
    *
    */
  
  
  
  1.34      +9 -9      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- http_log.c	2000/03/02 20:36:46	1.33
  +++ http_log.c	2000/03/10 00:06:53	1.34
  @@ -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/>.
    *
    */
  
  
  
  1.32      +9 -9      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- http_main.c	2000/02/28 03:13:47	1.31
  +++ http_main.c	2000/03/10 00:06:53	1.32
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.55      +10 -10    apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- http_protocol.c	2000/03/02 11:05:16	1.54
  +++ http_protocol.c	2000/03/10 00:06:53	1.55
  @@ -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 @@
    * http_protocol.c --- routines which directly communicate with the client.
    *
    * Code originally by Rob McCool; much redone by Robert S. Thau
  - * and the Apache Group.
  + * and the Apache Software Foundation.
    */
   
   #define CORE_PRIVATE
  
  
  
  1.20      +9 -9      apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- http_request.c	2000/01/28 18:01:20	1.19
  +++ http_request.c	2000/03/10 00:06:53	1.20
  @@ -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/>.
    *
    */
  
  
  
  1.15      +9 -9      apache-2.0/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- http_vhost.c	2000/01/28 18:01:23	1.14
  +++ http_vhost.c	2000/03/10 00:06:54	1.15
  @@ -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/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/main/iol_file.c
  
  Index: iol_file.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/iol_file.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- iol_file.c	2000/03/01 16:21:20	1.10
  +++ iol_file.c	2000/03/10 00:06:54	1.11
  @@ -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/>.
    *
    */
  
  
  
  1.20      +9 -9      apache-2.0/src/main/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- listen.c	2000/01/28 18:01:29	1.19
  +++ listen.c	2000/03/10 00:06:55	1.20
  @@ -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/>.
    *
    */
  
  
  
  1.12      +9 -9      apache-2.0/src/main/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- rfc1413.c	2000/01/28 18:01:31	1.11
  +++ rfc1413.c	2000/03/10 00:06:55	1.12
  @@ -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/>.
    *
    */
  
  
  
  1.32      +10 -10    apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- util.c	2000/03/02 11:05:16	1.31
  +++ util.c	2000/03/10 00:06:55	1.32
  @@ -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
    * 
    */
   
  
  
  
  1.10      +9 -9      apache-2.0/src/main/util_date.c
  
  Index: util_date.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- util_date.c	2000/01/19 01:15:14	1.9
  +++ util_date.c	2000/03/10 00:06:55	1.10
  @@ -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/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/main/util_md5.c
  
  Index: util_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- util_md5.c	2000/01/28 18:01:39	1.8
  +++ util_md5.c	2000/03/10 00:06:55	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.26      +9 -9      apache-2.0/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- util_script.c	2000/01/28 18:01:42	1.25
  +++ util_script.c	2000/03/10 00:06:55	1.26
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/main/util_uri.c
  
  Index: util_uri.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- util_uri.c	2000/01/28 18:01:45	1.6
  +++ util_uri.c	2000/03/10 00:06:55	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/modules/example/mod_example.c
  
  Index: mod_example.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/example/mod_example.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_example.c	1999/10/11 22:39:42	1.4
  +++ mod_example.c	2000/03/10 00:06:59	1.5
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/experimental/mod_mmap_static.c
  
  Index: mod_mmap_static.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_mmap_static.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_mmap_static.c	2000/01/04 19:00:56	1.6
  +++ mod_mmap_static.c	2000/03/10 00:07:00	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.64      +9 -9      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- dexter.c	2000/01/19 01:15:32	1.63
  +++ dexter.c	2000/03/10 00:07:01	1.64
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/mpm/dexter/dexter.h
  
  Index: dexter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dexter.h	1999/11/16 03:00:42	1.5
  +++ dexter.h	2000/03/10 00:07:01	1.6
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.4       +9 -9      apache-2.0/src/modules/mpm/dexter/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/mpm_default.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mpm_default.h	2000/01/19 01:15:33	1.3
  +++ mpm_default.h	2000/03/10 00:07:01	1.4
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.11      +9 -9      apache-2.0/src/modules/mpm/dexter/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- scoreboard.c	2000/01/19 01:15:34	1.10
  +++ scoreboard.c	2000/03/10 00:07:01	1.11
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.5       +9 -9      apache-2.0/src/modules/mpm/dexter/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- scoreboard.h	1999/10/13 20:14:53	1.4
  +++ scoreboard.h	2000/03/10 00:07:01	1.5
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.2       +9 -9      apache-2.0/src/modules/mpm/mpmt_beos/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/acceptlock.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- acceptlock.c	1999/10/08 19:02:32	1.1
  +++ acceptlock.c	2000/03/10 00:07:03	1.2
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.2       +9 -9      apache-2.0/src/modules/mpm/mpmt_beos/acceptlock.h
  
  Index: acceptlock.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/acceptlock.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- acceptlock.h	1999/10/08 19:02:33	1.1
  +++ acceptlock.h	2000/03/10 00:07:03	1.2
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/mpm/mpmt_beos/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpm_default.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_default.h	2000/01/19 01:15:39	1.2
  +++ mpm_default.h	2000/03/10 00:07:03	1.3
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.15      +9 -9      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mpmt_beos.c	2000/02/07 12:02:59	1.14
  +++ mpmt_beos.c	2000/03/10 00:07:03	1.15
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.4       +9 -9      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.h
  
  Index: mpmt_beos.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mpmt_beos.h	1999/12/13 22:53:15	1.3
  +++ mpmt_beos.h	2000/03/10 00:07:03	1.4
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/scoreboard.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- scoreboard.h	1999/11/02 17:29:26	1.2
  +++ scoreboard.h	2000/03/10 00:07:03	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/modules/mpm/mpmt_pthread/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpm_default.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mpm_default.h	2000/01/19 01:15:41	1.4
  +++ mpm_default.h	2000/03/10 00:07:04	1.5
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.56      +9 -9      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mpmt_pthread.c	2000/02/14 22:20:34	1.55
  +++ mpmt_pthread.c	2000/03/10 00:07:04	1.56
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.5       +9 -9      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.h
  
  Index: mpmt_pthread.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mpmt_pthread.h	1999/12/13 22:53:20	1.4
  +++ mpmt_pthread.h	2000/03/10 00:07:04	1.5
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.9       +9 -9      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- scoreboard.h	2000/01/19 01:15:43	1.8
  +++ scoreboard.h	2000/03/10 00:07:04	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/mpm/prefork/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/mpm_default.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_default.h	2000/01/19 01:15:52	1.2
  +++ mpm_default.h	2000/03/10 00:07:06	1.3
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.69      +9 -9      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- prefork.c	2000/03/02 11:05:17	1.68
  +++ prefork.c	2000/03/10 00:07:06	1.69
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/mpm/prefork/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/scoreboard.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- scoreboard.h	2000/01/19 01:15:58	1.5
  +++ scoreboard.h	2000/03/10 00:07:06	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/mpm/spmt_os2/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/mpm_default.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_default.h	2000/01/19 01:16:07	1.2
  +++ mpm_default.h	2000/03/10 00:07:06	1.3
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- scoreboard.h	2000/01/19 01:16:07	1.5
  +++ scoreboard.h	2000/03/10 00:07:06	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.30      +9 -9      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- spmt_os2.c	2000/03/03 14:24:40	1.29
  +++ spmt_os2.c	2000/03/10 00:07:06	1.30
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/mpm/winnt/mpm_default.h
  
  Index: mpm_default.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_default.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_default.h	2000/01/19 01:16:10	1.2
  +++ mpm_default.h	2000/03/10 00:07:07	1.3
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.42      +9 -9      apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- winnt.c	2000/02/16 16:30:36	1.41
  +++ winnt.c	2000/03/10 00:07:07	1.42
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.8       +9 -9      apache-2.0/src/modules/mpm/winnt/winnt.h
  
  Index: winnt.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- winnt.h	2000/01/27 05:58:00	1.7
  +++ winnt.h	2000/03/10 00:07:07	1.8
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.4       +9 -9      apache-2.0/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_proxy.c	1999/11/19 18:47:56	1.3
  +++ mod_proxy.c	2000/03/10 00:07:08	1.4
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/mod_proxy.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_proxy.h	1999/08/31 05:33:31	1.2
  +++ mod_proxy.h	2000/03/10 00:07:08	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proxy_cache.c	1999/11/19 18:48:08	1.5
  +++ proxy_cache.c	2000/03/10 00:07:08	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.2       +9 -9      apache-2.0/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- proxy_connect.c	1999/08/24 06:55:19	1.1
  +++ proxy_connect.c	2000/03/10 00:07:08	1.2
  @@ -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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- proxy_ftp.c	1999/10/11 22:39:45	1.4
  +++ proxy_ftp.c	2000/03/10 00:07:08	1.5
  @@ -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/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proxy_http.c	1999/08/31 05:33:33	1.3
  +++ proxy_http.c	2000/03/10 00:07:08	1.4
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- proxy_util.c	1999/11/19 18:48:14	1.6
  +++ proxy_util.c	2000/03/10 00:07:08	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_access.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_access.c	2000/01/19 02:41:52	1.6
  +++ mod_access.c	2000/03/10 00:07:09	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_actions.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_actions.c	2000/01/28 18:02:12	1.6
  +++ mod_actions.c	2000/03/10 00:07:09	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/standard/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_alias.c	2000/01/28 18:02:13	1.5
  +++ mod_alias.c	2000/03/10 00:07:10	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.17      +9 -9      apache-2.0/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_asis.c	2000/01/28 18:02:14	1.16
  +++ mod_asis.c	2000/03/10 00:07:10	1.17
  @@ -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/>.
    *
    */
  
  
  
  1.14      +9 -9      apache-2.0/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_auth.c	2000/01/28 18:02:16	1.13
  +++ mod_auth.c	2000/03/10 00:07:10	1.14
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_anon.c	1999/10/22 16:01:24	1.6
  +++ mod_auth_anon.c	2000/03/10 00:07:10	1.7
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_db.c	2000/01/19 02:41:53	1.6
  +++ mod_auth_db.c	2000/03/10 00:07:10	1.7
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_dbm.c	1999/12/31 17:04:58	1.6
  +++ mod_auth_dbm.c	2000/03/10 00:07:10	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/standard/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_digest.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_auth_digest.c	2000/01/18 23:41:52	1.5
  +++ mod_auth_digest.c	2000/03/10 00:07:10	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.24      +9 -9      apache-2.0/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_autoindex.c	2000/02/10 13:24:13	1.23
  +++ mod_autoindex.c	2000/03/10 00:07:11	1.24
  @@ -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/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_cern_meta.c	2000/01/19 02:41:56	1.8
  +++ mod_cern_meta.c	2000/03/10 00:07:11	1.9
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.30      +9 -9      apache-2.0/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_cgi.c	2000/03/01 16:21:21	1.29
  +++ mod_cgi.c	2000/03/10 00:07:11	1.30
  @@ -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/>.
    *
    */
  
  
  
  1.4       +9 -9      apache-2.0/src/modules/standard/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_cgid.c	2000/01/09 05:18:30	1.3
  +++ mod_cgid.c	2000/03/10 00:07:11	1.4
  @@ -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/>. 
    * 
    */ 
  
  
  
  1.8       +9 -9      apache-2.0/src/modules/standard/mod_digest.c
  
  Index: mod_digest.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_digest.c	2000/02/17 23:55:11	1.7
  +++ mod_digest.c	2000/03/10 00:07:11	1.8
  @@ -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/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/modules/standard/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_dir.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_dir.c	2000/01/28 18:02:18	1.7
  +++ mod_dir.c	2000/03/10 00:07:11	1.8
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/standard/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_env.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_env.c	2000/01/19 02:41:58	1.5
  +++ mod_env.c	2000/03/10 00:07:11	1.6
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_expires.c	2000/01/19 02:41:59	1.9
  +++ mod_expires.c	2000/03/10 00:07:11	1.10
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.5       +9 -9      apache-2.0/src/modules/standard/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_headers.c	2000/02/17 23:55:11	1.4
  +++ mod_headers.c	2000/03/10 00:07:11	1.5
  @@ -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/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_imap.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_imap.c	2000/01/19 02:42:02	1.9
  +++ mod_imap.c	2000/03/10 00:07:11	1.10
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.21      +9 -9      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_include.c	2000/01/19 02:42:04	1.20
  +++ mod_include.c	2000/03/10 00:07:11	1.21
  @@ -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/>.
    *
    */
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_info.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_info.c	1999/10/22 16:01:26	1.6
  +++ mod_info.c	2000/03/10 00:07:12	1.7
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/standard/mod_log_agent.c
  
  Index: mod_log_agent.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_agent.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_log_agent.c	1999/08/31 05:33:54	1.2
  +++ mod_log_agent.c	2000/03/10 00:07:12	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.16      +9 -9      apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_log_config.c	2000/02/10 13:24:13	1.15
  +++ mod_log_config.c	2000/03/10 00:07:12	1.16
  @@ -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/>.
    *
    */
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/standard/mod_log_referer.c
  
  Index: mod_log_referer.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_referer.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_log_referer.c	1999/08/31 05:33:55	1.2
  +++ mod_log_referer.c	2000/03/10 00:07:12	1.3
  @@ -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/>.
    *
    */
  
  
  
  1.10      +9 -9      apache-2.0/src/modules/standard/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_mime.c	2000/01/19 02:42:09	1.9
  +++ mod_mime.c	2000/03/10 00:07:12	1.10
  @@ -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/>.
    *
    */
  
  
  
  1.15      +12 -12    apache-2.0/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_mime_magic.c	2000/02/16 21:21:51	1.14
  +++ mod_mime_magic.c	2000/03/10 00:07:12	1.15
  @@ -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,10 +59,10 @@
    * mod_mime_magic: MIME type lookup via file magic numbers
    * Copyright (c) 1996-1997 Cisco Systems, Inc.
    *
  - * This software was submitted by Cisco Systems to the Apache Group in July
  + * This software was submitted by Cisco Systems to the Apache Software Foundation in July
    * 1997.  Future revisions and derivatives of this source code must
    * acknowledge Cisco Systems as the original contributor of this module.
  - * All other licensing and usage conditions are those of the Apache Group.
  + * All other licensing and usage conditions are those of the Apache Software Foundation.
    *
    * Some of this code is derived from the free version of the file command
    * originally posted to comp.sources.unix.  Copyright info for that program
  @@ -119,7 +119,7 @@
    *
    * Initial installation          July/August 1996
    * Misc bug fixes                May 1997
  - * Submission to Apache Group    July 1997
  + * Submission to Apache Software Foundation    July 1997
    *
    */
   
  
  
  
  1.19      +9 -9      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_negotiation.c	2000/01/19 02:42:13	1.18
  +++ mod_negotiation.c	2000/03/10 00:07:12	1.19
  @@ -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/>.
    *
    */
  
  
  
  1.15      +10 -10    apache-2.0/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_rewrite.c	2000/02/21 16:41:41	1.14
  +++ mod_rewrite.c	2000/03/10 00:07:12	1.15
  @@ -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/>.
    *
    */
  @@ -81,7 +81,7 @@
   **  to internal proxy throughput.
   **
   **  This module was originally written in April 1996 and
  -**  gifted exclusively to the The Apache Group in July 1997 by
  +**  gifted exclusively to the The Apache Software Foundation in July 1997 by
   **
   **      Ralf S. Engelschall
   **      rse@engelschall.com
  
  
  
  1.5       +10 -10    apache-2.0/src/modules/standard/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_rewrite.h	1999/12/31 05:05:28	1.4
  +++ mod_rewrite.h	2000/03/10 00:07:12	1.5
  @@ -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/>.
    *
    */
  @@ -85,7 +85,7 @@
   **  to internal proxy throughput.
   **
   **  This module was originally written in April 1996 and
  -**  gifted exclusively to the The Apache Group in July 1997 by
  +**  gifted exclusively to the The Apache Software Foundation in July 1997 by
   **
   **      Ralf S. Engelschall
   **      rse@engelschall.com
  
  
  
  1.7       +9 -9      apache-2.0/src/modules/standard/mod_setenvif.c
  
  Index: mod_setenvif.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_setenvif.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_setenvif.c	2000/01/28 18:02:21	1.6
  +++ mod_setenvif.c	2000/03/10 00:07:12	1.7
  @@ -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
    * IT'S 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/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_so.c	2000/01/21 19:24:46	1.7
  +++ mod_so.c	2000/03/10 00:07:12	1.8
  @@ -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/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_speling.c	2000/02/17 23:55:11	1.8
  +++ mod_speling.c	2000/03/10 00:07:12	1.9
  @@ -1,6 +1,6 @@
   #define WANT_BASENAME_MATCH
   /* ====================================================================
  - * 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
  @@ -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/>.
    *
    */
  
  
  
  1.9       +9 -9      apache-2.0/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_status.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_status.c	2000/01/18 23:41:56	1.8
  +++ mod_status.c	2000/03/10 00:07:13	1.9
  @@ -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/>.
    *
    */
  
  
  
  1.6       +9 -9      apache-2.0/src/modules/standard/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_unique_id.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_unique_id.c	1999/12/31 19:03:18	1.5
  +++ mod_unique_id.c	2000/03/10 00:07:13	1.6
  @@ -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/>.
    *
    */
  
  
  
  1.8       +9 -9      apache-2.0/src/modules/standard/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_userdir.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_userdir.c	2000/01/19 02:42:17	1.7
  +++ mod_userdir.c	2000/03/10 00:07:13	1.8
  @@ -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/>.
    *
    */
  
  
  
  1.11      +9 -9      apache-2.0/src/modules/standard/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_usertrack.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_usertrack.c	2000/01/09 05:18:31	1.10
  +++ mod_usertrack.c	2000/03/10 00:07:13	1.11
  @@ -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/>.
    *
    */
  
  
  
  1.4       +11 -11    apache-2.0/src/modules/standard/mod_vhost_alias.c
  
  Index: mod_vhost_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_vhost_alias.c	1999/12/31 17:06:15	1.3
  +++ mod_vhost_alias.c	2000/03/10 00:07:13	1.4
  @@ -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/>.
    *
    */
  @@ -60,11 +60,11 @@
    * 
    * Copyright (c) 1998-1999 Demon Internet Ltd.
    *
  - * This software was submitted by Demon Internet to the Apache Group
  + * This software was submitted by Demon Internet to the Apache Software Foundation
    * in May 1999. Future revisions and derivatives of this source code
    * must acknowledge Demon Internet as the original contributor of
    * this module. All other licensing and usage conditions are those
  - * of the Apache Group.
  + * of the Apache Software Foundation.
    *
    * Originally written by Tony Finch <fanf@demon.net> <dot@dotat.at>.
    *
  
  
  
  1.3       +9 -9      apache-2.0/src/modules/test/mod_rndchunk.c
  
  Index: mod_rndchunk.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/test/mod_rndchunk.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_rndchunk.c	1999/08/31 05:34:33	1.2
  +++ mod_rndchunk.c	2000/03/10 00:07:21	1.3
  @@ -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 sof