Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/acs-admin/acs-admin.info	27 Oct 2014 16:38:50 -0000	1.47
+++ openacs-4/packages/acs-admin/acs-admin.info	12 Jun 2015 21:14:16 -0000	1.48
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.9.0d1" url="http://openacs.org/repository/download/apm/acs-admin-5.9.0d1.apm">
+    <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/acs-admin-5.9.0d2.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
         <release-date>2013-09-08</release-date>
@@ -18,7 +18,7 @@
           (including package installation, cache, authentication, and user accounts) for an OpenACS system.
         </description>
 
-        <provides url="acs-admin" version="5.9.0d1"/>
+        <provides url="acs-admin" version="5.9.0d2"/>
         <requires url="acs-kernel" version="5.9.0d1"/>
         <requires url="acs-mail-lite" version="5.9.0d1"/>
 
Index: openacs-4/packages/acs-admin/www/developer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/developer.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/developer.adp	29 May 2015 09:09:02 -0000	1.4
+++ openacs-4/packages/acs-admin/www/developer.adp	12 Jun 2015 21:14:16 -0000	1.5
@@ -86,7 +86,7 @@
       title="OpenACS Discussion Forums">discussion forums</a> on
       openacs.org, including the <a
       href="http://openacs.org/forums/forum-view?forum_id=14013"
-      title="OpenACS discussion forum on openacs.org">OpenACS Q&A
+      title="OpenACS discussion forum on openacs.org">OpenACS Q&amp;A
       forum</a>.</li>
       <li>Post <b>bugs</b> and <b>feature requests</b> in the <a href="http://openacs.org/bugtracker/openacs/" 
       title="Software Development Manager on openacs.org">Bug
Index: openacs-4/packages/acs-admin/www/apm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/acs-admin/www/apm/index.tcl	27 Oct 2014 16:38:51 -0000	1.25
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	12 Jun 2015 21:14:16 -0000	1.26
@@ -120,11 +120,12 @@
 }
 
 # The reload links make the page slow, so make them optional
-set page_url "[ad_conn url]?[export_vars -url {orderby owned_by supertype}]"
+set page_url [export_vars -base [ad_conn url] -url {orderby owned_by supertype}]
+set href [export_vars -base [ad_conn url] -url {orderby owned_by supertype reload_links_p}]
 if { $reload_links_p } {
-    set reload_filter "<a href=\"$page_url&reload_links_p=0\">Do not check for changed files</a>"
+    set reload_filter "<a href=\"[ns_quotehtml $href]\">Do not check for changed files</a>"
 } else {
-    set reload_filter "<a href=\"$page_url&reload_links_p=1\">Check for changed files</a>"
+    set reload_filter "<a href=\"[ns_quotehtml $href]\">Check for changed files</a>"
 }
 
 # Build the list of files we're watching.