X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=doc%2Fdirplex.doc;h=c38ff4a2cd86047edfd97e1b028f4cc6c8ef216d;hb=e568e373b4050faf5fef37b3413e69c1e108a47b;hp=9d2240d449063bae9a040e2c3ea7f452efc3cc43;hpb=fda48525a7bab9e487e69264619ebdbabcd83ff2;p=ashd.git

diff --git a/doc/dirplex.doc b/doc/dirplex.doc
index 9d2240d..c38ff4a 100644
--- a/doc/dirplex.doc
+++ b/doc/dirplex.doc
@@ -85,12 +85,13 @@ 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/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.
+configuration file named `dirplex.rc`. It looks in `$HOME/.ashd/etc`,
+and then in all directories named by the *PATH* environment variable,
+appended with `../etc/ashd`. For example, then, if *PATH* is
+`/usr/local/bin:/bin:/usr/bin`, the directories `$HOME/.ashd/etc`,
+`/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
@@ -182,7 +183,7 @@ The following configuration directives are recognized:
 	pattern-matching procedure and the follow-up lines accepted by
 	this stanza are described below, under MATCHING.
 
-*capture* 'HANDLER'::
+*capture* 'HANDLER' ['FLAGS']::
 
 	Only meaningful in `.htrc` files. If a *capture* directive is
 	specified, then the URL-to-file mapping procedure as described
@@ -192,7 +193,9 @@ The following configuration directives are recognized:
 	be a named request handler specified either in the same
 	`.htrc` file or elsewhere. The *capture* directive accepts no
 	follow-up lines. Note that the `X-Ash-File` header is not
-	added to requests passed via *capture* directives.
+	added to requests passed via *capture* directives.  If 'FLAGS'
+	contain the character `R`, this *capture* directive will be
+	ignored if it is in the root directory that *dirplex* serves.
 
 MATCHING
 --------