summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColm MacCarthaigh <colm@apache.org>2005-10-24 09:42:56 +0000
committerColm MacCarthaigh <colm@apache.org>2005-10-24 09:42:56 +0000
commit545079d994f0fc666015135b6197a248acffb1bc (patch)
tree4d41bef3a62f3be8cc7e36597fbc4e180dfd0160
parent6d9c3cee779a04b9b5a578e1503dd159b61e28ed (diff)
downloadhttpd-545079d994f0fc666015135b6197a248acffb1bc.tar.gz
Update transformations, mainly to reflect the fe80 -> 2001:db8 changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328014 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/bind.html.de2
-rw-r--r--docs/manual/bind.html.en2
-rw-r--r--docs/manual/bind.html.fr2
-rw-r--r--docs/manual/bind.html.ja.euc-jp2
-rw-r--r--docs/manual/bind.html.ko.euc-kr2
-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/mod/core.html.de2
-rw-r--r--docs/manual/mod/core.html.en4
-rw-r--r--docs/manual/mod/core.html.ja.euc-jp4
-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_alias.html.en11
-rw-r--r--docs/manual/mod/mod_alias.xml.ja2
-rw-r--r--docs/manual/mod/mod_alias.xml.ko2
-rw-r--r--docs/manual/mod/mod_authz_host.html.en4
-rw-r--r--docs/manual/mod/mod_authz_host.html.ja.euc-jp4
-rw-r--r--docs/manual/mod/mod_authz_host.html.ko.euc-kr4
-rw-r--r--docs/manual/mod/mod_authz_host.xml.ja2
-rw-r--r--docs/manual/mod/mod_authz_host.xml.ko2
-rw-r--r--docs/manual/mod/mpm_common.html.de2
-rw-r--r--docs/manual/mod/mpm_common.html.en2
-rw-r--r--docs/manual/mod/mpm_common.html.ja.euc-jp2
-rw-r--r--docs/manual/mod/mpm_common.xml.de2
-rw-r--r--docs/manual/mod/mpm_common.xml.ja2
-rw-r--r--docs/manual/new_features_2_0.html.de2
-rw-r--r--docs/manual/new_features_2_0.html.en2
-rw-r--r--docs/manual/new_features_2_0.html.fr2
-rw-r--r--docs/manual/new_features_2_0.html.ja.euc-jp2
-rw-r--r--docs/manual/new_features_2_0.html.ko.euc-kr2
-rw-r--r--docs/manual/new_features_2_0.html.pt-br2
-rw-r--r--docs/manual/new_features_2_0.html.ru.koi8-r2
-rw-r--r--docs/manual/new_features_2_0.xml.de2
-rw-r--r--docs/manual/new_features_2_0.xml.fr2
-rw-r--r--docs/manual/new_features_2_0.xml.ja2
-rw-r--r--docs/manual/new_features_2_0.xml.ko2
-rw-r--r--docs/manual/new_features_2_0.xml.pt-br2
-rw-r--r--docs/manual/new_features_2_0.xml.ru2
-rw-r--r--docs/manual/new_features_2_2.html.en6
-rw-r--r--docs/manual/new_features_2_2.xml.ko2
-rw-r--r--docs/manual/new_features_2_2.xml.pt-br2
43 files changed, 61 insertions, 48 deletions
diff --git a/docs/manual/bind.html.de b/docs/manual/bind.html.de
index b67abbaeee..f34008cb56 100644
--- a/docs/manual/bind.html.de
+++ b/docs/manual/bind.html.de
@@ -79,7 +79,7 @@
Klammern angegeben werden:</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en
index b208cb35c2..b25f80598a 100644
--- a/docs/manual/bind.html.en
+++ b/docs/manual/bind.html.en
@@ -80,7 +80,7 @@
following example:</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
diff --git a/docs/manual/bind.html.fr b/docs/manual/bind.html.fr
index 58ad0876ec..ea3ea49c8a 100644
--- a/docs/manual/bind.html.fr
+++ b/docs/manual/bind.html.fr
@@ -87,7 +87,7 @@
entre crochets de la façon suivante :</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
diff --git a/docs/manual/bind.html.ja.euc-jp b/docs/manual/bind.html.ja.euc-jp
index 0677a3061f..f441f95545 100644
--- a/docs/manual/bind.html.ja.euc-jp
+++ b/docs/manual/bind.html.ja.euc-jp
@@ -82,7 +82,7 @@
IPv6 ¥¢¥É¥ì¥¹¤Ï¡¢³Ñ³ç¸Ì¤Ç¼¡¤ÎÎã¤Î¤è¤¦¤Ë°Ï¤Þ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
diff --git a/docs/manual/bind.html.ko.euc-kr b/docs/manual/bind.html.ko.euc-kr
index cf17ab84d0..622f740365 100644
--- a/docs/manual/bind.html.ko.euc-kr
+++ b/docs/manual/bind.html.ko.euc-kr
@@ -75,7 +75,7 @@
<p>IPv6 ÁÖ¼Ò´Â ´ÙÀ½°ú °°ÀÌ ´ë°ýÈ£·Î ¹­¾î¾ß ÇÑ´Ù:</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
diff --git a/docs/manual/bind.xml.de b/docs/manual/bind.xml.de
index c6ee98e6c4..b12a82e541 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: 290801 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/bind.xml.fr b/docs/manual/bind.xml.fr
index 6a0b9cdffd..f0aeff3ea1 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:290801 (outdated) -->
+<!-- English Revision: 103425:327999 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja
index 580fb9cea4..dabfcdcdb1 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: 151408:290801 (outdated) -->
+<!-- English Revision: 190982:327999 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/bind.xml.ko b/docs/manual/bind.xml.ko
index a98cdaffce..374f8842fe 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:290801 (outdated) -->
+<!-- English Revision: 105989:327999 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de
index ba63b1d405..3aacbb8c59 100644
--- a/docs/manual/mod/core.html.de
+++ b/docs/manual/mod/core.html.de
@@ -3354,4 +3354,4 @@ IP-Adressen angewendet werden</td></tr>
</div><div id="footer">
<p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
-</body></html>
+</body></html> \ No newline at end of file
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index da30d42e61..4d013cef36 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -2201,7 +2201,7 @@ hosting</td></tr>
in the following example:</p>
<div class="example"><p><code>
- NameVirtualHost [fe80::a00:20ff:fea7:ccea]:8080
+ NameVirtualHost [2001:db8::a00:20ff:fea7:ccea]:8080
</code></p></div>
<p>To receive requests on all interfaces, you can use an argument of
@@ -3207,7 +3207,7 @@ hostname or IP address</td></tr>
IPv6 example is shown below:</p>
<div class="example"><p><code>
- &lt;VirtualHost [fe80::a00:20ff:fea7:ccea]&gt;<br />
+ &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]&gt;<br />
<span class="indent">
ServerAdmin webmaster@host.example.com<br />
DocumentRoot /www/docs/host.example.com<br />
diff --git a/docs/manual/mod/core.html.ja.euc-jp b/docs/manual/mod/core.html.ja.euc-jp
index a7778ea5e4..d47293df88 100644
--- a/docs/manual/mod/core.html.ja.euc-jp
+++ b/docs/manual/mod/core.html.ja.euc-jp
@@ -2221,7 +2221,7 @@ Apache ¤¬¥Õ¥¡¥¤¥ë¤ò¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Ë»È¤¦¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ñ¥¹¤Ë
<p>IPV6 ¤Î¥¢¥É¥ì¥¹¤Ï¼¡¤ÎÎã¤Î¤è¤¦¤Ë³Ñ³ç¸Ì¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹:</p>
<div class="example"><p><code>
- NameVirtualHost [fe80::a00:20ff:fea7:ccea]:8080
+ NameVirtualHost [2001:db8::a00:20ff:fea7:ccea]:8080
</code></p></div>
<p>¤¹¤Ù¤Æ¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
@@ -3167,7 +3167,7 @@ Apache ¤¬¥Õ¥¡¥¤¥ë¤ò¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Ë»È¤¦¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ñ¥¹¤Ë
³Ñ³ç¸Ì¤Ç³ç¤Ã¤Æ»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Ï IPv6 ¤ÎÎã¤Ç¤¹:</p>
<div class="example"><p><code>
- &lt;VirtualHost [fe80::a00:20ff:fea7:ccea]&gt;<br />
+ &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]&gt;<br />
<span class="indent">
ServerAdmin webmaster@host.example.com<br />
DocumentRoot /www/docs/host.example.com<br />
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index e3f86cd719..1deefbcc19 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:315051 (outdated) -->
+<!-- English Revision: 167959:327999 (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 f76fe55a97..b85f201632 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:315051 (outdated) -->
+<!-- English Revision: 190982:327999 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 5a90edb777..40e21108eb 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -125,7 +125,10 @@ ignored.</p>
</code></p></div>
<p>A request for http://myserver/image/foo.gif would cause the
- server to return the file /ftp/pub/image/foo.gif.</p>
+ server to return the file /ftp/pub/image/foo.gif. Only complete
+ path segments are matched, so the above alias would not match a
+ request for http://myserver/imagefoo.gif. For more complex
+ matching using regular expressions, see the <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> directive.</p>
<p>Note that if you include a trailing / on the
<var>url-path</var> then the server will require a trailing / in
@@ -215,7 +218,11 @@ a different URL</td></tr>
<p>If the client requests http://example.com/service/foo.txt, it
will be told to access http://foo2.example.com/service/foo.txt
- instead.</p>
+ instead. Only complete path segments are matched, so the above
+ example would not match a request for
+ http://example.com/servicefoo.txt. For more complex matching
+ using regular expressions, see the <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> directive.</p>
+
<div class="note"><h3>Note</h3> <p>Redirect directives take precedence over
Alias and ScriptAlias directives, irrespective of their ordering in
diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index 52e30598cc..eca7b9b006 100644
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.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:290723 (outdated) -->
+<!-- English Revision: 151408:326143 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_alias.xml.ko b/docs/manual/mod/mod_alias.xml.ko
index 0adaa93be5..0d54d90a53 100644
--- a/docs/manual/mod/mod_alias.xml.ko
+++ b/docs/manual/mod/mod_alias.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: 151408:290723 (outdated) -->
+<!-- English Revision: 151408:326143 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_authz_host.html.en b/docs/manual/mod/mod_authz_host.html.en
index 62f01c768f..89c8ea46ad 100644
--- a/docs/manual/mod/mod_authz_host.html.en
+++ b/docs/manual/mod/mod_authz_host.html.en
@@ -163,8 +163,8 @@ server</td></tr>
below:</p>
<div class="example"><p><code>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
+ Allow from 2001:db8::a00:20ff:fea7:ccea<br />
+ Allow from 2001:db8::a00:20ff:fea7:ccea/10
</code></p></div>
<p>The third format of the arguments to the
diff --git a/docs/manual/mod/mod_authz_host.html.ja.euc-jp b/docs/manual/mod/mod_authz_host.html.ja.euc-jp
index b7047711ad..bdcb2de73b 100644
--- a/docs/manual/mod/mod_authz_host.html.ja.euc-jp
+++ b/docs/manual/mod/mod_authz_host.html.ja.euc-jp
@@ -163,8 +163,8 @@
<p>IPv6 ¥¢¥É¥ì¥¹¤È IPv6 ¤Î¥µ¥Ö¥Í¥Ã¥È¤Ï°Ê²¼¤Î¤è¤¦¤Ë»ØÄê¤Ç¤­¤Þ¤¹:</p>
<div class="example"><p><code>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
+ Allow from 2001:db8::a00:20ff:fea7:ccea<br />
+ Allow from 2001:db8::a00:20ff:fea7:ccea/10
</code></p></div>
<p><code class="directive">Allow</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤Î»°¤ÄÌܤηÁ¼°¤Ï¡¢
diff --git a/docs/manual/mod/mod_authz_host.html.ko.euc-kr b/docs/manual/mod/mod_authz_host.html.ko.euc-kr
index e765732648..e20b33f629 100644
--- a/docs/manual/mod/mod_authz_host.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_host.html.ko.euc-kr
@@ -150,8 +150,8 @@
ÀÖ´Ù:</p>
<div class="example"><p><code>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
+ Allow from 2001:db8::a00:20ff:fea7:ccea<br />
+ Allow from 2001:db8::a00:20ff:fea7:ccea/10
</code></p></div>
<p><code class="directive">Allow</code> Áö½Ã¾î ¾Æ±Ô¸ÕÆ®ÀÇ ¼¼¹ø°
diff --git a/docs/manual/mod/mod_authz_host.xml.ja b/docs/manual/mod/mod_authz_host.xml.ja
index 0e18835167..0d6e28212e 100644
--- a/docs/manual/mod/mod_authz_host.xml.ja
+++ b/docs/manual/mod/mod_authz_host.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: 160356 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/mod/mod_authz_host.xml.ko b/docs/manual/mod/mod_authz_host.xml.ko
index 573d771dec..a679a8fc0c 100644
--- a/docs/manual/mod/mod_authz_host.xml.ko
+++ b/docs/manual/mod/mod_authz_host.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: 151408:160356 (outdated) -->
+<!-- English Revision: 151408:327999 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mpm_common.html.de b/docs/manual/mod/mpm_common.html.de
index 402c96a33a..8afb784c98 100644
--- a/docs/manual/mod/mpm_common.html.de
+++ b/docs/manual/mod/mpm_common.html.de
@@ -290,7 +290,7 @@ Ausnahmefehler behandeln lassen kann</td></tr>
Klammern eingeschlossen werden:</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
<div class="note"><h3>Fehlermöglichkeit</h3>
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 70ff7a94e2..b7edae3096 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -296,7 +296,7 @@ The <var>protocol</var> argument was added in 2.1.5</td></tr>
following example:</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
<p>The optional <var>protocol</var> argument is not required for most
diff --git a/docs/manual/mod/mpm_common.html.ja.euc-jp b/docs/manual/mod/mpm_common.html.ja.euc-jp
index 32c05806bc..e7f46a4398 100644
--- a/docs/manual/mod/mpm_common.html.ja.euc-jp
+++ b/docs/manual/mod/mpm_common.html.ja.euc-jp
@@ -287,7 +287,7 @@ accept ¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ë¡¢Apache ¤¬¤½¤ì¤é¤Î»Ò¥×¥í¥»¥¹¤òľÎ󲽤¹¤ë¤¿¤á¤Ë
Î㤨¤Ð¼¡¤ÎÎã¤Î¤è¤¦¤Ë¤Ç¤¹¡£</p>
<div class="example"><p><code>
- Listen [fe80::a00:20ff:fea7:ccea]:80
+ Listen [2001:db8::a00:20ff:fea7:ccea]:80
</code></p></div>
<p><var>protocol</var> ¥ª¥×¥·¥ç¥ó°ú¿ô¤ÏÄ̾ï¤ÎÀßÄê¤Ç¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index 367ef8d520..6737c300a6 100644
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.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: 151408:280384 (outdated) -->
+<!-- English Revision: 151408:327999 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index e21014877b..85c52db8d4 100644
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.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:280384 (outdated) -->
+<!-- English Revision: 190982:327999 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/new_features_2_0.html.de b/docs/manual/new_features_2_0.html.de
index 4614a5acf8..937ab69a75 100644
--- a/docs/manual/new_features_2_0.html.de
+++ b/docs/manual/new_features_2_0.html.de
@@ -88,7 +88,7 @@
Runtime-Bibliothek IPv6 unterstützt, bekommt Apache
standarmäßig IPv6 Listening Sockets. Zusätzlich
unterstützen die Konfigurationsanweisungen <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>, <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code> und <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> numerische IPv6-Adressangaben
- (z.B., "<code>Listen [fe80::1]:8080</code>").</dd>
+ (z.B., "<code>Listen [2001:db8::1]:8080</code>").</dd>
<dt><strong>Filterung</strong></dt>
diff --git a/docs/manual/new_features_2_0.html.en b/docs/manual/new_features_2_0.html.en
index 8470b22e35..5f36779499 100644
--- a/docs/manual/new_features_2_0.html.en
+++ b/docs/manual/new_features_2_0.html.en
@@ -83,7 +83,7 @@
Apache Portable Runtime library, Apache gets IPv6 listening
sockets by default. Additionally, the <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>, <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code>, and <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> directives support
IPv6 numeric address strings (e.g., "<code>Listen
- [fe80::1]:8080</code>").</dd>
+ [2001:db8::1]:8080</code>").</dd>
<dt>Filtering</dt>
diff --git a/docs/manual/new_features_2_0.html.fr b/docs/manual/new_features_2_0.html.fr
index 3996750f45..746ef2f5de 100644
--- a/docs/manual/new_features_2_0.html.fr
+++ b/docs/manual/new_features_2_0.html.fr
@@ -87,7 +87,7 @@
de connexions IPv6. Les directives <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>,
<code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code> et
<code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> supportent également
- les adresses IPv6 (comme par exemple, dans "<code>Listen[fe80::1]:8080</code>").</dd>
+ les adresses IPv6 (comme par exemple, dans "<code>Listen[2001:db8::1]:8080</code>").</dd>
<dt>Filtering</dt>
diff --git a/docs/manual/new_features_2_0.html.ja.euc-jp b/docs/manual/new_features_2_0.html.ja.euc-jp
index 0c37b7af4e..b9eb866b44 100644
--- a/docs/manual/new_features_2_0.html.ja.euc-jp
+++ b/docs/manual/new_features_2_0.html.ja.euc-jp
@@ -88,7 +88,7 @@
<code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code>
¤Î³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ IPv6 ¤Î¥¢¥É¥ì¥¹¤ò
¥µ¥Ý¡¼¥È¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿ (Î㤨¤Ð¡¢
- "<code>Listen [fe80::1]:8080</code>")¡£</dd>
+ "<code>Listen [2001:db8::1]:8080</code>")¡£</dd>
<dt>¥Õ¥£¥ë¥¿</dt>
diff --git a/docs/manual/new_features_2_0.html.ko.euc-kr b/docs/manual/new_features_2_0.html.ko.euc-kr
index 268baeadbf..7f70fb2570 100644
--- a/docs/manual/new_features_2_0.html.ko.euc-kr
+++ b/docs/manual/new_features_2_0.html.ko.euc-kr
@@ -80,7 +80,7 @@
<code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code>,
<code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> Áö½Ã¾î°¡
IPv6 ¼ýÀÚ ÁÖ¼Ò¸¦ Áö¿øÇÑ´Ù. (¿¹,
- "<code>Listen [fe80::1]:8080</code>").</dd>
+ "<code>Listen [2001:db8::1]:8080</code>").</dd>
<dt>ÇÊÅ͸µ</dt>
diff --git a/docs/manual/new_features_2_0.html.pt-br b/docs/manual/new_features_2_0.html.pt-br
index 7aa074d9df..eb7bbb9d4e 100644
--- a/docs/manual/new_features_2_0.html.pt-br
+++ b/docs/manual/new_features_2_0.html.pt-br
@@ -82,7 +82,7 @@
Apache Portable Runtime, o Apache monitora por padrão
as interfaces IPv6. Em adição as diretrizes <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>, <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code> e <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code>, suportam correntes (strings) de
endereços numéricos do tipo IPv6. (ex. "<code>Listen
- [fe80::1]:8080</code>").</dd>
+ [2001:db8::1]:8080</code>").</dd>
<dt>Filtrando</dt>
diff --git a/docs/manual/new_features_2_0.html.ru.koi8-r b/docs/manual/new_features_2_0.html.ru.koi8-r
index e7c4466c23..d79bf750e5 100644
--- a/docs/manual/new_features_2_0.html.ru.koi8-r
+++ b/docs/manual/new_features_2_0.html.ru.koi8-r
@@ -91,7 +91,7 @@
ÂÁÚÏ×ÏÊ ÂÉÂÌÉÏÔÅËÏÊ Apache Portable Runtime, Apache
ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÏÌÕÞÁÅÔ ×ÏÚÍÏÖÎÏÓÔØ ÓÌÕÛÁÔØ IPv6 ÓÏËÅÔÙ
(sockets). ÷ ÄÏÂÁ×ÏË Ë ÜÔÏÍÕ ÄÉÒÅËÔÉ×Ù <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>, <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code> É <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> ÍÏÇÕÔ ÒÁÂÏÔÁÔØ Ó ÁÄÒÅÓÎÙÍÉ ÓÔÒÏËÁÍÉ,
- ÚÁÄÁÎÎÙÍÉ × ÆÏÒÍÁÔÅ IPv6 (Ô.Å. ÎÁÐÒÉÍÅÒ "Listen [fe80::1]:8080").</dd>
+ ÚÁÄÁÎÎÙÍÉ × ÆÏÒÍÁÔÅ IPv6 (Ô.Å. ÎÁÐÒÉÍÅÒ "Listen [2001:db8::1]:8080").</dd>
<dt>éÓÐÏÌØÚÏ×ÁÎÉÅ ÆÉÌØÔÒÏ×</dt>
diff --git a/docs/manual/new_features_2_0.xml.de b/docs/manual/new_features_2_0.xml.de
index a678034a41..132fec2efe 100644
--- a/docs/manual/new_features_2_0.xml.de
+++ b/docs/manual/new_features_2_0.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: 151408 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_0.xml.fr b/docs/manual/new_features_2_0.xml.fr
index 00ccf838f2..99f1b82140 100644
--- a/docs/manual/new_features_2_0.xml.fr
+++ b/docs/manual/new_features_2_0.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 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_0.xml.ja b/docs/manual/new_features_2_0.xml.ja
index 228e51c030..02153b16bb 100644
--- a/docs/manual/new_features_2_0.xml.ja
+++ b/docs/manual/new_features_2_0.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 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_0.xml.ko b/docs/manual/new_features_2_0.xml.ko
index a2f7009b27..902aba93be 100644
--- a/docs/manual/new_features_2_0.xml.ko
+++ b/docs/manual/new_features_2_0.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 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_0.xml.pt-br b/docs/manual/new_features_2_0.xml.pt-br
index ead1e31d65..28124fee3d 100644
--- a/docs/manual/new_features_2_0.xml.pt-br
+++ b/docs/manual/new_features_2_0.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 -->
+<!-- English Revision: 327999 -->
<!--
Copyright 2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_0.xml.ru b/docs/manual/new_features_2_0.xml.ru
index e1178baa9a..ad766f4418 100644
--- a/docs/manual/new_features_2_0.xml.ru
+++ b/docs/manual/new_features_2_0.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: 96910:151408 (outdated) -->
+<!-- English Revision: 96910:327999 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index 11aef815de..805fbe6acc 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -52,6 +52,12 @@
has been introduced to cleanup <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>
setups.</dd>
+ <dt>Configuration</dt>
+ <dd>The default configuration layout has been simplified and
+ modularised. Configuration snippets which assist with enabling
+ commonly used features are now bundled and easily included in the
+ main server configuration.</dd>
+
<dt>Graceful stop</dt>
<dd>The <code class="module"><a href="./mod/prefork.html">prefork</a></code>, <code class="module"><a href="./mod/worker.html">worker</a></code> and
<code class="module"><a href="./mod/event.html">event</a></code> MPMs now allow <code class="program"><a href="./programs/httpd.html">httpd</a></code>
diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index 1deb3d79d9..a942f23f91 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:291100 (outdated) -->
+<!-- English Revision: 105989:327998 (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 a0ce165b40..d299efe156 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:291100 (outdated) -->
+<!-- English Revision: 151408:327998 (outdated) -->
<!--
Copyright 2005 The Apache Software Foundation or its licensors,