From: Eric Covener <covener@apache.org>
Date: Sat, 4 Dec 2010 03:37:13 +0000 (+0000)
Subject: add a note about merging
X-Git-Tag: 2.3.10~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7902f66e48305f5d44c272cb0877707382b0b1b;p=thirdparty%2Fapache%2Fhttpd.git

add a note about merging



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042091 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml
index 38e5d069db8..faed9c3c35a 100644
--- a/docs/manual/mod/mod_userdir.xml
+++ b/docs/manual/mod/mod_userdir.xml
@@ -159,6 +159,10 @@ host</context></contextlist>
     was assumed if no <directive module="mod_userdir">UserDir</directive>
     directive was present.</p>
 
+    <note><title>Merging details</title>
+    <p> Lists of specific enabled and disabled users are replaced, not merged, 
+    from global to virtual host scope</p></note>
+
 </usage>
 
 <seealso>