Index: xdocs/legal/src-headers.xml =================================================================== --- xdocs/legal/src-headers.xml (Revision 793889) +++ xdocs/legal/src-headers.xml (Arbeitskopie) @@ -111,8 +111,9 @@ NOTICE file
  1. Every Apache distribution should include a NOTICE file in the top directory, along with the standard LICENSE file.
  2. -
  3. The top of each NOTICE file should include the following text, suitably modified to reflect the product name and year(s) - of distribution of the current and past versions of the product: +
  4. The top of each NOTICE file should include the following + text, suitably modified to reflect the product name and year of distribution + of the current version of the product:
               Apache [PRODUCT_NAME]
               Copyright [yyyy] The Apache Software Foundation
    Index: xdocs/licenses/example-NOTICE.txt
    ===================================================================
    --- xdocs/licenses/example-NOTICE.txt	(Revision 793889)
    +++ xdocs/licenses/example-NOTICE.txt	(Arbeitskopie)
    @@ -1,26 +1,14 @@
    -   =========================================================================
    -   ==  Example NOTICE file for use with the Apache License, Version 2.0,  ==
    -   ==  in this case for the Apache httpd-2.0 distribution.                ==
    -   =========================================================================
    +Apache HTTP Server
    +Copyright 2009 The Apache Software Foundation.
     
    -   Apache HTTP Server
    -   Copyright 1999-2006 The Apache Software Foundation
    +This product includes software developed at
    +The Apache Software Foundation (http://www.apache.org/).
     
    -   This product includes software developed at
    -   The Apache Software Foundation (http://www.apache.org/).
    +Portions of this software were developed at the National Center
    +for Supercomputing Applications (NCSA) at the University of
    +Illinois at Urbana-Champaign.
     
    -   Portions of this software were developed at the National Center
    -   for Supercomputing Applications (NCSA) at the University of
    -   Illinois at Urbana-Champaign.
    -
    -   This software contains code derived from the RSA Data Security
    -   Inc. MD5 Message-Digest Algorithm, including various
    -   modifications by Spyglass Inc., Carnegie Mellon University, and
    -   Bell Communications Research, Inc (Bellcore).
    -
    -   Regular expression support is provided by the PCRE library package,
    -   which is open source software, written by Philip Hazel, and copyright
    -   by the University of Cambridge, England. The original software is
    -   available from
    -      ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
    -
    +This software contains code derived from the RSA Data Security
    +Inc. MD5 Message-Digest Algorithm, including various
    +modifications by Spyglass Inc., Carnegie Mellon University, and
    +Bell Communications Research, Inc (Bellcore).