Explain the changed syntax of CacheNegotiatedDocs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84814 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html
index 96222acb2272f4930e38b7e01ce76c6d81ceea3a..cbb026d22d15b008f52657cdbd6751749e15af65 100644 (file)
--- a/docs/manual/mod/mod_negotiation.html
+++ b/docs/manual/mod/mod_negotiation.html
@@ -115,7 +115,11 @@ requirements, and returns that document.<P>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> CacheNegotiatedDocs<BR>
+><STRONG>Syntax:</STRONG></A> CacheNegotiatedDocs <EM>boolean</EM><BR>
+<A
+ HREF="directive-dict.html#Default"
+ REL="Help"
+><STRONG>Default:</STRONG></A> <CODE>CacheNegotiatedDocs off</CODE><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -132,20 +136,21 @@ requirements, and returns that document.<P>
  HREF="directive-dict.html#Compatibility"
  REL="Help"
 ><STRONG>Compatibility:</STRONG></A> CacheNegotiatedDocs is only available
-in Apache 1.1 and later.<P>
+in Apache 1.1 and later. The syntax changed in version 2.0.<P>
 
 <P>If set, this directive allows content-negotiated documents to be
 cached by proxy servers. This could mean that clients behind those
 proxys could retrieve versions of the documents that are not the best
 match for their abilities, but it will make caching more
 efficient.
-<P>
 
-This directive only applies to requests which come from HTTP/1.0 browsers.
+<P>This directive only applies to requests which come from HTTP/1.0 browsers.
 HTTP/1.1 provides much better control over the caching of negotiated
 documents, and this directive has no effect in responses to
 HTTP/1.1 requests.
 
+<P>Prior to version 2.0, CacheNegotiatedDocs did not take an argument;
+it was turned on by the presence of the directive by itself.
 
 
 <H2><A NAME="languagepriority">LanguagePriority</A></H2>

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index ca98d3937bf7d0ea14652cc54ee39f4a31abc16c..8d66fe6687abe063261587fcc3bfe788ca72e25c 100644 (file)
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -133,7 +133,6 @@ static int do_cache_negotiated_docs(server_rec *s)
 
 static const command_rec negotiation_cmds[] =
 {
-    /* TODOC: CacheNegotiatedDocs now takes a FLAG argument */
     {"CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF, FLAG,
      "Either 'on' or 'off' (default)"},
     {"LanguagePriority", set_language_priority, NULL, OR_FILEINFO, ITERATE,