From: Fredrik Tolf Date: Thu, 2 Mar 2017 04:49:00 +0000 (+0100) Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=295f91786e8606bed03ca004157adbeb84565094;hp=36038382b2b8a2631716e03f595b567d01af961d Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd --- diff --git a/doc/dirplex.doc b/doc/dirplex.doc index e2769d7..8a0184f 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, @@ -295,7 +295,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.