Index: openacs-4/packages/acs-templating/www/doc/demo/contract-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/contract-2.tcl,v
diff -u -r1.3.12.2 -r1.3.12.3
--- openacs-4/packages/acs-templating/www/doc/demo/contract-2.tcl	22 May 2016 19:25:47 -0000	1.3.12.2
+++ openacs-4/packages/acs-templating/www/doc/demo/contract-2.tcl	6 Feb 2017 12:46:04 -0000	1.3.12.3
@@ -1,21 +1,20 @@
 ad_page_contract {
-  @cvs-id $Id$
+    @cvs-id $Id$
 } {
-  count:naturalnum
-  noun:notnull,nohtml
-  { plural:nohtml "" }
+    count:naturalnum
+    noun:notnull,nohtml
+    { plural:nohtml "" }
 } -validate {
-  supersticion -requires {count} {
-    if {$count == 13} {
-      ad_complain
+    supersticion -requires {count} {
+        if {$count == 13} {
+            ad_complain
+        }
     }
-  }
+    csrf { csrf::validate }   
 } -errors {
-  supersticion {This number brings you no luck.}
+    supersticion {This number brings you no luck.}
 } -properties {
     phrase:onevalue
-} -validate {
-    csrf { security::csrf::validate }   
 } -return_errors error_list
 
 if {[info exists error_list]} {
Index: openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.tcl	25 May 2016 07:40:21 -0000	1.3.2.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list7/add-edit.tcl	6 Feb 2017 12:46:04 -0000	1.3.2.3
@@ -14,7 +14,7 @@
     context:onevalue
     page_title:onevalue
 } -validate {
-    csrf { security::csrf::validate }
+    csrf { csrf::validate }
 }
 
 # When using ad_form to generate or edit acs_objects, the object type's
Index: openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl	22 May 2016 19:25:48 -0000	1.2.2.2
+++ openacs-4/packages/acs-templating/www/doc/demo/list9/delete.tcl	6 Feb 2017 12:46:04 -0000	1.2.2.3
@@ -8,7 +8,7 @@
 } {
   template_demo_note_id:naturalnum,notnull,multiple
 } -validate {
-    csrf { security::csrf::validate }
+    csrf { csrf::validate }
 }
 
 foreach template_demo_note_id $template_demo_note_id {