diff options
author | Christophe Jaillet <jailletc36@apache.org> | 2016-05-01 09:13:01 +0000 |
---|---|---|
committer | Christophe Jaillet <jailletc36@apache.org> | 2016-05-01 09:13:01 +0000 |
commit | 348ec9de1129f14e2cd0af7b099c60e9fee19b4e (patch) | |
tree | 5fc5057f0d05acdc920dd25aa3188d4367329380 | |
parent | 17072601bd6eae365b5c3edc7ad2022e813378b9 (diff) | |
download | httpd-348ec9de1129f14e2cd0af7b099c60e9fee19b4e.tar.gz |
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741848 13f79535-47bb-0310-9956-ffa450edef68
42 files changed, 96 insertions, 98 deletions
diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en index b1bfe91622..f3e4955922 100644 --- a/docs/manual/custom-error.html.en +++ b/docs/manual/custom-error.html.en @@ -66,10 +66,10 @@ if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is set to FileInfo.</p> - <pre class="prettyprint lang-config">ErrorDocument 500 "Sorry, our script crashed. Oh dear"<br /> -ErrorDocument 500 /cgi-bin/crash-recover<br /> -ErrorDocument 500 http://error.example.com/server_error.html<br /> -ErrorDocument 404 /errors/not_found.html <br /> + <pre class="prettyprint lang-config">ErrorDocument 500 "Sorry, our script crashed. Oh dear" +ErrorDocument 500 /cgi-bin/crash-recover +ErrorDocument 500 http://error.example.com/server_error.html +ErrorDocument 404 /errors/not_found.html ErrorDocument 401 /subscription/how_to_subscribe.html</pre> @@ -155,8 +155,8 @@ ErrorDocument 401 /subscription/how_to_subscribe.html</pre> script might include the following:</p> <pre class="prettyprint lang-perl">... -print "Content-type: text/html\n"; <br /> -printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br /> +print "Content-type: text/html\n"; +printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; ...</pre> @@ -182,8 +182,8 @@ printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br /> <p>In your server configuration file, you'll see a line such as:</p> - <pre class="prettyprint lang-config"> # Multi-language error messages<br /> - #Include conf/extra/httpd-multilang-errordoc.conf</pre> + <pre class="prettyprint lang-config"># Multi-language error messages +#Include conf/extra/httpd-multilang-errordoc.conf</pre> <p>Uncommenting this <code>Include</code> line will enable this diff --git a/docs/manual/custom-error.xml.es b/docs/manual/custom-error.xml.es index 38bf5e4fdc..feafdd06ac 100644 --- a/docs/manual/custom-error.xml.es +++ b/docs/manual/custom-error.xml.es @@ -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.es.xsl"?> -<!-- English Revision: 420990:1361160 (outdated) --> +<!-- English Revision: 420990:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/custom-error.xml.fr b/docs/manual/custom-error.xml.fr index fa7be7039e..5e98fd4a6b 100644 --- a/docs/manual/custom-error.xml.fr +++ b/docs/manual/custom-error.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> -<!-- English Revision : 1361160 --> +<!-- English Revision: 1361160:1741841 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja index 41c9a7f5e2..639f497965 100644 --- a/docs/manual/custom-error.xml.ja +++ b/docs/manual/custom-error.xml.ja @@ -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.ja.xsl"?> -<!-- English Revision: 558686:1361160 (outdated) --> +<!-- English Revision: 558686:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/custom-error.xml.ko b/docs/manual/custom-error.xml.ko index 331c187467..cc41affccc 100644 --- a/docs/manual/custom-error.xml.ko +++ b/docs/manual/custom-error.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: 420990:1361160 (outdated) --> +<!-- English Revision: 420990:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/custom-error.xml.meta b/docs/manual/custom-error.xml.meta index 3a15b5a4cf..5900a59241 100644 --- a/docs/manual/custom-error.xml.meta +++ b/docs/manual/custom-error.xml.meta @@ -9,9 +9,9 @@ <variants> <variant>en</variant> <variant outdated="yes">es</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> - <variant>tr</variant> + <variant outdated="yes">tr</variant> </variants> </metafile> diff --git a/docs/manual/custom-error.xml.tr b/docs/manual/custom-error.xml.tr index b884d2b36e..b29cad2fb1 100644 --- a/docs/manual/custom-error.xml.tr +++ b/docs/manual/custom-error.xml.tr @@ -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.tr.xsl"?> -<!-- English Revision: 1361160 --> +<!-- English Revision: 1361160:1741841 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/developer/hooks.html.en b/docs/manual/developer/hooks.html.en index 9eadee7413..d8a3335037 100644 --- a/docs/manual/developer/hooks.html.en +++ b/docs/manual/developer/hooks.html.en @@ -31,9 +31,9 @@ date.</p> </div> - <p>In general, a hook function is one that the Apache HTTP Server - will call at some point during the processing of a request. - Modules can provide functions that are called, and specify when + <p>In general, a hook function is one that the Apache HTTP Server + will call at some point during the processing of a request. + Modules can provide functions that are called, and specify when they get called in comparison to other modules.</p> </div> <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#corehooks">Core Hooks</a></li> @@ -123,7 +123,7 @@ <p>The first hook that does <em>not</em> return <code>DECLINED</code> stops the loop and its return value is returned from the hook - caller. Note that <code>DECLINED</code> is the traditional + caller. Note that <code>DECLINED</code> is the traditional hook return value meaning "I didn't do anything", but it can be whatever suits you.</p> @@ -162,7 +162,7 @@ ret=ap_run_do_something(r, n);</pre> <p>Include the appropriate header, and define a static function of the correct type:</p> - <pre class="prettyprint lang-c">static int my_something_doer(request_rec *r, int n)<br /> + <pre class="prettyprint lang-c">static int my_something_doer(request_rec *r, int n) { ... return OK; @@ -202,7 +202,7 @@ mode MODULE_VAR_EXPORT my_module = order relative to each other, but, of course, all modules using <code>APR_HOOK_FIRST</code> will be run before <code>APR_HOOK_MIDDLE</code> which are before <code>APR_HOOK_LAST</code>. Modules that don't care - when they are run should use <code>APR_HOOK_MIDDLE</code>. <em>These + when they are run should use <code>APR_HOOK_MIDDLE</code>. <em>These values are spaced out, so that positions like <code>APR_HOOK_FIRST-2</code> are possible to hook slightly earlier than other functions.</em></p> diff --git a/docs/manual/developer/output-filters.html.en b/docs/manual/developer/output-filters.html.en index 565bda425c..d7eedcbc60 100644 --- a/docs/manual/developer/output-filters.html.en +++ b/docs/manual/developer/output-filters.html.en @@ -131,12 +131,12 @@ brigade should have no side effects (such as changing any state private to the filter).</p> - <div class="example"><h3>How to handle an empty brigade</h3><pre class="prettyprint lang-c"> apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)<br /> - { - if (APR_BRIGADE_EMPTY(bb)) { - return APR_SUCCESS; - } - ....</pre> + <div class="example"><h3>How to handle an empty brigade</h3><pre class="prettyprint lang-c">apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb) +{ + if (APR_BRIGADE_EMPTY(bb)) { + return APR_SUCCESS; + } + ...</pre> </div> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -281,16 +281,16 @@ const char *data; apr_size_t length; while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { - rv = apr_bucket_read(e, &data, &length, APR_BLOCK_READ); - if (rv) ...; - /* Remove bucket e from bb. */ - APR_BUCKET_REMOVE(e); - /* Insert it into temporary brigade. */ - APR_BRIGADE_INSERT_HEAD(tmpbb, e); - /* Pass brigade downstream. */ - rv = ap_pass_brigade(f->next, tmpbb); - if (rv) ...; - apr_brigade_cleanup(tmpbb); + rv = apr_bucket_read(e, &data, &length, APR_BLOCK_READ); + if (rv) ...; + /* Remove bucket e from bb. */ + APR_BUCKET_REMOVE(e); + /* Insert it into temporary brigade. */ + APR_BRIGADE_INSERT_HEAD(tmpbb, e); + /* Pass brigade downstream. */ + rv = ap_pass_brigade(f->next, tmpbb); + if (rv) ...; + apr_brigade_cleanup(tmpbb); }</pre> </div> @@ -307,26 +307,24 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { a new brigade per invocation as described in the <a href="#brigade">Brigade structure</a> section.</p> <div class="example"><h3>Example code to maintain filter state</h3><pre class="prettyprint lang-c">struct dummy_state { - apr_bucket_brigade *tmpbb; - int filter_state; - ... + apr_bucket_brigade *tmpbb; + int filter_state; + ... }; apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb) { - struct dummy_state *state; state = f->ctx; if (state == NULL) { - /* First invocation for this response: initialise state structure. - */ - f->ctx = state = apr_palloc(f->r->pool, sizeof *state); - - state->tmpbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc); - state->filter_state = ...; + /* First invocation for this response: initialise state structure. + */ + f->ctx = state = apr_palloc(f->r->pool, sizeof *state); + state->tmpbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc); + state->filter_state = ...; } ...</pre> </div> @@ -421,7 +419,8 @@ while ((e = APR_BRIGADE_FIRST(bb)) != APR_BRIGADE_SENTINEL(bb)) { /* Retry, using a blocking read. */ mode = APR_BLOCK_READ; continue; - } else if (rv != APR_SUCCESS) { + } + else if (rv != APR_SUCCESS) { /* handle errors */ } diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en index e75f17b550..415d342671 100644 --- a/docs/manual/howto/htaccess.html.en +++ b/docs/manual/howto/htaccess.html.en @@ -272,7 +272,7 @@ changes on a per-directory basis.</p> </Directory> <Location "/"> - Options +IncludesNoExec -ExecCGI<br /> + Options +IncludesNoExec -ExecCGI </Location></pre> diff --git a/docs/manual/howto/htaccess.xml.fr b/docs/manual/howto/htaccess.xml.fr index 0e08dd201a..b35ba36835 100644 --- a/docs/manual/howto/htaccess.xml.fr +++ b/docs/manual/howto/htaccess.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1673563 --> +<!-- English Revision: 1673563:1741841 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja index e84e0be9e6..0a72c01e78 100644 --- a/docs/manual/howto/htaccess.xml.ja +++ b/docs/manual/howto/htaccess.xml.ja @@ -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.ja.xsl"?> -<!-- English Revision: 574882:1673563 (outdated) --> +<!-- English Revision: 574882:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/htaccess.xml.ko b/docs/manual/howto/htaccess.xml.ko index d9e417ffad..42c066ea05 100644 --- a/docs/manual/howto/htaccess.xml.ko +++ b/docs/manual/howto/htaccess.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: 151408:1673563 (outdated) --> +<!-- English Revision: 151408:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/htaccess.xml.meta b/docs/manual/howto/htaccess.xml.meta index a962e7243c..aba40c04ac 100644 --- a/docs/manual/howto/htaccess.xml.meta +++ b/docs/manual/howto/htaccess.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> <variant outdated="yes">pt-br</variant> diff --git a/docs/manual/howto/htaccess.xml.pt-br b/docs/manual/howto/htaccess.xml.pt-br index 89a8764b39..e7d1f1dadf 100644 --- a/docs/manual/howto/htaccess.xml.pt-br +++ b/docs/manual/howto/htaccess.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:1673563 (outdated) --> +<!-- English Revision: 151408:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en index 1f97e4d44e..55f23747ff 100644 --- a/docs/manual/howto/public_html.html.en +++ b/docs/manual/howto/public_html.html.en @@ -139,8 +139,8 @@ You can, likewise, disable the feature for all but a few users by using a configuration like the following:</p> - <pre class="prettyprint lang-config"> UserDir disabled<br /> - UserDir enabled rbowen krietz</pre> + <pre class="prettyprint lang-config">UserDir disabled +UserDir enabled rbowen krietz</pre> <p>See <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> diff --git a/docs/manual/howto/public_html.xml.fr b/docs/manual/howto/public_html.xml.fr index 972470e914..f753ee2a55 100644 --- a/docs/manual/howto/public_html.xml.fr +++ b/docs/manual/howto/public_html.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1673563 --> +<!-- English Revision: 1673563:1741841 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja index b27ef4b629..d4ef0ec414 100644 --- a/docs/manual/howto/public_html.xml.ja +++ b/docs/manual/howto/public_html.xml.ja @@ -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.ja.xsl"?> -<!-- English Revision: 1591193:1673563 (outdated) --> +<!-- English Revision: 1591193:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/public_html.xml.ko b/docs/manual/howto/public_html.xml.ko index 3d79e7b8cb..ac8f1903d8 100644 --- a/docs/manual/howto/public_html.xml.ko +++ b/docs/manual/howto/public_html.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: 151408:1673563 (outdated) --> +<!-- English Revision: 151408:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/public_html.xml.meta b/docs/manual/howto/public_html.xml.meta index 30c006edff..cae6f7cca8 100644 --- a/docs/manual/howto/public_html.xml.meta +++ b/docs/manual/howto/public_html.xml.meta @@ -8,9 +8,9 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> - <variant>tr</variant> + <variant outdated="yes">tr</variant> </variants> </metafile> diff --git a/docs/manual/howto/public_html.xml.tr b/docs/manual/howto/public_html.xml.tr index 8412287c1d..5aa4eb2106 100644 --- a/docs/manual/howto/public_html.xml.tr +++ b/docs/manual/howto/public_html.xml.tr @@ -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.tr.xsl"?> -<!-- English Revision: 1673563 --> +<!-- English Revision: 1673563:1741841 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr> Reviewed by: Orhan Berent <berent belgeler.gen.tr> diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en index 2e097d5f8e..9327ed66d9 100644 --- a/docs/manual/howto/ssi.html.en +++ b/docs/manual/howto/ssi.html.en @@ -109,8 +109,8 @@ existing HTML documents.</p> do this. You can tell Apache to parse any file with a particular file extension, such as <code>.shtml</code>, with the following directives:</p> -<pre class="prettyprint lang-config"> AddType text/html .shtml<br /> - AddOutputFilter INCLUDES .shtml</pre> +<pre class="prettyprint lang-config">AddType text/html .shtml +AddOutputFilter INCLUDES .shtml</pre> <p>One disadvantage to this approach is that if you wanted to diff --git a/docs/manual/howto/ssi.xml.fr b/docs/manual/howto/ssi.xml.fr index 58b1b7407d..c297371491 100644 --- a/docs/manual/howto/ssi.xml.fr +++ b/docs/manual/howto/ssi.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision : 1646393 --> +<!-- English Revision: 1646393:1741841 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/howto/ssi.xml.ja b/docs/manual/howto/ssi.xml.ja index 62ba14c791..131573fec4 100644 --- a/docs/manual/howto/ssi.xml.ja +++ b/docs/manual/howto/ssi.xml.ja @@ -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.ja.xsl"?> -<!-- English Revision: 659902:1646393 (outdated) --> +<!-- English Revision: 659902:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/ssi.xml.ko b/docs/manual/howto/ssi.xml.ko index ed1ae0db44..636f5cc348 100644 --- a/docs/manual/howto/ssi.xml.ko +++ b/docs/manual/howto/ssi.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: 659902:1646393 (outdated) --> +<!-- English Revision: 659902:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/howto/ssi.xml.meta b/docs/manual/howto/ssi.xml.meta index 0d8deb802c..1c020635eb 100644 --- a/docs/manual/howto/ssi.xml.meta +++ b/docs/manual/howto/ssi.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> </variants> diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en index f0b5ff88b1..db5e69b82f 100644 --- a/docs/manual/logs.html.en +++ b/docs/manual/logs.html.en @@ -446,9 +446,9 @@ CustomLog logs/access_log common env=!dontlog</pre> english-speakers to one log file, and non-english speakers to a different log file.</p> - <pre class="prettyprint lang-config"> SetEnvIf Accept-Language "en" english<br /> - CustomLog logs/english_log common env=english<br /> - CustomLog logs/non_english_log common env=!english</pre> + <pre class="prettyprint lang-config">SetEnvIf Accept-Language "en" english +CustomLog logs/english_log common env=english +CustomLog logs/non_english_log common env=!english</pre> <p>In a caching scenario one would want to know about diff --git a/docs/manual/logs.xml.fr b/docs/manual/logs.xml.fr index 4bd04f92f3..103138e3bb 100644 --- a/docs/manual/logs.xml.fr +++ b/docs/manual/logs.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1739105 --> +<!-- English Revision: 1739105:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja index deae6c457f..03635f5958 100644 --- a/docs/manual/logs.xml.ja +++ b/docs/manual/logs.xml.ja @@ -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.ja.xsl"?> -<!-- English Revision: 659902:1739105 (outdated) --> +<!-- English Revision: 659902:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.xml.ko b/docs/manual/logs.xml.ko index 7a369ac42e..955ceb5ed9 100644 --- a/docs/manual/logs.xml.ko +++ b/docs/manual/logs.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:1739105 (outdated) --> +<!-- English Revision: 105989:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.xml.meta b/docs/manual/logs.xml.meta index 666a35465e..9005f4528b 100644 --- a/docs/manual/logs.xml.meta +++ b/docs/manual/logs.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> <variant outdated="yes">tr</variant> diff --git a/docs/manual/logs.xml.tr b/docs/manual/logs.xml.tr index 4583880d44..23e4839a82 100644 --- a/docs/manual/logs.xml.tr +++ b/docs/manual/logs.xml.tr @@ -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.tr.xsl"?> -<!-- English Revision: 1657858:1739105 (outdated) --> +<!-- English Revision: 1657858:1741841 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr> Reviewed by: Orhan Berent <berent belgeler.gen.tr> diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en index f57e88673a..27a5812882 100644 --- a/docs/manual/mod/mod_include.html.en +++ b/docs/manual/mod/mod_include.html.en @@ -985,8 +985,8 @@ server.</td></tr> output of a file each processing different commands (possibly at different times).</p> - <pre class="prettyprint lang-config"> SSIStartTag "<%"<br /> - SSIEndTag "%>"</pre> + <pre class="prettyprint lang-config">SSIStartTag "<%" +SSIEndTag "%>"</pre> <p>The example given above, which also specifies a matching diff --git a/docs/manual/mod/mod_include.xml.fr b/docs/manual/mod/mod_include.xml.fr index a07c1b6779..224335964e 100644 --- a/docs/manual/mod/mod_include.xml.fr +++ b/docs/manual/mod/mod_include.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: 1735963 --> +<!-- English Revision: 1735963:1741841 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_include.xml.ja b/docs/manual/mod/mod_include.xml.ja index f62869704e..100151ad2c 100644 --- a/docs/manual/mod/mod_include.xml.ja +++ b/docs/manual/mod/mod_include.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: 656287:1735963 (outdated) --> +<!-- English Revision: 656287:1741841 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_include.xml.meta b/docs/manual/mod/mod_include.xml.meta index 38fc26d152..05ca827f41 100644 --- a/docs/manual/mod/mod_include.xml.meta +++ b/docs/manual/mod/mod_include.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_lua.html.en b/docs/manual/mod/mod_lua.html.en index ac3fcefdb0..93ba7faa2c 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -1007,17 +1007,16 @@ end</pre> <div class="section"> <h2><a name="logging" id="logging">Logging Functions</a></h2> -<pre class="prettyprint lang-lua"> -- examples of logging messages<br /> - r:trace1("This is a trace log message") -- trace1 through trace8 can be used <br /> - r:debug("This is a debug log message")<br /> - r:info("This is an info log message")<br /> - r:notice("This is a notice log message")<br /> - r:warn("This is a warn log message")<br /> - r:err("This is an err log message")<br /> - r:alert("This is an alert log message")<br /> - r:crit("This is a crit log message")<br /> - r:emerg("This is an emerg log message")<br /> -</pre> +<pre class="prettyprint lang-lua">-- examples of logging messages +r:trace1("This is a trace log message") -- trace1 through trace8 can be used +r:debug("This is a debug log message") +r:info("This is an info log message") +r:notice("This is a notice log message") +r:warn("This is a warn log message") +r:err("This is an err log message") +r:alert("This is an alert log message") +r:crit("This is a crit log message") +r:emerg("This is an emerg log message")</pre> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr index 1c48aa8bb7..58b86cd99c 100644 --- a/docs/manual/mod/mod_lua.xml.fr +++ b/docs/manual/mod/mod_lua.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1701351 --> +<!-- English Revision: 1701351:1741841 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_lua.xml.meta b/docs/manual/mod/mod_lua.xml.meta index b55c7710e9..8fc1a0efdf 100644 --- a/docs/manual/mod/mod_lua.xml.meta +++ b/docs/manual/mod/mod_lua.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_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 7d9fe975f1..da26030312 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -671,7 +671,7 @@ RewriteRule ^(.+) /other/archive/$1 [R]</pre> </li> - <li> + <li> <p>If the <em>TestString</em> has the special value <code>expr</code>, the <em>CondPattern</em> will be treated as an <a href="../expr.html">ap_expr</a>.</p> @@ -682,7 +682,7 @@ RewriteRule ^(.+) /other/archive/$1 [R]</pre> to block unwanted hotlinking. </p> - <pre class="prettyprint lang-config">RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br /> + <pre class="prettyprint lang-config">RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'" RewriteRule "^/images" "-" [F]</pre> </li> diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index 45b0db3708..1e156d916e 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: 1737777 --> +<!-- English Revision: 1737777:1741841 (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> |