From 6a6b021d1a3ae71a695ae75c7190bf815d7c249e Mon Sep 17 00:00:00 2001 From: Colm MacCarthaigh Date: Wed, 16 Nov 2005 10:23:56 +0000 Subject: Make references to 2.1 and later consistent with each other. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344971 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/filter.xml | 2 +- docs/manual/mod/mod_dbd.xml | 2 +- docs/manual/mod/mod_ext_filter.xml | 4 ++-- docs/manual/mod/mod_filter.xml | 4 ++-- docs/manual/mod/mod_proxy.xml | 13 +++++++------ docs/manual/mod/mod_ssl.xml | 4 ++-- docs/manual/new_features_2_2.xml | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docs/manual/filter.xml b/docs/manual/filter.xml index 2d58be5120..b5373a17d3 100644 --- a/docs/manual/filter.xml +++ b/docs/manual/filter.xml @@ -94,7 +94,7 @@ filter modules. A few of these are:

Smart filtering applies different filter providers according to the state of request processing

-

mod_filter, included in Apache 2.1 and up, +

mod_filter, included in Apache 2.1 and later, enables the filter chain to be configured dynamically at run time. So for example you can set up a proxy to rewrite HTML with an HTML filter and JPEG images with a completely diff --git a/docs/manual/mod/mod_dbd.xml b/docs/manual/mod/mod_dbd.xml index 98df88a439..34c12ac7e1 100644 --- a/docs/manual/mod/mod_dbd.xml +++ b/docs/manual/mod/mod_dbd.xml @@ -27,7 +27,7 @@ Extension mod_dbd.c dbd_module -Version 2.1 and higher +Version 2.1 and later

mod_dbd manages SQL database connections using diff --git a/docs/manual/mod/mod_ext_filter.xml b/docs/manual/mod/mod_ext_filter.xml index 61a62d803d..11903a6f97 100644 --- a/docs/manual/mod/mod_ext_filter.xml +++ b/docs/manual/mod/mod_ext_filter.xml @@ -253,8 +253,8 @@ delivery to the client

Use mode=output (the default) for filters which process the response. Use mode=input for filters - which process the request. mode=input is new with - Apache 2.1.
+ which process the request. mode=input is available + in Apache 2.1 and later.
intype=imt
diff --git a/docs/manual/mod/mod_filter.xml b/docs/manual/mod/mod_filter.xml index 4466b06c53..f0983b236f 100644 --- a/docs/manual/mod/mod_filter.xml +++ b/docs/manual/mod/mod_filter.xml @@ -27,7 +27,7 @@ Base mod_filter.c filter_module -Version 2.1 and higher +Version 2.1 and later

This module enables smart, context-sensitive configuration of @@ -208,7 +208,7 @@ content filter modules. This is work-in-progress; the FilterProtocol implements some of this functionality for back-compatibility with Apache 2.0 - modules. For httpd 2.1 and up, the + modules. For httpd 2.1 and later, the ap_register_output_filter_protocol and ap_filter_protocol API enables filter modules to declare their own behaviour.

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index ea49e73011..2387316601 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -506,12 +506,13 @@ expressions general ProxyPass directive.

-

New in Apache 2.1, is the ability to use pooled connections to a - backend server. Using the key=value parameters it is possible - to tune this connection pooling. The default for a Hard Maximum - for the number of connections is the number of threads per process in the - active MPM. In the Prefork MPM, this is always 1, while with the Worker MPM - it is controlled by the ThreadsPerChild.

+

As of Apache 2.1, the ability to use pooled connections to a backend + server is available. Using the key=value parameters it is + possible to tune this connection pooling. The default for a Hard + Maximum for the number of connections is the number of threads per + process in the active MPM. In the Prefork MPM, this is always 1, while with + the Worker MPM it is controlled by the + ThreadsPerChild.

Setting min will determine how many connections will always be open to the backend server. Upto the Soft Maximum or smax diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 1689d3ba3c..70a4b3c56a 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -494,8 +494,8 @@ SSLEngine on
...
</VirtualHost> -

New in Apache 2.1, SSLEngine can be set to -optional. This enables support for +

In Apache 2.1 and later, SSLEngine can be set to +optional. This enables support for RFC 2817, Upgrading to TLS Within HTTP/1.1. At this time no web browsers support RFC 2817.

diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml index 3d9d4a97a8..2b278a5a7d 100644 --- a/docs/manual/new_features_2_2.xml +++ b/docs/manual/new_features_2_2.xml @@ -233,9 +233,9 @@ had to take responsibility for managing it themselves. Apart from reinventing the wheel, this can be very inefficient, for example when several modules each maintain their own connections.

-

Apache 2.1 and up provides the ap_dbd API for +

Apache 2.1 and later provides the ap_dbd API for managing database connections (including optimised strategies - for threaded and unthreaded MPMs), while APR 1.2 and up provides + for threaded and unthreaded MPMs), while APR 1.2 and later provides the apr_dbd API for interacting with the database.

New modules SHOULD now use these APIs for all SQL database operations. Existing applications SHOULD be upgraded to use it -- cgit v1.2.3