From: Erik Abele <erikabele@apache.org>
Date: Wed, 13 Feb 2008 12:54:55 +0000 (+0000)
Subject: Change docs URLs to canonical version and sync document with trunk.
X-Git-Tag: 2.2.9~369
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18499c6ab41dc0679821af07ccbd9837e74b87b4;p=thirdparty%2Fapache%2Fhttpd.git

Change docs URLs to canonical version and sync document with trunk.


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

diff --git a/INSTALL b/INSTALL
index 3c0692b2e71..827883c5248 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.2/install.html
 
      $ ./configure --prefix=PREFIX
      $ make
@@ -17,17 +17,25 @@
               might use "/usr/local/apache2" for PREFIX (without the
               quotes).
 
-            * If you are building on FreeBSD, be aware that threads will
-              be disabled and the prefork MPM will be used by default,
-              as threads do not work well with Apache on FreeBSD.  If
-              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.
+            * If you want to build a threaded MPM (for instance worker)
+              on  FreeBSD, be aware that threads do not work well with
+              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
+              to try a threaded Apache on an earlier version of FreeBSD,
+              use the --enable-threads parameter to ./configure in
+              addition to the --with-mpm parameter.
+
+            * If you are a developer building Apache directly from
+              Subversion, you will need to run ./buildconf before running
+              configure. This script bootstraps the build environment and
+              requires Python as well as GNU autoconf and libtool. If you
+              build Apache from a release tarball, you don't have to run
+              buildconf.
+
+            * If you are building directly from Subversion on Mac OS X
+              (Darwin), make sure to use GNU Libtool 1.4.2 or newer. All
+              recent versions of the developer tools on this platform
+              include a sufficiently recent version of GNU Libtool (named
+              glibtool, but buildconf knows where to find it).
 
   For a short impression of what possibilities you have, here is a
   typical example which configures Apache for the installation tree
@@ -48,7 +56,7 @@
   ---------------------
 
   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.2/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