Try to reduce confusion over multiple and possible "conflicting"

versions of the term "default" by changing AddDefaultCharset to
be of the mode Off | On | charset
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 4a5434d3781d0c1d505201da03c307f3dfca9c00..749e7092c33dde73e844ea119168bf707e64dc93 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -166,13 +166,13 @@ AllowOverride None<BR>
 
 <H2><A NAME="adddefaultcharset">AddDefaultCharset directive</A></H2>
 <A HREF="directive-dict.html#Syntax" REL="Help"><STRONG>Syntax:</STRONG></A> 
-AddDefaultCharset <EM>None / Default / charset</EM><BR>
+AddDefaultCharset <EM>Off / On / charset</EM><BR>
 <A HREF="directive-dict.html#Context" REL="Help" ><STRONG>Context:</STRONG></A> 
 all<BR>
 <A HREF="directive-dict.html#Status" REL="Help" ><STRONG>Status:</STRONG></A> 
 core<BR>
 <A HREF="directive-dict.html#Default" REL="Help"><STRONG>Default:</STRONG></A>
-<CODE>AddDefaultCharset None</CODE><BR>
+<CODE>AddDefaultCharset Off</CODE><BR>
 <A HREF="directive-dict.html#Compatibility" REL="Help"><STRONG>Compatibility:
 </STRONG></A> AddDefaultCharset is only available in Apache 1.3.12 and 
 later<P>
@@ -180,9 +180,11 @@ This directive specifies the name of the character set that will be added
 to any response that does not have any parameter on the content
 type in the HTTP headers. This will override any character set specified
 in the body of the document via a <CODE>META</CODE> tag. A setting
-of <CODE>AddDefaultCharset None</CODE> disables this functionality.
-<CODE>AddDefaultCharset Default</CODE> is the exact same as
-<code>AddDefaultCharsetName iso-8859-1</code>.
+of <CODE>AddDefaultCharset Off</CODE> disables this functionality.
+<CODE>AddDefaultCharset On</CODE> enables Apache's internal
+default charset of <code>iso-8859-1</code> as required by the
+directive. You can also specify an alternate charset to be used;
+e.g. <code>AddDefaultCharset utf-8</code>.
 <P><HR>
 
 <H2><A NAME="addmodule">AddModule directive</A></H2>