update transformation

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

diff --git a/docs/manual/mod/core.html.ja.euc-jp b/docs/manual/mod/core.html.ja.euc-jp
index 6bf670ae613b0af8045095b687772f5e057b108f..1f8b1dc73885b2acf27750a08593f9fa3488955c 100644 (file)
--- a/docs/manual/mod/core.html.ja.euc-jp
+++ b/docs/manual/mod/core.html.ja.euc-jp
@@ -25,8 +25,6 @@
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/core.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>¾ï¤Ë»ÈÍѲÄǽ¤Ê Apache HTTP ¥µ¡¼¥Ð¤Î¥³¥¢µ¡Ç½</td></tr>
 <tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr></table>
 </div>
@@ -201,8 +199,8 @@
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="AddDefaultCharset" id="AddDefaultCharset">AddDefaultCharset</a> <a name="adddefaultcharset" id="adddefaultcharset">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÌÀ¼¨Åª¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤±þÅú¤ËÄɲ䵤ì¤ë
-¥Ç¥Õ¥©¥ë¥È¤Îʸ»ú¥»¥Ã¥È</td></tr>
+<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ì¥¹¥Ý¥ó¥¹¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>text/plain</code> ¤¢¤ë¤¤¤Ï
+<code>text/html</code> ¤Î¾ì¹ç¤ËÄɲ乤ë¥Ç¥Õ¥©¥ë¥È¤Î charset ¥Ñ¥é¥á¡¼¥¿</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddDefaultCharset On|Off|<var>charset</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AddDefaultCharset Off</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
@@ -210,19 +208,41 @@
 <tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
 </table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢HTTP ¥Ø¥Ã¥À¤Ë¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¥Ñ¥é¥á¡¼¥¿¤ò
-    »ý¤¿¤Ê¤¤±þÅú¤ËÄɲ䵤ì¤ëʸ»ú¥»¥Ã¥È¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¥É¥­¥å¥á¥ó¥ÈÆâ¤Î META ¥¿¥°¤Ç»ØÄꤵ¤ì¤¿¤É¤Î¤è¤¦¤Êʸ»ú¥»¥Ã¥È
-    ¤â̵¸ú¤Ë¤·¤Þ¤¹¡£
-    <code>AddDefaultCharset Off</code> ¤È¤¤¤¦ÀßÄê¤Ë¤è¤ê¡¢¤³¤Îµ¡Ç½¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <code>AddDefaultCharset On</code> ¤Ë¤¹¤ì¤Ð¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÍ×µáÄ̤ê
-    Apache ÆâÉô¤Î¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È <code>iso-8859-1</code> ¤ËÀßÄꤷ¤Þ¤¹¡£
-    ¤Þ¤¿¡¢Â¾¤Î <var>charset</var> ¤â»ØÄê¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð:</p>
+    <p>¥ì¥¹¥Ý¥ó¥¹¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>text/plain</code> 
+    ¤¢¤ë¤¤¤Ï <code>text/html</code> 
+    ¤Î¾ì¹ç¤Ë¸Â¤ê¤Þ¤¹¤¬¡¢¥ì¥¹¥Ý¥ó¥¹¤ËÄɲ乤ë¥á¥Ç¥£¥¢¥¿¥¤¥×¤Îʸ»ú¥»¥Ã¥È¥Ñ¥é¥á¡¼¥¿
+    (ʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î̾Á°) ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤷ¤Þ¤¹¡£
+    ¤³¤ì¤Ï¥ì¥¹¥Ý¥ó¥¹ <span class="transnote">(<em>ÌõÃí:</em> ¥ì¥¹¥Ý¥ó¥¹¤Î HTML)</span> Æâ¤Ç <code>META</code> 
+    Í×ÁǤǻØÄꤵ¤ì¤¿¡¢¤É¤Î¤è¤¦¤Êʸ»ú¥»¥Ã¥È¤â̵¸ú¤Ë¤·¤Þ¤¹¤¬¡¢
+    ºÇ½ªÅª¤ÊµóÆ°¤Ï¥æ¡¼¥¶¤Î¥¯¥é¥¤¥¢¥ó¥È¦¤ÎÀßÄê¤Ç·è¤Þ¤ê¤Þ¤¹¡£
+    ¤³¤Îµ¡Ç½¤Ï <code>AddDefaultCharset Off</code> ¤È¤¤¤¦ÀßÄê¤Ç̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
+    <code>AddDefaultCharset On</code> ¤Ë¤¹¤ì¤Ð¡¢
+    Apache ÆâÉô¤Î¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È <code>iso-8859-1</code> ¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
+    ¤½¤Î¾ <var>charset</var> ¤Ë»ØÄê¤Ç¤­¤ëÃͤǤ¢¤ì¤Ð¡¢¤É¤ó¤ÊÃͤǤâ»È¤¨¤Þ¤¹¡£
+    »ØÄꤹ¤ëÃͤϡ¢MIME ¥á¥Ç¥£¥¢¥¿¥¤¥×¤È¤·¤Æ»È¤ï¤ì¤ë
+    <a href="http://www.iana.org/assignments/character-sets">IANA 
+    ¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ëʸ»ú¥»¥Ã¥È̾</a>¤Î¤¦¤Á¤Î°ì¤Ä¤Ë¤¹¤Ù¤­¤Ç¤¹¡£
+    Î㤨¤Ð:</p>
 
     <div class="example"><p><code>
       AddDefaultCharset utf-8
     </code></p></div>
 
