Index: openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml,v
diff -u -r1.6.12.1 -r1.6.12.2
--- openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml	6 Sep 2013 12:06:48 -0000	1.6.12.1
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/permissions-design.xml	7 Sep 2013 09:22:12 -0000	1.6.12.2
@@ -374,7 +374,7 @@
 user is checked. To create an error page, Tcl code should call:</para>
 
 <programlisting>
-ad_require_permission $object_id $object_type $method
+permission::require_permission -object_id $object_id -privilege $method
 </programlisting>
 
 <para>These procedures are defined in <computeroutput>acs-permissions-procs.tcl</computeroutput>.</para>
Index: openacs-4/packages/calendar/calendar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v
diff -u -r1.41 -r1.41.2.1
--- openacs-4/packages/calendar/calendar.info	31 Oct 2011 00:50:15 -0000	1.41
+++ openacs-4/packages/calendar/calendar.info	7 Sep 2013 09:30:36 -0000	1.41.2.1
@@ -10,7 +10,7 @@
     <version name="2.6.0" url="http://openacs.org/repository/download/apm/calendar-2.6.0.apm">
         <owner url="mailto:openacs-calendar@dirkgomez.de">Dirk Gomez</owner>
         <summary>Personal and shared event calendars.</summary>
-        <release-date>2011-10-30</release-date>
+        <release-date>2013-08-30</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Manage group and shared calendars with download.</description>
         <maturity>0</maturity>
Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl,v
diff -u -r1.8 -r1.8.4.1
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	30 Aug 2008 19:51:23 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl	7 Sep 2013 09:30:37 -0000	1.8.4.1
@@ -16,7 +16,7 @@
 
 
 auth::require_login
-ad_require_permission $cal_item_id cal_item_write
+permission::require_permission -object_id $cal_item_id -privilege cal_item_write
 
 calendar::item::get -cal_item_id $cal_item_id -array cal_item
 
Index: openacs-4/packages/calendar/www/calendar-item-types.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/calendar/www/calendar-item-types.tcl	10 Oct 2009 22:38:09 -0000	1.5
+++ openacs-4/packages/calendar/www/calendar-item-types.tcl	7 Sep 2013 09:30:37 -0000	1.5.2.1
@@ -11,7 +11,7 @@
 }
 
 # Permission check
-ad_require_permission $calendar_id calendar_admin
+permission::require_permission -object_id $calendar_id -privilege calendar_admin
 
 # List the item types and allow addition of a new one
 set item_types [calendar::get_item_types -calendar_id $calendar_id]
Index: openacs-4/packages/calendar/www/item-type-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/item-type-delete.tcl,v
diff -u -r1.2 -r1.2.22.1
--- openacs-4/packages/calendar/www/item-type-delete.tcl	10 Sep 2002 22:22:31 -0000	1.2
+++ openacs-4/packages/calendar/www/item-type-delete.tcl	7 Sep 2013 09:30:37 -0000	1.2.22.1
@@ -13,7 +13,7 @@
 }
 
 # Permission check
-ad_require_permission $calendar_id calendar_admin
+permission::require_permission -object_id $calendar_id -privilege calendar_admin
 
 # Delete the type
 calendar::item_type_delete -calendar_id $calendar_id -item_type_id $item_type_id
Index: openacs-4/packages/calendar/www/item-type-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/item-type-new.tcl,v
diff -u -r1.2 -r1.2.22.1
--- openacs-4/packages/calendar/www/item-type-new.tcl	10 Sep 2002 22:22:31 -0000	1.2
+++ openacs-4/packages/calendar/www/item-type-new.tcl	7 Sep 2013 09:30:37 -0000	1.2.22.1
@@ -13,7 +13,7 @@
 }
 
 # Permission check
-ad_require_permission $calendar_id calendar_admin
+permission::require_permission -object_id $calendar_id -privilege calendar_admin
 
 # Add the type
 calendar::item_type_new -calendar_id $calendar_id -type $type