summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColm MacCarthaigh <colm@apache.org>2005-11-16 15:56:13 +0000
committerColm MacCarthaigh <colm@apache.org>2005-11-16 15:56:13 +0000
commit609d0155e2b34d9cd12a501e8c41b03b26cd26f5 (patch)
tree47e5fc6b8b9ba5658cf4b00a3d5b059fc3bbb598
parentdcb0ab51583ba81716e2fdc8a91ec1c28f31c0c5 (diff)
downloadhttpd-609d0155e2b34d9cd12a501e8c41b03b26cd26f5.tar.gz
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345045 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/filter.html.en2
-rw-r--r--docs/manual/filter.xml.es2
-rw-r--r--docs/manual/filter.xml.fr2
-rw-r--r--docs/manual/filter.xml.ja2
-rw-r--r--docs/manual/filter.xml.ko2
-rw-r--r--docs/manual/mod/core.html.en3
-rw-r--r--docs/manual/mod/core.xml.de2
-rw-r--r--docs/manual/mod/core.xml.ja2
-rw-r--r--docs/manual/mod/mod_dbd.html.en2
-rw-r--r--docs/manual/mod/mod_ext_filter.html.en4
-rw-r--r--docs/manual/mod/mod_ext_filter.xml.ja2
-rw-r--r--docs/manual/mod/mod_ext_filter.xml.ko2
-rw-r--r--docs/manual/mod/mod_ext_filter.xml.meta2
-rw-r--r--docs/manual/mod/mod_filter.html.en4
-rw-r--r--docs/manual/mod/mod_proxy.html.en13
-rw-r--r--docs/manual/mod/mod_proxy.xml.ja2
-rw-r--r--docs/manual/mod/mod_ssl.html.en4
-rw-r--r--docs/manual/new_features_2_2.html.en4
-rw-r--r--docs/manual/new_features_2_2.xml.ko2
-rw-r--r--docs/manual/new_features_2_2.xml.pt-br2
-rw-r--r--docs/manual/upgrading.html.en2
-rw-r--r--docs/manual/upgrading.xml.de2
-rw-r--r--docs/manual/upgrading.xml.ja2
-rw-r--r--docs/manual/upgrading.xml.ko2
-rw-r--r--docs/manual/upgrading.xml.pt-br2
-rw-r--r--docs/manual/upgrading.xml.ru2
26 files changed, 36 insertions, 36 deletions
diff --git a/docs/manual/filter.html.en b/docs/manual/filter.html.en
index b567489042..fc6ee8a659 100644
--- a/docs/manual/filter.html.en
+++ b/docs/manual/filter.html.en
@@ -75,7 +75,7 @@ filter modules. A few of these are:</p>
<p class="figure">
<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><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code>, included in Apache 2.1 and up,
+<p><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code>, 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/filter.xml.es b/docs/manual/filter.xml.es
index 037691da88..ab8978c15d 100644
--- a/docs/manual/filter.xml.es
+++ b/docs/manual/filter.xml.es
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 151408:332971 (outdated) -->
+<!-- English Revision: 151408:344971 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/filter.xml.fr b/docs/manual/filter.xml.fr
index f7f35f50b7..d740903bc3 100644
--- a/docs/manual/filter.xml.fr
+++ b/docs/manual/filter.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 151408:332971 (outdated) -->
+<!-- English Revision: 151408:344971 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/filter.xml.ja b/docs/manual/filter.xml.ja
index a113cb6dd7..27af95c202 100644
--- a/docs/manual/filter.xml.ja
+++ b/docs/manual/filter.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:332971 (outdated) -->
+<!-- English Revision: 151408:344971 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/filter.xml.ko b/docs/manual/filter.xml.ko
index ad8922bd41..a172cb6e12 100644
--- a/docs/manual/filter.xml.ko
+++ b/docs/manual/filter.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:332971 (outdated) -->
+<!-- English Revision: 151408:344971 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 6e63446120..fd0acb0037 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3190,7 +3190,7 @@ port</td></tr>
<div class="note"><h3>Note</h3>
<p>The ordering of when the physical port is used is as follows:<br /><br />
- <code>UseCanonicalName On</code>
+ <code>UseCanonicalName On</code></p>
<ul>
<li>Port provided in <code>Servername</code></li>
<li>Physical port</li>
@@ -3203,7 +3203,6 @@ port</td></tr>
<li>Port provided in <code>Servername</code></li>
<li>Default port</li>
</ul>
- </p>
<p>With <code>UseCanonicalPhysicalPort Off</code>, the
physical ports are removed from the ordering.</p>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index b4d57640ab..67a439a182 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:344369 (outdated) -->
+<!-- English Revision: 167959:344972 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 26337e9689..1d8f4697af 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:344369 (outdated) -->
+<!-- English Revision: 190982:344972 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index c2732442d7..cd9bba5c83 100644
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -27,7 +27,7 @@
<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>dbd_module</td></tr>
<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_dbd.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.1 and higher</td></tr></table>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.1 and later</td></tr></table>
<h3>Summary</h3>
<p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> manages SQL database connections using
diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en
index f94a9c66ab..39c7893080 100644
--- a/docs/manual/mod/mod_ext_filter.html.en
+++ b/docs/manual/mod/mod_ext_filter.html.en
@@ -267,8 +267,8 @@ delivery to the client</td></tr>
<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_ext_filter.xml.ja b/docs/manual/mod/mod_ext_filter.xml.ja
index 9698644617..1b2d330bce 100644
--- a/docs/manual/mod/mod_ext_filter.xml.ja
+++ b/docs/manual/mod/mod_ext_filter.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:344971 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_ext_filter.xml.ko b/docs/manual/mod/mod_ext_filter.xml.ko
index 2d68dd5a8b..32c4213ee0 100644
--- a/docs/manual/mod/mod_ext_filter.xml.ko
+++ b/docs/manual/mod/mod_ext_filter.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:151408 (outdated) -->
+<!-- English Revision: 105989:344971 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_ext_filter.xml.meta b/docs/manual/mod/mod_ext_filter.xml.meta
index 3cf7e6ec18..a1e476648f 100644
--- a/docs/manual/mod/mod_ext_filter.xml.meta
+++ b/docs/manual/mod/mod_ext_filter.xml.meta
@@ -7,7 +7,7 @@
<variants>
<variant>en</variant>
- <variant>ja</variant>
+ <variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en
index 13dc47a1d2..fa7d6838a1 100644
--- a/docs/manual/mod/mod_filter.html.en
+++ b/docs/manual/mod/mod_filter.html.en
@@ -27,7 +27,7 @@
<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>filter_module</td></tr>
<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_filter.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.1 and higher</td></tr></table>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.1 and later</td></tr></table>
<h3>Summary</h3>
<p>This module enables smart, context-sensitive configuration of
@@ -220,7 +220,7 @@
content filter modules. This is work-in-progress; the
<code class="directive"><a href="#filterprotocol">FilterProtocol</a></code> 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.html.en b/docs/manual/mod/mod_proxy.html.en
index d4cb629416..409f7d8d8f 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -691,12 +691,13 @@ through</td></tr>
general <code class="directive">ProxyPass</code> directive.</p>
</div>
- <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 <code class="directive">ThreadsPerChild</code>.</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
+ <code class="directive">ThreadsPerChild</code>.</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_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index eed1334355..7facbe7d58 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 189754:326130 (outdated) -->
+<!-- English Revision: 189754:344971 (outdated) -->
<!--
Copyright 2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index ef106d34d8..770fe405b8 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -624,8 +624,8 @@ SSLEngine on<br />
...<br />
&lt;/VirtualHost&gt;
</code></p></div>
-<p>New in Apache 2.1, <code class="directive">SSLEngine</code> can be set to <code>
-optional</code>. This enables support for
+<p>In Apache 2.1 and later, <code class="directive">SSLEngine</code> 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>
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index 633db3269e..1762489a27 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -236,9 +236,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
diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index 571056e5fb..0cd88c5870 100644
--- a/docs/manual/new_features_2_2.xml.ko
+++ b/docs/manual/new_features_2_2.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:332902 (outdated) -->
+<!-- English Revision: 105989:344971 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br
index 1bf9249b03..97567b832d 100644
--- a/docs/manual/new_features_2_2.xml.pt-br
+++ b/docs/manual/new_features_2_2.xml.pt-br
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:332902 (outdated) -->
+<!-- English Revision: 151408:344971 (outdated) -->
<!--
Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 966b16568c..69d90bfd00 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -34,7 +34,7 @@
the <code>src/CHANGES</code> file.</p>
<p>This document describes only the changes from 2.2 to 2.4. If you
- are upgrading from version 2.0, you should also consult the <a href="http://httpd.apache.org/docs/2.0/upgrading.html">2.0 to 2.2
+ are upgrading from version 2.0, you should also consult the <a href="http://httpd.apache.org/docs/2.2/upgrading.html">2.0 to 2.2
upgrading document.</a></p>
</div>
diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de
index 7d6a951414..266e44f153 100644
--- a/docs/manual/upgrading.xml.de
+++ b/docs/manual/upgrading.xml.de
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 170636:333052 (outdated) -->
+<!-- English Revision: 170636:344485 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index 13dbbe0728..3b53352fbf 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='iso-2022-jp' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:333052 (outdated) -->
+<!-- English Revision: 151408:344485 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ko b/docs/manual/upgrading.xml.ko
index eb98a26f97..2f95073a38 100644
--- a/docs/manual/upgrading.xml.ko
+++ b/docs/manual/upgrading.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:333052 (outdated) -->
+<!-- English Revision: 151408:344485 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.pt-br b/docs/manual/upgrading.xml.pt-br
index da66c596a7..2e34f3d8f2 100644
--- a/docs/manual/upgrading.xml.pt-br
+++ b/docs/manual/upgrading.xml.pt-br
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:333052 (outdated) -->
+<!-- English Revision: 151408:344485 (outdated) -->
<!--
Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/upgrading.xml.ru b/docs/manual/upgrading.xml.ru
index 73f6fb39ef..15f290998c 100644
--- a/docs/manual/upgrading.xml.ru
+++ b/docs/manual/upgrading.xml.ru
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='KOI8-R' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
-<!-- English Revision: 96997:333052 (outdated) -->
+<!-- English Revision: 96997:344485 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,