+    <p><code class="directive">AddDefaultCharset</code> ¤ò»È¤¦¤È¤­¤Ï¡¢Á´¤Æ¤Î¥Æ¥­¥¹¥È¥ê¥½¡¼¥¹¤¬
+    »ØÄꤹ¤ëʸ»ú¥¨¥ó¥³¡¼¥É¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Èʬ¤«¤Ã¤Æ¤¤¤Æ¡¢¤«¤Ä¡¢
+    ¥ê¥½¡¼¥¹¤Î¸Ä¡¹¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¤Î¤¬ÂçÊѤʾì¹ç¤Î¤ß¤Ç¤¹¡£
+    Îã¤òµó¤²¤ë¤È¡¢¥ì¥¬¥·¡¼¤Ê CGI ¥¹¥¯¥ê¥×¥È¤Ê¤É¤Î¡¢Æ°Åª¤ËÀ¸À®¤µ¤ì¤ë
+    ¥³¥ó¥Æ¥ó¥Ä¤ò´Þ¤à¥ê¥½¡¼¥¹¤Ëʸ»ú¥»¥Ã¥È¥Ñ¥é¥á¡¼¥¿¤òÄɲ乤ë¾ì¹ç¤Ç¡¢
+    ¥æ¡¼¥¶¤ÎÆþÎϥǡ¼¥¿¤¬½ÐÎϤËÆþ¤ê¡¢¥¯¥í¥¹¥µ¥¤¥È¥¹¥¯¥ê¥×¥Æ¥£¥ó¥°¤¬
+    °ú¤­µ¯¤³¤µ¤ì¤¦¤ë¾ì¹ç¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È¤ò¥»¥Ã¥È¤·¤¿¤È¤·¤Æ¤â¡¢
+    ¥Ö¥é¥¦¥¶¤Î "ʸ»ú¥¨¥ó¥³¡¼¥É¤Î¼«Æ°ÁªÂò" µ¡Ç½¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥æ¡¼¥¶¤ò
+    ¼é¤ë¤³¤È¤Ë¤Ï¤Ê¤é¤Ê¤¤¤Î¤Ç¡¢¤â¤Á¤í¤ó¤è¤êÎɤ¤²ò·èºö¤Ïñ¤Ë¥¹¥¯¥ê¥×¥È¤ò½¤Àµ
+    (¤¢¤ë¤¤¤Ïºï½ü) ¤¹¤ë¤³¤È¤Ç¤¹¡£</p>
+
+<h3>»²¾È</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addcharset">AddCharset</a></code></li>
+</ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="AddOutputFilterByType" id="AddOutputFilterByType">AddOutputFilterByType</a> <a name="addoutputfilterbytype" id="addoutputfilterbytype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
@@ -365,7 +385,7 @@
       <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
       <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>,
       <code class="directive"><a href="#authname">AuthName</a></code>, 
-      <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code> <em>¤Ê¤É¡£</em>)¡£</dd>
+      <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code> <em>¤Ê¤É</em>)¡£</dd>
 
       <dt>FileInfo</dt>
 
@@ -373,7 +393,7 @@
       ¥É¥­¥å¥á¥ó¥È¥¿¥¤¥×¤òÀ©¸æ¤¹¤ë¤¿¤á¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤòµö²Ä¤¹¤ë (<code class="directive"><a href="#defaulttype">DefaultType</a></code>, <code class="directive"><a href="#errordocument">ErrorDocument</a></code>, <code class="directive"><a href="#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>,
       <code class="directive"><a href="#sethandler">SetHandler</a></code>, <code class="directive"><a href="#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code>, 
       <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤Î Add* ¤È Remove*
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö<em>¤Ê¤É¡£</em>)¡£</dd>
+      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö<em>¤Ê¤É</em>)¡£</dd>
 
       <dt>Indexes</dt>
 
@@ -383,7 +403,7 @@
       <code class="directive"><a href="../mod/mod_autoindex.html#addicon">AddIcon</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></code>,
       <code class="directive"><a href="../mod/mod_autoindex.html#addiconbytype">AddIconByType</a></code>,
       <code class="directive"><a href="../mod/mod_autoindex.html#defaulticon">DefaultIcon</a></code>, <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#fancyindexing">FancyIndexing</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#headername">HeaderName</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#indexignore">IndexIgnore</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#readmename">ReadmeName</a></code>
-      <em>¤Ê¤É¡£</em>)¡£</dd>
+      <em>¤Ê¤É</em>)¡£</dd>
 
       <dt>Limit</dt>
 
@@ -731,7 +751,7 @@ Apache 
     ¤·¤«¤·¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï°ú¿ô¤È¤·¤ÆÀµµ¬É½¸½¤ò¤È¤ê¤Þ¤¹¡£Î㤨¤Ð:</p>
 
     <div class="example"><p><code>
