Merge branch 'master' into timeheap

[ashd.git] / doc / sendfile.doc

diff --git a/doc/sendfile.doc b/doc/sendfile.doc
index 3c31929..57467b1 100644 (file)
--- a/doc/sendfile.doc
+++ b/doc/sendfile.doc
@@ -26,6 +26,12 @@ empty. However, if the *-f* argument is given, the given 'FILE' will
 always be served instead, and the `X-Ash-File` header and any rest
 string is ignored.
 
+A file's MIME type may be specified explicitly either by using the
+*-c* option, or by passing the header `X-Ash-Content-Type` to
+*sendfile* with the MIME type of the file. That header might, for
+instance, be set using the *set* directives of *dirplex*(1) or
+*patplex*(1).
+
 If a MIME-type is not explicitly specified, *sendfile* uses
 *libmagic*(3) to determine the MIME-type automatically. If *sendfile*
 is compiled with support for filesystem attributes (see *attr*(5) if
@@ -46,7 +52,7 @@ OPTIONS
 
 *-c* 'CONTENT-TYPE'::
 
-       Sends 'CONTENT-TYPE' as the file's MIME-type instead of trying
+       Send 'CONTENT-TYPE' as the file's MIME-type instead of trying
        to auto-detect the file type.
 
 *-f* 'FILE'::
@@ -60,4 +66,4 @@ Fredrik Tolf <fredrik@dolda2000.com>
 
 SEE ALSO
 --------
-*dirplex*(1), *ashd*(7)
+*dirplex*(1), *psendfile*(1), *ashd*(7)