summaryrefslogtreecommitdiffstats
path: root/docs/manual/mod
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2010-12-29 22:54:25 +0100
committerStefan Fritsch <sf@apache.org>2010-12-29 22:54:25 +0100
commit9975402ed90ed964803abd7992dd73bd5307a86a (patch)
tree154d4234fd17e4cad4dbc131a2dd9db8a213d9c0 /docs/manual/mod
parentAllow to use arbitrary boolean expressions (ap_expr) in RewriteCond. (diff)
downloadapache2-9975402ed90ed964803abd7992dd73bd5307a86a.tar.xz
apache2-9975402ed90ed964803abd7992dd73bd5307a86a.zip
update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/mod')
-rw-r--r--docs/manual/mod/core.html.en6
-rw-r--r--docs/manual/mod/core.xml.de2
-rw-r--r--docs/manual/mod/core.xml.ja2
-rw-r--r--docs/manual/mod/core.xml.tr2
-rw-r--r--docs/manual/mod/mod_headers.html.en2
-rw-r--r--docs/manual/mod/mod_headers.xml.ja2
-rw-r--r--docs/manual/mod/mod_headers.xml.ko2
-rw-r--r--docs/manual/mod/mod_rewrite.html.en15
-rw-r--r--docs/manual/mod/mod_substitute.html.en2
-rw-r--r--docs/manual/mod/mpm_common.html.en2
-rw-r--r--docs/manual/mod/mpm_common.xml.de2
-rw-r--r--docs/manual/mod/mpm_common.xml.ja2
-rw-r--r--docs/manual/mod/mpm_common.xml.tr2
13 files changed, 27 insertions, 16 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 56685c954d..7182eb0594 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1158,7 +1158,7 @@ in case of an error</td></tr>
</code></p></div>
<p>Specifying <code>connection</code> or <code>request</code> as first
- paramter allows to specify additional formats, causing additional
+ parameter allows to specify additional formats, causing additional
information to be logged when the first message is logged for a specific
connection or request, respectivly. This additional information is only
logged once per connection/request. If a connection or request is processed
@@ -4015,14 +4015,14 @@ hostname or IP address</td></tr>
<p>When a request is received, the server first maps it to the best matching
<code class="directive">&lt;VirtualHost&gt;</code> based on the local
IP address and port combination only. Non-wildcards have a higher
- precedence. if no match based on IP and port occurs at all, the
+ precedence. If no match based on IP and port occurs at all, the
"main" server configuration is used.</p>
<p>If multiple virtual hosts contain the best matching IP address and port,
the server selects from these virtual hosts the best match based on the
requested hostname. If no matching name-based virtual host is found,
then the first listed virtual host that matched the IP address will be
- used. As a consequence, the first listed virtual for a given IP address
+ used. As a consequence, the first listed virtual host for a given IP address
and port combination is default virtual host for that IP and port
combination.</p>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index fc95f2ac9d..a464dbf69e 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 290816:1053375 (outdated) -->
+<!-- English Revision: 290816:1053666 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index ec2bb851a9..f19012c532 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:1053375 (outdated) -->
+<!-- English Revision: 669847:1053666 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 19e4185589..ea306e3f25 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:1053375 (outdated) -->
+<!-- English Revision: 813376:1053666 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index c4deb0c97e..486f72e415 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -229,7 +229,7 @@ headers</td></tr>
will have to read on for further complications.</p>
<p> The default value of <code>onsuccess</code> may need to be changed to
- <code>always</code> under the circumstances similar to those listed below
+ <code>always</code> under the circumstances similar to those listed below.
Note also that repeating this directive with both conditions makes sense in
some scenarios because <code>always</code> is not a superset of
<code>onsuccess</code> with respect to existing headers:</p>
diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja
index 9fcaebaa73..825a09e18e 100644
--- a/docs/manual/mod/mod_headers.xml.ja
+++ b/docs/manual/mod/mod_headers.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:1053655 (outdated) -->
+<!-- English Revision: 151408:1053666 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_headers.xml.ko b/docs/manual/mod/mod_headers.xml.ko
index e13840dabf..bd5db878a1 100644
--- a/docs/manual/mod/mod_headers.xml.ko
+++ b/docs/manual/mod/mod_headers.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: 151408:1053655 (outdated) -->
+<!-- English Revision: 151408:1053666 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index b4f57284f8..800dcd8c69 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -330,6 +330,10 @@ RewriteRule ^index\.html$ newsite.html
</li>
</ul>
+ <p>If the <em>TestString</em> has the special value <code>expr</code>, the
+ <em>CondPattern</em> will be treated as a
+ <a href="../expr.html">ap_expr</a>.</p>
+
<p>Other things you should be aware of:</p>
<ol>
@@ -583,6 +587,12 @@ RewriteRule ^index\.html$ newsite.html
</div>
</li>
+ <li>
+ <p>If the <em>TestString</em> has the special value <code>expr</code>, the
+ <em>CondPattern</em> will be treated as a
+ <a href="../expr.html">ap_expr</a>.</p>
+ </li>
+
<li>You can also set special flags for
<em>CondPattern</em> by appending
<strong><code>[</code><em>flags</em><code>]</code></strong>
@@ -1028,9 +1038,10 @@ cannot use <code>$N</code> in the substitution string!
...</a></em></td>
</tr>
<tr>
- <td>env|E=<em>VAR</em>[:<em>VAL</em>]</td>
+ <td>env|E=[!]<em>VAR</em>[:<em>VAL</em>]</td>
<td>Causes an environment variable <em>VAR</em> to be set (to the
- value <em>VAL</em> if provided). <em><a href="../rewrite/flags.html#flag_e">details ...</a></em></td>
+ value <em>VAL</em> if provided). The form !<em>VAR</em> causes
+ the environment variable <em>VAR</em> to be unset.<em><a href="../rewrite/flags.html#flag_e">details ...</a></em></td>
</tr>
<tr>
<td>forbidden|F</td>
diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en
index 6914e6bfd2..d1c6720786 100644
--- a/docs/manual/mod/mod_substitute.html.en
+++ b/docs/manual/mod/mod_substitute.html.en
@@ -97,7 +97,7 @@
&lt;/Location&gt;
</code></p></div>
- <p>Backreferences can be used in the comparison and in the substituion,
+ <p>Backreferences can be used in the comparison and in the substitution,
when regular expressions are used, as illustrated in the following example: </p>
<div class="example"><h3>Example of using backreferences and captures</h3><p><code>
&lt;Location /&gt;
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 6e3ac03a90..ea6356286b 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -718,7 +718,7 @@ client connections</td></tr>
of adjustment should only be made in a test environment which allows
the full set of web server processing can be exercised, as there
may be infrequent requests which require more stack to process.
- The minumum required stack size strongly depends on the modules
+ The minimum required stack size strongly depends on the modules
used, but any change in the web server configuration can invalidate
the current <code class="directive">ThreadStackSize</code> setting.</li>
</ul>
diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de
index 724d0d016e..70c2c566d2 100644
--- a/docs/manual/mod/mpm_common.xml.de
+++ b/docs/manual/mod/mpm_common.xml.de
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151408:1032706 (outdated) -->
+<!-- English Revision: 151408:1053666 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja
index af3de76c29..1223753930 100644
--- a/docs/manual/mod/mpm_common.xml.ja
+++ b/docs/manual/mod/mpm_common.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 674934:1032706 (outdated) -->
+<!-- English Revision: 674934:1053666 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mpm_common.xml.tr b/docs/manual/mod/mpm_common.xml.tr
index e4e0421c88..3ceac268ba 100644
--- a/docs/manual/mod/mpm_common.xml.tr
+++ b/docs/manual/mod/mpm_common.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 804678:1032706 (outdated) -->
+<!-- English Revision: 804678:1053666 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>