-      &lt;DirectoryMatch "^/www/.*/[0-9]{3}"&gt;
+      &lt;DirectoryMatch "^/www/(.+/)?[0-9]{3}"&gt;
     </code></p></div>
 
     <p>¤Ï /www/ °Ê²¼¤Ë¤¢¤ë¿ô»ú 3 ʸ»ú¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</p>
@@ -1720,21 +1740,20 @@ Apache 
 <tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
 </table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥ÀÆâ¤Ë´Þ¤á¤ë¤³¤È¤Î¤Ç¤­¤ë
-    ¥Ð¥¤¥È¿ô¡¢<var>bytes</var> ¤ò
-    0 ¤«¤é¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤ëÄê¿ô
-    <code>DEFAULT_LIMIT_REQUEST_FIELDSIZE</code> (ÇÛÉÛ»þ¤Ë¤Ï 8192 ¤È»ØÄê)
-    ¤Ç»ØÄꤵ¤ì¤¿ÃͤޤǤοô»ú¤Ç»ØÄꤷ¤Þ¤¹¡£</p>
+    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À°ì¤Ä¤Ç¼õÉÕ¤±¤ë
+    ¥Ð¥¤¥È¿ô <var>bytes</var> ¤ò»ØÄꤷ¤Þ¤¹¡£</p>
 
     <p><code class="directive">LimitRequestFieldSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤Ë»ØÄꤷ¤¿¥¤¥ó¥×¥Ã¥È¥Ð¥Ã¥Õ¥¡ÍÆḬ̂ʲ¼¤Ë
-    HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ÎµöÍƤµ¤ì¤ë¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+    HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ÇµöÍƤµ¤ì¤ë¥µ¥¤¥º¤òÁý¸º¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
     ¥µ¡¼¥Ð¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤȤ·¤Æ¡¢
-    Ä̾ï¤Î¥¯¥é¥¤¥¢¥ó¥È¥ê¥¯¥¨¥¹¥È¤«¤éÁ÷¤é¤ì¤¿¸Ä¡¹¤Î¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Ë
-    ½½Ê¬Â­¤ëÂ礭¤µ¤òɬÍפȤ·¤Þ¤¹¡£
-    ÉáÄ̤Υꥯ¥¨¥¹¥È¥Ø¥Ã¥À¤Î¥µ¥¤¥º¤Ï¡¢¸Ä¡¹¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤êÂ礭¤¯ÊѤï¤ê¡¢
-    ¾ÜºÙ¤Ê¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò¤¹¤ë¤¿¤á¤Î¥Ö¥é¥¦¥¶¤ÎÀßÄê¤Þ¤Ç¤Ë¤â
-    ±Æ¶Á¤µ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</p>
+    °ìÈÌŪ¤Ê¥¯¥é¥¤¥¢¥ó¥È¤«¤é¥ê¥¯¥¨¥¹¥È¤¬Á÷¤é¤ì¤¿ºÝ¤Ë¡¢¤½¤Î¥ê¥¯¥¨¥¹¥È¤Ë
+    ÉÕ°¤·¤Æ¤¤¤ë¤É¤Î¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Ë¤Ä¤¤¤Æ¤â¡¢
+    ½½Ê¬Â­¤ê¤ëÂ礭¤µ¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+    °ìÈÌŪ¤Ê¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Î¥µ¥¤¥º¤È¤¤¤Ã¤Æ¤â¡¢¤½¤ÎÂ礭¤µ¤Ï¸Ä¡¹¤Î
+    ¥¯¥é¥¤¥¢¥ó¥È¤Î¼ÂÁõ¤Ë¤è¤Ã¤ÆÂ礭¤¯°Û¤Ê¤ê¡¢
+    ¾ÜºÙ¤Ê¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤«¤É¤¦¤«¤Î¡¢
+    ¥Ö¥é¥¦¥¶¤ÎÀßÄê¤Ë¤â±Æ¶Á¤µ¤ì¤¿¤ê¤·¤Þ¤¹¡£
+    SPENGO ǧ¾Ú¥Ø¥Ã¥À¤Ç¤Ï 12392 ¥Ð¥¤¥È¤Ë¤Þ¤ÇµÚ¤Ö¤³¤È¤¹¤é¤¢¤ê¤Þ¤¹¡£</p>
 
     <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
     ´ÉÍý¼Ô¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î°Û¾ï¤Ê¥ê¥¯¥¨¥¹¥È¤òÀ©¸æ¤Ç¤­¤ë¤è¤¦¤Ë¤·¡¢
@@ -1761,13 +1780,10 @@ Apache 
 <tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
 </table>
     <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢HTTP ¥ê¥¯¥¨¥¹¥È¹ÔÆâ¤ÇµöÍƤµ¤ì¤ë¥Ð¥¤¥È¿ô
-    <var>bytes</var> ¤ò 0 ¤«¤é¥³¥ó¥Ñ¥¤¥ë»þ¤ÎÄê¿ô
-    <code>DEFAULT_LIMIT_REQUEST_LINE</code> (ÇÛÉÛ»þ¤Ë¤Ï 8190 ¤È»ØÄê)
-    ¤Ç»ØÄꤵ¤ì¤¿ÃͤޤǤοô»ú¤Ç»ØÄꤷ¤Þ¤¹¡£</p>
+    <var>bytes</var> ¤ò»ØÄꤷ¤Þ¤¹¡£</p>
 
