diff options
Diffstat (limited to 'docs/manual')
| -rw-r--r-- | docs/manual/content-negotiation.html.en | 18 | ||||
| -rw-r--r-- | docs/manual/content-negotiation.html.tr.utf8 | 1 | ||||
| -rw-r--r-- | docs/manual/content-negotiation.xml | 2 | ||||
| -rw-r--r-- | docs/manual/content-negotiation.xml.ja | 2 | ||||
| -rw-r--r-- | docs/manual/content-negotiation.xml.ko | 2 | ||||
| -rw-r--r-- | docs/manual/content-negotiation.xml.meta | 2 | ||||
| -rw-r--r-- | docs/manual/content-negotiation.xml.tr | 2 |
7 files changed, 20 insertions, 9 deletions
diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en index 60798077e0..f961214146 100644 --- a/docs/manual/content-negotiation.html.en +++ b/docs/manual/content-negotiation.html.en @@ -135,15 +135,24 @@ Negotiation</a></li> <p>in the server configuration file.</p> <p>Type map files should have the same name as the resource - which they are describing, and have an entry for each available + which they are describing, followed by the extension + <code>.var</code>. In the examples shown below, the resource is + named <code>foo</code>, so the type map file is named + <code>foo.var</code>.</p> + + <p>This file should have an entry for each available variant; these entries consist of contiguous HTTP-format header lines. Entries for different variants are separated by blank lines. Blank lines are illegal within an entry. It is conventional to begin a map file with an entry for the combined entity as a whole (although this is not required, and if - present will be ignored). An example map file is shown below. - This file would be named <code>foo.var</code>, as it describes - a resource named <code>foo</code>.</p> + present will be ignored). An example map file is shown below.</p> + + <p>URIs in this file are relative to the location of the type map + file. Usually, these files will be located in the same directory as + the type map file, but this is not required. You may provide + absolute or relative URIs for any file located on the same server as + the map file.</p> <div class="example"><p><code> URI: foo<br /> @@ -156,6 +165,7 @@ Negotiation</a></li> Content-type: text/html;charset=iso-8859-2<br /> Content-language: fr, de<br /> </code></p></div> + <p>Note also that a typemap file will take precedence over the filename's extension, even when Multiviews is on. If the variants have different source qualities, that may be indicated diff --git a/docs/manual/content-negotiation.html.tr.utf8 b/docs/manual/content-negotiation.html.tr.utf8 index 82f515cc59..9ec25c443c 100644 --- a/docs/manual/content-negotiation.html.tr.utf8 +++ b/docs/manual/content-negotiation.html.tr.utf8 @@ -23,6 +23,7 @@ <a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/content-negotiation.html" title="Türkçe"> tr </a></p> </div> +<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div> <p>Apache HTTPD, içerik uzlaşımını HTTP/1.1 belirtiminde bahsedildiği şekliyle diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml index d7402657aa..f0a007cc2e 100644 --- a/docs/manual/content-negotiation.xml +++ b/docs/manual/content-negotiation.xml @@ -128,7 +128,7 @@ which they are describing, followed by the extension <code>.var</code>. In the examples shown below, the resource is named <code>foo</code>, so the type map file is named - <code>foo.var<code>.</p> + <code>foo.var</code>.</p> <p>This file should have an entry for each available variant; these entries consist of contiguous HTTP-format header diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja index 19bd4c6141..037a6bf4ba 100644 --- a/docs/manual/content-negotiation.xml.ja +++ b/docs/manual/content-negotiation.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: 675610:1029134 (outdated) --> +<!-- English Revision: 675610:1149174 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/content-negotiation.xml.ko b/docs/manual/content-negotiation.xml.ko index 5929ce2b9b..f81bd32528 100644 --- a/docs/manual/content-negotiation.xml.ko +++ b/docs/manual/content-negotiation.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:1029134 (outdated) --> +<!-- English Revision: 151408:1149174 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/content-negotiation.xml.meta b/docs/manual/content-negotiation.xml.meta index f3e81e598f..70a3640196 100644 --- a/docs/manual/content-negotiation.xml.meta +++ b/docs/manual/content-negotiation.xml.meta @@ -10,6 +10,6 @@ <variant>en</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/content-negotiation.xml.tr b/docs/manual/content-negotiation.xml.tr index e13ee23f6e..8372022721 100644 --- a/docs/manual/content-negotiation.xml.tr +++ b/docs/manual/content-negotiation.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: 1029134 --> +<!-- English Revision: 1029134:1149174 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> |