Englishification

We'll get the upgrade docs for 1.3->2.2 done over the weekend. If we EOL 1.3 and
point people to 2.0, I'll just cry :-(

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@896702 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/README b/README
index e07ae52542a0905effc455918365cfee58d293d3..091fc23ecdbabef6097e95d5092a3e16f5400303 100644 (file)
--- a/README
+++ b/README
@@ -5,25 +5,27 @@
   What is it?
   -----------
 
-  Apache is an HTTP server designed as a plug-in replacement for
-  the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in
-  the NCSA server and includes many frequently requested new
-  features, and has an API which allows it to be extended to meet
-  users' needs more easily.
+  Apache httpd 1.3 is a HTTP server designed as a plug-in replacement 
+  for the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in
+  the NCSA server, includes many frequently-requested new features, 
+  and has an API which allows it to be extended more easily to meet 
+  users' needs.
 
   The Latest Version
   ------------------
 
-  As of January 2010, version 1.3 of Apache has reached its end
-  of life. Future security updates will be available as patches, 
-  via;
+  Apache httpd 1.3 has reached end of life, as of January 2010. 
+  No further releases of this software will be made, although critical 
+  security updates may be made available as patches from the following 
+  website:
   
     http://www.apache.org/dist/httpd/patches/
 
   Users are encouraged to upgrade to version 2.2 or higher of 
-  Apache httpd. Information on upgrading is available at;
+  Apache httpd. 
+  
+  Information on upgrading is available from the following website:
 
-     http://httpd.apache.org/docs/2.0/upgrading.html
      http://httpd.apache.org/docs/2.2/upgrading.html
 
   Documentation
@@ -37,17 +39,13 @@
   Installation
   ------------
 
-  From Apache version 1.3 and up you have two possibilities to
-  build and install the Apache package: The old commonly known
-  but manual way from Apache 1.2 and below and the new
-  out-of-the-box way through the new Apache Autoconf-style
-  Interface (APACI). For detailed instructions see the file
-  INSTALL in this directory.
+  For detailed installation instructions, please see the INSTALL 
+  file in this directory.
 
   Licensing
   ---------
 
-  Please see the file called LICENSE.
+  For license details, please seem the LICENSE file in this directory.
 
   Acknowledgments
   ----------------

diff --git a/src/CHANGES b/src/CHANGES
index 3fc4863d5ab3b8425cbb35555b4b02620a2ee0e3..bf42c7c06d5efe5cac7bdbacdce45b9bd38e5164 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,9 +1,10 @@
 Changes with Apache 1.3.42
 
-  *) INFORMATIONAL: Please note that this release is considered
-     the final release of the Apache 1.3.x, which has now reached
-     end of life status. Future security updates will be distributed 
-     as patches, via 
+  *) IMPORTANT: This is the final release of Apache httpd 1.3.
+     Apache httpd 1.3 has reached end of life, as of January 2010.
+     No further releases of this software will be made, although critical
+     security updates may be made available as patches from the following
+     website:
 
      http://www.apache.org/dist/httpd/patches/
 
@@ -11,13 +12,12 @@ Changes with Apache 1.3.42
      bug-fixes and community support are advised to use Apache 2.2 
      or higher. 
 
-     Information on upgrading is available at;
+     Information on upgrading is available from the following website:
 
-     http://httpd.apache.org/docs/2.0/upgrading.html
      http://httpd.apache.org/docs/2.2/upgrading.html
 
      Thank you to everyone who helped make Apache 1.3.x the most 
-     successful, and most used, webserver software on the planet. 
+     successful, and most used, webserver software on the planet! 
      [Apache httpd group]
 
   *) Protect logresolve from mismanaged DNS records that return