-    <p><code class="directive">LimitRequestLine</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢¥µ¡¼¥Ð´ÉÍý¼Ô¤Ï
-    ¥µ¡¼¥Ð¤Î¥³¥ó¥Ñ¥¤¥ë»þ¤Ë»ØÄꤷ¤¿¥¤¥ó¥×¥Ã¥È¥Ð¥Ã¥Õ¥¡ÍÆḬ̂ʲ¼¤Ë
-    ¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¹Ô¤Î¥µ¥¤¥º¤ÎÀ©¸Â¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ 
+    <p><code class="directive">LimitRequestLine</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢
+    ¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¹Ô¤ÎµöÍÆ¥µ¥¤¥º¤òÁý¸º¤Ç¤­¤Þ¤¹¡£ 
     ¥ê¥¯¥¨¥¹¥È¹Ô¤Ï¡¢HTTP¥á¥½¥Ã¥É¡¢URI¡¢¥×¥í¥È¥³¥ë¥Ð¡¼¥¸¥ç¥ó¤«¤éÀ®¤Ã¤Æ¤ª¤ê¡¢
     <code class="directive">LimitRequestLine</code> ¤Ï¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
     µöÍƤ¹¤ë¥ê¥¯¥¨¥¹¥È URI ¤ÎŤµ¤òÀ©¸Â¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
@@ -2320,7 +2336,7 @@ Apache 
 <tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
 </table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¤É¤Îǧ¾ÚºÑ¤ß¤Î¥æ¡¼¥¶¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ë
+    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¤É¤Îǧ¾ÚºÑ¤ß¤Î¥æ¡¼¥¶¤¬¥ê¥½¡¼¥¹¤Ë
     ¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤ò»ØÄꤷ¤Þ¤¹¡£
     °Ê²¼¤Î¤è¤¦¤Ê¹½Ê¸¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
 
@@ -2346,7 +2362,7 @@ Apache 
 
     <div class="example"><p><code>
        AuthType Basic<br />
-       AuthName "Restricted Directory"<br />
+       AuthName "Restricted Resource"<br />
        AuthUserFile /web/users<br />
        AuthGroupFile /web/groups<br />
        Require group admin
@@ -2989,49 +3005,49 @@ Apache 
 </table>
     <p>¿¤¯¤Î¾õ¶·¤Ç Apache ¤Ï<em>¼«¸Ê»²¾È</em> URL¡¢¤¹¤Ê¤ï¤Á
     Ʊ¤¸¥µ¡¼¥Ð¤ò»Ø¤¹ URL¡¢¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    <code>UseCanonicalName On</code> ¤ò»È¤¦¤È (1.3 ¤è¤êÁ°¤Î
-    ¤¹¤Ù¤Æ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤â) Apache ¤Ï <a href="#servername">ServerName</a> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <a href="#port">Port</a>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¥µ¡¼¥Ð¤ÎÀµ¼°¤Ê̾Á°¤òºîÀ®¤·¤Þ¤¹¡£
-    ¤³¤Î̾Á°¤¬¤¹¤Ù¤Æ¤Î¼«¸Ê»²¾È URL ¤Ç»È¤ï¤ì¡¢CGI ¤Î <code>SERVER_NAME</code>
-    ¤È <code>SERVER_PORT</code> ¤Ë¤â»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p><code>UseCanonicalName Off</code> ¤Ç¤Ï Apache ¤Ï
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤òÄ󶡤·¤¿¾ì¹ç¤Ë¤Ï¼«¸Ê»²¾È URL ¤ò
-    ¤½¤ì¤é¤ò¸µ¤ËºîÀ®¤·¤Þ¤¹ (Ä󶡤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¾å¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë
-    Àµ¼°¤Ê̾Á°¤ò»È¤¤¤Þ¤¹)¡£
+    <code>UseCanonicalName On</code> ¤Î¾ì¹ç¤Ï¡¢<code class="directive"><a href="#servername">ServerName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë
+    ¥Û¥¹¥È̾¤È¥Ý¡¼¥ÈÈÖ¹æ¤ò»È¤Ã¤Æ¡¢¤½¤ÎÀµµ¬Ì¾ (¼«¸Ê»²¾È¤Î̾Á°) ¤òÀ¸À®¤·¤Þ¤¹¡£
+    ¤³¤Î̾Á°¤Ï¡¢¤¹¤Ù¤Æ¤Î¼«¸Ê»²¾È URL ¤Ç»È¤ï¤ì¤Þ¤¹¤·¡¢CGI ¤Î 
+    <code>SERVER_NAME</code> ¤È <code>SERVER_PORT</code> ¤Ç¤â»È¤ï¤ì¤Þ¤¹¡£</p>
+
+    <p><code>UseCanonicalName Off</code> ¤Î¾ì¹ç¡¢
+    ¥¯¥é¥¤¥¢¥ó¥È¤¬¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤ò»ØÄꤷ¤¿¤È¤­¤Ë¤Ï¡¢
+    ¤½¤ì¤é¤ò¸µ¤Ë¼«¸Ê»²¾È URL ¤òºîÀ®¤·¤Þ¤¹ (»ØÄ꤬¤Ê¤«¤Ã¤¿¤È¤­¤Ï
+    ¾å¤ÎÄêµÁ¤ÈƱÍͤˤ·¤ÆÀµµ¬Ì¾¤ò²ò·è¤·¤Þ¤¹)¡£
     ¤³¤ì¤é¤ÎÃͤÏ<a href="../vhosts/name-based.html">̾Á°¥Ù¡¼¥¹¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>¤ò¼ÂÁõ¤¹¤ë¤Î¤Ë»È¤ï¤ì¤Æ¤¤¤ë¤Î¤ÈƱ¤¸Ãͤǡ¢
