From: Rich Bowen Date: Thu, 21 Jul 2011 13:54:38 +0000 (+0000) Subject: Fix XML error and rebuild changes. X-Git-Tag: 2.3.14^2~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad3b470ba48fbfca8893181483d2e6d3d091dd01;p=thirdparty%2Fapache%2Fhttpd.git Fix XML error and rebuild changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1149177 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en index 60798077e09..f9612141462 100644 --- a/docs/manual/content-negotiation.html.en +++ b/docs/manual/content-negotiation.html.en @@ -135,15 +135,24 @@ Negotiation

in the server configuration file.

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 + .var. In the examples shown below, the resource is + named foo, so the type map file is named + foo.var.

+ +

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 foo.var, as it describes - a resource named foo.

+ present will be ignored). An example map file is shown below.

+ +

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.

URI: foo
@@ -156,6 +165,7 @@ Negotiation Content-type: text/html;charset=iso-8859-2
Content-language: fr, de

+

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 82f515cc595..9ec25c443cb 100644 --- a/docs/manual/content-negotiation.html.tr.utf8 +++ b/docs/manual/content-negotiation.html.tr.utf8 @@ -23,6 +23,7 @@  ko  |  tr 

+
Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.

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 d7402657aa5..f0a007cc2e2 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 .var. In the examples shown below, the resource is named foo, so the type map file is named - foo.var.

+ foo.var.

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 19bd4c61417..037a6bf4ba2 100644 --- a/docs/manual/content-negotiation.xml.ja +++ b/docs/manual/content-negotiation.xml.ja @@ -1,7 +1,7 @@ - + + +