From ea4f379bd58f12a75ddc19f40148eb6747827c13 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Mon, 23 Nov 2009 19:11:37 +0000
Subject: [PATCH] Fix explanation of option content_types. Reorder options.

SVN Revision: 2755
---
 doc/guide.html | 15 ++++++++-------
 doc/guide.tex  | 20 ++++++++------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/doc/guide.html b/doc/guide.html
index 38247d69e..6e5127ea7 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -2155,15 +2155,16 @@ Directory to serve the files.
 </DD><DT CLASS="dt-description"><B><TT>{accesslog, Path}</TT></B></DT><DD CLASS="dd-description"> 
 File to log accesses using an Apache-like format.
 No log will be recorded if this option is not specified.
-</DD><DT CLASS="dt-description"><B><TT>{custom_headers, [ {Name, Value}, ...]}</TT></B></DT><DD CLASS="dd-description"> 
-Indicate custom HTTP headers to be included in all responses.
-Default value is: <TT>[]</TT>
 </DD><DT CLASS="dt-description"><B><TT>{directory_indices, [Index, ...]}</TT></B></DT><DD CLASS="dd-description"> 
 Indicate one or more directory index files, similarly to Apache&#X2019;s
 DirectoryIndex variable. When a web request hits a directory
 instead of a regular file, those directory indices are looked in
 order, and the first one found is returned.
-Specify a mapping of extensions to content types.
+</DD><DT CLASS="dt-description"><B><TT>{custom_headers, [ {Name, Value}, ...]}</TT></B></DT><DD CLASS="dd-description"> 
+Indicate custom HTTP headers to be included in all responses.
+Default value is: <TT>[]</TT>
+</DD><DT CLASS="dt-description"><B><TT>{content_types, [ {Name, Type}, ...]}</TT></B></DT><DD CLASS="dd-description"> 
+Specify mappings of extension to content type.
 There are several content types already defined,
 with this option you can add new definitions, modify or delete existing ones.
 To delete an existing definition, simply define it with a value: &#X2018;undefined&#X2019;.
@@ -2183,13 +2184,13 @@ To use this module you must enable it:
                          {docroot, "/var/www"}, 
                          {accesslog, "/var/log/ejabberd/access.log"},
                          {directory_indices, ["index.html", "main.htm"]},
+                         {custom_headers, [{"X-Powered-By", "Erlang/OTP"},
+                                           {"X-Fry", "It's a widely-believed fact!"}
+                                          ]},
                          {content_types, [{".ogg", "audio/ogg"},
                                           {".png", "image/png"},
                                           {".jpg", undefined}
                                          ]},
-                         {custom_headers, [{"X-Powered-By", "Erlang/OTP"},
-                                           {"X-Fry", "It's a widely-believed fact!"}
-                                          ]},
                          {default_content_type, "text/html"}
                         ]
   },
diff --git a/doc/guide.tex b/doc/guide.tex
index 32b8f622a..16d1ee2d7 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2849,20 +2849,16 @@ Options:
   \titem{\{accesslog, Path\}} \ind{options!accesslog}
     File to log accesses using an Apache-like format.
     No log will be recorded if this option is not specified.
-  \titem{\{custom\_headers, [ \{Name, Value\}, ...]\}} \ind{options!customheaders}
-    Indicate custom HTTP headers to be included in all responses.
-    Default value is: \term{[]}
   \titem{\{directory\_indices, [Index, ...]\}} \ind{options!directoryindices}
     Indicate one or more directory index files, similarly to Apache's
     DirectoryIndex variable. When a web request hits a directory
     instead of a regular file, those directory indices are looked in
     order, and the first one found is returned.
-  %B \titem{content\_types} \ind{options!contenttypes}
-  %M \titem{\{content\_types, \{Extension, Type\} \}} \ind{options!contenttypes}
-  %B \titem{\{content\_types, [ Extension, Type, ... ]\}} \ind{options!contenttypes}
-  %B \titem{\{content\_types, [ {Extension, Type}, ... ]\}} \ind{options!contenttypes}
-  %M \titem{\{content\_types, [ \{Extension, Type\}, ... ]\}} \ind{options!contenttypes}
-    Specify a mapping of extensions to content types.
+  \titem{\{custom\_headers, [ \{Name, Value\}, ...]\}} \ind{options!customheaders}
+    Indicate custom HTTP headers to be included in all responses.
+    Default value is: \term{[]}
+  \titem{\{content\_types, [ \{Name, Type\}, ...]\}} \ind{options!contenttypes}
+    Specify mappings of extension to content type.
     There are several content types already defined,
     with this option you can add new definitions, modify or delete existing ones.
     To delete an existing definition, simply define it with a value: `undefined'.
@@ -2885,13 +2881,13 @@ To use this module you must enable it:
                          {docroot, "/var/www"}, 
                          {accesslog, "/var/log/ejabberd/access.log"},
                          {directory_indices, ["index.html", "main.htm"]},
+                         {custom_headers, [{"X-Powered-By", "Erlang/OTP"},
+                                           {"X-Fry", "It's a widely-believed fact!"}
+                                          ]},
                          {content_types, [{".ogg", "audio/ogg"},
                                           {".png", "image/png"},
                                           {".jpg", undefined}
                                          ]},
-                         {custom_headers, [{"X-Powered-By", "Erlang/OTP"},
-                                           {"X-Fry", "It's a widely-believed fact!"}
-                                          ]},
                          {default_content_type, "text/html"}
                         ]
   },