From 71142e336db2d5207a6ba7b99a058249792e090b Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 23 Dec 2009 16:08:34 +0000
Subject: [PATCH] Add explanation about global Access precendence over vhost
 Access (EJAB-803)

SVN Revision: 2824
---
 doc/guide.html | 5 ++++-
 doc/guide.tex  | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/guide.html b/doc/guide.html
index a3841f901..1d894cd7a 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1183,7 +1183,10 @@ The syntax is:
 sequentially checks if that JID matches any of the ACLs that are named in the
 second elements of the tuples in the list. If it matches, the first element of
 the first matched tuple is returned, otherwise the value &#X2018;<TT>deny</TT>&#X2019; is
-returned.</P><P>Example:
+returned.</P><P>If you define specific Access rights in a virtual host,
+remember that the globally defined Access rights have precedence over those.
+This means that, in case of conflict, the Access granted or denied in the global server is used
+and the Access of a virtual host doesn&#X2019;t have effect.</P><P>Example:
 </P><PRE CLASS="verbatim">{access, configure, [{allow, admin}]}.
 {access, something, [{deny, badmans},
                      {allow, all}]}.
diff --git a/doc/guide.tex b/doc/guide.tex
index 966f0334b..c3d16587d 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1439,6 +1439,11 @@ second elements of the tuples in the list. If it matches, the first element of
 the first matched tuple is returned, otherwise the value `\term{deny}' is
 returned.
 
+If you define specific Access rights in a virtual host,
+remember that the globally defined Access rights have precedence over those.
+This means that, in case of conflict, the Access granted or denied in the global server is used
+and the Access of a virtual host doesn't have effect.
+
 Example:
 \begin{verbatim}
 {access, configure, [{allow, admin}]}.