-    Ʊ¤¸¥¯¥é¥¤¥¢¥ó¥È¤«¤é¼èÆÀ¤Ç¤­¤ëÃͤǤ¹¡£CGI ÊÑ¿ô <code>SERVER_NAME</code>
-    ¤È <code>SERVER_PORT</code> ¤â¥¯¥é¥¤¥¢¥ó¥È¤«¤éÍ¿¤¨¤é¤ì¤¿Ãͤ«¤é
-    ºîÀ®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤¬Í­ÍѤʾì¹ç¤ÎÎã¤Ï¡¢¥¤¥ó¥È¥é¥Í¥Ã¥È¤Î¥µ¡¼¥Ð¤Ç¡¢<code>www</code> ¤Î
-    ¤è¤¦¤Êû¤¤Ì¾Á°¤Ç¥æ¡¼¥¶¤¬¥Þ¥·¥ó¤ËÀܳ¤·¤Æ¤¤¤ë¤È¤­¤Ç¤¹¡£
-    ¥æ¡¼¥¶¤¬Ã»¤¤Ì¾Á°¤òÆþÎϤ·¤Æ¡¢URL ¤¬<em>ºÇ¸å¤Î¥¹¥é¥Ã¥·¥å̵¤·¤Î</em>¥Ç¥£¥ì¥¯¥È¥ê
-    ¤Ø¤Î¤â¤Î¤Ç¤¢¤ë¤È¤­¤Ë¡¢Apache ¤Ï¥ê¥¯¥¨¥¹¥È¤ò
-    <code>http://www.domain.com/splat/</code> ¤Ø¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤³¤È¤Ë
-    µ¤ÉÕ¤¯¤Ç¤·¤ç¤¦¡£Ç§¾Ú¤ò¤¹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¤¤ë¤È¡¢¤³¤Î¾ì¹ç
+    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>¤ò¼ÂÁõ¤Ç»È¤ï¤ì¤Æ¤¤¤ë¤Î¤ÈƱ¤¸Ãͤǡ¢
+    Ʊ¤¸¥¯¥é¥¤¥¢¥ó¥È¤Ç¼èÆÀ¤Ç¤­¤ëÃͤˤʤäƤ¤¤Þ¤¹¡£
+    CGI ÊÑ¿ô <code>SERVER_NAME</code> ¤È <code>SERVER_PORT</code> 
+    ¤â¥¯¥é¥¤¥¢¥ó¥È¤«¤éÍ¿¤¨¤é¤ì¤¿Ãͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£</p>
+
+    <p>¤³¤Î¤è¤¦¤ÊµóÆ°¤¬ÊØÍø¤ÊÎã¤Ï¡¢¥¤¥ó¥È¥é¥Í¥Ã¥È¤Î¥µ¡¼¥Ð¤Ç <code>www</code>
+    ¤Î¤è¤¦¤Êû¤¤Ì¾Á°¤Ç¥æ¡¼¥¶¤¬¥Þ¥·¥ó¤ËÀܳ¤¹¤ë¤È¤­¤Ç¤¹¡£
+    ¥æ¡¼¥¶¤ÎÆþÎϤÇû¤¤¥Û¥¹¥È̾¤¬»È¤ï¤ì¤Æ¤¤¤Æ¡¢URL ¤¬<em>ºÇ¸å¤Î¥¹¥é¥Ã¥·¥å̵¤·¤Î</em>
+    ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤Ã¤Æ¤¤¤ë <code>http://www/splat</code> ¤Î¤è¤¦¤Ê¤È¤­¡¢
+    Apache ¤Ï¥ê¥¯¥¨¥¹¥È¤ò <code>http://www.domain.com/splat/</code> 
+    ¤Ø¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£
+    ǧ¾Ú¤ò¤¹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¤¤ë¤È¡¢¤³¤Î¾ì¹ç
     ¥æ¡¼¥¶¤Ï 2 ²óǧ¾Ú¤ò¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¯¤Ê¤ê¤Þ¤¹ (<code>www</code> ¤Ë
-    ÂФ·¤Æ 1 ²ó¡¢<code>www.domain.com</code> ¤ËÂФ·¤Æ¤â¤¦°ì²ó -- 
-    ¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">¤³¤ÎÏÃÂê¤Î
+    ÂФ·¤Æ 1 ²ó¡¢<code>www.domain.com</code> ¤ËÂФ·¤Æ¤â¤¦ 1 ²ó -- 
+    ¾ÜºÙ¤Ï <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">¤³¤ÎÏÃÂê¤Î
     FAQ</a> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤)¡£
