summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColm MacCarthaigh <colm@apache.org>2005-11-16 11:23:56 +0100
committerColm MacCarthaigh <colm@apache.org>2005-11-16 11:23:56 +0100
commit6a6b021d1a3ae71a695ae75c7190bf815d7c249e (patch)
treec0bcb28217fb60c454d627693e541e63f3d6215a
parentFix typo in ProxyStatus syntax error message. (diff)
downloadapache2-6a6b021d1a3ae71a695ae75c7190bf815d7c249e.tar.xz
apache2-6a6b021d1a3ae71a695ae75c7190bf815d7c249e.zip
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
-rw-r--r--docs/manual/filter.xml2
-rw-r--r--docs/manual/mod/mod_dbd.xml2
-rw-r--r--docs/manual/mod/mod_ext_filter.xml4
-rw-r--r--docs/manual/mod/mod_filter.xml4
-rw-r--r--docs/manual/mod/mod_proxy.xml13
-rw-r--r--docs/manual/mod/mod_ssl.xml4
-rw-r--r--docs/manual/new_features_2_2.xml4
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:</p>
<img src="images/mod_filter_new.png" width="423" height="331"
alt="Smart filtering applies different filter providers according to the state of request processing"/>
</p>
-<p><module>mod_filter</module>, included in Apache 2.1 and up,
+<p><module>mod_filter</module>, 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 @@
<status>Extension</status>
<sourcefile>mod_dbd.c</sourcefile>
<identifier>dbd_module</identifier>
-<compatibility>Version 2.1 and higher</compatibility>
+<compatibility>Version 2.1 and later</compatibility>
<summary>
<p><module>mod_dbd</module> 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</description>
<dd>Use <code>mode=output</code> (the default) for filters which
process the response. Use <code>mode=input</code> for filters
- which process the request. <code>mode=input</code> is new with
- Apache 2.1.</dd>
+ which process the request. <code>mode=input</code> is available
+ in Apache 2.1 and later.</dd>
<dt><code>intype=<var>imt</var></code></dt>
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 @@
<status>Base</status>
<sourcefile>mod_filter.c</sourcefile>
<identifier>filter_module</identifier>
-<compatibility>Version 2.1 and higher</compatibility>
+<compatibility>Version 2.1 and later</compatibility>
<summary>
<p>This module enables smart, context-sensitive configuration of
@@ -208,7 +208,7 @@
content filter modules. This is work-in-progress; the
<directive module="mod_filter">FilterProtocol</directive> 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
<code>ap_register_output_filter_protocol</code> and
<code>ap_filter_protocol</code> API enables filter modules to
declare their own behaviour.</p>
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</description>
general <directive>ProxyPass</directive> directive.</p>
</note>
- <p>New in Apache 2.1, is the ability to use pooled connections to a
- backend server. Using the <code>key=value</code> parameters it is possible
- to tune this connection pooling. The default for a <code>Hard Maximum</code>
- 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 <directive>ThreadsPerChild</directive>.</p>
+ <p>As of Apache 2.1, the ability to use pooled connections to a backend
+ server is available. Using the <code>key=value</code> parameters it is
+ possible to tune this connection pooling. The default for a <code>Hard
+ Maximum</code> 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
+ <directive>ThreadsPerChild</directive>.</p>
<p>Setting <code>min</code> will determine how many connections will always
be open to the backend server. Upto the Soft Maximum or <code>smax</code>
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<br />
...<br />
&lt;/VirtualHost&gt;
</example>
-<p>New in Apache 2.1, <directive>SSLEngine</directive> can be set to <code>
-optional</code>. This enables support for
+<p>In Apache 2.1 and later, <directive>SSLEngine</directive> can be set to
+<code>optional</code>. This enables support for
<a href="http://www.ietf.org/rfc/rfc2817.txt">RFC 2817</a>, Upgrading to TLS
Within HTTP/1.1. At this time no web browsers support RFC 2817.</p>
</usage>
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.</p>
- <p>Apache 2.1 and up provides the <code>ap_dbd</code> API for
+ <p>Apache 2.1 and later provides the <code>ap_dbd</code> 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 <code>apr_dbd</code> API for interacting with the database.</p>
<p>New modules SHOULD now use these APIs for all SQL database
operations. Existing applications SHOULD be upgraded to use it