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 729c78d3c90a0f439dfc62a065c78f98fd61a1a9..368d84305ae7d54c46cf36bb212e46b25f9a28bf 100644 (file)
--- 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</td></tr>
     <code class="directive">VirtualDocumentRoot</code> is turned off. This directive
     cannot be used in the same context as <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code>.</p>
 
+<div class="warning"><h3>Note</h3>
+<code class="directive">VirtualDocumentRoot</code> will override any <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives you may have put in the same 
+context or child contexts. Putting a <code class="directive">VirtualDocumentRoot</code> 
+in the global server scope will effectively override <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives in any virtual hosts defined later 
+on, unless you set <code class="directive">VirtualDocumentRoot</code> to <code>None</code> 
+in each virtual host.
+</div>
+
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

diff --git a/docs/manual/mod/mod_vhost_alias.xml.tr b/docs/manual/mod/mod_vhost_alias.xml.tr
index c3747928fe48ab9b60d2dec632ef664dc15d9438..4c1464df4531fad8b8dfd7dc4469a8e1e76c4bae 100644 (file)
--- a/docs/manual/mod/mod_vhost_alias.xml.tr
+++ b/docs/manual/mod/mod_vhost_alias.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1337101 (outdated) -->
+<!-- English Revision: 1174747:1346943 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>