-    ¤·¤«¤·¡¢<code class="directive">UseCanonicalName</code> ¤¬ <code>Off</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¡¢
-    Apache ¤Ï <code>htttp://www/splat/</code> ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£</p>
+    ¤·¤«¤· <code class="directive">UseCanonicalName</code> ¤¬ <code>Off</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¡¢
+    Apache ¤Ï <code>http://www/splat/</code> ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£</p>
 
     <p>»°¤ÄÌܤΥª¥×¥·¥ç¥ó <code>UseCanonicalName DNS</code> ¤Ï¡¢
-    <code>Host:</code> ¥Ø¥Ã¥À¤òÄ󶡤·¤Ê¤¤¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤ò¥µ¥Ý¡¼¥È¤·¤¿
-    Â絬ÌÏ¤Ê IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°¤Ç»ÈÍѤµ¤ì¤ë¤³¤È¤ò
-    °Õ¿Þ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢Apache ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤¬
-    Àܳ¤·¤¿ IP ¥¢¥É¥ì¥¹¤Ë DNS ¤ÎµÕ°ú¤­¤ò¹Ô¤Ê¤Ã¤Æ¼«¸Ê»²¾È URL ¤ò
-    ºîÀ®¤·¤Þ¤¹¡£</p>
+    Â絬ÌÏ¤Ê IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°¤Ç¡¢
+    <code>Host:</code> ¥Ø¥Ã¥À¤òÄ󶡤·¤Ê¤¤¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤ò
+    ¥µ¥Ý¡¼¥È¤¹¤ë¾ì¹ç¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
+    ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï Apache ¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬Àܳ¤·¤¿ IP ¥¢¥É¥ì¥¹¤ËÂФ·¤Æ
+    DNS ¤ÎµÕ°ú¤­¤ò¹Ô¤Ê¤Ã¤Æ¡¢¼«¸Ê»²¾È URL ¤òºîÀ®¤·¤Þ¤¹¡£</p>
 
     <div class="warning"><h3>·Ù¹ð</h3>
-    <p>CGI ¤¬ <code>SERVER_NAME</code> ¤Ë
-    ´Ø¤¹¤ë²¾Äê¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤È¤­¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÎÀßÄê¤ÇÆ°ºî¤·¤Ê¤¯
-    ¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¥¯¥é¥¤¥¢¥ó¥È¤Ï¼Â¼ÁŪ¤Ë¤Ï¥Û¥¹¥È̾¤ˤȤ·¤Æ
+    <p>CGI ¤¬ <code>SERVER_NAME</code> ¤Ë´Ø¤·¤Æ²¿¤é¤«¤ÎÁ°Äó¾ò·ï¤ò
+    ²¾Äꤷ¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤ÏÆ°ºî¤·¤Ê¤¯
+    ¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¥¯¥é¥¤¥¢¥ó¥È¤Ï¼Â¼ÁŪ¤Ë¤Ï¥Û¥¹¥È̾¤È¤·¤Æ
     ²¿¤Ç¤â˾¤ß¤ÎÃͤò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£CGI ¤¬
-    <code>SERVER_NAME</code> ¤Î¤ß¤ò»È¤Ã¤Æ¼«¸Ê»²¾È URL ¤òºîÀ®¤·¤Æ¤¤¤ë
-    ¾ì¹ç¤Ï¤É¤ÎÀßÄê¤ò¹Ô¤Ê¤Ã¤Æ¤âÂç¾æÉפʤϤº¤Ç¤¹¡£</p></div>
+    <code>SERVER_NAME</code> ¤ò»È¤Ã¤Æ¼«¸Ê»²¾È URL ¤òºîÀ®¤¹¤ë¤³¤È¤·¤«¤·¤Ê¤¤
+    ¾ì¹ç¤Ï¡¢¤É¤ÎÀßÄê¤ò¹Ô¤Ê¤Ã¤Æ¤âÂç¾æÉפʤϤº¤Ç¤¹¡£</p></div>
 
 <h3>»²¾È</h3>
 <ul>

diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index b6a4b3c0354f83df12fccabb8a49d934b57a321d..79ae78c3c4ccf2dd8b5f7b995ef8d779ea0ac749 100644 (file)
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -8,6 +8,6 @@
   <variants>
     <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant outdated="yes">ja</variant>
+    <variant>ja</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index 08d6149dd7700126661464077accb222b073772a..64fd06f0a25a488d2d107850ecc715d7d4b99486 100644 (file)
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -124,6 +124,8 @@
 <li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
+<li><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate</a></li>
 <li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
 <li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
 <li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>

diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index a68ab6b6b3e62334773de17350df87b42e0c4b16..e7dc2c0d728a9156c992b8b33f96c9e486304995 100644 (file)
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -125,6 +125,8 @@
 <li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
+<li><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate</a></li>
 <li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
 <li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
 <li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>

diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
index aba132c2af50827cd1c219dd2f0f8ad98a2e523e..a807843afe54ca148ce733230d0aff3e8057cf12 100644 (file)
--- a/docs/manual/mod/directives.html.es
+++ b/docs/manual/mod/directives.html.es
@@ -127,6 +127,8 @@
 <li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
 <li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
 <li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
