Rebuild

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

diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index 559fde8ca64fe26cbd05821ff07ee10f15e2fab0..e27bc5606b2c1b85e2f1a3858daca984697ef28f 100644 (file)
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -163,7 +163,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
     with the file's behavior (handlers and filters)
     and content (mime-type, language, character set and

diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index 2629fd877873d338a121901374a95b33def15984..ec1c81b91900beda9544c06feac46cb4e64e5173 100644 (file)
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -161,7 +161,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
     with the file's behavior (handlers and filters)
     and content (mime-type, language, character set and

diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index 835f192df4e843e1d07e80c1785d6720e9ef5218..033f36a31ed1a12b421a9c06dbb09cc1494b3ff4 100644 (file)
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -166,7 +166,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
     with the file's behavior (handlers and filters)
     and content (mime-type, language, character set and

diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8
index 73310437fef0330805cdeae4fad750d31646517c..487c77afe2a8ac20d2edbdc5b0a69e764447e6ae 100644 (file)
--- a/docs/manual/mod/index.html.ja.utf8
+++ b/docs/manual/mod/index.html.ja.utf8
@@ -151,7 +151,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_logio.html">mod_logio</a></dt><dd>リクエスト毎に入力バイト数と出力バイト数とをロギング</dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>リクエストされたファイルの拡張子とファイルの振る舞い
     (ハンドラとフィルタ)、内容 (MIME タイプ、言語、文字セット、エンコーディング)
     とを関連付ける</dd>

diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index 47e7e2d996b1c1ed9355dd3539395665219e0357..931600283aac1f0644de7c5d0450a2e4f2b2c197 100644 (file)
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -150,7 +150,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_logio.html">mod_logio</a></dt><dd>¿äû´ç ÀÔÃâ·Â ¹ÙÀÌÆ®¼ö¸¦ ±â·Ï</dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
     with the file's behavior (handlers and filters)
     and content (mime-type, language, character set and

diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
index 0fd0c33ec4b2ec5b9cd0cd81d7f76e69e8a9b144..084c88fc925a60a9deae054913dc8519d727acc2 100644 (file)
--- a/docs/manual/mod/index.html.tr.utf8
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -157,7 +157,7 @@ by other LDAP modules</dd>
 </dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
     with the file's behavior (handlers and filters)
     and content (mime-type, language, character set and

diff --git a/docs/manual/mod/index.html.zh-cn b/docs/manual/mod/index.html.zh-cn
index 5f58153f130ce16f06e6f799d67ada65580fed15..936b84abf935d3882df814e308f5ff9b30fc723b 100644 (file)
--- a/docs/manual/mod/index.html.zh-cn
+++ b/docs/manual/mod/index.html.zh-cn
@@ -156,7 +156,7 @@ by other LDAP modules</dd>
 <dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
 <dt><a href="mod_lua.html">mod_lua</a></dt><dd>Provides Lua hooks into various portions of the httpd
 request processing</dd>
-<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>This module provides usage of macros within apache runtime configuration files</dd>
+<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Provides macros within apache httpd runtime configuration files</dd>
 <dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
     with the file's behavior (handlers and filters)
     and content (mime-type, language, character set and

diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en
index 786ef433e9d99a634fdc42e8768ed5f91742c415..796a6ee4a2e0770da57fc41c2e8444c19e66dda6 100644 (file)
--- a/docs/manual/mod/mod_macro.html.en
+++ b/docs/manual/mod/mod_macro.html.en
@@ -27,7 +27,7 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_macro.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_macro.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>This module provides usage of macros within apache httpd runtime configuration files</td></tr>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides macros within apache httpd runtime configuration files</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>macro_module</td></tr>
 <tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_macro.c</td></tr></table>
@@ -35,7 +35,7 @@
 
 
     <p>This modules provides macros within apache httpd runtime configuration files.
-    These macros have parameters.  They are expanded when used (parameters are
+    These macros may have parameters. They are expanded when used (parameters are
     substituted by their values given as an argument), and the result is
     processed normally.</p>
 </div>
@@ -56,7 +56,7 @@
 <p>Definition of a macro:</p>
 
     <ul>
-    <li> macro definition within a &lt;Macro&gt; section, following
+    <li> macro definition within a <code class="directive">&lt;Macro&gt;</code> section, following
          the httpd configuration style.</li>
     <li> user defined names for the macro and its parameters.</li>
     <li> macro names are case-insensitive, like httpd directives.</li>
@@ -188,18 +188,18 @@ UndefMacro RestrictedAccessPolicy
     before processing.</p>
 
     <pre class="prettyprint lang-config">
-    Use LocalAccessPolicy
-    ...
-    Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"
+Use LocalAccessPolicy
+...
+Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"
     </pre>
 
 
     <p>is equivalent, with the macros defined above, to:</p>
 
     <pre class="prettyprint lang-config">
-    Require ip 10.2.16.0/24
-    ...
-    Require ip 192.54.172.0/24 192.54.148.0/24
+Require ip 10.2.16.0/24
+...
+Require ip 192.54.172.0/24 192.54.148.0/24
     </pre>
 
 

diff --git a/docs/manual/mod/mod_macro.html.fr b/docs/manual/mod/mod_macro.html.fr
index 310fddf5d5f0a4a559e50e009addbeedf4bc19a2..d553d533732f48c4d1ee645bc1d3f16804f778a5 100644 (file)
--- a/docs/manual/mod/mod_macro.html.fr
+++ b/docs/manual/mod/mod_macro.html.fr
@@ -27,6 +27,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/mod/mod_macro.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_macro.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Ce module permet d'utiliser des macros dans les fichiers
 de configuration Apache.</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Base</td></tr>

diff --git a/docs/manual/mod/mod_macro.xml.meta b/docs/manual/mod/mod_macro.xml.meta
index 2e26ebcdf4eb18cc2fe1def0434617b60131dfae..5454b3cb284bdad1f4dffe2502275cb4e620ea4b 100644 (file)
--- a/docs/manual/mod/mod_macro.xml.meta
+++ b/docs/manual/mod/mod_macro.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>