Index: xdocs/legal/src-headers.xml
===================================================================
--- xdocs/legal/src-headers.xml	(revision 794237)
+++ xdocs/legal/src-headers.xml	(working copy)
@@ -111,8 +111,10 @@
 <title>NOTICE file</title>
 <ol start="0">  
  <li id="notice-required">Every Apache distribution should include a NOTICE file in the top directory, along with the standard LICENSE file.</li>
- <li id="notice-text">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:
+ <li id="notice-text">
+   The top of each NOTICE file should include the following text, suitably
+   modified to reflect the product name and year of first publication of
+   this version of the product:
   <pre>
           Apache [PRODUCT_NAME]
           Copyright [yyyy] The Apache Software Foundation
Index: xdocs/licenses/example-NOTICE.txt
===================================================================
--- xdocs/licenses/example-NOTICE.txt	(revision 794237)
+++ xdocs/licenses/example-NOTICE.txt	(working copy)
@@ -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).