diff options
author | Luca Toscano <elukey@apache.org> | 2019-12-09 10:28:43 +0100 |
---|---|---|
committer | Luca Toscano <elukey@apache.org> | 2019-12-09 10:28:43 +0100 |
commit | 940ba678d2200172e90e29e57a85a5dd3a7ec492 (patch) | |
tree | 2746c7bf7d385018744da902bb3c1b1ef80661c8 /docs/manual | |
parent | Axe an empty line in order to synch with 2.4.x (diff) | |
download | apache2-940ba678d2200172e90e29e57a85a5dd3a7ec492.tar.xz apache2-940ba678d2200172e90e29e57a85a5dd3a7ec492.zip |
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1871080 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | docs/manual/mod/mod_proxy.html.en | 6 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_rewrite.html.en | 8 | ||||
-rw-r--r-- | docs/manual/mod/mod_rewrite.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_rewrite.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_ssl.html.en | 4 | ||||
-rw-r--r-- | docs/manual/mod/mod_ssl.xml.es | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_ssl.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_ssl.xml.meta | 2 |
11 files changed, 21 insertions, 13 deletions
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index a1222ce343..fd6dc9e750 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -783,7 +783,7 @@ NoProxy .example.com 192.168.112.0/21</pre> <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy</td></tr> -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4.39 and later</td></tr> +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4.40 and later</td></tr> </table> <p>This directive determines whether the proxy should forward 100-continue <em>Expect:</em>ation to the origin server and thus let it decide when/if @@ -1006,7 +1006,7 @@ proxied resources</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="ProxyMaxForwards" id="ProxyMaxForwards">ProxyMaxForwards</a> <a name="proxymaxforwards" id="proxymaxforwards">Directive</a> <a title="Permanent link" href="#proxymaxforwards" class="permalink">¶</a></h2> <table class="directive"> -<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximium number of proxies that a request can be forwarded +<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of proxies that a request can be forwarded through</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyMaxForwards <var>number</var></code></td></tr> <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyMaxForwards -1</code></td></tr> @@ -2085,7 +2085,7 @@ expressions</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_proxy</td></tr> </table> - <p>This directive allows a user to specifiy a timeout on proxy requests. + <p>This directive allows a user to specify a timeout on proxy requests. This is useful when you have a slow/buggy appserver which hangs, and you would rather just return a timeout and fail gracefully instead of waiting however long it takes the server to return.</p> diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index 493a303cbb..b084f5833c 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -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.fr.xsl"?> -<!-- English Revision: 1856036 --> +<!-- English Revision: 1856036:1870672 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index e5396d237a..ac0c9c0143 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.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: 344971:1856036 (outdated) --> +<!-- English Revision: 344971:1870672 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta index 38a79fdda7..f0185375d4 100644 --- a/docs/manual/mod/mod_proxy.xml.meta +++ b/docs/manual/mod/mod_proxy.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> </variants> </metafile> diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 304c97298a..8b80c881a2 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -531,6 +531,14 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" <em>CondPattern</em>, or is equal to <em>CondPattern</em> (the two strings are equal, character for character).</dd> </dl> + <div class="note"><h3>Note</h3> + The string comparison operator is part of the <em>CondPattern</em> + argument and must be included in the quotes if those are used. Eg. + + <pre class="prettyprint lang-config">RewriteCond %{HTTP_USER_AGENT} "=This Robot/1.0"</pre> + + </div> + </li> <li> diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index 4ef2c39568..e9caf2f2e4 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -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.fr.xsl"?> -<!-- English Revision: 1853280 --> +<!-- English Revision: 1853280:1870427 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 4bb642c287..bac5512335 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -2446,7 +2446,7 @@ should be shared between multiple nodes. For single-instance httpd setups, it is recommended to <em>not</em> configure a ticket key file, but to rely on (random) keys generated by mod_ssl at startup, instead.</p> <p>The ticket key file must contain 48 bytes of random data, -preferrably created from a high-entropy source. On a Unix-based system, +preferably created from a high-entropy source. On a Unix-based system, a ticket key file can be created as follows:</p> <div class="example"><p><code> @@ -2534,7 +2534,7 @@ utility:</p> openssl srp -srpvfile passwd.srpv -userinfo "some info" -add username </code></p></div> <p> The value given with the optional <code>-userinfo</code> parameter is -avalable in the <code>SSL_SRP_USERINFO</code> request environment variable.</p> +available in the <code>SSL_SRP_USERINFO</code> request environment variable.</p> </div> diff --git a/docs/manual/mod/mod_ssl.xml.es b/docs/manual/mod/mod_ssl.xml.es index a12f0eb078..377b6d9ea9 100644 --- a/docs/manual/mod/mod_ssl.xml.es +++ b/docs/manual/mod/mod_ssl.xml.es @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?> -<!-- English Revision: 1817381:1869606 (outdated) --> +<!-- English Revision: 1817381:1870672 (outdated) --> <!-- Spanish Translation: Daniel Ferradal <dferradal@apache.org> --> <!-- Updated and reviewed: Luis Gil de bernabe <lgilbernabe@apache.org> --> diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr index 3843fdc4b8..13c9cc5e46 100644 --- a/docs/manual/mod/mod_ssl.xml.fr +++ b/docs/manual/mod/mod_ssl.xml.fr @@ -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.fr.xsl"?> -<!-- English Revision: 1869606 --> +<!-- English Revision: 1869606:1870672 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_ssl.xml.meta b/docs/manual/mod/mod_ssl.xml.meta index d50eb9de39..194507ef07 100644 --- a/docs/manual/mod/mod_ssl.xml.meta +++ b/docs/manual/mod/mod_ssl.xml.meta @@ -9,6 +9,6 @@ <variants> <variant>en</variant> <variant outdated="yes">es</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> |