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.14 -r1.15
--- openacs-4/packages/acs-admin/acs-admin.info	3 Aug 2002 17:48:17 -0000	1.14
+++ openacs-4/packages/acs-admin/acs-admin.info	16 Sep 2002 12:40:26 -0000	1.15
@@ -2,8 +2,8 @@
 <!-- Generated by the OpenACS Package Manager -->
 
 <package key="acs-admin" url="http://openacs.org/repository/apm/packages/acs-admin/" type="apm_service">
-    <package-name>OpenACS Administration</package-name>
-    <pretty-plural>OpenACS Administration Services</pretty-plural>
+    <package-name>Site-Wide Administration</package-name>
+    <pretty-plural>Site-Wide Administration Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
Index: openacs-4/packages/acs-admin/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/index.tcl	27 Apr 2001 04:06:02 -0000	1.2
+++ openacs-4/packages/acs-admin/www/index.tcl	16 Sep 2002 12:40:26 -0000	1.3
@@ -5,15 +5,15 @@
     @cvs-id $Id$
 }
 
-set title "ACS Administration for [ad_system_name]"
+set title "[ad_conn instance_name] for [ad_system_name]"
 
 set page "
 [ad_admin_header $title]
 <h2>$title</h2>
 [ad_context_bar]
 <hr>
 
-ACS Administration is used to administer the site-wide services of the ArsDigita Community System.
+[ad_conn instance_name] is used to administer the site-wide services of the ArsDigita Community System.
 
 <ul>
   <li><a href=apm>ACS Package Manager</a>
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/index.adp	6 Sep 2002 21:49:56 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	16 Sep 2002 12:40:27 -0000	1.6
@@ -12,11 +12,13 @@
   <li><a href=object-types/>Object Types</a>
 </ul>
 
-<if @acs_admin_available_p@ eq "t">
+<if @acs_admin_available_p@ true>
   To administer the site-wide services of OpenACS, use
   <a href="@acs_admin_url@">@instance_name@</a>.
-</if><else>
-  The OpenACS Administration service is not available.  If you are a site-wide administrator, 
-  use the <a href="site-map">Site Map</a> to mount the OpenACS Administration service.  This provides 
-  an interface for administering the site-wide services of OpenACS.
+</if>
+<else>
+  The Site-Wide Administration service is not available.  If you are a
+  site-wide administrator, use the <a href="site-map">Site Map</a> to
+  mount the Site-Wide Administration service.  This provides an
+  interface for administering the site-wide services of OpenACS.
 </else>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	6 Sep 2002 21:49:56 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	16 Sep 2002 12:40:27 -0000	1.4
@@ -22,7 +22,7 @@
      where p.package_id = :package_id
 } -default "Subsite"]
 
-# Return the first available link to the OpenACS Admin page.
+# Return the first available link to the Site-Wide Admin page.
 if {[db_0or1row acs_admin_url_get {
     select site_node.url(node_id) acs_admin_url, instance_name
     from site_nodes s, apm_packages p