Merge branch 'master' into timeheap

[ashd.git] / python / doc / scgi-wsgi.doc

diff --git a/python/doc/scgi-wsgi.doc b/python/doc/scgi-wsgi.doc
index 1aab621..08fc31e 100644 (file)
--- a/python/doc/scgi-wsgi.doc
+++ b/python/doc/scgi-wsgi.doc
@@ -7,7 +7,7 @@ scgi-wsgi - WSGI adapter for SCGI
 
 SYNOPSIS
 --------
-*scgi-wsgi* [*-hA*] [*-p* 'MODPATH'] [*-T* \[HOST:]'PORT'] 'HANDLER-MODULE' ['ARGS'...]
+*scgi-wsgi* [*-hAL*] [*-m* 'PDM-SPEC'] [*-p* 'MODPATH'] [*-t* 'HANDLING-MODEL'] [*-T* \[HOST:]'PORT'] 'HANDLER-MODULE' ['ARGS'...]
 
 DESCRIPTION
 -----------
@@ -41,11 +41,22 @@ OPTIONS
        the WSGI application object. See the PROTOCOL section of
        *ashd-wsgi*(1) for details.
 
+*-L*::
+       By default, *scgi-wsgi* sets up the Python logging with a
+       logging format and for logging to standard error. The *-L*
+       option suppresses that behavior, so that any handler module
+       may set up logging itself.
+
 *-p* 'MODPATH'::
 
        Prepend 'MODPATH' to Python's `sys.path`; can be given multiple
        times.
 
+*-t* 'HANDLING-MODEL'::
+
+       Specify the way *scgi-wsgi* handles requests. See the REQUEST
+       HANDLING section of *ashd-wsgi*(1) for details.
+
 *-T* \[HOST:]'PORT'::
 
        Instead of using a listening socket passed on standard input
@@ -53,6 +64,12 @@ OPTIONS
        address listening for connections on 'PORT' instead. If 'HOST'
        is not given, `localhost` is used by default.
 
+*-m* 'PDM-SPEC'::
+
+       If the PDM library is installed on the system, create a
+       listening socket for connecting PDM clients according to
+       'PDM-SPEC'.
+
 AUTHOR
 ------
 Fredrik Tolf <fredrik@dolda2000.com>