X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=doc%2Fdirplex.doc;h=8a0184f6f13f10e651678f1f7d5543a1df151ec5;hb=HEAD;hp=048548a20721996a151ef94777af2ea89fba3900;hpb=5ff7def2adbff86a0e2d69f8f82f0b07882ca782;p=ashd.git

diff --git a/doc/dirplex.doc b/doc/dirplex.doc
index 048548a..c18ca14 100644
--- a/doc/dirplex.doc
+++ b/doc/dirplex.doc
@@ -71,7 +71,7 @@ element. If there is such a file, it is considered the result of the
 mapping.
 
 If the result of the mapping procedure is a directory, it is checked
-for the presence of a filed named by the *index-file* configuration
+for the presence of a file named by the *index-file* configuration
 directive (see CONFIGURATION below). If there is such a file, it is
 considered the final result instead of the directory itself. If the
 index file name contains no dots and there is no exact match, then,
@@ -148,6 +148,19 @@ The following configuration directives are recognized:
 	may be given to turn off index file searching completely. The
 	*index-file* directive accepts no follow-up lines.
 
+*dot-allow* ['PATTERN'...]::
+
+	As described under 404 RESPONSES, a path element beginning
+	with a dot character is normally rejected by default, but the
+	*dot-allow* directive allows certain dot-files or -directories
+	to be selectively allowed. Each 'PATTERN' is an ordinary glob
+	pattern, the matching of which allows access to a given path
+	element. When checking for access to dot-files or
+	-directories, only the *dot-allow* directive "closest" to the
+	file under consideration is used. It should be noted that the
+	default configuration file for *dirplex* contains a
+	*dot-allow* directive for the `.well-known` directory.
+
 *child* 'NAME'::
 
 	Declares a named, persistent request handler (see *ashd*(7)
@@ -193,9 +206,10 @@ 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.  If 'FLAGS'
-	contain the character `R`, this *capture* directive will be
-	ignored if it is in the root directory that *dirplex* serves.
+	added to requests passed via *capture* directives. Normally,
+	*capture* directives will be ignored if they appear in the
+	root directory that *dirplex* serves, but not if 'FLAGS'
+	contain the character `D`.
 
 MATCHING
 --------
@@ -213,7 +227,7 @@ in the global configuration files are searched in order of their
 *match* stanzas are considered depends on the type of the file being
 matched: if an ordinary file is being matched, only *match* stanzas
 without any 'TYPE' parameter are considered, while if it is a
-directory, only those with type 'TYPE' parameter specified as
+directory, only those with the 'TYPE' parameter specified as
 *directory* are considered. 'TYPE' can also take the value *notfound*,
 described below under 404 RESPONSES.
 
@@ -294,7 +308,7 @@ A HTTP 404 response is sent to the client if
  * A path element is encountered during mapping which, after URL
    unescaping, either begins with a dot or contains slashes;
  * The mapping procedure finds a file which is neither a directory nor
-   a regular file (or a symbolic link to any of the same);
+   a regular file (nor a symbolic link to any of the same);
  * An empty, non-final path element is encountered during mapping; or
  * The mapping procedure results in a file which is not matched by any
    *match* stanza.