Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Fix explanation of option content_types. Reorder options.

Browse Source 
SVN Revision: 2756
This commit is contained in:
Badlop 2009-11-23 20:28:53 +00:00
parent 4f369d048d
commit 9ac9a84ca7
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/guide.html
View File

@ -2143,15 +2143,16 @@ Directory to serve the files.
</DD><DT CLASS="dt-description"><B><TT>{accesslog, Path}</TT></B></DT><DD CLASS="dd-description"> </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. File to log accesses using an Apache-like format.
No log will be recorded if this option is not specified. 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"> </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 Indicate one or more directory index files, similarly to Apache&#X2019;s
DirectoryIndex variable. When a web request hits a directory DirectoryIndex variable. When a web request hits a directory
instead of a regular file, those directory indices are looked in instead of a regular file, those directory indices are looked in
order, and the first one found is returned. 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, There are several content types already defined,
with this option you can add new definitions, modify or delete existing ones. 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;. To delete an existing definition, simply define it with a value: &#X2018;undefined&#X2019;.
@ -2171,13 +2172,13 @@ To use this module you must enable it:
{docroot, "/var/www"}, {docroot, "/var/www"},
{accesslog, "/var/log/ejabberd/access.log"}, {accesslog, "/var/log/ejabberd/access.log"},
{directory_indices, ["index.html", "main.htm"]}, {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"}, {content_types, [{".ogg", "audio/ogg"},
{".png", "image/png"}, {".png", "image/png"},
{".jpg", undefined} {".jpg", undefined}
]}, ]},
{custom_headers, [{"X-Powered-By", "Erlang/OTP"},
{"X-Fry", "It's a widely-believed fact!"}
]},
{default_content_type, "text/html"} {default_content_type, "text/html"}
] ]
}, },

20
doc/guide.tex
View File

@ -2832,20 +2832,16 @@ Options:
\titem{\{accesslog, Path\}} \ind{options!accesslog} \titem{\{accesslog, Path\}} \ind{options!accesslog}
File to log accesses using an Apache-like format. File to log accesses using an Apache-like format.
No log will be recorded if this option is not specified. 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} \titem{\{directory\_indices, [Index, ...]\}} \ind{options!directoryindices}
Indicate one or more directory index files, similarly to Apache's Indicate one or more directory index files, similarly to Apache's
DirectoryIndex variable. When a web request hits a directory DirectoryIndex variable. When a web request hits a directory
instead of a regular file, those directory indices are looked in instead of a regular file, those directory indices are looked in
order, and the first one found is returned. order, and the first one found is returned.
%B \titem{content\_types} \ind{options!contenttypes} \titem{\{custom\_headers, [ \{Name, Value\}, ...]\}} \ind{options!customheaders}
%M \titem{\{content\_types, \{Extension, Type\} \}} \ind{options!contenttypes} Indicate custom HTTP headers to be included in all responses.
%B \titem{\{content\_types, [ Extension, Type, ... ]\}} \ind{options!contenttypes} Default value is: \term{[]}
%B \titem{\{content\_types, [ {Extension, Type}, ... ]\}} \ind{options!contenttypes} \titem{\{content\_types, [ \{Name, Type\}, ...]\}} \ind{options!contenttypes}
%M \titem{\{content\_types, [ \{Extension, Type\}, ... ]\}} \ind{options!contenttypes} Specify mappings of extension to content type.
Specify a mapping of extensions to content types.
There are several content types already defined, There are several content types already defined,
with this option you can add new definitions, modify or delete existing ones. 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'. To delete an existing definition, simply define it with a value: `undefined'.
@ -2868,13 +2864,13 @@ To use this module you must enable it:
{docroot, "/var/www"}, {docroot, "/var/www"},
{accesslog, "/var/log/ejabberd/access.log"}, {accesslog, "/var/log/ejabberd/access.log"},
{directory_indices, ["index.html", "main.htm"]}, {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"}, {content_types, [{".ogg", "audio/ogg"},
{".png", "image/png"}, {".png", "image/png"},
{".jpg", undefined} {".jpg", undefined}
]}, ]},
{custom_headers, [{"X-Powered-By", "Erlang/OTP"},
{"X-Fry", "It's a widely-believed fact!"}
]},
{default_content_type, "text/html"} {default_content_type, "text/html"}
] ]
}, },