Imported Upstream version 2.3.16-beta

1 files changed, 17 insertions, 11 deletions

diff --git a/INSTALL b/INSTALL
index 153f5c64..7cc31da4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@
   ------------------
 
   For complete installation documentation, see [ht]docs/manual/install.html or
-  http://httpd.apache.org/docs/2.2/install.html
+  http://httpd.apache.org/docs/2.3/install.html
 
      $ ./configure --prefix=PREFIX
      $ make
@@ -17,12 +17,16 @@
               might use "/usr/local/apache2" for PREFIX (without the
               quotes).
 
-            * If you are a developer who will be linking your code with
+            * Consider if you need to use the bundled APR and APR-Util
+              via ./configure's --with-included-apr option, to use the
+              bundled source instead of a previously installed APR and
+              APR-Util (such as those provided with many OSes).  This
+              is required if you don't have the compiler which the
+              system APR was built with.  This can be advantageous if 
+              you are a developer who will be linking your code with
               Apache or using a debugger to step through server code,
-              ./configure's --with-included-apr option may be advantageous,
               as it removes the possibility of version or compile-option
-              mismatches with APR and APR-util code.  (Many OSes now
-              include their own version of APR and APR-util.)
+              mismatches with APR and APR-util code.
 
             * If you are a developer building Apache directly from
               Subversion, you will need to run ./buildconf before running
@@ -55,7 +59,7 @@
      --enable-rewrite=shared \
      --enable-speling=shared 
 
-  The easiest way to find all of the configuration flags for Apache 2.2
+  The easiest way to find all of the configuration flags for Apache 2.3
   is to run ./configure --help.
 
 
@@ -63,14 +67,16 @@
   ---------------------
 
   For complete documentation, see [ht]docs/manual/platform/windows.html or
-  http://httpd.apache.org/docs/2.2/platform/windows.html.
+  http://httpd.apache.org/docs/2.3/platform/windows.html.
 
   The Apache/Win32 binaries are primarily distributed as a Windows Installer 
   package (.msi), and may be available as a .zip file as well.  These packages 
-  are named apache-2.2.xx-win32-x86.msi and apache-2.2.xx-win32-x86.zip.  
-  Please choose the .msi package if at all possible.
+  are named apache-2.3.xx-win32-x86.msi and apache-2.3.xx-win32-x86.zip.  
+  Please choose the .msi package if at all possible. Note that Apache version
+  2.3 is a development version and binaries may not be available. Use a 
+  released version from the stable 2.2 branch instead. 
 
-  If you have unpacked a source distribution (named httpd-2.2-xx.zip, without
+  If you have unpacked a source distribution (named httpd-2.3-xx.zip, without
   any -win32-x86 notation) you must compile the package yourself, see the links
   mentioned above.  Unless you intended to do this, please look again for the 
   binary package from http://www.apache.org/dist/httpd/binaries/win32/ and
@@ -100,7 +106,7 @@
   comp.infosystems.www.servers.unix or
   comp.infosystems.www.servers.ms-windows.
 
-  Thanks for using the Apache HTTP Server, version 2.2.
+  Thanks for using the Apache HTTP Server, version 2.3.
 
                                      The Apache Software Foundation
                                      http://www.apache.org/