diff options
author | Graham Leggett <minfrin@apache.org> | 2010-11-20 22:41:19 +0100 |
---|---|---|
committer | Graham Leggett <minfrin@apache.org> | 2010-11-20 22:41:19 +0100 |
commit | 676435def7515b5f8d57d03e3b208c707f6e6c35 (patch) | |
tree | 43495e1031417f6c600638f4387b2ba5d982b588 /docs/manual | |
parent | mod_include: Add the onerror attribute to the include element, allowing (diff) | |
download | apache2-676435def7515b5f8d57d03e3b208c707f6e6c35.tar.xz apache2-676435def7515b5f8d57d03e3b208c707f6e6c35.zip |
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037336 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r-- | docs/manual/caching.xml.tr | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.de | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.tr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_cache.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_cache.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_cache_disk.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_cache_disk.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_include.html.en | 31 | ||||
-rw-r--r-- | docs/manual/new_features_2_2.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/new_features_2_2.xml.pt-br | 2 | ||||
-rw-r--r-- | docs/manual/new_features_2_2.xml.tr | 2 | ||||
-rw-r--r-- | docs/manual/new_features_2_4.html.en | 7 | ||||
-rw-r--r-- | docs/manual/programs/configure.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/programs/configure.xml.tr | 2 | ||||
-rw-r--r-- | docs/manual/programs/htcacheclean.xml.ko | 2 | ||||
-rw-r--r-- | docs/manual/programs/htcacheclean.xml.tr | 2 |
17 files changed, 48 insertions, 20 deletions
diff --git a/docs/manual/caching.xml.tr b/docs/manual/caching.xml.tr index 5e2ba2f452..75acd37ab0 100644 --- a/docs/manual/caching.xml.tr +++ b/docs/manual/caching.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: 922237:1029134 (outdated) --> +<!-- English Revision: 922237:1037244 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 5ee2ee23a8..0241add52a 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: 167959:1034057 (outdated) --> +<!-- English Revision: 167959:1037244 (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 a1dce086bf..e68ebb2c2a 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:1034057 (outdated) --> +<!-- English Revision: 669847:1037244 (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 8a80ebabdc..a6604bd45c 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:1034057 (outdated) --> +<!-- English Revision: 813376:1037244 (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_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja index b241d6a0fc..d1d23710a4 100644 --- a/docs/manual/mod/mod_cache.xml.ja +++ b/docs/manual/mod/mod_cache.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: 504183:1029587 (outdated) --> +<!-- English Revision: 504183:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_cache.xml.ko b/docs/manual/mod/mod_cache.xml.ko index 17a811b56d..5c972320b2 100644 --- a/docs/manual/mod/mod_cache.xml.ko +++ b/docs/manual/mod/mod_cache.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: 105569:1029587 (outdated) --> +<!-- English Revision: 105569:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_cache_disk.xml.ja b/docs/manual/mod/mod_cache_disk.xml.ja index 8565b8063c..e44b50e356 100644 --- a/docs/manual/mod/mod_cache_disk.xml.ja +++ b/docs/manual/mod/mod_cache_disk.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: 515267:-1 (outdated) --> +<!-- English Revision: 515267:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_cache_disk.xml.ko b/docs/manual/mod/mod_cache_disk.xml.ko index 6ddb360518..67168506c5 100644 --- a/docs/manual/mod/mod_cache_disk.xml.ko +++ b/docs/manual/mod/mod_cache_disk.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: 105989:-1 (outdated) --> +<!-- English Revision: 105989:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en index a63dd8cfc1..fccf6fd023 100644 --- a/docs/manual/mod/mod_include.html.en +++ b/docs/manual/mod/mod_include.html.en @@ -348,9 +348,10 @@ scripts are invoked as normal using the complete URL given in the command, including any query string.</p> - <p>An attribute defines the location of the document; the - inclusion is done for each attribute given to the include - command. The valid attributes are:</p> + <p>An attribute defines the location of the document, and may + appear more than once in an include element; an inclusion is + done for each attribute given to the include command in turn. + The valid attributes are:</p> <dl> <dt><code>file</code></dt> @@ -375,11 +376,11 @@ <p>If the specified URL is a CGI program, the program will be executed and its output inserted in place of the directive in the parsed file. You may include a query string in a CGI url:</p> - + <div class="example"><p><code> <!--#include virtual="/cgi-bin/example.cgi?argument=value" --> </code></p></div> - + <p><code>include virtual</code> should be used in preference to <code>exec cgi</code> to include the output of CGI programs into an HTML document.</p> @@ -392,6 +393,26 @@ requests.</p> </dd> + + <dt><code>onerror</code></dt> + <dd><p>The value is a (%-encoded) URL-path which is shown should a + previous attempt to include a file or virtual attribute failed. + To be effective, this attribute must be specified after the + file or virtual attributes being covered. If the attempt to + include the onerror path fails, or if onerror is not specified, the + default error message will be included.</p> + + <div class="example"><p><code> + # Simple example<br /> + <!--#include virtual="/not-exist.html" onerror="/error.html" --> + </code></p></div> + + <div class="example"><p><code> + # Dedicated onerror paths<br /> + <!--#include virtual="/path-a.html" onerror="/error-a.html" virtual="/path-b.html" onerror="/error-b.html" --> + </code></p></div> + + </dd> </dl> diff --git a/docs/manual/new_features_2_2.xml.ko b/docs/manual/new_features_2_2.xml.ko index 5126a51e40..a932891b71 100644 --- a/docs/manual/new_features_2_2.xml.ko +++ b/docs/manual/new_features_2_2.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:922642 (outdated) --> +<!-- English Revision: 105989:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/new_features_2_2.xml.pt-br b/docs/manual/new_features_2_2.xml.pt-br index 81792aa0b8..25338aa65a 100644 --- a/docs/manual/new_features_2_2.xml.pt-br +++ b/docs/manual/new_features_2_2.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:922642 (outdated) --> +<!-- English Revision: 151408:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/new_features_2_2.xml.tr b/docs/manual/new_features_2_2.xml.tr index ca1ac9c338..7e9934025d 100644 --- a/docs/manual/new_features_2_2.xml.tr +++ b/docs/manual/new_features_2_2.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: 712041:922642 (outdated) --> +<!-- English Revision: 712041:1037244 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en index fdf094261c..99f8c41b36 100644 --- a/docs/manual/new_features_2_4.html.en +++ b/docs/manual/new_features_2_4.html.en @@ -109,6 +109,13 @@ <dt><code class="module"><a href="./mod/mod_allowmethods.html">mod_allowmethods</a></code></dt> <dd>New module to restrict certain HTTP methods without interfering with authentication or authorization.</dd> + + <dt><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></dt> + + <dd>Support for the 'onerror' attribute within an 'include' element, + allowing an error document to be served on error instead of the default + error string.</dd> + </dl> </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> diff --git a/docs/manual/programs/configure.xml.ko b/docs/manual/programs/configure.xml.ko index 5c88c243b6..740384185e 100644 --- a/docs/manual/programs/configure.xml.ko +++ b/docs/manual/programs/configure.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:1033032 (outdated) --> +<!-- English Revision: 105989:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/programs/configure.xml.tr b/docs/manual/programs/configure.xml.tr index fd50107fe3..0ab829a835 100644 --- a/docs/manual/programs/configure.xml.tr +++ b/docs/manual/programs/configure.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: 804977:1033032 (outdated) --> +<!-- English Revision: 804977:1037244 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/programs/htcacheclean.xml.ko b/docs/manual/programs/htcacheclean.xml.ko index a940d3c548..a793d9c97a 100644 --- a/docs/manual/programs/htcacheclean.xml.ko +++ b/docs/manual/programs/htcacheclean.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: 105711:1022230 (outdated) --> +<!-- English Revision: 105711:1037244 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/programs/htcacheclean.xml.tr b/docs/manual/programs/htcacheclean.xml.tr index 9543439807..7c7a36a0e2 100644 --- a/docs/manual/programs/htcacheclean.xml.tr +++ b/docs/manual/programs/htcacheclean.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: 650172:1022230 (outdated) --> +<!-- English Revision: 650172:1037244 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> |