2.1 -> 2.3 changes. Only track the 2.3/2.4 release history.

[apache] / INSTALL

diff --git a/INSTALL b/INSTALL
index 14ff4970e4f8827be2c825c1e3f080a695f32c2b..7a17d3675be25636a3a379b2a4d351a29d54edf8 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,11 @@
 
   APACHE INSTALLATION OVERVIEW
 
-  For complete installation documentation, see docs/manual/install.html or
-  http://httpd.apache.org/docs-2.0/install.html
+  Quick Start - Unix
+  ------------------
 
-  Quick Start
-  -----------
+  For complete installation documentation, see [ht]docs/manual/install.html or
+  http://httpd.apache.org/docs-2.1/install.html
 
      $ ./configure --prefix=PREFIX
      $ make
@@ -14,7 +14,7 @@
 
      NOTES: * Replace PREFIX with the filesystem path under which 
               Apache should be installed.  A typical installation
-              might use "/usr/local/apache" for PREFIX (without the
+              might use "/usr/local/apache2" for PREFIX (without the
               quotes).
 
             * If you are building on FreeBSD, be aware that threads will
@@ -23,6 +23,9 @@
               you wish to try a threaded Apache on FreeBSD anyway, use
               "./configure --enable-threads".
 
+            * If you are building on Mac OS X (Darwin), make sure to
+              use libtool 1.4.2 or newer.
+
             * If you are a developer building Apache directly from CVS,
               you will need to run ./buildconf before running configure.
 
@@ -37,11 +40,52 @@
      --enable-rewrite=shared \
      --enable-speling=shared 
 
-  The easiest way to find all of the configuration flags for Apache 2.0
+  The easiest way to find all of the configuration flags for Apache 2.1
   is to run ./configure --help.
 
-  Thanks for using the Apache HTTP Server, version 2.0.
+
+  Quick Start - Windows
+  ---------------------
+
+  For complete documentation, see [ht]docs/manual/platform/windows.html or
+  http://httpd.apache.org/docs-2.1/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.1.xx-win32-x86.msi and apache-2.1.xx-win32-x86.zip.  
+  Please choose the .msi package if at all possible.
+
+  If you have unpacked a source distribution (named httpd-2.1-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
+  install that .msi (or .zip package, if you must.)
+
+  If you have unpacked this binary distribution from the .zip package, you 
+  _must_ edit the conf/httpd.conf file (with notepad or another text editor) 
+  to reflect the correct ServerName, Domain, and directory paths.  Search for 
+  the text "@@" to discover what you must edit.  To install and start the 
+  service after you have corrected the httpd.conf file, use the command
+
+    bin\Apache -k install
+    bin\Apache -k start
+
+  The .msi package configures the httpd.conf file, and installs and starts 
+  the Apache2 service for you.  It also installs plenty of useful shortcuts
+  and the taskbar ApacheMonitor.  We strongly encourage you to use it.
+
+
+  Postscript
+  ----------
+
+  The Apache HTTP Server group cannot field user's installation questions.
+  There are many valuable forums to help you get started.  Please refer your
+  questions to the appropriate forum, such as the Users Mailing List at
+  http://httpd.apache.org/userslist.html or the usenet newsgroups
+  comp.infosystems.www.servers.unix or
+  comp.infosystems.www.servers.ms-windows.
+
+  Thanks for using the Apache HTTP Server, version 2.1.
 
                                      The Apache Software Foundation
                                      http://www.apache.org/
-