[CMF-checkins] SVN: CMF/branches/1.5/ - Corrected the HelpSystem documentation for DCWorkflow Guards

[Jens Vagelpohl]

Log message for revision 41402:
  - Corrected the HelpSystem documentation for DCWorkflow Guards

Changed:
  U   CMF/branches/1.5/CHANGES.txt
  U   CMF/branches/1.5/DCWorkflow/help/003-guards.stx

-=-
Modified: CMF/branches/1.5/CHANGES.txt
===================================================================
--- CMF/branches/1.5/CHANGES.txt	2006-01-21 15:50:36 UTC (rev 41401)
+++ CMF/branches/1.5/CHANGES.txt	2006-01-21 15:51:20 UTC (rev 41402)
@@ -2,6 +2,9 @@
 
   Bug Fixes
 
+    - Corrected the HelpSystem documentation for DCWorkflow Guards
+      (http://www.zope.org/Collectors/CMF/394)
+
     - CMFCore utils: Synced _checkPermission with Zope 2.8.5 code.
       checkPermission of Zope 2.8.5 and later contains bug fixes and respects
       proxy roles, but for backwards compatibility CMF 1.5 still needs its own

Modified: CMF/branches/1.5/DCWorkflow/help/003-guards.stx
===================================================================
--- CMF/branches/1.5/DCWorkflow/help/003-guards.stx	2006-01-21 15:50:36 UTC (rev 41401)
+++ CMF/branches/1.5/DCWorkflow/help/003-guards.stx	2006-01-21 15:51:20 UTC (rev 41402)
@@ -1,10 +1,14 @@
 Guards
 
   Guard settings control access to the transitions, variables or work
-  lists. If a user possesses any of the permissions or roles
-  specified, or if one of the expressions evaluates as true, then
-  whatever is being guarded is accessible. If no permissions, roles
-  or expressions are specified, access is automatically granted.
+  lists. Guards can be applied based on permissions, roles, groups or
+  a TALES expression. These elements are applied sequentially if they
+  contain values. If one of the conditions in each of the specified
+  permissions, roles or groups is met the guard element will be
+  satisfied. For the guard to allow access, all specified element that
+  contain values must be satisfied.
+  If no permissions, roles or expressions are specified, access is 
+  automatically granted.
  
   You can supply several options in each field by separating them with
   a semicolon.