+<li><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate</a></li>
 <li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
 <li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
 <li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>

diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index 60d1f488b8f7cbf2a79ace2a4dd4d8a1c262cb7f..cd7e3ff10f02be7a5d50cf49d1db2b4c3e5364d3 100644 (file)
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -63,6 +63,8 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#cachemaxexpire">CacheMaxExpire</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachestorenostore">CacheStoreNoStore</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachestoreprivate">CacheStorePrivate</a></li>
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
@@ -187,24 +189,36 @@ manager</td></tr>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a> <a name="cacheignorecachecontrol" id="cacheignorecachecontrol">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ignore the fact that the client requested the content not be
-cached.</td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ignore request to not serve cached content to client</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheIgnoreCacheControl On|Off</code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheIgnoreCacheControl Off</code></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_cache</td></tr>
 </table>
-    <p>Ordinarily, documents with no-cache or no-store header values will not be stored in the cache.
-    The <code class="directive">CacheIgnoreCacheControl</code> directive allows this behavior to be overridden.
-    <code class="directive">CacheIgnoreCacheControl</code> On tells the server to attempt to cache the document
-    even if it contains no-cache or no-store header values. Documents requiring authorization will
-    <em>never</em> be cached.</p>
+    <p>Ordinarily, requests containing a Cache-Control: no-cache or
+    Pragma: no-cache header value will not be served from the cache.  The
+    <code class="directive">CacheIgnoreCacheControl</code> directive allows this
+    behavior to be overridden.  <code class="directive">CacheIgnoreCacheControl</code>
+    On tells the server to attempt to serve the resource from the cache even
+    if the request contains no-cache header values.  Resources requiring
+    authorization will <em>never</em> be cached.</p>
 
     <div class="example"><p><code>
       CacheIgnoreCacheControl On
     </code></p></div>
 
+    <div class="warning"><h3>Warning:</h3>
+       This directive will allow serving from the cache even if the client has
+       requested that the document not be served from the cache.  This might
+       result in stale content being served.
+    </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#cachestoreprivate">CacheStorePrivate</a></code></li>
+<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
+</ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="CacheIgnoreHeaders" id="CacheIgnoreHeaders">CacheIgnoreHeaders</a> <a name="cacheignoreheaders" id="cacheignoreheaders">Directive</a></h2>
@@ -340,6 +354,75 @@ LastModified date.</td></tr>
       CacheMaxExpire 604800
     </code></p></div>
 
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheStoreNoStore" id="CacheStoreNoStore">CacheStoreNoStore</a> <a name="cachestorenostore" id="cachestorenostore">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Attempt to cache requests or responses that have been marked as no-store.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheStoreNoStore On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheStoreNoStore Off</code></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_cache</td></tr>
+</table>
+    <p>Ordinarily, requests or responses with Cache-Control: no-store header
+       values will not be stored in the cache.  The
+       <code class="directive">CacheStoreNoCache</code> directive allows this
+       behavior to be overridden.  <code class="directive">CacheStoreNoCache</code> On
+       tells the server to attempt to cache the resource even if it contains
+       no-store header values.  Resources requiring authorization will
+       <em>never</em> be cached.</p>
+
+    <div class="example"><p><code>
+      CacheStoreNoStore On
+    </code></p></div>
+
+    <div class="warning"><h3>Warning:</h3>
+       As described in RFC 2616, the no-store directive is intended to
+       "prevent the inadvertent release or retention of sensitive information
+       (for example, on backup tapes)."  Enabling this option could store
+       sensitive information in the cache.  You are hereby warned.
+    </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></code></li>
+<li><code class="directive"><a href="#cachestoreprivate">CacheStorePrivate</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheStorePrivate" id="CacheStorePrivate">CacheStorePrivate</a> <a name="cachestoreprivate" id="cachestoreprivate">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Attempt to cache responses that the server has marked as private</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheStorePrivate On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheStorePrivate Off</code></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_cache</td></tr>
+</table>
+    <p>Ordinarily, responses with Cache-Control: private header values will not
+       be stored in the cache.  The <code class="directive">CacheStorePrivate</code>
+       directive allows this behavior to be overridden.
+       <code class="directive">CacheStorePrivate</code> On
+       tells the server to attempt to cache the resource even if it contains
+       private header values.  Resources requiring authorization will
+       <em>never</em> be cached.</p>
+
+    <div class="example"><p><code>
+      CacheStorePrivate On
+    </code></p></div>
+
+    <div class="warning"><h3>Warning:</h3>
+       This directive will allow caching even if the upstream server has
+       requested that the resource not be cached.  This directive is only
+       ideal for a 'private' cache.
+    </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></code></li>
+<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
+</ul>
 </div>
 </div>
 <div class="bottomlang">

diff --git a/docs/manual/mod/mod_cache.html.ja.euc-jp b/docs/manual/mod/mod_cache.html.ja.euc-jp
index 9382ff7a0bdff230d494ed644ae364728df282cd..6d72a16e26e84fb1eb60bac761967f943d485d61 100644 (file)
--- a/docs/manual/mod/mod_cache.html.ja.euc-jp
+++ b/docs/manual/mod/mod_cache.html.ja.euc-jp
@@ -25,6 +25,8 @@
 <a href="../ja/mod/mod_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cache.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>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å</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>cache_module</td></tr>

