Rebuild.

[apache] / docs / manual / install.xml

diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index eae54e34df701c7451b095fd0b6f313753399de4..b3d4accd0df7fad1fb9224ecc98ecf4af6d9eaac 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>
@@ -55,7 +57,7 @@
       <tr>
         <td><a href="#download">Download</a></td>
 
-        <td><code>$ lynx http://httpd.apache.org/download.cgi</code>
+        <td>Download the latest release from <a href="http://httpd.apache.org/download.cgi#apache24">http://httpd.apache.org/download.cgi</a>
         </td>
       </tr>
 
@@ -121,24 +123,24 @@
       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 domain names do not have version numbers; for example,
-      the APR distribution must be under ./srclib/apr/) and use
+      them into <code>/httpd_source_tree_root/srclib/apr</code> and /httpd_source_tree_root<code>/srclib/apr-util</code>
+      (be sure the directory names do not have version numbers; for example,
+      the APR distribution must be under /httpd_source_tree_root/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 
+      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>, 
+      <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 
+      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
@@ -172,12 +174,7 @@
       <dd>For some of the support scripts like <program>
       apxs</program> or <program>dbmmanage</program> (which are
       written in Perl) the Perl 5 interpreter is required (versions
-      5.003 or newer are sufficient). If you have multiple Perl
-      interpreters (for example, a systemwide install of Perl 4, and
-      your own install of Perl 5), you are advised to use the
-      <code>--with-perl</code> option (see below) to make sure the
-      correct one is used by <program>configure</program>.
-      If no Perl 5 interpreter is found by the
+      5.003 or newer are sufficient).  If no Perl 5 interpreter is found by the
       <program>configure</program> script, you will not be able to use
       the affected support scripts. Of course, you will still be able to
       build and use Apache httpd.</dd>
@@ -361,10 +358,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