* Rewritemaps use ${...}

* adjust the mime type directory in mod_mime.xml.ja as well (to get it uptodate
  again)
* `build all`

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

diff --git a/docs/manual/mod/mod_mime.html.ja.euc-jp b/docs/manual/mod/mod_mime.html.ja.euc-jp
index cf71109e6af662d6d13fda1456f3d66319511d19..d9476d62567509724d2177179b89897c8fb71d72 100644 (file)
--- a/docs/manual/mod/mod_mime.html.ja.euc-jp
+++ b/docs/manual/mod/mod_mime.html.ja.euc-jp
@@ -893,7 +893,7 @@
     ¤Û¤È¤ó¤É¤Î´ÉÍý¼Ô¤Ï¡¢¤è¤¯»È¤ï¤ì¤ë¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò
     IANA ¤ËÅÐÏ¿¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ë´ØÏ¢ÉÕ¤±¤Æ¤¤¤ë¡¢
     Apache ¤Î <code>mime.types</code> ¥Õ¥¡¥¤¥ë¤ò»È¤¤¤Þ¤¹¡£
-    ¸½ºß¤Î°ìÍ÷¤Ï <a href="http://www.isi.edu/in-notes/iana/assignments/media-types/media-types">http://www.isi.edu/in-notes/iana/assignments/media-types/media-types</a>
+    ¸½ºß¤Î°ìÍ÷¤Ï <a href="http://www.iana.org/assignments/media-types/index.html">http://www.iana.org/assignments/media-types/index.html</a>
     ¤Ç´ÉÍý¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¼çÍפʥá¥Ç¥£¥¢¥¿¥¤¥×¤ÎÄêµÁ¤òÄ󶡤·¤Æ¡¢
     ɬÍפȤ³¤í¤ò <code class="directive"><a href="#addtype">AddType</a></code> ¤Ç
     ¾å½ñ¤­¤¹¤ë¡¢¤È¤¤¤¦ÊýË¡¤Ç <code>httpd.conf</code> ¤ò´Êά¤Ë¤·¤Þ¤¹¡£

diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja
index ed3551b315a4bb69e753eaba2be27ebdc68c8a15..4a707cae2340e3c5cfb8b842ee4b876064a74e36 100644 (file)
--- a/docs/manual/mod/mod_mime.xml.ja
+++ b/docs/manual/mod/mod_mime.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: 160365 -->
+<!-- English Revision: 193037 -->
 
 <!--
  Copyright 2002-2005 The Apache Software Foundation or its licensors, as
@@ -854,8 +854,8 @@ module="mod_mime_magic">MimeMagicFile</directive></seealso>
     IANA \e$B$KEPO?$5$l$?%3%s%F%s%H%?%$%W$K4XO"IU$1$F$$$k!"\e(B
     Apache \e$B$N\e(B <code>mime.types</code> \e$B%U%!%$%k$r;H$$$^$9!#\e(B
     \e$B8=:_$N0lMw$O\e(B <a href=
-    "http://www.isi.edu/in-notes/iana/assignments/media-types/media-types"
-    >http://www.isi.edu/in-notes/iana/assignments/media-types/media-types</a>
+    "http://www.iana.org/assignments/media-types/index.html"
+    >http://www.iana.org/assignments/media-types/index.html</a>
     \e$B$G4IM}$5$l$F$$$^$9!#$3$l$O!"<gMW$J%a%G%#%"%?%$%W$NDj5A$rDs6!$7$F!"\e(B
     \e$BI,MW$H$3$m$r\e(B <directive module="mod_mime">AddType</directive> \e$B$G\e(B
     \e$B>e=q$-$9$k!"$H$$$&J}K!$G\e(B <code>httpd.conf</code> \e$B$r4JN,$K$7$^$9!#\e(B

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 19cadd998e58280114afa5390e62ac7437de02f6..521029f3a29ba89fad66d7855843198a10f102ad 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -800,7 +800,7 @@ Apache 2.0.41 and later</td></tr>
       <code class="directive">RewriteRule</code> as follows:</p>
 
       <div class="example"><p><code>
-      RewriteRule ^/ex/(.*) %{examplemap:$1}
+      RewriteRule ^/ex/(.*) ${examplemap:$1}
       </code></p></div>
 
       <p>The following combinations for <em>MapType</em> and

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index d00dc3df3cb6ce878af111e16a38eba6b2744828..ed1c60817eaf845df56bd47ec1860db31e10eccc 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -306,7 +306,7 @@ Apache 2.0.41 and later</compatibility>
       <directive>RewriteRule</directive> as follows:</p>
 
       <example>
-      RewriteRule ^/ex/(.*) %{examplemap:$1}
+      RewriteRule ^/ex/(.*) ${examplemap:$1}
       </example>
 
       <p>The following combinations for <em>MapType</em> and

diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index 522baf7a7ff0e5089a71a17b594e25e834dc470e..f8f134ec7ee1fff9e77557ef5eddb017dd8e7aea 100644 (file)
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -84,6 +84,11 @@
           This dedicated worker could not be used again until the Keep Alive 
           timeout was reached.</dd>
 
+      <dt>SQL Database Support</dt>
+      <dd><code class="module"><a href="./mod/mod_dbd.html">mod_dbd</a></code>, together with the apr_dbd framework,
+          brings direct SQL support to modules that need it.  Supports
+          connection pooling in threaded MPMs.</dd>
+
     </dl>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -160,6 +165,10 @@
           <code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code>, using the
           <code>ap_register_output_filter_protocol</code> or
           <code>ap_filter_protocol</code> calls.</dd>
+
+      <dt>Monitor hook added</dt>
+      <dd>Monitor hook enables modules to run regular/scheduled jobs
+          in the parent (root) process.</dd>
     </dl>
   </div></div>
 <div class="bottomlang">

diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko
index 1427d25e119c7e0698720ce5c20af33ece2c7e03..0e8d3ab0101a6d8d7754b7fbd0ae5e3e20951130 100644 (file)
--- a/docs/manual/new_features_2_2.xml.ko
+++ b/docs/manual/new_features_2_2.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:169315 (outdated) -->
+<!-- English Revision: 105989:193026 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,

diff --git a/docs/manual/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br
index 27ed101528f1d0e875db379a5855cd0224d7470b..a97474c4d3d06bbee9629268c04566754062a3fe 100644 (file)
--- a/docs/manual/new_features_2_2.xml.pt-br
+++ b/docs/manual/new_features_2_2.xml.pt-br
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:169315 (outdated) -->
+<!-- English Revision: 151408:193026 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or its licensors,