Commit 67009e05 authored by Andre Malo's avatar Andre Malo
Browse files

* 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
parent 8fea8fbd

docs/manual/mod/mod_mime.html.ja.euc-jp

+1 −1
Changes for docs/manual/mod/mod_mime.html.ja.euc-jp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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> を簡略にします。

docs/manual/mod/mod_mime.xml.ja

+3 −3
Changes for docs/manual/mod/mod_mime.xml.ja: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line 
<?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 $B$KEPO?$5$l$?%3%s%F%s%H%?%$%W$K4XO"IU$1$F$$$k!"(B

    Apache $B$N(B <code>mime.types</code> $B%U%!%$%k$r;H$$$^$9!#(B

    $B8=:_$N0lMw$O(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>

    $B$G4IM}$5$l$F$$$^$9!#$3$l$O!"<gMW$J%a%G%#%"%?%$%W$NDj5A$rDs6!$7$F!"(B

    $BI,MW$H$3$m$r(B <directive module="mod_mime">AddType</directive> $B$G(B

    $B>e=q$-$9$k!"$H$$$&J}K!$G(B <code>httpd.conf</code> $B$r4JN,$K$7$^$9!#(B

docs/manual/mod/mod_rewrite.html.en

+1 −1
Changes for docs/manual/mod/mod_rewrite.html.en: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

docs/manual/mod/mod_rewrite.xml

+1 −1
Changes for docs/manual/mod/mod_rewrite.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

docs/manual/new_features_2_2.html.en

+9 −0
Changes for docs/manual/new_features_2_2.html.en: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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">