httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r344973 - in /httpd/httpd/branches/2.2.x/docs/manual: filter.xml mod/mod_dbd.xml mod/mod_ext_filter.xml mod/mod_filter.xml mod/mod_proxy.xml mod/mod_ssl.xml new_features_2_2.xml
Date Wed, 16 Nov 2005 10:34:12 GMT
Author: colm
Date: Wed Nov 16 02:33:54 2005
New Revision: 344973

URL: http://svn.apache.org/viewcvs?rev=344973&view=rev
Log:
Merge r344971 from trunk:

Make references to 2.1 and later consistent with each other.

Reviewed by: colm

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/filter.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ext_filter.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_filter.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml
    httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/filter.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/filter.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/filter.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/filter.xml Wed Nov 16 02:33:54 2005
@@ -94,7 +94,7 @@
 <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

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_dbd.xml Wed Nov 16 02:33:54 2005
@@ -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

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ext_filter.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ext_filter.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ext_filter.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ext_filter.xml Wed Nov 16 02:33:54 2005
@@ -253,8 +253,8 @@
 
       <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>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_filter.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_filter.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_filter.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_filter.xml Wed Nov 16 02:33:54 2005
@@ -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>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml Wed Nov 16 02:33:54 2005
@@ -506,12 +506,13 @@
       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>


Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml Wed Nov 16 02:33:54 2005
@@ -494,8 +494,8 @@
 ...<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>

Modified: httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml?rev=344973&r1=344972&r2=344973&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml Wed Nov 16 02:33:54 2005
@@ -228,9 +228,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



Mime
View raw message