X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=doc%2Fdirplex.doc;h=7d1e41fea0a4e1793d6a25f9fd7a724eba62ecb5;hb=aa7e44069384016c57c417904bb45f6fa554981a;hp=d41c1add31eb99fa509e479e87f76d1131855da6;hpb=b70b2d4f237082541d01b4b33abc86ef2b7b2223;p=ashd.git

diff --git a/doc/dirplex.doc b/doc/dirplex.doc
index d41c1ad..7d1e41f 100644
--- a/doc/dirplex.doc
+++ b/doc/dirplex.doc
@@ -82,11 +82,11 @@ CONFIGURATION
 Configuration in *dirplex* comes from several sources. When *dirplex*
 starts, unless the *-N* option is given, it tries to find a global
 configuration file named `dirplex.rc`. It looks in all directories
-named by the *PATH* environment variable, appended with `../etc`. For
-example, then, if *PATH* is `/usr/local/bin:/bin:/usr/bin`, the
-directories `/usr/local/etc`, `/etc` and `/usr/etc` are searched for
-`dirplex.rc`, in that order. Only the first file found is used, should
-there exist several.
+named by the *PATH* environment variable, appended with
+`../etc/ashd`. For example, then, if *PATH* is
+`/usr/local/bin:/bin:/usr/bin`, the directories `/usr/local/etc/ashd`,
+`/etc/ashd` and `/usr/etc/ashd` are searched for `dirplex.rc`, in that
+order. Only the first file found is used, should there exist several.
 
 If the *-c* option is given to *dirplex*, it too specifies a
 configuration file to load. If the name given contains any slashes, it
@@ -124,6 +124,16 @@ treated as comments and ignored.
 
 The follow configuration directives are recognized:
 
+*include* ['FILENAME'...]::
+
+	Read the the named files and act as if their contents stood in
+	place of the *include* stanza. A 'FILENAME' may be a glob
+	pattern, in which case all matching files are used, sorted by
+	their filenames. If a 'FILENAME' is a relative path, it is
+	treated relative to the directory containing the file from
+	which the *include* stanza was read, even if the inclusion has
+	been nested. Inclusions may be nested to any level.
+
 *index-file* ['FILENAME'...]::
 
 	The given 'FILENAMEs' are used for finding index files (see
@@ -158,9 +168,9 @@ The follow configuration directives are recognized:
 	['ARGS'...], specifying the program to execute and the
 	arguments to pass it. In addition to the specified arguments,
 	the HTTP method, raw URL and the rest string will be appended
-	added as described in *ashd*(7). If given in a `.htrc` file,
-	the program will be started in the same directory as the
-	`.htrc` file itself.
+	as described in *ashd*(7). If given in a `.htrc` file, the
+	program will be started in the same directory as the `.htrc`
+	file itself.
 
 *match* [*directory*]::