From: Daniel Gruno
Date: Wed, 6 Jun 2012 15:30:13 +0000 (+0000)
Subject: xforms
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2812f70425d43ef39c4c2045a91661385413d9e2;p=thirdparty%2Fapache%2Fhttpd.git
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1346945 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en
index 729c78d3c90..368d84305ae 100644
--- a/docs/manual/mod/mod_vhost_alias.html.en
+++ b/docs/manual/mod/mod_vhost_alias.html.en
@@ -273,6 +273,14 @@ for a given virtual host
VirtualDocumentRoot is turned off. This directive
cannot be used in the same context as VirtualDocumentRootIP.
+Note
+
VirtualDocumentRoot will override any
DocumentRoot directives you may have put in the same
+context or child contexts. Putting a
VirtualDocumentRoot
+in the global server scope will effectively override
DocumentRoot directives in any virtual hosts defined later
+on, unless you set
VirtualDocumentRoot to
None
+in each virtual host.
+
+
diff --git a/docs/manual/mod/mod_vhost_alias.xml.tr b/docs/manual/mod/mod_vhost_alias.xml.tr
index c3747928fe4..4c1464df453 100644
--- a/docs/manual/mod/mod_vhost_alias.xml.tr
+++ b/docs/manual/mod/mod_vhost_alias.xml.tr
@@ -1,7 +1,7 @@
-
+