Update Japanese translations.

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

diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja
index d88bc9663cce1a4cdc363e1096b0216025ad5479..0c29239f3bb3417a28ab9d336c643cacfbc2cbd2 100644 (file)
--- a/docs/manual/howto/htaccess.xml.ja
+++ b/docs/manual/howto/htaccess.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: 151408:167970 (outdated) -->
+<!-- English Revision: 167970 -->
 
 <!--
- Copyright 2003-2005 The Apache Software Foundation or its licensors,
-                     as applicable.
+ Copyright 2003-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.
@@ -256,6 +256,49 @@
     <code>/www/htdocs/example1/example2</code> \e$B$G$O\e(B CGI \e$B$N<B9T$O\e(B
     \e$B5v2D$5$l$^$;$s!#$3$l$O!"\e(B<code>Options Includes</code> \e$B$N$_$,\e(B
     \e$B8zNO$r;}$A!"$=$l$,$9$Y$F$N0JA0$N@_Dj$r>e=q$-$9$k$+$i$G$9!#\e(B</p>
+
+    <section id="merge"><title>\e$B%a%$%s@_Dj%U%!%$%k$KBP$9$k\e(B
+    .htaccess \e$B$N%^!<%8\e(B</title>
+
+    <p>As discussed in the documentation on <a
+    href="../sections.html">Configuration Sections</a>,
+    <code>.htaccess</code> files can override the <directive
+    type="section" module="core">Directory</directive> sections for
+    the corresponding directory, but will be overriden by other types
+    of configuration sections from the main configuration files.  This
+    fact can be used to enforce certain configurations, even in the
+    presence of a liberal <directive
+    module="core">AllowOverride</directive> setting.  For example, to
+    prevent script execution while allowing anything else to be set in
+    <code>.htaccess</code> you can use:</p>
+    <p><a href="../sections.html">\e$B%;%/%7%g%s$N@_Dj\e(B</a>
+    \e$B$K5-:\$5$l$F$$$k$h$&$K!"\e(B<code>.htaccess</code> \e$B%U%!%$%k$r;H$C$F\e(B
+    <directive type="section" module="core">Directory</directive>
+    \e$B%;%/%7%g%s$N@_Dj$r%G%#%l%/%H%jKh$K>e=q$-$G$-$^$9$,!"\e(B
+    \e$B%a%$%s@_Dj%U%!%$%kCf$K$"$k!"B>$N<oN`$N@_Dj%;%/%7%g%s$K$h$C$F\e(B
+    \e$B$5$i$K>e=q$-$5$l$k$3$H$b$"$j$^$9!#\e(B
+    \e$B$3$NFCD'$r;H$C$F!"\e(B
+    <directive module="core">AllowOverride</directive>
+    \e$B$G<+M3EY$N9b$$@_Dj$,$"$C$?$H$7$F$b!"$"$kFCDj$N@_Dj$,3N<B$K\e(B
+    \e$BH?1G$5$l$k$h$&$K$G$-$^$9!#Nc$($P!"\e(BCGI \e$B%9%/%j%W%H$N<B9T$O\e(B
+    \e$BIT5v2D$K!"$+$D!"\e(B<code>.htaccess</code> \e$B$G$=$NB>$N9`L\$O\e(B
+    \e$B@_Dj$G$-$k$h$&$K!"$H$$$&>l9g$O<!$N$h$&$K$G$-$^$9\e(B :</p>
+    
+    <example>
+&lt;Directory /&gt;<br />
+<indent>
+Allowoverride All<br />
+</indent>
+&lt;/Directory&gt;<br />
+<br />
+&lt;Location /&gt;<br />
+<indent>
+Options +IncludesNoExec -ExecCGI<br />
+</indent>
+&lt;/Location&gt;
+    </example>
+</section>
+
 </section>
 
 <section id="auth"><title>\e$BG'>Z$NNc\e(B</title>

diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja
index e47fc9946a649d847a5b3e9aa686997ac836add4..ccf6cda4f900bbfef571a5db177012e2c82a2f93 100644 (file)
--- a/docs/manual/logs.xml.ja
+++ b/docs/manual/logs.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: 151408:165671 (outdated) -->
+<!-- English Revision: 165671 -->
 
 <!--
- Copyright 2002-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.
@@ -242,7 +242,7 @@
        (<code>%t</code>)</dt>
 
        <dd>
-         \e$B%5!<%P$,%j%/%(%9%H$N=hM}$r=*$($?;~9o$G$9!#=q<0$O\e(B:
+         \e$B%5!<%P$,%j%/%(%9%H$r<u$1<h$C$?;~9o$G$9!#=q<0$O\e(B:
 
            <p class="indent">
              <code>[day/month/year:hour:minute:second zone]<br />

diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja
index 01c13eab5dc54572e9767e7ff90697f056aa336d..03efa3a1a3d362f34bb2f20191d0b6470f194064 100644 (file)
--- a/docs/manual/vhosts/ip-based.xml.ja
+++ b/docs/manual/vhosts/ip-based.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: 151408 -->
+<!-- English Revision: 169327 -->
 
 <!--
- 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.
@@ -143,8 +143,8 @@
     \e$BMs$rD4$Y$F$/$@$5$$!#\e(B</p>
 
     <p><a href="../suexec.html">suEXEC\e$B%i%C%Q!<\e(B</a>\e$B$r;H$C$F$$$k>l9g$O!"\e(B
-    <directive module="mpm_common">User</directive> \e$B$H\e(B <directive
-    module="mpm_common">Group</directive> \e$B%G%#%l%/%F%#%V$r\e(B VirtualHost
+    <directive module="mod_suexec">SuexecUserGroup</directive>
+    \e$B%G%#%l%/%F%#%V$r\e(B VirtualHost
     \e$B%G%#%l%/%F%#%V$NCf$G;HMQ$9$k$3$H$,$G$-$^$9!#\e(B</p>
 
     <p><em>\e$B%;%-%e%j%F%#\e(B:</em> \e$B%m%0%U%!%$%k$r=q$/>l=j$r;XDj$9$k$H$-$O!"\e(B