diff --git a/docs/manual/mod/mod_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja
index 9198fca40931bd7e79e2bc9c62c00ba89145a8dd..c7448f3fed95af6f693a41973de141d8e2967eb3 100644 (file)
--- a/docs/manual/mod/mod_cache.xml.ja
+++ b/docs/manual/mod/mod_cache.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: 125573 -->
+<!-- English Revision: 125573:149492 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_cache.xml.ko b/docs/manual/mod/mod_cache.xml.ko
index 6a4ab7532685b4f05c7daf34c7671b837e3569af..cbd1ac9bba5d85bf77d5f99da8d4811c57a2c4a5 100644 (file)
--- a/docs/manual/mod/mod_cache.xml.ko
+++ b/docs/manual/mod/mod_cache.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: 105569:125573 (outdated) -->
+<!-- English Revision: 105569:149492 (outdated) -->
 
 <!--
  Copyright 2003-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/mod/mod_cache.xml.meta b/docs/manual/mod/mod_cache.xml.meta
index 7713d67822e25f443cdee81ca53397bdb1bae2b8..ecfabbb0811cca5624418ef38d76b51ca5a7982e 100644 (file)
--- a/docs/manual/mod/mod_cache.xml.meta
+++ b/docs/manual/mod/mod_cache.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/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 925642e4edb4c605f25c8f04894cccbc2809393a..825164b1bf2c6186422f943629751a4791c750d6 100644 (file)
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -209,8 +209,7 @@ cache.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
 manager</td></tr>
 <tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
-cached.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore request to not serve cached content to client</td></tr>
 <tr><td><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</a></td><td> None </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Do not store the given HTTP header(s) in the cache.
 </td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
@@ -226,6 +225,8 @@ cache</td></tr>
 cached by proxy servers</td></tr>
 <tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
+<tr><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server has marked as private</td></tr>
 <tr><td><a href="core.html#cgimapextension">CGIMapExtension <var>CGI-Pfad</var> <var>.Endung</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technik zur Bestimmung des Interpreters für
 CGI-Skripte</td></tr>
 <tr class="odd"><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Charset to translate into</td></tr>

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 9fa2d03bcd218b8e5ad4db2647fae2a46bc1cd0d..45584ce4174eac8c0b7b189c34cab27d04884186 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -205,8 +205,7 @@ cache.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
 manager</td></tr>
 <tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
-cached.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore request to not serve cached content to client</td></tr>
 <tr><td><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</a></td><td> None </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Do not store the given HTTP header(s) in the cache.
 </td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
@@ -222,6 +221,8 @@ cache</td></tr>
 cached by proxy servers</td></tr>
 <tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
+<tr><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server has marked as private</td></tr>
 <tr><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
 <tr class="odd"><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Charset to translate into</td></tr>

diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index d3425138528606b620b83b58731f6035871fda33..f9f13d65b855c259b1d35869b47863256454d806 100644 (file)
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -208,8 +208,7 @@ cache.</td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
 manager</td></tr>
 <tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
-cached.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore request to not serve cached content to client</td></tr>
 <tr><td><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</a></td><td> None </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Do not store the given HTTP header(s) in the cache.
 </td></tr>
 <tr class="odd"><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
@@ -225,6 +224,8 @@ cache</td></tr>
 cached by proxy servers</td></tr>
 <tr class="odd"><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
 stored</td></tr>
+<tr><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server has marked as private</td></tr>
 <tr><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
 <tr class="odd"><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Charset to translate into</td></tr>

diff --git a/docs/manual/mod/quickreference.html.ja.euc-jp b/docs/manual/mod/quickreference.html.ja.euc-jp
index f9d889142b90a8983b82ce24719b215e5b68f329..3eb6f181f9fab240eb1d8f9794d2f29569c00b8d 100644 (file)
--- a/docs/manual/mod/quickreference.html.ja.euc-jp
+++ b/docs/manual/mod/quickreference.html.ja.euc-jp
@@ -78,8 +78,8 @@ accept 
 ɽ¼¨¤µ¤ì¤ë¡¢MIME ¥¿¥¤¥×¤ÇÁªÂò¤µ¤ì¤¿ÂåÂإƥ­¥¹¥È</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#addcharset">AddCharset <var>charset</var> <var>extension</var>
 [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">ÌÀ¼¨Åª¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤±þÅú¤ËÄɲ䵤ì¤ë
-¥Ç¥Õ¥©¥ë¥È¤Îʸ»ú¥»¥Ã¥È</td></tr>
+<tr><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥ì¥¹¥Ý¥ó¥¹¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>text/plain</code> ¤¢¤ë¤¤¤Ï
+<code>text/html</code> ¤Î¾ì¹ç¤ËÄɲ乤ë¥Ç¥Õ¥©¥ë¥È¤Î charset ¥Ñ¥é¥á¡¼¥¿</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æɽ¼¨¤¹¤ëÀâÌÀ</td></tr>
 <tr><td><a href="mod_mime.html#addencoding">AddEncoding <var>MIME-enc</var> <var>extension</var>
 [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°