update Japanese translation.

Submitted by: kawai
Reviewed by: OKANO Takayoshi <kano@na.rim.or.jp>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178722 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index c34cec15f5349aafa82f4c6e428539c4afc5e75c..b53052872ab300dad1b2460313dae4b351325677 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml.ja
+++ b/docs/manual/mod/mod_proxy_balancer.xml.ja
@@ -1,11 +1,11 @@
 <?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: 105989:153116 (outdated) -->
+<!-- English Revision: 153116 -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2004-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
     \e$B$$$J$1$l$P$$$1$^$;$s!#\e(B</p>
 
     <note type="warning"><title>\e$B7Y9p\e(B</title>
-      <p><a href="#access"
+      <p><a href="mod_proxy.html#access"
       >\e$B0BA4$J%5!<%P$K$9$k\e(B</a>\e$B$^$G%W%m%/%75!G=$OM-8z$K$7$J$$$G$/$@$5$$!#\e(B
       \e$B%*!<%W%s%W%m%-%7%5!<%P$O$"$J$?<+?H$N%M%C%H%o!<%/$K$H$C$F$b!"\e(B
       \e$B%$%s%?!<%M%C%HA4BN$K$H$C$F$b4m81$G$9!#\e(B</p>
@@ -47,4 +47,261 @@
 </summary>
 <seealso><module>mod_proxy</module></seealso>
 
+<section id="scheduler">
+    <title>\e$B%m!<%I%P%i%s%5$N%9%1%8%e!<%i$N%"%k%4%j%:%`\e(B</title>
+    <p>\e$B8=;~E@$G$O\e(B 2 \e$B<oN`$N%m!<%I%P%i%s%5%9%1%8%e!<%i%"%k%4%j%:%`$+$iA*$Y$^$9!#\e(B
+    \e$B%j%/%(%9%H2s?t$K$h$k$b$N\e(B <transnote>Request Counting</transnote>
+    \e$B$H!"%H%i%U%#%C%/NL$K$h$k$b$N\e(B <transnote>Weighted Traffic Counting</transnote>
+    \e$B$,$"$j$^$9!#%P%i%s%5$N@_Dj\e(B <code>lbmethod</code> \e$BCM$G!"$I$A$i$r;H$&$+;XDj$7$^$9!#\e(B
+    \e$B>\:Y$O\e(B <directive module="mod_proxy">Proxy</directive> \e$B%G%#%l%/%F%#%V$r\e(B
+    \e$B;2>H$7$F$/$@$5$$!#\e(B</p>
+
+</section>
+
+<section id="requests">
+    <title>Request Counting \e$B%"%k%4%j%:%`\e(B</title>
+    <p><code>lbmethod=requests</code> \e$B$GM-8z$K$J$j$^$9!#\e(B
+    \e$B$3$N%9%1%8%e!<%i$NGX7J$K$"$k9M$(J}$O!"MM!9$J%o!<%+!<$,$=$l$>$l!"\e(B
+    \e$B@_Dj$5$l$F$$$kJ,C4%j%/%(%9%H?t$r$-$A$s$H<u$1<h$l$k$h$&$K!"\e(B
+    \e$B%j%/%(%9%H$r07$&$H$$$&9M$(J}$G$9!#<!$N$h$&$KF0:n$7$^$9\e(B:</p>
+
+    <p><dfn>lbfactor</dfn> \e$B$O!"\e(B<em>\e$B$I$NDxEY%o!<%+!<$K;E;v$r?6$k$+\e(B</em>
+    \e$B$D$^$j\e(B<em>\e$B%o!<%+!<$N%/%*!<%?\e(B</em>\e$B$r;X$7$^$9!#$3$NCM$O\e(B "\e$BJ,C4\e(B" 
+    \e$BNL$rI=$9@55,2=$5$l$?CM$G$9!#\e(B</p>
+
+    <p><dfn>lbstatus</dfn> \e$B$O!"\e(B<em>\e$B%o!<%+!<$N%/%*!<%?$rK~$?$9$?$a$K\e(B
+    \e$B$I$N$0$i$$5^$.$GF/$+$J$1$l$P$J$i$J$$$+\e(B</em>\e$B$r;X$7$^$9!#\e(B</p>
+
+    <p><dfn>\e$B%o!<%+!<\e(B</dfn>\e$B$O%m!<%I%P%i%s%5$N%a%s%P$G!"DL>o$O!"\e(B
+    \e$B%5%]!<%H$5$l$k%W%m%H%3%k$N$&$A$N0l$D$rDs6!$7$F$$$k%j%b!<%H%[%9%H$G$9!#\e(B
+    </p>
+
+    <p>\e$B$^$:8D!9$N%o!<%+!<$K%o!<%+!<%/%*!<%?$r3d$j?6$j!"$I$N%o!<%+!<$,:G$b5^$.$G\e(B
+    \e$BF/$+$J$1$l$P$J$i$J$$$+\e(B (lbstatus \e$B$,:GBg$N$b$N\e(B) \e$B$rD4$Y$^$9!#\e(B
+    \e$B<!$K;E;v$r$9$k$h$&$K$3$N%o!<%+!<$rA*Br$7!"A*Br$7$?%o!<%+!<$N\e(B lbstatus 
+    \e$B$rA4BN$K3d$j?6$C$?$V$s$@$1:9$70z$-$^$9!#$G$9$+$i!"\e(Blbstatus \e$B$NAmNL$O\e(B
+    \e$B7k2LE*$KJQ2=$7$^$;$s\e(B(*)\e$B$7!"%j%/%(%9%H$O4|BTDL$j$KJ,;6$5$l$^$9!#\e(B</p>
+
+    <p>\e$B$"$k%o!<%+!<$,L58z$K$J$C$F$b!"B>$N$b$N$O@5>o$K%9%1%8%e!<%k$5$lB3$1$^$9!#\e(B
+    </p>
+
+    <example><pre><code>for each worker in workers
+    worker lbstatus += worker lbfactor
+    total factor    += worker lbfactor
+    if worker lbstatus > candidate lbstatus
+        candidate = worker
+
+candidate lbstatus -= total factor</code></pre>
+    </example>
+
+    <p>\e$B%P%i%s%5$r<!$N$h$&$K@_Dj$7$?>l9g\e(B:</p>
+    
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th>
+        <th>d</th></tr>
+    <tr><th>lbfactor</th>
+        <td>25</td>
+        <td>25</td>
+        <td>25</td>
+        <td>25</td></tr>
+    <tr><th>lbstatus</th>
+        <td>0</td>
+        <td>0</td>
+        <td>0</td>
+        <td>0</td></tr>
+    </table>
+
+    <p>\e$B$=$7$F\e(B <var>b</var> \e$B$,L58z$K$J$C$?>l9g!"<!$N$h$&$J%9%1%8%e!<%k$,\e(B
+    \e$B9T$o$l$^$9!#\e(B</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th>
+        <th>d</th></tr>
+    <tr><th>lbstatus</th>
+        <td><em>-50</em></td>
+        <td>0</td>
+        <td>25</td>
+        <td>25</td></tr>
+    <tr><th>lbstatus</th>
+        <td>-25</td>
+        <td>0</td>
+        <td><em>-25</em></td>
+        <td>50</td></tr>
+    <tr><th>lbstatus</th>
+        <td>0</td>
+        <td>0</td>
+        <td>0</td>
+        <td><em>0</em></td></tr>
+    <tr><td colspan="5">(repeat)</td></tr>
+    </table>
+
+    <p>\e$B$D$^$j$3$N$h$&$K%9%1%8%e!<%k$5$l$^$9\e(B: <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> ... \e$B<!$NE@$KCm0U$7$F$/$@$5$$\e(B:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th>
+        <th>d</th></tr>
+    <tr><th>lbfactor</th>
+        <td>25</td>
+        <td>25</td>
+        <td>25</td>
+        <td>25</td></tr>
+    </table>
+
+    <p>\e$B$3$N5sF0$O!"<!$N@_Dj$HA4$/F1$8$K$J$j$^$9\e(B:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th>
+        <th>d</th></tr>
+    <tr><th>lbfactor</th>
+        <td>1</td>
+        <td>1</td>
+        <td>1</td>
+        <td>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> \e$B$OA4$F@55,2=$5$l$?$b$N$G!"\e(B
+    \e$BB>$H$NAjBPCM$@$+$i$G$9!#<!$N@_Dj$G$O\e(B:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th></tr>
+    <tr><th>lbfactor</th>
+        <td>1</td>
+        <td>4</td>
+        <td>1</td></tr>
+    </table>
+
+    <p>\e$B%o!<%+!<\e(B <var>b</var> \e$B$O!"J?6Q$7$F!"\e(B<var>a</var> \e$B$H\e(B <var>c</var>
+    \e$B$N\e(B 4 \e$BG\$N?t$N%j%/%(%9%H$r<u$1;}$D$3$H$K$J$j$^$9!#\e(B</p>
+
+    <p>\e$B<!$N$h$&$JHsBP>N$J@_Dj$G$O!"$3$&$J$k$HM=A[$5$l$k$G$7$g$&\e(B:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th></tr>
+    <tr><th>lbfactor</th>
+        <td>70</td>
+        <td>30</td></tr>
+    <tr><td colspan="2">&nbsp;</td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>-30</em></td>
+        <td>30</td></tr>
+    <tr><th>lbstatus</th>
+        <td>40</td>
+        <td><em>-40</em></td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>10</em></td>
+        <td>-10</td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>-20</em></td>
+        <td>20</td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>-50</em></td>
+        <td>50</td></tr>
+    <tr><th>lbstatus</th>
+        <td>20</td>
+        <td><em>-20</em></td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>-10</em></td>
+        <td>10</td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>-40</em></td>
+        <td>40</td></tr>
+    <tr><th>lbstatus</th>
+        <td>30</td>
+        <td><em>-30</em></td></tr>
+    <tr><th>lbstatus</th>
+        <td><em>0</em></td>
+        <td>0</td></tr>
+    <tr><td colspan="3">(repeat)</td></tr>
+    </table>
+
+    <p>\e$B%9%1%8%e!<%k$O\e(B 10 \e$B%9%1%8%e!<%k8e$K7+$jJV$5$l!"\e(B<var>a</var> 7 \e$B2s$H\e(B
+    <var>b</var> 3 \e$B2s$G$^$P$i$KA*$P$l$^$9!#\e(B</p>
+</section>
+
+<section id="traffic">
+    <title>Weighted Traffic Counting \e$B%"%k%4%j%:%`\e(B</title>
+    <p><code>lbmethod=traffic</code> \e$B$GM-8z$K$J$j$^$9!#\e(B
+    \e$B$3$N%9%1%8%e!<%i$NGX7J$K$"$k9M$(J}$O!"\e(BRequest Counting 
+    \e$B$HHs>o$K;w$F$$$^$9$,!"<!$N0c$$$,$"$j$^$9\e(B:</p>
+
+    <p><dfn>lbfactor</dfn> \e$B$O\e(B <em>\e$B$I$l$@$1$N%P%$%H?t$N%H%i%U%#%C%/NL$r!"\e(B
+    \e$B$3$N%o!<%+!<$K=hM}$7$F$b$i$$$?$$$+\e(B</em> \e$B$rI=$7$^$9!#\e(B
+    \e$B$3$NCM$bF1MM$K@55,2=$5$l$?CM$G!"%o!<%+!<A4BN$N$&$A$G$N\e(B "\e$BJ,C4\e(B"
+    \e$BNL$rI=8=$7$F$$$^$9!#%j%/%(%9%H?t$rC1=c$K?t$($kBe$o$j$K!"\e(B
+    \e$B$I$l$@$1$NE>AwNL$r=hM}$7$?$+$r?t$($^$9!#\e(B</p>
+
+    <p>\e$B<!$N$h$&$K%P%i%s%5$r@_Dj$7$?>l9g\e(B:</p>
+    
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th></tr>
+    <tr><th>lbfactor</th>
+        <td>1</td>
+        <td>2</td>
+        <td>1</td></tr>
+    </table>
+
+    <p><var>b</var> \e$B$K$O\e(B <var>a</var> \e$B$d\e(B <var>c</var> \e$B$N\e(B 2 \e$BG\\e(B
+    \e$B=hM}$7$F$[$7$$$H$$$&$3$H$K$J$j$^$9!#\e(B
+    <var>b</var> \e$B$O\e(B 2 \e$BG\$N\e(B I/O \e$B$r=hM}$9$k$H$$$&0UL#$K$J$j!"\e(B
+    2 \e$BG\$N%j%/%(%9%H?t$r=hM}$9$k$H$$$&$3$H$K$O$J$j$^$;$s!#\e(B
+    \e$B$G$9$+$i%j%/%(%9%H$H%l%9%]%s%9$N%5%$%:$,!"\e(B
+    \e$B=E$_IU$1$H?6$jJ,$1$N%"%k%4%j%:%`$K8z$$$F$$$^$9!#\e(B</p>
+
+</section>
+
+<section id="enable">
+    <title>\e$B%P%i%s%5%^%M!<%8%c$N%5%]!<%H$rM-8z$K$9$k\e(B</title>
+    <p>\e$B$3$N%b%8%e!<%k$O\e(B <module>mod_status</module> \e$B$N%5!<%S%9$r\e(B
+    <em>\e$BI,MW$H$7$^$9\e(B</em>\e$B!#\e(B
+    \e$B%P%i%s%5%^%M!<%8%c$r;H$&$H!"%P%i%s%5$N%a%s%P!<$NF0E*$J99?7$,\e(B
+    \e$B$G$-$^$9!#%P%i%s%5%^%M!<%8%c$r;H$C$F!"%P%i%s%978?t\e(B (lbfactor)
+    \e$B$rJQ99$7$?$j!"%a%s%P!<$rJQ99$7$?$j!"FCDj$N%a%s%P!<$r\e(B
+    \e$B%*%U%i%$%s%b!<%I$K$7$?$j$G$-$^$9!#\e(B</p>
+
+    <p>\e$B$G$9$+$i!"%m!<%I%P%i%s%54IM}5!G=$r;H$$$?$1$l$P!"\e(B
+    <module>mod_status</module> \e$B$H\e(B <module>mod_proxy_balancer</module>
+    \e$B$r%5!<%P$KAH$_9~$^$J$1$l$P$J$j$^$;$s!#\e(B</p>
+
+    <p>foo.com \e$B%I%a%$%s$N%V%i%&%6$+$i%m!<%I%P%i%s%54IM}5!G=$r\e(B
+    \e$B;H$($k$h$&$K$9$k$K$O!"<!$N$h$&$J%3!<%I$r\e(B <code>httpd.conf</code>
+    \e$B$KDI2C$7$^$9!#\e(B</p>
+<example>
+    &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;
+</example>
+
+    <p>\e$B$3$&$9$k$H!"\e(B<code>http://your.server.name/balancer-manager</code>
+    \e$B$N%Z!<%87PM3$G!"%&%'%V%V%i%&%6$+$i%m!<%I%P%i%s%5%^%M!<%8%c$K\e(B
+    \e$B%"%/%;%9$G$-$k$h$&$K$J$j$^$9!#\e(B</p>
+</section>
+
 </modulesynopsis>

diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja
index 7d812b0b0302444e10e92c6101bac8ac40f9503e..0e1b903c74085de50cd89ea9b37f32af363fd84d 100644 (file)
--- a/docs/manual/vhosts/examples.xml.ja
+++ b/docs/manual/vhosts/examples.xml.ja
@@ -1,11 +1,11 @@
 <?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: 105989:151408 (outdated) -->
+<!-- English Revision: 151408  -->
 
 <!--
- Copyright 2004-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+ applicable.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@
     href="name-based.html">\e$BL>A0%Y!<%9\e(B</a> \e$B$d\e(B <a
     href="ip-based.html">IP \e$B%Y!<%9\e(B</a> \e$B$N%P!<%A%c%k%[%9%H$r;H$C$F\e(B
     \e$B0l$D$N%5!<%P$GJ#?t$N%&%'%V%5%$%H$r1?MQ$7$F$$$k>u67$G$9!#\e(B
-    \e$B0l$D$N%W%m%-%7%5!<%P$N8e$m$GJ#?t$N%5!<%P$r1?MQ$9$k%5%$%H8~$1$N\e(B
-    \e$B@bL@$O6a!9=q$+$l$k$O$:$G$9!#\e(B</p>
+    </p>
 
 </summary>
 
@@ -302,7 +301,7 @@
 
     <p>\e$B%5!<%P%^%7%s$O$=$l$>$l\e(B <code>www.example.com</code> \e$B$H\e(B
     <code>www.example.org</code> \e$B$K$=$l$>$l2r7h$5$l$k!"\e(BIP \e$B%"%I%l%9$rFs$D\e(B
-    (<code>192.168.1.1</code> \e$B$H\e(B <code>172.20.30.40</code>) \e$B;}$C$F$$$^$9!#\e(B
+    (<code>172.20.30.40</code> \e$B$H\e(B <code>172.20.30.50</code>) \e$B;}$C$F$$$^$9!#\e(B
     \e$B$I$A$i$b%]!<%H\e(B 80 \e$B$H\e(B 8080 \e$B$G%[%9%H$rAv$i$;$^$9!#\e(B</p>
 
     <example>
@@ -396,6 +395,27 @@
 
     </section>
 
+    <section id="proxy"><title><code>Virtual_host</code> \e$B$H\e(B
+    mod_proxy \e$B$rJ;MQ$9$k\e(B</title>
+
+    <p>\e$B<!$NNc$O!"%U%m%s%HB&$N%P!<%A%c%k%[%9%H$GB>$N%^%7%s$X%W%m%/%7$7$^$9!#\e(B
+    \e$BNc$G$O\e(B <code>192.168.111.2</code> \e$B$N%^%7%s$G$O%P!<%A%c%k%[%9%HL>$O\e(B
+    \e$BF1$8L>A0$G@_Dj$5$l$F$$$^$9!#J#?t$N%[%9%HL>$r0lBf$N%^%7%s$K%W%m%/%7$9$k\e(B
+    \e$B>l9g$O!"\e(B<directive module="mod_proxy">ProxyPreserveHost On</directive>
+    \e$B%G%#%l%/%F%#%V$r;H$C$F!"4uK>$N%[%9%HL>$rEO$;$k$h$&$K$J$j$^$9!#\e(B
+    </p>
+
+    <example>
+    &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;
+    </example>
+
+    </section>
+
     <section id="default"><title><code>_default_</code> \e$B$N%P!<%A%c%k%[%9%H$r\e(B
     \e$B;H$&\e(B</title> 
 
@@ -457,7 +477,7 @@
     </example>
 
     <p>80 \e$BHV%]!<%H$N%G%U%)%k%H%P!<%A%c%k%[%9%H\e(B (\e$B%o%$%k%I%+!<%I%]!<%H$N\e(B
-    \e$B%G%U%)%k%H%P!<%A%c%k%[%9%H$h$j$bA0$K=q$+$l$F$$$J$1$l$P$J$j$^$;$s\e(B) \e$B$O\e(B
+    \e$B%G%U%)%k%H%P!<%A%c%k%[%9%H$h$j$bA0$K=q$+$l$F$$$J$1$l$P\e(B<em>\e$B$J$j$^$;$s\e(B</em>) \e$B$O\e(B
     \e$BL$;XDj$N\e(B IP \e$B%"%I%l%9$KAw$i$l$?$9$Y$F$N%j%/%(%9%H$r07$$$^$9!#\e(B
     \e$B<g%5!<%P$O%j%/%(%9%H$r07$$$^$;$s!#\e(B</p>
     </section>