From: Jim Jagielski Date: Wed, 8 Feb 2012 16:14:57 +0000 (+0000) Subject: Upgrading... X-Git-Tag: 2.4.1~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb0c93fd7761bfff3ee0cd47bc801ae7c8ed9f2f;p=apache 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 203163203a..65c88ad915 100644 --- 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 f7cb453ee6..f5afc1b1ea 100644 --- a/docs/manual/new_features_2_4.html.en +++ b/docs/manual/new_features_2_4.html.en @@ -43,7 +43,7 @@
It is now possible to specify KeepAliveTimeout in milliseconds.
-
Loadable MPMs
+
Run-time Loadable MPMs
Multiple MPMs can now be built as loadable modules at compile time. The MPM of choice can be configured at run time.
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml index d50e05653a..506a4279af 100644 --- a/docs/manual/new_features_2_4.xml +++ b/docs/manual/new_features_2_4.xml @@ -39,7 +39,7 @@ >KeepAliveTimeout in milliseconds. -
Loadable MPMs
+
Run-time Loadable MPMs
Multiple MPMs can now be built as loadable modules at compile time. The MPM of choice can be configured at run time.
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index a54ea9d32a..549b572781 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -84,6 +84,12 @@
  • configure: the "reallyall" module set adds developer modules to the "all" set
  • + +
  • 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 --with-included-apr after downloading + (from Apache APR) and unpacking + apr/apr-util into ./srclib/
  • top
    diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index 0b844516e4..05be3dd9ba 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -84,6 +84,12 @@
  • configure: the "reallyall" module set adds developer modules to the "all" set
  • + +
  • 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 --with-included-apr after downloading + (from Apache APR) and unpacking + apr/apr-util into ./srclib/