summaryrefslogtreecommitdiff
path: root/docs/manual/content-negotiation.html.en
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-10-01 20:57:36 +0000
committerStefan Fritsch <sf@apache.org>2011-10-01 20:57:36 +0000
commita83284e10365f9baf39331e545dde65ecdc99ef1 (patch)
tree62b5783c3c8bdd535762acfcac4676621f71bc25 /docs/manual/content-negotiation.html.en
parentf184e2562789b5c46d3752f0770472083fadfe8c (diff)
downloadhttpd-a83284e10365f9baf39331e545dde65ecdc99ef1.tar.gz
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1178089 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/content-negotiation.html.en')
-rw-r--r--docs/manual/content-negotiation.html.en8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 0d6b30344d..30264b0b90 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -85,7 +85,7 @@ Negotiation</a></li>
<p>httpd supports 'server driven' content negotiation, as
defined in the HTTP/1.1 specification. It fully supports the
<code>Accept</code>, <code>Accept-Language</code>,
- <code>Accept-Charset</code> and<code>Accept-Encoding</code>
+ <code>Accept-Charset</code> and<code>Accept-Encoding</code>
request headers. httpd also supports 'transparent'
content negotiation, which is an experimental negotiation
protocol defined in RFC 2295 and RFC 2296. It does not offer
@@ -140,7 +140,7 @@ Negotiation</a></li>
<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
@@ -341,7 +341,7 @@ Negotiation</a></li>
not selected at each test are eliminated. After each test,
if only one variant remains, select it as the best match
and proceed to step 3. If more than one variant remains,
- move on to the next test.
+ move on to the next test.
<ol>
<li>Multiply the quality factor from the <code>Accept</code>
@@ -521,7 +521,7 @@ Negotiation</a></li>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="extensions" id="extensions">Extensions to Transparent Content
-Negotiation</a></h2>
+Negotiation</a></h2>
<p>httpd extends the transparent content negotiation protocol (RFC
2295) as follows. A new <code>{encoding ..}</code> element is used in