Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.62.2.4 -r1.62.2.5
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	28 Sep 2013 14:11:35 -0000	1.62.2.4
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	28 Sep 2013 15:38:30 -0000	1.62.2.5
@@ -225,16 +225,9 @@
 } {
     writes HEAD, TITLE, and BODY tags to start off pages in a consistent fashion
 
-
     @see   Documentation on the site master template for the proper way to standardize page headers
 } {
-    
-    #    if {[parameter::get -parameter MenuOnUserPagesP -default pdm] == 1} {
-    #	return [ad_header_with_extra_stuff -focus $focus $page_title [ad_pdm] [ad_pdm_spacer]]
-    #    } else {
-    #    }
     return [ad_header_with_extra_stuff -focus $focus $page_title $extra_stuff_for_document_head]
-
 }
 
 ad_proc -deprecated ad_header_with_extra_stuff {
@@ -335,14 +328,7 @@
     
     @see  Documentation on the site master template for the proper way to standardize page headers
 } {
-    
-    # if {[parameter::get -package_id [ad_acs_kernel_id] -parameter MenuOnAdminPagesP -default pdm] == 1} {
-	
-	# return [ad_header_with_extra_stuff -focus $focus $page_title [ad_pdm "admin" 5 5] [ad_pdm_spacer "admin"]]
-	
-	# } else {}
-
-	return [ad_header_with_extra_stuff -focus $focus $page_title]
+    return [ad_header_with_extra_stuff -focus $focus $page_title]
 }
 
 ad_proc -deprecated ad_admin_footer {} {
@@ -391,16 +377,17 @@
 
     @param exception_text HTML chunk to go inside an UL tag with the error messages.
 } {
-    set complaint_template [parameter::get_from_package_key -package_key "acs-tcl" -parameter "ReturnComplaint" -default "/packages/acs-tcl/lib/ad-return-complaint"]
+    set complaint_template [parameter::get_from_package_key \
+				-package_key "acs-tcl" \
+				-parameter "ReturnComplaint" \
+				-default "/packages/acs-tcl/lib/ad-return-complaint"]
     ns_return 200 text/html [ad_parse_template \
                                  -params [list [list exception_count $exception_count] \
                                               [list exception_text $exception_text]] \
 				 $complaint_template]
 				 
-    
     # raise abortion flag, e.g., for templating
-    global request_aborted
-    set request_aborted [list 200 "Problem with Your Input"]
+    set ::request_aborted [list 200 "Problem with Your Input"]
 }
 
 
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	5 Sep 2013 11:51:00 -0000	1.30.2.2
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	28 Sep 2013 15:38:30 -0000	1.30.2.3
@@ -2030,25 +2030,14 @@
   @author Chrisitan Brechbuehler <christian@arsdigita.com>
   @creation-date 13 Aug 2000
 } {
-  # copied from defs-procs.tcl: ad_return_complaint
-
-  doc_return 200 text/html "[ad_header_with_extra_stuff \
-                             "[_ acs-tcl.lt_Problem_with_a_Templa]" "" ""]
-    
-<h2>[_ acs-tcl.lt_Problem_with_a_Page_o]</h2>
-
-<hr>
-
-[_ acs-tcl.lt_We_had_a_problem_proc]
-	
-<ul>
-  <li>$error
-</ul>
-	
-<p>
-	
-[_ acs-tcl.Sorry]
-	
-[ad_footer]
-"
+    set complaint_template [parameter::get_from_package_key \
+				-package_key "acs-tcl" \
+				-parameter "ReturnComplaint" \
+				-default "/packages/acs-admin/www/apm/apm.adpacs-tcl/lib/ad-return-complaint"]
+    set exception_count 1
+    set exception_text $error
+    ns_return 200 text/html [ad_parse_template \
+                                 -params [list [list exception_count $exception_count] \
+                                              [list exception_text $exception_text]] \
+				 $complaint_template]
 }