Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.103.2.8 -r1.103.2.9
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	2 Oct 2013 10:11:35 -0000	1.103.2.8
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	17 Oct 2013 09:05:21 -0000	1.103.2.9
@@ -30,10 +30,10 @@
         </callbacks>
 
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CRFileLocationRoot"  default="content-repository-content-files" description="The directory to which files are published and from where they are retrieved when a files is served. It is taken to be relative to [acs_root_dir] unless FileLocationRelativeP is set to 1" section_name="files"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CRFileLocationRoot"  default="content-repository-content-files" description="The directory to which files are published and from where they are retrieved when a files is served. It is taken to be relative to $::acs::rootdir unless FileLocationRelativeP is set to 1" section_name="files"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="FileLocationRelativeP"  default="1" description="Defaults to 1 which means the FileLocation parameter is relative to the web servers root folder. If set to 0, the FileLocation parameter is an absolute path and so can contain a drive letter for example. Important note: if you change this parameter to 0, remember the system will attempt to retrieve existing files from the new location. You will also need to bounce the server after changing this or the FileLocation value." section_name="files"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageMagickConvertBinary"  default="/usr/bin/convert" description="Binary to use with the image:: procs in packages/acs-content-repository/tcl/image-procs.tcl" section_name="files"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TemplateRoot"  default="templates" description="The directory to which templates are published and from where they are retrieved when a page is served. If the value does not start with a '/', it is taken to be relative to [acs_root_dir]. Packages that use the content-repository can override this setting by defining their own TemplateRoot parameter." section_name="templates"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TemplateRoot"  default="templates" description="The directory to which templates are published and from where they are retrieved when a page is served. If the value does not start with a '/', it is taken to be relative to $::acs::rootdir. Packages that use the content-repository can override this setting by defining their own TemplateRoot parameter." section_name="templates"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl,v
diff -u -r1.5.10.1 -r1.5.10.2
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	17 Oct 2013 08:56:37 -0000	1.5.10.1
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-callback-procs.tcl	17 Oct 2013 09:05:21 -0000	1.5.10.2
@@ -42,7 +42,7 @@
 	set file_location ""
 	
 	if {$relativepath_p} {
-	    # The file location is relative to acs_root_dir
+	    # The file location is relative to $::acs::rootdir
 	    append file_location "$::acs::rootdir/"
 	}
 	append file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]
Index: openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl,v
diff -u -r1.14.10.1 -r1.14.10.2
--- openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl	17 Oct 2013 08:56:37 -0000	1.14.10.1
+++ openacs-4/packages/acs-content-repository/tcl/acs-content-repository-init.tcl	17 Oct 2013 09:05:21 -0000	1.14.10.2
@@ -35,8 +35,8 @@
     set file_location ""
 
     if {$relativepath_p} {
-	# The file location is relative to acs_root_dir
-	append file_location "$::acs::rootdir/"
+	# The file location is relative to $::acs::rootdir
+	set file_location $::acs::rootdir/
     }
     append file_location [parameter::get_from_package_key -package_key "acs-content-repository" -parameter "CRFileLocationRoot" -default "content-repository-content-files"]