Upgrading...

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

diff --git a/docs/man/httpd.8 b/docs/man/httpd.8
index 203163203a3b10297446bb0a3f4e73f5eae9b892..65c88ad915c08a3f01c1cd919e148efb3548cd00 100644 (file)
--- a/docs/man/httpd.8
+++ b/docs/man/httpd.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTTPD" 8 "2010-09-12" "Apache HTTP Server" "httpd"
+.TH "HTTPD" 8 "2012-02-08" "Apache HTTP Server" "httpd"
 
 .SH NAME
 httpd \- Apache Hypertext Transfer Protocol Server
@@ -88,7 +88,7 @@ Dump a list of loaded Static and Shared Modules\&.
 -S
 Show the settings as parsed from the config file (currently only shows the virtualhost settings)\&.  
 .TP
--T (Availabe in 2\&.3\&.8 and later)
+-T (Available in 2\&.3\&.8 and later)
 Skip document root check at startup/restart\&.  
 .TP
 -t
@@ -109,10 +109,10 @@ The following arguments are available only on the Windows platform:
  
 .TP
 -k install|config|uninstall
-Install Apache as a Windows NT service; change startup options for the Apache service; and uninstall the Apache service\&.  
+Install Apache httpd as a Windows NT service; change startup options for the Apache httpd service; and uninstall the Apache httpd service\&.  
 .TP
 -n \fIname\fR
-The \fIname\fR of the Apache service to signal\&.  
+The \fIname\fR of the Apache httpd service to signal\&.  
 .TP
 -w
 Keep the console window open on error so that the error message can be read\&.  

diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index f7cb453ee683dc366e0d8ce4cbc4a8b98dad7b09..f5afc1b1ea23e65933ac7f761f574a6164b756e4 100644 (file)
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -43,7 +43,7 @@
       <dd>It is now possible to specify <code class="directive"><a href="./mod/core.html#keepalivetimeout">KeepAliveTimeout</a></code> in milliseconds.
       </dd>
 
-      <dt>Loadable MPMs</dt>
+      <dt>Run-time Loadable MPMs</dt>
       <dd>Multiple MPMs can now be built as loadable modules at compile time.
       The MPM of choice can be configured at run time.</dd>
 

diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index d50e05653af7c56b7ac994fe6e421ed899198db1..506a4279aff2ca8d8442a98e5d1a37437cd679d2 100644 (file)
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -39,7 +39,7 @@
       >KeepAliveTimeout</directive> in milliseconds.
       </dd>
 
-      <dt>Loadable MPMs</dt>
+      <dt>Run-time Loadable MPMs</dt>
       <dd>Multiple MPMs can now be built as loadable modules at compile time.
       The MPM of choice can be configured at run time.</dd>
 

diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index a54ea9d32a68d5a34335981a40920c6dc6eab607..549b572781b912f708d499967c8a638eb8155c19 100644 (file)
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -84,6 +84,12 @@
 
       <li>configure: the "reallyall" module set adds developer modules
       to the "all" set</li>
+
+      <li>apr and apr-util: APR and APR-Util are no longer bundled with
+      Apache httpd 2.4. You can either use already installed versions or
+      continue to use <code>--with-included-apr</code> after downloading
+      (from <a href="http://apr.apache.org/">Apache APR</a>) and unpacking
+      apr/apr-util into <code>./srclib/</code></li>
     </ul>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>

diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 0b844516e483078d5490194a606ce80ba5ee2e8d..05be3dd9ba5048dddb0ecfcea505196f5768ef95 100644 (file)
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -84,6 +84,12 @@
 
       <li>configure: the "reallyall" module set adds developer modules
       to the "all" set</li>
+
+      <li>apr and apr-util: APR and APR-Util are no longer bundled with
+      Apache httpd 2.4. You can either use already installed versions or
+      continue to use <code>--with-included-apr</code> after downloading
+      (from <a href="http://apr.apache.org/">Apache APR</a>) and unpacking
+      apr/apr-util into <code>./srclib/</code></li>
     </ul>
 
   </section>