Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 17 Mar 2000 15:16:42 -0000
Message-ID: <20000317151642.57438.qmail@locus.apache.org>
From: dreid@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/htdocs/manual LICENSE

dreid       00/03/17 07:16:42

  Modified:    htdocs/manual LICENSE
  Log:
  Update the licence in the documentation.  Should this be done for 1.3
  as well?
  
  Revision  Changes    Path
  1.8       +9 -10     apache-2.0/htdocs/manual/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/apache-2.0/htdocs/manual/LICENSE,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LICENSE	1999/01/01 19:04:33	1.7
  +++ LICENSE	2000/03/17 15:16:40	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,13 +47,12 @@
    * ====================================================================
    *
    * 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/>.
    *
    */
  -