summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Abele <erikabele@apache.org>2007-10-23 10:32:38 +0000
committerErik Abele <erikabele@apache.org>2007-10-23 10:32:38 +0000
commitb94e361a73fd1ce6a6efbbb90e9276a611f3981d (patch)
tree5833f4be54dd40df7ce0612ad03f1537dc951ed0
parent54284b7b45051dceacf6c2997d75b3be59b53897 (diff)
downloadhttpd-b94e361a73fd1ce6a6efbbb90e9276a611f3981d.tar.gz
Transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@587449 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/bind.html.en2
-rw-r--r--docs/manual/bind.xml.de2
-rw-r--r--docs/manual/bind.xml.fr2
-rw-r--r--docs/manual/bind.xml.ja2
-rw-r--r--docs/manual/bind.xml.ko2
-rw-r--r--docs/manual/dso.html.en2
-rw-r--r--docs/manual/dso.xml.ja2
-rw-r--r--docs/manual/dso.xml.ko2
-rw-r--r--docs/manual/misc/perf-tuning.html.en20
-rw-r--r--docs/manual/misc/perf-tuning.xml.ko2
-rw-r--r--docs/manual/mod/mod_proxy.html.en6
-rw-r--r--docs/manual/mod/mod_proxy.xml.ja2
-rw-r--r--docs/manual/sitemap.html.en6
-rw-r--r--docs/manual/sitemap.xml.de2
-rw-r--r--docs/manual/sitemap.xml.es2
-rw-r--r--docs/manual/sitemap.xml.ja2
-rw-r--r--docs/manual/sitemap.xml.ko2
-rw-r--r--docs/manual/sitemap.xml.meta2
18 files changed, 31 insertions, 31 deletions
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en
index 5e6b0abdbf..79ff679e2b 100644
--- a/docs/manual/bind.html.en
+++ b/docs/manual/bind.html.en
@@ -69,7 +69,7 @@
</code></p></div>
<p>To make the server accept connections on port 80 for one interface,
- and port 8080 on another, use</p>
+ and port 8000 on another, use</p>
<div class="example"><p><code>
Listen 192.0.2.1:80<br />
diff --git a/docs/manual/bind.xml.de b/docs/manual/bind.xml.de
index befcd8d792..33017a3975 100644
--- a/docs/manual/bind.xml.de
+++ b/docs/manual/bind.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.en.xsl"?>
-<!-- English Revision: 420990:507346 (outdated) -->
+<!-- English Revision: 420990:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/bind.xml.fr b/docs/manual/bind.xml.fr
index a00026198d..b44e6feed8 100644
--- a/docs/manual/bind.xml.fr
+++ b/docs/manual/bind.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: 103425:507346 (outdated) -->
+<!-- English Revision: 103425:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja
index 0e6f450469..74572ab2a0 100644
--- a/docs/manual/bind.xml.ja
+++ b/docs/manual/bind.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: 327999:507346 (outdated) -->
+<!-- English Revision: 327999:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/bind.xml.ko b/docs/manual/bind.xml.ko
index e7d1b28c05..0768ad8c1a 100644
--- a/docs/manual/bind.xml.ko
+++ b/docs/manual/bind.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:507346 (outdated) -->
+<!-- English Revision: 105989:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/dso.html.en b/docs/manual/dso.html.en
index d1e7700539..b7c6f2f367 100644
--- a/docs/manual/dso.html.en
+++ b/docs/manual/dso.html.en
@@ -80,7 +80,7 @@
<div class="section">
<h2><a name="usage" id="usage">Usage Summary</a></h2>
- <p>To give you an overview of the DSO features of Apache 2.2,
+ <p>To give you an overview of the DSO features of Apache 2.x,
here is a short and concise summary:</p>
<ol>
diff --git a/docs/manual/dso.xml.ja b/docs/manual/dso.xml.ja
index 0ea5f9c633..e4271c3ee4 100644
--- a/docs/manual/dso.xml.ja
+++ b/docs/manual/dso.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: 420990:578697 (outdated) -->
+<!-- English Revision: 420990:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/dso.xml.ko b/docs/manual/dso.xml.ko
index c7deab6c59..e4e6de5798 100644
--- a/docs/manual/dso.xml.ko
+++ b/docs/manual/dso.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:578697 (outdated) -->
+<!-- English Revision: 105989:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en
index 6559d192c6..af00deaf94 100644
--- a/docs/manual/misc/perf-tuning.html.en
+++ b/docs/manual/misc/perf-tuning.html.en
@@ -23,19 +23,19 @@
</div>
- <p>Apache 2.0 is a general-purpose webserver, designed to
+ <p>Apache 2.x is a general-purpose webserver, designed to
provide a balance of flexibility, portability, and performance.
Although it has not been designed specifically to set benchmark
- records, Apache 2.0 is capable of high performance in many
+ records, Apache 2.x is capable of high performance in many
real-world situations.</p>
- <p>Compared to Apache 1.3, release 2.0 contains many additional
+ <p>Compared to Apache 1.3, release 2.x contains many additional
optimizations to increase throughput and scalability. Most of
these improvements are enabled by default. However, there are
compile-time and run-time configuration choices that can
significantly affect performance. This document describes the
options that a server administrator can configure to tune the
- performance of an Apache 2.0 installation. Some of these
+ performance of an Apache 2.x installation. Some of these
configuration options enable the httpd to better take advantage
of the capabilities of the hardware and OS, while others allow
the administrator to trade functionality for speed.</p>
@@ -122,7 +122,7 @@
from domain</code> or <code><code class="directive"><a href="../mod/mod_access.html#deny">Deny</a></code> from domain</code>
directives (i.e., using a hostname, or a domain name, rather than
an IP address) then you will pay for
- a double reverse DNS lookup (a reverse, followed by a forward
+ two DNS lookups (a reverse, followed by a forward lookup
to make sure that the reverse is not being spoofed). For best
performance, therefore, use IP addresses, rather than names, when
using these directives, if possible.</p>
@@ -270,7 +270,7 @@
- <p>In situations where Apache 2.0 needs to look at the contents
+ <p>In situations where Apache 2.x needs to look at the contents
of a file being delivered--for example, when doing server-side-include
processing--it normally memory-maps the file if the OS supports
some form of <code>mmap(2)</code>.</p>
@@ -283,7 +283,7 @@
<li>
<p>On some operating systems, <code>mmap</code> does not scale
as well as <code>read(2)</code> when the number of CPUs increases.
- On multiprocessor Solaris servers, for example, Apache 2.0 sometimes
+ On multiprocessor Solaris servers, for example, Apache 2.x sometimes
delivers server-parsed files faster when <code>mmap</code> is disabled.</p>
</li>
@@ -306,7 +306,7 @@
- <p>In situations where Apache 2.0 can ignore the contents of the file
+ <p>In situations where Apache 2.x can ignore the contents of the file
to be delivered -- for example, when serving static file content --
it normally uses the kernel sendfile support the file if the OS
supports the <code>sendfile(2)</code> operation.</p>
@@ -538,7 +538,7 @@
<div class="warning"><h3>Warning:</h3>
<p>This section has not been fully updated
- to take into account changes made in the 2.0 version of the
+ to take into account changes made in the 2.x version of the
Apache HTTP Server. Some of the information may still be
relevant, but please use it with care.</p>
</div>
@@ -1017,7 +1017,7 @@
<p>This <code>write(2)</code> call records the request in the
access log. Note that one thing missing from this trace is a
- <code>time(2)</code> call. Unlike Apache 1.3, Apache 2.0 uses
+ <code>time(2)</code> call. Unlike Apache 1.3, Apache 2.x uses
<code>gettimeofday(3)</code> to look up the time. On some operating
systems, like Linux or Solaris, <code>gettimeofday</code> has an
optimized implementation that doesn't require as much overhead
diff --git a/docs/manual/misc/perf-tuning.xml.ko b/docs/manual/misc/perf-tuning.xml.ko
index 0bba852491..820828d939 100644
--- a/docs/manual/misc/perf-tuning.xml.ko
+++ b/docs/manual/misc/perf-tuning.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:420990 (outdated) -->
+<!-- English Revision: 105989:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index cb7cd85211..e3cc2e18fd 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -356,7 +356,7 @@ proxy</td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>BalancerMember is only available in Apache 2.2.0
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>BalancerMember is only available in Apache 2.2
and later.</td></tr>
</table>
<p>This directive adds a member to a load balancing group. It must be used
@@ -545,7 +545,7 @@ response</td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>available in Apache 2.0.44 and later</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.44 and later</td></tr>
</table>
<p>The <code class="directive">ProxyBadHeader</code> directive determines the
behaviour of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> if it receives syntactically invalid
@@ -1273,7 +1273,7 @@ expressions</td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>ProxySet is only available in Apache 2.2.0
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>ProxySet is only available in Apache 2.2
and later.</td></tr>
</table>
<p>This directive is used as an alternate method of setting any of the
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 50d5cd3487..1a6fd1d89d 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:582476 (outdated) -->
+<!-- English Revision: 189754:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 817b2397fe..b39f692efa 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -48,9 +48,9 @@ Documentation</a>.</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section"><h2><a name="release" id="release">Release Notes</a></h2>
-<ul><li><a href="upgrading.html">Upgrading to 2.2 from 2.0</a></li>
-<li><a href="new_features_2_4.html">New features with Apache 2.4</a></li>
-<li><a href="new_features_2_2.html">New features with Apache 2.2</a></li>
+<ul><li><a href="upgrading.html">Upgrading to 2.4 from 2.2</a></li>
+<li><a href="new_features_2_4.html">New features with Apache 2.3/2.4</a></li>
+<li><a href="new_features_2_2.html">New features with Apache 2.1/2.2</a></li>
<li><a href="new_features_2_0.html">New features with Apache 2.0</a></li>
<li><a href="license.html">Apache License</a></li>
</ul>
diff --git a/docs/manual/sitemap.xml.de b/docs/manual/sitemap.xml.de
index f3a2a2f5e6..ea6cb0363c 100644
--- a/docs/manual/sitemap.xml.de
+++ b/docs/manual/sitemap.xml.de
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.es b/docs/manual/sitemap.xml.es
index 1c37f57d91..021c1c620b 100644
--- a/docs/manual/sitemap.xml.es
+++ b/docs/manual/sitemap.xml.es
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index 80ffd57be8..2a46dec951 100644
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 159098:420990 (outdated) -->
+<!-- English Revision: 159098:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.ko b/docs/manual/sitemap.xml.ko
index 0db660806f..f004fe0740 100644
--- a/docs/manual/sitemap.xml.ko
+++ b/docs/manual/sitemap.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:587444 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.meta b/docs/manual/sitemap.xml.meta
index 4e2470686c..96ddc8f902 100644
--- a/docs/manual/sitemap.xml.meta
+++ b/docs/manual/sitemap.xml.meta
@@ -6,7 +6,7 @@
<relpath>.</relpath>
<variants>
- <variant>de</variant>
+ <variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</variant>
<variant outdated="yes">ja</variant>