Index: openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	7 Aug 2017 23:48:01 -0000	1.24
+++ openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	16 May 2018 15:23:55 -0000	1.25
@@ -85,13 +85,7 @@
     ad_script_abort
 }
 
-ad_proc -public get_server_root {} {
-    Get the server root directory (supposing we run under ACS)
-} {
-    return $::acs::rootdir
-}
 
-
 ad_proc adp_parse_ad_conn_file {} {
     
     Handle a request for an adp and/or Tcl file in the template system
@@ -184,7 +178,20 @@
     }
 }
 
+
 #
+### Deprecated procs
+#
+
+ad_proc -deprecated -public get_server_root {} {
+    Get the server root directory (supposing we run under ACS)<br>
+    THIS PROC IS SUPERSEDED BY acs_root_dir
+} {
+    return $::acs::rootdir
+}
+
+
+#
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl	26 Feb 2008 16:57:16 -0000	1.3
+++ openacs-4/packages/content-portlet/tcl/content-portlet-compare-procs.tcl	16 May 2018 15:23:55 -0000	1.4
@@ -71,7 +71,7 @@
 				    -where_clause "name = 'es:Template_de_header'"]
     set tmp_item_id $item_id
     
-    set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page"
+    set fn "[acs_root_dir]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page"
     set standard_page "es:header_page"
     if {[file readable $fn]} {
 	set page [source $fn]
Index: openacs-4/packages/dotlrn-content/tcl/content-applet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-content/tcl/content-applet-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-content/tcl/content-applet-procs.tcl	27 Mar 2018 14:22:30 -0000	1.2
+++ openacs-4/packages/dotlrn-content/tcl/content-applet-procs.tcl	16 May 2018 15:23:55 -0000	1.3
@@ -102,7 +102,7 @@
 
 
        
-	set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndex.page"
+	set fn "[acs_root_dir]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndex.page"
 	set standard_page "index"
 	if {[file readable $fn]} {
 	    # create from default Template                                   
@@ -120,7 +120,7 @@
 	}
 
 
-	set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndexe.page"
+	set fn "[acs_root_dir]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateIndexe.page"
         set standard_page "es:o_index"
         if {[file readable $fn]} {
 	    # create from default Template                                                                                                                                   
@@ -139,7 +139,7 @@
 
 
 
-	set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplatebody.page"
+	set fn "[acs_root_dir]/packages/content-portlet/www/prototypes/gestemplate/GesTemplatebody.page"
 	set standard_page "es:Template_de_ges"
 	if {[file readable $fn]} {
 	    # create from default Template                                                                                                                                 
@@ -158,7 +158,7 @@
 	}
 	
 
-	set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheader.page"
+	set fn "[acs_root_dir]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheader.page"
         set standard_page "es:Template_de_header"
         if {[file readable $fn]} {
 	    # create from default header Template
@@ -181,7 +181,7 @@
             set carrera "Carrera"
             set cours_name "Curso"
 
-	set fn "[get_server_root]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page"
+	set fn "[acs_root_dir]/packages/content-portlet/www/prototypes/gestemplate/GesTemplateheaderpage.page"
 	set standard_page "es:header_page"
 	if {[file readable $fn]} {
 	    # create from default header page Template
Index: openacs-4/packages/eduwiki/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/eduwiki/tcl/apm-callback-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/eduwiki/tcl/apm-callback-procs.tcl	7 Oct 2009 19:11:52 -0000	1.1
+++ openacs-4/packages/eduwiki/tcl/apm-callback-procs.tcl	16 May 2018 15:23:55 -0000	1.2
@@ -38,7 +38,7 @@
    set rel_id [group::get_rel_segment -group_id $comm_id -type dotlrn_member_rel]
    permission::grant -object_id $package_id -party_id $rel_id -privilege read
 
-    set root_directory [get_server_root]
+    set root_directory [acs_root_dir]
     set prototypes_path "$root_directory/packages/eduwiki/www/prototypes"
     set folder_id [content::folder::get_folder_from_package \
 		      -package_id $package_id]
Index: openacs-4/packages/learning-content/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/learning-content/tcl/apm-callback-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/learning-content/tcl/apm-callback-procs.tcl	5 Mar 2009 21:28:57 -0000	1.1
+++ openacs-4/packages/learning-content/tcl/apm-callback-procs.tcl	16 May 2018 15:23:55 -0000	1.2
@@ -41,7 +41,7 @@
 
    ::xowiki::Package initialize -package_id $package_id
 
-    set root_directory [get_server_root]
+    set root_directory [acs_root_dir]
     set prototypes_path "$root_directory/packages/learning-content/www/prototypes/"
     foreach prototype_page [glob \
         $prototypes_path/*.page] {
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.202 -r1.203
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	9 May 2018 15:33:32 -0000	1.202
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	16 May 2018 15:23:55 -0000	1.203
@@ -306,7 +306,7 @@
     }
 
     # Necessary hack to work around the acs-templating system
-    set __adp_stub "[get_server_root][www_path]/."
+    set __adp_stub "[acs_root_dir][www_path]/."
     set {master_template} \"master\"
 
     # Compile and evaluate the template
@@ -730,7 +730,7 @@
     # Templating system hacks
     #
 
-    set __adp_stub "[get_server_root][www_path]/."
+    set __adp_stub "[acs_root_dir][www_path]/."
     set master_template \"master\"
 
     set code [template::adp_compile -string $template]
@@ -1874,7 +1874,7 @@
                 <P>
                 </form>
             }]
-            set __adp_stub "[get_server_root][www_path]/."
+            set __adp_stub "[acs_root_dir][www_path]/."
             set {master_template} \"master\"
 
             set code [template::adp_compile -string $template]
@@ -2320,7 +2320,7 @@
 
     uplevel 1 {
         set template "<include src=\"$__ts\" cf=\"$__cflist\">"
-        set __adp_stub "[get_server_root]/packages/$__pk/www/."
+        set __adp_stub "[acs_root_dir]/packages/$__pk/www/."
         set code [template::adp_compile -string $template]
         set output [template::adp_eval code]
         return $output
Index: openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl	7 Aug 2017 23:48:29 -0000	1.19
+++ openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl	16 May 2018 15:23:55 -0000	1.20
@@ -67,7 +67,7 @@
         set url      [ad_url][rss_package_url]$base
         set title    $channel_title
         set link     $channel_link
-        set size     [ns_gifsize [get_server_root]/packages/rss-support/www/$base]
+        set size     [ns_gifsize [acs_root_dir]/packages/rss-support/www/$base]
 
         set image [list                                          \
                 url $url                                         \
@@ -212,7 +212,7 @@
         set url      [ad_url][rss_package_url]$base
         set title    $channel_title
         set link     $channel_link
-        set size     [ns_gifsize [get_server_root]/packages/rss-support/www/$base]
+        set size     [ns_gifsize [acs_root_dir]/packages/rss-support/www/$base]
 
         set image [list                                          \
                 url $url                                         \
@@ -392,7 +392,7 @@
         set url      [ad_url][rss_package_url]$base
         set title    $channel_title
         set link     $channel_link
-        set size     [ns_gifsize [get_server_root]/packages/rss-support/www/$base]
+        set size     [ns_gifsize [acs_root_dir]/packages/rss-support/www/$base]
 
         set image [list                                          \
                 url $url                                         \
Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowf/tcl/xowf-procs.tcl	9 May 2018 15:33:34 -0000	1.21
+++ openacs-4/packages/xowf/tcl/xowf-procs.tcl	16 May 2018 15:23:55 -0000	1.22
@@ -2190,7 +2190,7 @@
     if {![string match "/packages/*/lib/*" $wfName]} {
       error "path leading to workflow name must look like /packages/*/lib/*"
     }
-    set fname [get_server_root]$wfName
+    set fname [acs_root_dir]$wfName
 
     if {![file readable $fname]} {
       error "file '$fname' not found"
Index: openacs-4/packages/xowiki/lib/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/lib/view.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/xowiki/lib/view.tcl	7 Aug 2017 23:48:30 -0000	1.13
+++ openacs-4/packages/xowiki/lib/view.tcl	16 May 2018 15:23:55 -0000	1.14
@@ -22,7 +22,7 @@
 #set ::xowiki_head [::xo::Page header_stuff]
 
 if {![info exists css]} {
-    set fn [get_server_root]/packages/xowiki/www/resources/xowiki.css
+    set fn [acs_root_dir]/packages/xowiki/www/resources/xowiki.css
     set F [open $fn]; set css [read $F]; close $F
     set css "<style type='text/css'>$css</style>"
     set html $css$html
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.317 -r1.318
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	9 May 2018 15:33:34 -0000	1.317
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	16 May 2018 15:23:55 -0000	1.318
@@ -1858,7 +1858,7 @@
                                       {-add_revision:boolean true}
                                     } {
     set page ""
-    set fn [get_server_root]/packages/$package_key/www/prototypes/$name.page
+    set fn [acs_root_dir]/packages/$package_key/www/prototypes/$name.page
     #:log "--W check $fn"
     if {[file readable $fn]} {
       # We have the file of the prototype page. We try to create