merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -12,6 +12,7 @@ Fixed:
 - fix port number as int in mysql connection info (sf bug 1082530)
 - fix setup.py to work with <Python2.3 (sf bug 1082801)
 - fix permissions checks in cgi templating (sf bug 1082755)
+- fix "Users may only edit their issues" example in docs
 
 
 2004-12-08 0.8.0b1

doc/customizing.txt

@@ -2,7 +2,7 @@
 Customising Roundup
 ===================
 
-:Version: $Revision: 1.161.2.2 $
+:Version: $Revision: 1.161.2.3 $
 
 .. This document borrows from the ZopeBook section on ZPT. The original is at:
    http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -3931,10 +3931,10 @@ First up, we create the new Role and Permission structure in
     def own_issue(db, userid, itemid):
         '''Determine whether the userid matches the creator of the issue.'''
         return userid == db.issue.get(itemid, 'creator')
-    p = db.security.addPermission(name='Edit Own Issues', klass='issue',
+    p = db.security.addPermission(name='Edit', klass='issue',
         code=own_issue, description='Can only edit own issues')
     db.security.addPermissionToRole('Provisional User', p)
-    p = db.security.addPermission(name='View Own Issues', klass='issue',
+    p = db.security.addPermission(name='View', klass='issue',
         code=own_issue, description='Can only view own issues')
     db.security.addPermissionToRole('Provisional User', p)