MDL-7328 Merged from stable

This commit is contained in:
koenr 2006-11-06 21:28:24 +00:00
parent da5104e60a
commit 14d6a11d62

View File

@ -53,7 +53,7 @@ to one of four values:
<p align="center"><b>Conflict resolution of permissions</b></p>
<p> Permissions at a "lower" context will generally override
anything at a higher "context" (this applies to overrides
anything at a "higher" context (this applies to overrides
and assigned roles). The exception is PROHIBIT which can not
be overridden at lower levels.
</p>