diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manual/new_features_2_0.html | 2 | ||||
| -rw-r--r-- | docs/manual/new_features_2_0.html.en | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html | 58 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.en | 58 |
4 files changed, 74 insertions, 46 deletions
diff --git a/docs/manual/new_features_2_0.html b/docs/manual/new_features_2_0.html index fb885e4ea3..1af9088b39 100644 --- a/docs/manual/new_features_2_0.html +++ b/docs/manual/new_features_2_0.html @@ -45,6 +45,8 @@ allow more flexibility. Also, new calls have been added that provide additional module capabilities without patching the core Apache server. +</DL> + <P><HR> <H2><A NAME="core">Module Enhancements:</A></H2> diff --git a/docs/manual/new_features_2_0.html.en b/docs/manual/new_features_2_0.html.en index fb885e4ea3..1af9088b39 100644 --- a/docs/manual/new_features_2_0.html.en +++ b/docs/manual/new_features_2_0.html.en @@ -45,6 +45,8 @@ allow more flexibility. Also, new calls have been added that provide additional module capabilities without patching the core Apache server. +</DL> + <P><HR> <H2><A NAME="core">Module Enhancements:</A></H2> diff --git a/docs/manual/upgrading.html b/docs/manual/upgrading.html index 990a064936..077b5d290b 100644 --- a/docs/manual/upgrading.html +++ b/docs/manual/upgrading.html @@ -28,10 +28,9 @@ system for configuring the build processes. Using this system is similar to, but not the same as, using the APACI system in Apache 1.3. Further documentation to follow.</li> -<li>In addition to the usual selection of modules which you can -choose to compile, Apache 2.0 has moved the main part of request -processing into Multi-Processing-Modules (MPMs). Documentation -on how to select an MPM is to follow.</li> +<li>In addition to the usual selection of modules which you can choose +to compile, Apache 2.0 has moved the main part of request processing +into <a href="mpm.html">Multi-Processing Modules</a> (MPMs).</li> </UL> <H3>Run-Time Configuration Changes</H3> @@ -42,28 +41,41 @@ the argument <code>on</code> or <code>off</code>. Existing instances of <code>CacheNegotiatedDocs</code> should be replaced with <code>CachNegotiatedDocs on</code>.</li> -<li>The <code>ErrorDocument</code> directive no longer uses a single -quote at the beginning of the argument to indicate a text message. -Instead, you should enclose the message in double quotes. For -example, existing instances of <code>ErrorDocument 403 "Some -Message</code> should be replaced with <code>ErrorDocument 403 "Some -Message"</code>. As long as the second argument is not a valid URL or -pathname, it will be treated as a text message.</li> +<li>The <code>ErrorDocument</code> directive no longer uses a quote at +the beginning of the argument to indicate a text message. Instead, +you should enclose the message in double quotes. For example, +existing instances of <blockquote><code>ErrorDocument 403 "Some +Message</code></blockquote> should be replaced with +<blockquote><code>ErrorDocument 403 "Some +Message"</code></blockquote> As long as the second argument is not a +valid URL or pathname, it will be treated as a text message.</li> <li>The <code>AccessConfig</code> and <code>ResourceConfig</code> directives no longer exist. Existing instances of these directives -can be replaced with the <code>Include</code> directive which -has equivalent functionality. If you were making use of the -default values of these directives without including them in -the configuration files, you may need to add -<code>Include conf/access.conf</code> and <code>Include conf/srm.conf</code> -to your httpd.conf.</li> - -<li>The <code>ExtendedStatus</code> directive no longer exists.</li> - -<li>The <code>ServerType</code> directive no longer exists.</li> - -<li>The <code>CoreDumpDirectory</code> directive no longer exists.</li> +can be replaced with the <a +href="mod/core.html#include"><code>Include</code></a> directive which +has equivalent functionality. If you were making use of the default +values of these directives without including them in the configuration +files, you may need to add <code>Include conf/access.conf</code> and +<code>Include conf/srm.conf</code> to your httpd.conf. In order to +assure that Apache reads the configuration files in the same order as +was implied by the older directives, the <code>Include</code> +directives should be placed at the end of httpd.conf, with the one for +<code>srm.conf</code> preceeding the one of +<code>access.conf</code>.</li> + +<li>The <code>BindAddress</code> directive no longer exists. +Equivalent functionality is provided with the more flexible <code><a +href="mod/mpm_common.html">Listen</a></code> directive. + +<li>The <code>ExtendedStatus</code> directive no longer exists. +Status reporting has been completely rewritten to take advantage +of the new MPM system.</li> + +<li>The <code>ServerType</code> directive no longer exists. +The method used to serve requests is now determined by the selection +of MPM. There is currently no MPM designed to be launced by +inetd.</li> <li>Many directives that were in the core server in Apache 1.3 are now in the MPMs.</li> diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index 990a064936..077b5d290b 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -28,10 +28,9 @@ system for configuring the build processes. Using this system is similar to, but not the same as, using the APACI system in Apache 1.3. Further documentation to follow.</li> -<li>In addition to the usual selection of modules which you can -choose to compile, Apache 2.0 has moved the main part of request -processing into Multi-Processing-Modules (MPMs). Documentation -on how to select an MPM is to follow.</li> +<li>In addition to the usual selection of modules which you can choose +to compile, Apache 2.0 has moved the main part of request processing +into <a href="mpm.html">Multi-Processing Modules</a> (MPMs).</li> </UL> <H3>Run-Time Configuration Changes</H3> @@ -42,28 +41,41 @@ the argument <code>on</code> or <code>off</code>. Existing instances of <code>CacheNegotiatedDocs</code> should be replaced with <code>CachNegotiatedDocs on</code>.</li> -<li>The <code>ErrorDocument</code> directive no longer uses a single -quote at the beginning of the argument to indicate a text message. -Instead, you should enclose the message in double quotes. For -example, existing instances of <code>ErrorDocument 403 "Some -Message</code> should be replaced with <code>ErrorDocument 403 "Some -Message"</code>. As long as the second argument is not a valid URL or -pathname, it will be treated as a text message.</li> +<li>The <code>ErrorDocument</code> directive no longer uses a quote at +the beginning of the argument to indicate a text message. Instead, +you should enclose the message in double quotes. For example, +existing instances of <blockquote><code>ErrorDocument 403 "Some +Message</code></blockquote> should be replaced with +<blockquote><code>ErrorDocument 403 "Some +Message"</code></blockquote> As long as the second argument is not a +valid URL or pathname, it will be treated as a text message.</li> <li>The <code>AccessConfig</code> and <code>ResourceConfig</code> directives no longer exist. Existing instances of these directives -can be replaced with the <code>Include</code> directive which -has equivalent functionality. If you were making use of the -default values of these directives without including them in -the configuration files, you may need to add -<code>Include conf/access.conf</code> and <code>Include conf/srm.conf</code> -to your httpd.conf.</li> - -<li>The <code>ExtendedStatus</code> directive no longer exists.</li> - -<li>The <code>ServerType</code> directive no longer exists.</li> - -<li>The <code>CoreDumpDirectory</code> directive no longer exists.</li> +can be replaced with the <a +href="mod/core.html#include"><code>Include</code></a> directive which +has equivalent functionality. If you were making use of the default +values of these directives without including them in the configuration +files, you may need to add <code>Include conf/access.conf</code> and +<code>Include conf/srm.conf</code> to your httpd.conf. In order to +assure that Apache reads the configuration files in the same order as +was implied by the older directives, the <code>Include</code> +directives should be placed at the end of httpd.conf, with the one for +<code>srm.conf</code> preceeding the one of +<code>access.conf</code>.</li> + +<li>The <code>BindAddress</code> directive no longer exists. +Equivalent functionality is provided with the more flexible <code><a +href="mod/mpm_common.html">Listen</a></code> directive. + +<li>The <code>ExtendedStatus</code> directive no longer exists. +Status reporting has been completely rewritten to take advantage +of the new MPM system.</li> + +<li>The <code>ServerType</code> directive no longer exists. +The method used to serve requests is now determined by the selection +of MPM. There is currently no MPM designed to be launced by +inetd.</li> <li>Many directives that were in the core server in Apache 1.3 are now in the MPMs.</li> |