XML update.

[apache] / docs / manual / install.xml

diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index 53d51cb5e83f290a588e9d9dd02899cd2fc2d9ef..31c3a21cc3e1242380d2b8ef232df06fc9ec331a 100644 (file)
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -30,7 +30,9 @@
     on Unix and Unix-like systems only. For compiling and
     installation on Windows, see <a
     href="platform/windows.html">Using Apache HTTP Server with Microsoft
-    Windows</a>. For other platforms, see the <a
+    Windows</a> and <a 
+    href="platform/win_compiling.html">Compiling Apache for Microsoft Windows</a>.
+    For other platforms, see the <a
     href="platform/">platform</a> documentation.</p>
 
     <p>Apache httpd uses <code>libtool</code> and <code>autoconf</code>
@@ -38,7 +40,7 @@
     projects.</p>
 
     <p>If you are upgrading from one minor version to the next (for
-    example, 2.2.50 to 2.2.51), please skip down to the <a
+    example, 2.4.8 to 2.4.9), please skip down to the <a
     href="#upgrading">upgrading</a> section.</p>
 
 </summary>
@@ -116,6 +118,29 @@
     <p>The following requirements exist for building Apache httpd:</p>
 
     <dl>
+      <dt>APR and APR-Util</dt>
+      <dd>Make sure you have APR and APR-Util already installed on
+      your system. If you don't, or prefer to not use the system-provided
+      versions, download the latest versions of both APR and APR-Util
+      from <a href="http://apr.apache.org/">Apache APR</a>, unpack
+      them into <code>./srclib/apr</code> and <code>./srclib/apr-util</code>
+      (be sure the directory names do not have version numbers; for example,
+      the APR distribution must be under ./srclib/apr/) and use
+      <code>./configure</code>'s <code>--with-included-apr</code>
+      option.  On some platforms, you may have to install the 
+      corresponding <code>-dev</code> packages to allow httpd to build 
+      against your installed copy of APR and APR-Util.</dd>
+
+      <dt>Perl-Compatible Regular Expressions Library (PCRE)</dt>
+      <dd>This library is required but not longer bundled with httpd.  
+      Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>, 
+      or install a Port or Package.  If your build system can't find
+      the pcre-config script installed by the PCRE build, point to it
+      using the <code>--with-pcre</code> parameter.  On some platforms, 
+      you may have to install the corresponding <code>-dev</code> 
+      package to allow httpd to build against your installed copy 
+      of PCRE.</dd>
+      
       <dt>Disk Space</dt>
       <dd>Make sure you have at least 50 MB of temporary free disk
       space available. After installation the server occupies
@@ -338,10 +363,10 @@ $ tar xvf httpd-<em>NN</em>.tar
     <p>The first step in upgrading is to read the release announcement
     and the file <code>CHANGES</code> in the source distribution to
     find any changes that may affect your site.  When changing between
-    major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.3),
+    major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.4),
     there will likely be major differences in the compile-time and
     run-time configuration that will require manual adjustments.  All
-    modules will also need to be upgraded to accomodate changes in the
+    modules will also need to be upgraded to accommodate changes in the
     module API.</p>
 
     <p>Upgrading from one minor version to the next (for example, from