Update documentation about docroot directive

GokulEvuri · Jan 6, 2012 · ad267c4 · ad267c4
1 parent 4ec8c19
commit ad267c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/doc/yaws.tex b/doc/yaws.tex
@@ -2296,10 +2296,19 @@ \section{Server Part}
 
               There is no such module configured by default.
 
-\item       \verb+docroot  =  Directory+ ---
+\item       \verb+docroot  =  Directory ...+ ---
               This makes the server serve all its content from
               \verb+Directory+.
 
+              It is possible to pass a space-separated list of directories as
+              docroot. If this is the case, the various directories will be
+              searched in order for the requested file. This also works with the
+              ssi and yssi constructs where the full list of directories will be
+              searched for files to ssi/yssi include. Multiple docroot
+              directives can be used.  You need at least one valid docroot,
+              other invalid docroots are skipped with their associated auth
+              structures.
+
 \item       \verb+auth_skip_docroot = true | false+ ---
               If true, the docroot will not be searched for
               \verb+.yaws_auth+ files. This is useful when the

diff --git a/man/yaws.conf.5 b/man/yaws.conf.5
@@ -436,7 +436,9 @@ It is possible to pass a space-separated list of directories as
 docroot. If this is the case, the various directories will be searched in
 order for the requested file. This also works with the ssi
 and yssi constructs where the full list of directories will be searched
-for files to ssi/yssi include.
+for files to ssi/yssi include. Multiple docroot directives can be used.
+You need at least one valid docroot, other invalid docroots are skipped with
+their associated auth structures.
 
 .TP
 \fBauth_skip_docroot = true | false\fR