Make Bill happy ;)

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

diff --git a/CHANGES b/CHANGES
index 926cf6f274c81480f68faf0566fb665e94989be3..75528e6feeeddddb2bfe0aeda929c494b91f0dee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.3.0
 
-  *) mod_autoindex: Add in ContentType and Charset options to
+  *) mod_autoindex: Add in Type and Charset options to
      IndexOptions directive. This allows the admin to explicitly
      set the content-type and charset of the generated page.
      [Jim Jagielski]

diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index 1a876a39a52deca3799a119f1f32e72d4ce9da2e..a3b568db74ccd666536673c8d449485431ef687a 100644 (file)
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -541,17 +541,17 @@ indexing</description>
       </example>
       </dd>
       
-      <dt><a name="indexoptions.contenttype"
-               id="indexoptions.contenttype"
-      >ContentType=<var>MIME content-type</var></a> (<em>Apache 2.0.61 and
+      <dt><a name="indexoptions.type"
+               id="indexoptions.type"
+      >Type=<var>MIME content-type</var></a> (<em>Apache 2.0.61 and
       later</em>)</dt>
 
-      <dd>The <code>ContentType</code> keyword allows you to
+      <dd>The <code>Type</code> keyword allows you to
       specify the MIME content-type of the generated page. The default
       is <var>text/html</var>.
 
       <example><title>Example:</title>
-        IndexOptions ContentType=text/plain
+        IndexOptions Type=text/plain
       </example>
       </dd>
       

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 7a4fdbadf96fc3319406f3e93cfa29f718819009..8d514021a5ba4b6427cbe4bd0f8eaf7a8f22f285 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -478,8 +478,8 @@ static const char *add_opts(cmd_parms *cmd, void *d, int argc, char *const argv[
                 d_cfg->desc_adjust = K_NOADJUST;
             }
         }
-        else if (!strncasecmp(w, "ContentType=", 12)) {
-            d_cfg->ctype = apr_pstrdup(cmd->pool, &w[12]);
+        else if (!strncasecmp(w, "Type=", 5)) {
+            d_cfg->ctype = apr_pstrdup(cmd->pool, &w[5]);
         }
         else if (!strncasecmp(w, "Charset=", 8)) {
             d_cfg->charset = apr_pstrdup(cmd->pool, &w[8]);