summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstrid Malo <kess@apache.org>2005-05-27 16:48:56 +0000
committerAstrid Malo <kess@apache.org>2005-05-27 16:48:56 +0000
commit1769b9210aee01483669e41d542a71b720ce67a3 (patch)
tree6ec3f9be48aed27f5f1a859d93813643a77bbf4c
parent2d3678a0ed9871c8e692411933986c939431bb26 (diff)
downloadhttpd-1769b9210aee01483669e41d542a71b720ce67a3.tar.gz
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178796 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/install.html.de3
-rw-r--r--docs/manual/install.html.en17
-rw-r--r--docs/manual/install.html.ja.euc-jp2
-rw-r--r--docs/manual/install.xml.de2
-rw-r--r--docs/manual/install.xml.es2
-rw-r--r--docs/manual/install.xml.fr2
-rw-r--r--docs/manual/install.xml.ja2
-rw-r--r--docs/manual/install.xml.ko2
-rw-r--r--docs/manual/install.xml.meta4
-rw-r--r--docs/manual/mod/mod_log_config.html.en199
-rw-r--r--docs/manual/mod/mod_log_config.html.ja.euc-jp2
-rw-r--r--docs/manual/mod/mod_log_config.xml.ja2
-rw-r--r--docs/manual/mod/mod_log_config.xml.ko2
-rw-r--r--docs/manual/mod/mod_log_config.xml.meta2
-rw-r--r--docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp261
-rw-r--r--docs/manual/mod/mod_proxy_balancer.xml.meta2
-rw-r--r--docs/manual/vhosts/examples.html.ja.euc-jp32
-rw-r--r--docs/manual/vhosts/examples.xml.meta2
18 files changed, 412 insertions, 128 deletions
diff --git a/docs/manual/install.html.de b/docs/manual/install.html.de
index 3ba1706de5..5afab9a423 100644
--- a/docs/manual/install.html.de
+++ b/docs/manual/install.html.de
@@ -25,6 +25,9 @@
<a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+ nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+ die neuesten Änderungen.</div>
<p>Dieses Dokument umfaßt nur die Kompilierung und Installation des
Apache auf Unix und Unix-ähnlichen Systemen. Für die
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index d50a993ed8..5842b4b84a 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -345,14 +345,15 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
work. (This is only valid for versions after 2.0.41; earlier
versions have incompatible changes.)</p>
- <p>If you kept the source tree from your last installation,
- upgrading is even easier. The file <code>config.nice</code> in
- the root of the old source tree contains the exact
- <code class="program"><a href="./programs/configure.html">configure</a></code> command line that you used to configure the
- source tree. Then to upgrade from one version to the next, you
- need only copy the <code>config.nice</code> file to the source
- tree of the new version, edit it to make any desired changes, and
- then run:</p>
+ <p>To upgrade across minor versions, start by finding the file
+ <code>config.nice</code> in the <code>build</code> directory of
+ your installed server or at the root of the source tree for your
+ old install. This will contain the exact
+ <code class="program"><a href="./programs/configure.html">configure</a></code> command line that you used to
+ configure the source tree. Then to upgrade from one version to
+ the next, you need only copy the <code>config.nice</code> file to
+ the source tree of the new version, edit it to make any desired
+ changes, and then run:</p>
<div class="example"><p><code>
$ ./config.nice<br />
diff --git a/docs/manual/install.html.ja.euc-jp b/docs/manual/install.html.ja.euc-jp
index 1c9a5f155b..af78f7f72a 100644
--- a/docs/manual/install.html.ja.euc-jp
+++ b/docs/manual/install.html.ja.euc-jp
@@ -25,6 +25,8 @@
<a href="./ja/install.html" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
+<div class="outofdate">This translation may be out of date. Check the
+ English version for recent changes.</div>
<p>¤³¤Îʸ½ñ¤Ç°·¤¦ÈϰϤϡ¢Unix ¤ä Unix ¤ËÎà»÷¤·¤¿¥·¥¹¥Æ¥à¤Ç¤Î
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index 1847d2c30d..03214ecc80 100644
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.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: 151408:178520 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.es b/docs/manual/install.xml.es
index be33a27c9f..096fda8919 100644
--- a/docs/manual/install.xml.es
+++ b/docs/manual/install.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: 105989:151408 (outdated) -->
+<!-- English Revision: 105989:178520 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.fr b/docs/manual/install.xml.fr
index 86151e0d56..7a415c9dde 100644
--- a/docs/manual/install.xml.fr
+++ b/docs/manual/install.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: 105989:151408 (outdated) -->
+<!-- English Revision: 105989:178520 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja
index fedddfe037..da45c10feb 100644
--- a/docs/manual/install.xml.ja
+++ b/docs/manual/install.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: 151408:178520 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko
index 555a4de07d..219a80a337 100644
--- a/docs/manual/install.xml.ko
+++ b/docs/manual/install.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:151408 (outdated) -->
+<!-- English Revision: 105989:178520 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/install.xml.meta b/docs/manual/install.xml.meta
index 53e8a0c4bd..06f4946208 100644
--- a/docs/manual/install.xml.meta
+++ b/docs/manual/install.xml.meta
@@ -6,11 +6,11 @@
<relpath>.</relpath>
<variants>
- <variant>de</variant>
+ <variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</variant>
<variant outdated="yes">fr</variant>
- <variant>ja</variant>
+ <variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 47167a740f..53a4b8c60f 100644
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -80,80 +80,80 @@
<th>Description</th></tr>
<tr><td><code>%%</code></td>
<td>The percent sign</td></tr>
-<tr class="odd"><td><code>%...a</code></td>
+<tr class="odd"><td><code>%a</code></td>
<td>Remote IP-address</td></tr>
-<tr><td><code>%...A</code></td>
+<tr><td><code>%A</code></td>
<td>Local IP-address</td></tr>
-<tr class="odd"><td><code>%...B</code></td>
+<tr class="odd"><td><code>%B</code></td>
<td>Size of response in bytes, excluding HTTP headers.</td></tr>
-<tr><td><code>%...b</code></td>
+<tr><td><code>%b</code></td>
<td>Size of response in bytes, excluding HTTP headers. In CLF format, <em>i.e.</em>
a '<code>-</code>' rather than a 0 when no bytes are sent.</td></tr>
-<tr class="odd"><td><code>%...{<var>Foobar</var>}C</code></td>
+<tr class="odd"><td><code>%{<var>Foobar</var>}C</code></td>
<td>The contents of cookie <var>Foobar</var> in the request sent
to the server.</td></tr>
-<tr><td><code>%...D</code></td>
+<tr><td><code>%D</code></td>
<td>The time taken to serve the request, in microseconds.</td></tr>
-<tr class="odd"><td><code>%...{<var>FOOBAR</var>}e</code></td>
+<tr class="odd"><td><code>%{<var>FOOBAR</var>}e</code></td>
<td>The contents of the environment variable
<var>FOOBAR</var></td></tr>
-<tr><td><code>%...f</code></td>
+<tr><td><code>%f</code></td>
<td>Filename</td></tr>
-<tr class="odd"><td><code>%...h</code></td>
+<tr class="odd"><td><code>%h</code></td>
<td>Remote host</td></tr>
-<tr><td><code>%...H</code></td>
+<tr><td><code>%H</code></td>
<td>The request protocol</td></tr>
-<tr class="odd"><td><code>%...{<var>Foobar</var>}i</code></td>
+<tr class="odd"><td><code>%{<var>Foobar</var>}i</code></td>
<td>The contents of <code><var>Foobar</var>:</code> header line(s)
in the request sent to the server.</td></tr>
-<tr><td><code>%...l</code></td>
+<tr><td><code>%l</code></td>
<td>Remote logname (from identd, if supplied). This will return a
dash unless <code class="module"><a href="../mod/mod_ident.html">mod_ident</a></code> is present and <code class="directive"><a href="../mod/mod_ident.html#identitycheck">IdentityCheck</a></code> is set
<code>On</code>.</td></tr>
-<tr class="odd"><td><code>%...m</code></td>
+<tr class="odd"><td><code>%m</code></td>
<td>The request method</td></tr>
-<tr><td><code>%...{<var>Foobar</var>}n</code></td>
+<tr><td><code>%{<var>Foobar</var>}n</code></td>
<td>The contents of note <var>Foobar</var> from another
module.</td></tr>
-<tr class="odd"><td><code>%...{<var>Foobar</var>}o</code></td>
+<tr class="odd"><td><code>%{<var>Foobar</var>}o</code></td>
<td>The contents of <code><var>Foobar</var>:</code> header line(s)
in the reply.</td></tr>
-<tr><td><code>%...p</code></td>
+<tr><td><code>%p</code></td>
<td>The canonical port of the server serving the request</td></tr>
-<tr class="odd"><td><code>%...P</code></td>
+<tr class="odd"><td><code>%P</code></td>
<td>The process ID of the child that serviced the request.</td></tr>
-<tr><td><code>%...{<var>format</var>}P</code></td>
+<tr><td><code>%{<var>format</var>}P</code></td>
<td>The process ID or thread id of the child that serviced the
request. Valid formats are <code>pid</code> and <code>tid</code>.
</td></tr>
-<tr class="odd"><td><code>%...q</code></td>
+<tr class="odd"><td><code>%q</code></td>
<td>The query string (prepended with a <code>?</code> if a query
string exists, otherwise an empty string)</td></tr>
-<tr><td><code>%...r</code></td>
+<tr><td><code>%r</code></td>
<td>First line of request</td></tr>
-<tr class="odd"><td><code>%...s</code></td>
+<tr class="odd"><td><code>%s</code></td>
<td>Status. For requests that got internally redirected, this is
- the status of the *original* request --- <code>%...&gt;s</code>
+ the status of the *original* request --- <code>%&gt;s</code>
for the last.</td></tr>
-<tr><td><code>%...t</code></td>
+<tr><td><code>%t</code></td>
<td>Time the request was received (standard english
format)</td></tr>
-<tr class="odd"><td><code>%...{<var>format</var>}t</code></td>
+<tr class="odd"><td><code>%{<var>format</var>}t</code></td>
<td>The time, in the form given by format, which should be in
<code>strftime(3)</code> format. (potentially localized)</td></tr>
-<tr><td><code>%...T</code></td>
+<tr><td><code>%T</code></td>
<td>The time taken to serve the request, in seconds.</td></tr>
-<tr class="odd"><td><code>%...u</code></td>
+<tr class="odd"><td><code>%u</code></td>
<td>Remote user (from auth; may be bogus if return status
(<code>%s</code>) is 401)</td></tr>
-<tr><td><code>%...U</code></td>
+<tr><td><code>%U</code></td>
<td>The URL path requested, not including any query string.</td></tr>
-<tr class="odd"><td><code>%...v</code></td>
+<tr class="odd"><td><code>%v</code></td>
<td>The canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
of the server serving the request.</td></tr>
-<tr><td><code>%...V</code></td>
+<tr><td><code>%V</code></td>
<td>The server name according to the <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> setting.</td></tr>
-<tr class="odd"><td><code>%...X</code></td>
+<tr class="odd"><td><code>%X</code></td>
<td>Connection status when response is completed:
<table>
@@ -168,87 +168,90 @@
sent.</td></tr>
</table>
- <p>(This directive was <code>%...c</code> in late versions of Apache
+ <p>(This directive was <code>%c</code> in late versions of Apache
1.3, but this conflicted with the historical ssl
- <code>%...{<var>var</var>}c</code> syntax.)</p></td></tr>
-<tr><td><code>%...I</code></td>
+ <code>%{<var>var</var>}c</code> syntax.)</p></td></tr>
+<tr><td><code>%I</code></td>
<td>Bytes received, including request and headers, cannot be zero.
You need to enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
-<tr class="odd"><td><code>%...O</code></td>
+<tr class="odd"><td><code>%O</code></td>
<td>Bytes sent, including headers, cannot be zero. You need to
enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
</table>
- <p>The "<var>...</var>" can be nothing at all (<em>e.g.</em>,
- <code>"%h %u %r %s %b"</code>), or it can indicate conditions for
- inclusion of the item (which will cause it to be replaced with "-" if
- the condition is not met). The forms of condition are a list of
- HTTP status codes, which may or may not be preceded by "!".
- Thus, "%400,501{User-agent}i" logs <code>User-agent:</code> on 400
- errors and 501 errors (Bad Request, Not Implemented) only;
- "%!200,304,302{Referer}i" logs <code>Referer:</code> on all requests
- which did <em>not</em> return some sort of normal status.</p>
-
- <p>The modifiers "&lt;" and "&gt;" can be used for requests that
- have been internally redirected to choose whether the original or
- final (respectively) request should be consulted. By default, the
- <code>%</code> directives <code>%s, %U, %T, %D,</code> and
- <code>%r</code> look at the original request while all others look
- at the final request. So for example, <code>%&gt;s</code> can be
- used to record the final status of the request and
- <code>%&lt;u</code> can be used to record the original
- authenticated user on a request that is internally redirected to an
- unauthenticated resource.</p>
-
- <p>Note that in httpd 2.0 versions prior to 2.0.46, no escaping was performed
- on the strings from <code>%...r</code>, <code>%...i</code> and
- <code>%...o</code>. This was mainly to comply with the requirements of
- the Common Log Format. This implied that clients could insert control
- characters into the log, so you had to be quite careful when dealing
- with raw log files.</p>
-
- <p>For security reasons, starting with 2.0.46, non-printable and
- other special characters are escaped mostly by using
- <code>\x<var>hh</var></code> sequences, where <var>hh</var> stands for
- the hexadecimal representation of the raw byte. Exceptions from this
- rule are <code>"</code> and <code>\</code> which are escaped by prepending
- a backslash, and all whitespace characters which are written in their
- C-style notation (<code>\n</code>, <code>\t</code> etc).</p>
-
- <p>Note that in httpd 2.0, unlike 1.3, the <code>%b</code> and
- <code>%B</code> format strings do not represent the number of
- bytes sent to the client, but simply the size in bytes of the HTTP
- response (which will differ, for instance, if the connection is
- aborted, or if SSL is used). The <code>%O</code> format provided
- by <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> will log the actual number of bytes
- sent over the network.</p>
-
- <p>Some commonly used log format strings are:</p>
+ <h3><a name="modifiers" id="modifiers">Modifiers</a></h3>
+
+ <p>Particular items can be restricted to print only for
+ responses with specific HTTP status codes by placing a
+ comma-separated list of status codes immediately following the
+ "%". For example, <code>"%400,501{User-agent}i"</code> logs
+ <code>User-agent</code> on 400 errors and 501 errors only. For
+ other status codes, the literal string <code>"-"</code> will be
+ logged. The status code list may be preceded by a
+ "<code>!</code>" to indicate negation:
+ <code>"%!200,304,302{Referer}i"</code> logs <code>Referer</code>
+ on all requests that do <em>not</em> return one of the three
+ specified codes.</p>
+
+ <p>The modifiers "&lt;" and "&gt;" can be used for requests that
+ have been internally redirected to choose whether the original
+ or final (respectively) request should be consulted. By
+ default, the <code>%</code> directives <code>%s, %U, %T,
+ %D,</code> and <code>%r</code> look at the original request
+ while all others look at the final request. So for example,
+ <code>%&gt;s</code> can be used to record the final status of
+ the request and <code>%&lt;u</code> can be used to record the
+ original authenticated user on a request that is internally
+ redirected to an unauthenticated resource.</p>
- <dl>
- <dt>Common Log Format (CLF)</dt>
- <dd><code>"%h %l %u %t \"%r\" %&gt;s %b"</code></dd>
+
- <dt>Common Log Format with Virtual Host</dt>
- <dd><code>"%v %h %l %u %t \"%r\" %&gt;s %b"</code></dd>
+ <h3><a name="format-notes" id="format-notes">Some Notes</a></h3>
+
+ <p>For security reasons, starting with version 2.0.46,
+ non-printable and other special characters in <code>%r</code>,
+ <code>%i</code> and <code>%o</code> are escaped using
+ <code>\x<var>hh</var></code> sequences, where <var>hh</var>
+ stands for the hexadecimal representation of the raw
+ byte. Exceptions from this rule are <code>"</code> and
+ <code>\</code>, which are escaped by prepending a backslash, and
+ all whitespace characters, which are written in their C-style
+ notation (<code>\n</code>, <code>\t</code>, etc). In versions
+ prior to 2.0.46, no escaping was performed on these strings so
+ you had to be quite careful when dealing with raw log files.</p>
+
+ <p>In httpd 2.0, unlike 1.3, the <code>%b</code> and
+ <code>%B</code> format strings do not represent the number of
+ bytes sent to the client, but simply the size in bytes of the
+ HTTP response (which will differ, for instance, if the
+ connection is aborted, or if SSL is used). The <code>%O</code>
+ format provided by <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> will log the
+ actual number of bytes sent over the network.</p>
- <dt>NCSA extended/combined log format</dt>
- <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
- \"%{User-agent}i\""</code></dd>
+
- <dt>Referer log format</dt>
- <dd><code>"%{Referer}i -&gt; %U"</code></dd>
+ <h3><a name="examples" id="examples">Examples</a></h3>
- <dt>Agent (Browser) log format</dt>
- <dd><code>"%{User-agent}i"</code></dd>
- </dl>
+ <p>Some commonly used log format strings are:</p>
+
+ <dl>
+ <dt>Common Log Format (CLF)</dt>
+ <dd><code>"%h %l %u %t \"%r\" %&gt;s %b"</code></dd>
- <p>Note that the canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> and <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> of the server serving the
- request are used for <code>%v</code> and <code>%p</code>
- respectively. This happens regardless of the <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> setting
- because otherwise log analysis programs would have to duplicate
- the entire vhost matching algorithm in order to decide what
- host really served the request.</p>
+ <dt>Common Log Format with Virtual Host</dt>
+ <dd><code>"%v %h %l %u %t \"%r\" %&gt;s %b"</code></dd>
+
+ <dt>NCSA extended/combined log format</dt>
+ <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
+ \"%{User-agent}i\""</code></dd>
+
+ <dt>Referer log format</dt>
+ <dd><code>"%{Referer}i -&gt; %U"</code></dd>
+
+ <dt>Agent (Browser) log format</dt>
+ <dd><code>"%{User-agent}i"</code></dd>
+ </dl>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="security" id="security">Security Considerations</a></h2>
diff --git a/docs/manual/mod/mod_log_config.html.ja.euc-jp b/docs/manual/mod/mod_log_config.html.ja.euc-jp
index 2c6e379b3e..404ccd7c7e 100644
--- a/docs/manual/mod/mod_log_config.html.ja.euc-jp
+++ b/docs/manual/mod/mod_log_config.html.ja.euc-jp
@@ -25,6 +25,8 @@
<a href="../ja/mod/mod_log_config.html" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
+<div class="outofdate">This translation may be out of date. Check the
+ English version for recent changes.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Î¥í¥®¥ó¥°</td></tr>
<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>log_config_module</td></tr>
diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 074b2350e9..9fffdc15e8 100644
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.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: 165671 -->
+<!-- English Revision: 165671:178530 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index 9c3008b2ff..1a8e2c05c2 100644
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.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:165671 (outdated) -->
+<!-- English Revision: 105989:178530 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
diff --git a/docs/manual/mod/mod_log_config.xml.meta b/docs/manual/mod/mod_log_config.xml.meta
index 34d03d2b3e..f9817111e8 100644
--- a/docs/manual/mod/mod_log_config.xml.meta
+++ b/docs/manual/mod/mod_log_config.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_proxy_balancer.html.ja.euc-jp b/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
index ef857dd419..a521cac37e 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
+++ b/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
@@ -24,8 +24,6 @@
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
<a href="../ja/mod/mod_proxy_balancer.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
</div>
-<div class="outofdate">This translation may be out of date. Check the
- English version for recent changes.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>Éé²Ùʬ»¶¤Î¤¿¤á¤Î <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ³ÈÄ¥</td></tr>
<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>proxy_balancer_module</td></tr>
@@ -42,18 +40,273 @@
¤¤¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
<div class="warning"><h3>·Ù¹ð</h3>
- <p><a href="#access">°ÂÁ´¤Ê¥µ¡¼¥Ð¤Ë¤¹¤ë</a>¤Þ¤Ç¥×¥í¥¯¥·µ¡Ç½¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
+ <p><a href="mod_proxy.html#access">°ÂÁ´¤Ê¥µ¡¼¥Ð¤Ë¤¹¤ë</a>¤Þ¤Ç¥×¥í¥¯¥·µ¡Ç½¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
¥ª¡¼¥×¥ó¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï¤¢¤Ê¤¿¼«¿È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤Æ¤â¡¢
¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤˤȤäƤâ´í¸±¤Ç¤¹¡£</p>
</div>
</div>
<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-<h3>»²¾È</h3>
+<h3>¥È¥Ô¥Ã¥¯</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#scheduler">¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥¹¥±¥¸¥å¡¼¥é¤Î¥¢¥ë¥´¥ê¥º¥à</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#traffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Î¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></li>
+</ul><h3>»²¾È</h3>
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="scheduler" id="scheduler">¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥¹¥±¥¸¥å¡¼¥é¤Î¥¢¥ë¥´¥ê¥º¥à</a></h2>
+
+ <p>¸½»þÅÀ¤Ç¤Ï 2 ¼ïÎà¤Î¥í¡¼¥É¥Ð¥é¥ó¥µ¥¹¥±¥¸¥å¡¼¥é¥¢¥ë¥´¥ê¥º¥à¤«¤éÁª¤Ù¤Þ¤¹¡£
+ ¥ê¥¯¥¨¥¹¥È²ó¿ô¤Ë¤è¤ë¤â¤Î <span class="transnote">(<em>ÌõÃí:</em> Request Counting)</span>
+ ¤È¡¢¥È¥é¥Õ¥£¥Ã¥¯Î̤ˤè¤ë¤â¤Î <span class="transnote">(<em>ÌõÃí:</em> Weighted Traffic Counting)</span>
+ ¤¬¤¢¤ê¤Þ¤¹¡£¥Ð¥é¥ó¥µ¤ÎÀßÄê <code>lbmethod</code> Ãͤǡ¢¤É¤Á¤é¤ò»È¤¦¤«»ØÄꤷ¤Þ¤¹¡£
+ ¾ÜºÙ¤Ï <code class="directive"><a href="../mod/mod_proxy.html#proxy">Proxy</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
+ »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requests" id="requests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
+
+ <p><code>lbmethod=requests</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+ ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢ÍÍ¡¹¤Ê¥ï¡¼¥«¡¼¤¬¤½¤ì¤¾¤ì¡¢
+ ÀßÄꤵ¤ì¤Æ¤¤¤ëʬô¥ê¥¯¥¨¥¹¥È¿ô¤ò¤­¤Á¤ó¤È¼õ¤±¼è¤ì¤ë¤è¤¦¤Ë¡¢
+ ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤È¤¤¤¦¹Í¤¨Êý¤Ç¤¹¡£¼¡¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹:</p>
+
+ <p><dfn>lbfactor</dfn> ¤Ï¡¢<em>¤É¤ÎÄøÅ٥¥«¡¼¤Ë»Å»ö¤ò¿¶¤ë¤«</em>
+ ¤Ä¤Þ¤ê<em>¥ï¡¼¥«¡¼¤Î¥¯¥ª¡¼¥¿</em>¤ò»Ø¤·¤Þ¤¹¡£¤³¤ÎÃÍ¤Ï "ʬô"
+ Î̤òɽ¤¹Àµµ¬²½¤µ¤ì¤¿ÃͤǤ¹¡£</p>
+
+ <p><dfn>lbstatus</dfn> ¤Ï¡¢<em>¥ï¡¼¥«¡¼¤Î¥¯¥ª¡¼¥¿¤òËþ¤¿¤¹¤¿¤á¤Ë
+ ¤É¤Î¤°¤é¤¤µÞ¤®¤ÇƯ¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤«</em>¤ò»Ø¤·¤Þ¤¹¡£</p>
+
+ <p><dfn>¥ï¡¼¥«¡¼</dfn>¤Ï¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥á¥ó¥Ð¤Ç¡¢Ä̾ï¤Ï¡¢
+ ¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥×¥í¥È¥³¥ë¤Î¤¦¤Á¤Î°ì¤Ä¤òÄ󶡤·¤Æ¤¤¤ë¥ê¥â¡¼¥È¥Û¥¹¥È¤Ç¤¹¡£
+ </p>
+
+ <p>¤Þ¤º¸Ä¡¹¤Î¥ï¡¼¥«¡¼¤Ë¥ï¡¼¥«¡¼¥¯¥ª¡¼¥¿¤ò³ä¤ê¿¶¤ê¡¢¤É¤Î¥ï¡¼¥«¡¼¤¬ºÇ¤âµÞ¤®¤Ç
+ Ư¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤« (lbstatus ¤¬ºÇÂç¤Î¤â¤Î) ¤òÄ´¤Ù¤Þ¤¹¡£
+ ¼¡¤Ë»Å»ö¤ò¤¹¤ë¤è¤¦¤Ë¤³¤Î¥ï¡¼¥«¡¼¤òÁªÂò¤·¡¢ÁªÂò¤·¤¿¥ï¡¼¥«¡¼¤Î lbstatus
+ ¤òÁ´ÂΤ˳ä¤ê¿¶¤Ã¤¿¤Ö¤ó¤À¤±º¹¤·°ú¤­¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢lbstatus ¤ÎÁíÎ̤Ï
+ ·ë²ÌŪ¤ËÊѲ½¤·¤Þ¤»¤ó(*)¤·¡¢¥ê¥¯¥¨¥¹¥È¤Ï´üÂÔÄ̤ê¤Ëʬ»¶¤µ¤ì¤Þ¤¹¡£</p>
+
+ <p>¤¢¤ë¥ï¡¼¥«¡¼¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤â¡¢Â¾¤Î¤â¤Î¤ÏÀµ¾ï¤Ë¥¹¥±¥¸¥å¡¼¥ë¤µ¤ì³¤±¤Þ¤¹¡£
+ </p>
+
+ <div class="example"><pre><code>for each worker in workers
+ worker lbstatus += worker lbfactor
+ total factor += worker lbfactor
+ if worker lbstatus &gt; candidate lbstatus
+ candidate = worker
+
+candidate lbstatus -= total factor</code></pre></div>
+
+ <p>¥Ð¥é¥ó¥µ¤ò¼¡¤Î¤è¤¦¤ËÀßÄꤷ¤¿¾ì¹ç:</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th>
+ <th class="data">c</th>
+ <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+ <td class="data">25</td>
+ <td class="data">25</td>
+ <td class="data">25</td>
+ <td class="data">25</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data">0</td>
+ <td class="data">0</td>
+ <td class="data">0</td>
+ <td class="data">0</td></tr>
+</table>
+
+ <p>¤½¤·¤Æ <var>b</var> ¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ê¥¹¥±¥¸¥å¡¼¥ë¤¬
+ ¹Ô¤ï¤ì¤Þ¤¹¡£</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th>
+ <th class="data">c</th>
+ <th class="data">d</th></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>-50</em></td>
+ <td class="data">0</td>
+ <td class="data">25</td>
+ <td class="data">25</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data">-25</td>
+ <td class="data">0</td>
+ <td class="data"><em>-25</em></td>
+ <td class="data">50</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data">0</td>
+ <td class="data">0</td>
+ <td class="data">0</td>
+ <td class="data"><em>0</em></td></tr>
+<tr><td class="data" colspan="5">(repeat)</td></tr>
+</table>
+
+ <p>¤Ä¤Þ¤ê¤³¤Î¤è¤¦¤Ë¥¹¥±¥¸¥å¡¼¥ë¤µ¤ì¤Þ¤¹: <var>a</var> <var>c</var>
+ <var>d</var> <var>a</var> <var>c</var> <var>d</var> <var>a</var>
+ <var>c</var> <var>d</var> ... ¼¡¤ÎÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤:</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th>
+ <th class="data">c</th>
+ <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+ <td class="data">25</td>
+ <td class="data">25</td>
+ <td class="data">25</td>
+ <td class="data">25</td></tr>
+</table>
+
+ <p>¤³¤ÎµóÆ°¤Ï¡¢¼¡¤ÎÀßÄê¤ÈÁ´¤¯Æ±¤¸¤Ë¤Ê¤ê¤Þ¤¹:</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th>
+ <th class="data">c</th>
+ <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+ <td class="data">1</td>
+ <td class="data">1</td>
+ <td class="data">1</td>
+ <td class="data">1</td></tr>
+</table>
+
+ <p>This is because all values of <dfn>lbfactor</dfn> are normalized
+ with respect to the others. For:</p>
+ <p><dfn>lbfactor</dfn> ¤ÏÁ´¤ÆÀµµ¬²½¤µ¤ì¤¿¤â¤Î¤Ç¡¢
+ ¾¤È¤ÎÁêÂÐÃͤÀ¤«¤é¤Ç¤¹¡£¼¡¤ÎÀßÄê¤Ç¤Ï:</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th>
+ <th class="data">c</th></tr>
+<tr><th>lbfactor</th>
+ <td class="data">1</td>
+ <td class="data">4</td>
+ <td class="data">1</td></tr>
+</table>
+
+ <p>¥ï¡¼¥«¡¼ <var>b</var> ¤Ï¡¢Ê¿¶Ñ¤·¤Æ¡¢<var>a</var> ¤È <var>c</var>
+ ¤Î 4 Çܤοô¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±»ý¤Ä¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
+
+ <p>¼¡¤Î¤è¤¦¤ÊÈóÂоΤÊÀßÄê¤Ç¤Ï¡¢¤³¤¦¤Ê¤ë¤ÈͽÁÛ¤µ¤ì¤ë¤Ç¤·¤ç¤¦:</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th></tr>
+<tr><th>lbfactor</th>
+ <td class="data">70</td>
+ <td class="data">30</td></tr>
+<tr><td class="data" colspan="2">&nbsp;</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>-30</em></td>
+ <td class="data">30</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data">40</td>
+ <td class="data"><em>-40</em></td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>10</em></td>
+ <td class="data">-10</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>-20</em></td>
+ <td class="data">20</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>-50</em></td>
+ <td class="data">50</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data">20</td>
+ <td class="data"><em>-20</em></td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>-10</em></td>
+ <td class="data">10</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>-40</em></td>
+ <td class="data">40</td></tr>
+<tr><th>lbstatus</th>
+ <td class="data">30</td>
+ <td class="data"><em>-30</em></td></tr>
+<tr><th>lbstatus</th>
+ <td class="data"><em>0</em></td>
+ <td class="data">0</td></tr>
+<tr><td class="data" colspan="3">(repeat)</td></tr>
+</table>
+
+ <p>¥¹¥±¥¸¥å¡¼¥ë¤Ï 10 ¥¹¥±¥¸¥å¡¼¥ë¸å¤Ë·«¤êÊÖ¤µ¤ì¡¢<var>a</var> 7 ²ó¤È
+ <var>b</var> 3 ²ó¤Ç¤Þ¤Ð¤é¤ËÁª¤Ð¤ì¤Þ¤¹¡£</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="traffic" id="traffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
+
+ <p><code>lbmethod=traffic</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+ ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢Request Counting
+ ¤ÈÈó¾ï¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¼¡¤Î°ã¤¤¤¬¤¢¤ê¤Þ¤¹:</p>
+
+ <p><dfn>lbfactor</dfn> ¤Ï <em>¤É¤ì¤À¤±¤Î¥Ð¥¤¥È¿ô¤Î¥È¥é¥Õ¥£¥Ã¥¯Î̤ò¡¢
+ ¤³¤Î¥ï¡¼¥«¡¼¤Ë½èÍý¤·¤Æ¤â¤é¤¤¤¿¤¤¤«</em> ¤òɽ¤·¤Þ¤¹¡£
+ ¤³¤ÎÃͤâƱÍͤËÀµµ¬²½¤µ¤ì¤¿Ãͤǡ¢¥ï¡¼¥«¡¼Á´ÂΤΤ¦¤Á¤Ç¤Î "ʬô"
+ Î̤òɽ¸½¤·¤Æ¤¤¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¿ô¤òñ½ã¤Ë¿ô¤¨¤ëÂå¤ï¤ê¤Ë¡¢
+ ¤É¤ì¤À¤±¤ÎžÁ÷Î̤ò½èÍý¤·¤¿¤«¤ò¿ô¤¨¤Þ¤¹¡£</p>
+
+ <p>¼¡¤Î¤è¤¦¤Ë¥Ð¥é¥ó¥µ¤òÀßÄꤷ¤¿¾ì¹ç:</p>
+
+ <table><tr><th>worker</th>
+ <th class="data">a</th>
+ <th class="data">b</th>
+ <th class="data">c</th></tr>
+<tr><th>lbfactor</th>
+ <td class="data">1</td>
+ <td class="data">2</td>
+ <td class="data">1</td></tr>
+</table>
+
+ <p><var>b</var> ¤Ë¤Ï <var>a</var> ¤ä <var>c</var> ¤Î 2 ÇÜ
+ ½èÍý¤·¤Æ¤Û¤·¤¤¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
+ <var>b</var> ¤Ï 2 ÇܤΠI/O ¤ò½èÍý¤¹¤ë¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¡¢
+ 2 ÇܤΥꥯ¥¨¥¹¥È¿ô¤ò½èÍý¤¹¤ë¤È¤¤¤¦¤³¤È¤Ë¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
+ ¤Ç¤¹¤«¤é¥ê¥¯¥¨¥¹¥È¤È¥ì¥¹¥Ý¥ó¥¹¤Î¥µ¥¤¥º¤¬¡¢
+ ½Å¤ßÉÕ¤±¤È¿¶¤êʬ¤±¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë¸ú¤¤¤Æ¤¤¤Þ¤¹¡£</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Î¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></h2>
+
+ <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> ¤Î¥µ¡¼¥Ó¥¹¤ò
+ <em>ɬÍפȤ·¤Þ¤¹</em>¡£
+ ¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤ò»È¤¦¤È¡¢¥Ð¥é¥ó¥µ¤Î¥á¥ó¥Ð¡¼¤ÎưŪ¤Ê¹¹¿·¤¬
+ ¤Ç¤­¤Þ¤¹¡£¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤ò»È¤Ã¤Æ¡¢¥Ð¥é¥ó¥¹·¸¿ô (lbfactor)
+ ¤òÊѹ¹¤·¤¿¤ê¡¢¥á¥ó¥Ð¡¼¤òÊѹ¹¤·¤¿¤ê¡¢ÆÃÄê¤Î¥á¥ó¥Ð¡¼¤ò
+ ¥ª¥Õ¥é¥¤¥ó¥â¡¼¥É¤Ë¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£</p>
+
+ <p>¤Ç¤¹¤«¤é¡¢¥í¡¼¥É¥Ð¥é¥ó¥µ´ÉÍýµ¡Ç½¤ò»È¤¤¤¿¤±¤ì¤Ð¡¢
+ <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> ¤È <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>
+ ¤ò¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
+
+ <p>foo.com ¥É¥á¥¤¥ó¤Î¥Ö¥é¥¦¥¶¤«¤é¥í¡¼¥É¥Ð¥é¥ó¥µ´ÉÍýµ¡Ç½¤ò
+ »È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¡¼¥É¤ò <code>httpd.conf</code>
+ ¤ËÄɲä·¤Þ¤¹¡£</p>
+<div class="example"><p><code>
+ &lt;Location /balancer-manager&gt;<br />
+ SetHandler balancer-manager<br />
+<br />
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from .foo.com<br />
+ &lt;/Location&gt;
+</code></p></div>
+
+ <p>¤³¤¦¤¹¤ë¤È¡¢<code>http://your.server.name/balancer-manager</code>
+ ¤Î¥Ú¡¼¥¸·Ðͳ¤Ç¡¢¥¦¥§¥Ö¥Ö¥é¥¦¥¶¤«¤é¥í¡¼¥É¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Ë
+ ¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_balancer.xml.meta b/docs/manual/mod/mod_proxy_balancer.xml.meta
index f3f7b32013..086a80711d 100644
--- a/docs/manual/mod/mod_proxy_balancer.xml.meta
+++ b/docs/manual/mod/mod_proxy_balancer.xml.meta
@@ -7,6 +7,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">ja</variant>
+ <variant>ja</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/examples.html.ja.euc-jp b/docs/manual/vhosts/examples.html.ja.euc-jp
index a779e4bab2..7d387eeeb2 100644
--- a/docs/manual/vhosts/examples.html.ja.euc-jp
+++ b/docs/manual/vhosts/examples.html.ja.euc-jp
@@ -22,15 +22,12 @@
<a href="../ja/vhosts/examples.html" title="Japanese">&nbsp;ja&nbsp;</a> |
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
</div>
-<div class="outofdate">This translation may be out of date. Check the
- English version for recent changes.</div>
<p>¤³¤Îʸ½ñ¤Ï¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤ÎºÝ¤Ë
¤è¤¯¤¢¤ë¼ÁÌä¤ËÅú¤¨¤ë¤â¤Î¤Ç¤¹¡£ÁÛÄꤷ¤Æ¤¤¤ëÂÐ¾Ý¤Ï <a href="name-based.html">̾Á°¥Ù¡¼¥¹</a> ¤ä <a href="ip-based.html">IP ¥Ù¡¼¥¹</a> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤Ã¤Æ
°ì¤Ä¤Î¥µ¡¼¥Ð¤ÇÊ£¿ô¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò±¿ÍѤ·¤Æ¤¤¤ë¾õ¶·¤Ç¤¹¡£
- °ì¤Ä¤Î¥×¥í¥­¥·¥µ¡¼¥Ð¤Î¸å¤í¤ÇÊ£¿ô¤Î¥µ¡¼¥Ð¤ò±¿ÍѤ¹¤ë¥µ¥¤¥È¸þ¤±¤Î
- ÀâÌÀ¤Ï¶á¡¹½ñ¤«¤ì¤ë¤Ï¤º¤Ç¤¹¡£</p>
+ </p>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#purename">°ì¤Ä¤Î IP ¥¢¥É¥ì¥¹¤Ç¤¤¤¯¤Ä¤«¤Î̾Á°¥Ù¡¼¥¹¤Î
@@ -45,6 +42,8 @@
¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#mixed">̾Á°¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤òº®¤¼¤¿
¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxy"><code>Virtual_host</code> ¤È
+ mod_proxy ¤òÊ»ÍѤ¹¤ë</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#default"><code>_default_</code> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
»È¤¦</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#migrate">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤«¤é IP ¥Ù¡¼¥¹¤Î
@@ -320,7 +319,7 @@
<p>¥µ¡¼¥Ð¥Þ¥·¥ó¤Ï¤½¤ì¤¾¤ì <code>www.example.com</code> ¤È
<code>www.example.org</code> ¤Ë¤½¤ì¤¾¤ì²ò·è¤µ¤ì¤ë¡¢IP ¥¢¥É¥ì¥¹¤òÆó¤Ä
- (<code>192.168.1.1</code> ¤È <code>172.20.30.40</code>) »ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+ (<code>172.20.30.40</code> ¤È <code>172.20.30.50</code>) »ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¤É¤Á¤é¤â¥Ý¡¼¥È 80 ¤È 8080 ¤Ç¥Û¥¹¥È¤òÁö¤é¤»¤Þ¤¹¡£</p>
<div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
@@ -414,6 +413,27 @@
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
+<h2><a name="proxy" id="proxy"><code>Virtual_host</code> ¤È
+ mod_proxy ¤òÊ»ÍѤ¹¤ë</a></h2>
+
+ <p>¼¡¤ÎÎã¤Ï¡¢¥Õ¥í¥ó¥È¦¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¾¤Î¥Þ¥·¥ó¤Ø¥×¥í¥¯¥·¤·¤Þ¤¹¡£
+ Îã¤Ç¤Ï <code>192.168.111.2</code> ¤Î¥Þ¥·¥ó¤Ç¤Ï¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È̾¤Ï
+ Ʊ¤¸Ì¾Á°¤ÇÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£Ê£¿ô¤Î¥Û¥¹¥È̾¤ò°ìÂæ¤Î¥Þ¥·¥ó¤Ë¥×¥í¥¯¥·¤¹¤ë
+ ¾ì¹ç¤Ï¡¢<code class="directive"><a href="../mod/mod_proxy.html#proxypreservehost on">ProxyPreserveHost On</a></code>
+ ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¡¢´õ˾¤Î¥Û¥¹¥È̾¤òÅϤ»¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+ </p>
+
+ <div class="example"><p><code>
+ &lt;VirtualHost *:*&gt;<br />
+ ProxyPreserveHost On<br />
+ ProxyPass / http://192.168.111.2<br />
+ ProxyPassReverse / http://192.168.111.2/<br />
+ ServerName hostname.example.com<br />
+ &lt;/VirtualHost&gt;
+ </code></p></div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
<h2><a name="default" id="default"><code>_default_</code> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
»È¤¦</a></h2>
@@ -475,7 +495,7 @@
</code></p></div>
<p>80 È֥ݡ¼¥È¤Î¥Ç¥Õ¥©¥ë¥È¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È (¥ï¥¤¥ë¥É¥«¡¼¥É¥Ý¡¼¥È¤Î
- ¥Ç¥Õ¥©¥ë¥È¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤è¤ê¤âÁ°¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó) ¤Ï
+ ¥Ç¥Õ¥©¥ë¥È¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤è¤ê¤âÁ°¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð<em>¤Ê¤ê¤Þ¤»¤ó</em>) ¤Ï
̤»ØÄê¤Î IP ¥¢¥É¥ì¥¹¤ËÁ÷¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤Þ¤¹¡£
¼ç¥µ¡¼¥Ð¤Ï¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤Þ¤»¤ó¡£</p>
diff --git a/docs/manual/vhosts/examples.xml.meta b/docs/manual/vhosts/examples.xml.meta
index 4995be9a55..9d727c0674 100644
--- a/docs/manual/vhosts/examples.xml.meta
+++ b/docs/manual/vhosts/examples.xml.meta
@@ -7,7 +7,7 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">ja</variant>
+ <variant>ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>