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.10 -r1.11
--- openacs-4/packages/acs-admin/acs-admin.info	19 Aug 2001 21:26:05 -0000	1.10
+++ openacs-4/packages/acs-admin/acs-admin.info	29 Aug 2001 21:22:48 -0000	1.11
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-admin" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-admin/" type="apm_service">
-    <package-name>ACS Administration</package-name>
-    <pretty-plural>ACS Administration Services</pretty-plural>
+<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>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.1.1" url="http://www.arsdigita.com/acs-repository/download/apm/acs-admin-4.1.1.apm">
+    <version name="4.1.1" url="http://openacs.org/repository/download/apm/acs-admin-4.1.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
-        <summary>Provides an interface for administering the Arsdigita Community System Installation.</summary>
+        <summary>Provides an interface for administering the OpenACS Community System Installation.</summary>
         <release-date>2001-04-27</release-date>
         <vendor url="http://www.openacs.org/">OpenACS</vendor>
-        <description format="text/html">A UI for administering the ACS system.</description>
+        <description format="text/html">A UI for administering the OpenACS system.</description>
 
         <provides url="acs-admin" version="4.1"/>
 
Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl	9 May 2001 22:32:25 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl	29 Aug 2001 21:22:48 -0000	1.3
@@ -25,9 +25,9 @@
     // Update the package and version URL, if the package key and/or version name change.
     var form = document.forms\[0\];
     if (form.package_uri.value == '')
-        form.package_uri.value = 'http://www.arsdigita.com/acs-repository/apm/packages/' + form.package_key.value;
+        form.package_uri.value = 'http://openacs.org/repository/apm/packages/' + form.package_key.value;
     if ((form.version_name.value != '') && (form.version_uri.value == ''))
-        form.version_uri.value = 'http://www.arsdigita.com/acs-repository/download/apm/' + form.package_key.value + '-' + form.version_name.value + '.apm';
+        form.version_uri.value = 'http://openacs.org/repository/download/apm/' + form.package_key.value + '-' + form.version_name.value + '.apm';
 }
 </script>
 
@@ -46,7 +46,7 @@
   <td></td>
   <td>Select a package key for your package. This is a unique, short, and lower-case identifier
 for your package containing only letters, numbers, and hyphens (e.g., <tt>address-book</tt>
-for the address book package or <tt>apm</tt> for the ArsDigita Package Manager).
+for the address book package or <tt>photo-album</tt> for the Photo Album).
 Files for your package will be placed in a directory with this name.</td>
 </tr>
 
@@ -58,7 +58,7 @@
 <tr>
   <td></td>
   <td>Select a short, human-readable name for your package, e.g., \"Address Book\" or
-\"ArsDigita Package Manager.\"
+\"Photo Album.\"
 </tr>
 
 <tr>
@@ -81,7 +81,7 @@
   <td></td>
   <td>Indicate whether this package is an application or a service.   
   Applications are software intended for end-users, e.g. Bboard.
-  Services are system-level software that extend the ACS to provide new system-wide functionality,
+  Services are system-level software that extend OpenACS to provide new system-wide functionality,
   e.g. Workflow.
 </tr>
 <tr>
@@ -178,7 +178,7 @@
 These should be entered in order of importance: whoever works most heavily
 on the package should be first. You'll probably want to use email addresses
 for URLs, in which case you should precede them with <tt>mailto:</tt> (e.g.,
-<tt>mailto:samoyed@arsdigita.com</tt>).
+<tt>mailto:developername@openacs.org</tt>).
 </tr>
 
 <tr>
@@ -201,7 +201,7 @@
 <tr>
   <td></td>
   <td>If the package is being released by a company, type in its name and URL here.
-ArsDigita employees should <a href=\"javascript:document.forms\[0\].vendor.value='ArsDigita Corporation';document.forms\[0\].vendor_uri.value='http://www.arsdigita.com/';void(0)\">click here</a> to fill this in automatically.</td>
+<!-- ArsDigita employees should <a href=\"javascript:document.forms\[0\].vendor.value='ArsDigita Corporation';document.forms\[0\].vendor_uri.value='http://www.arsdigita.com/';void(0)\">click here</a> to fill this in automatically.</td> -->
 </tr>
 
 <tr>
Index: openacs-4/packages/acs-admin/www/tests/tcl-documentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/tests/Attic/tcl-documentation.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/tests/tcl-documentation.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/tests/tcl-documentation.tcl	29 Aug 2001 21:22:48 -0000	1.2
@@ -59,7 +59,7 @@
 
 <h2>Input Filter Acceptance Tests</h2>
 
-for the ArsDigita Community System
+for the OpenACS Community System
 <hr>
 
 <p>This page applies a suite of tests for the ad_page_contract filters.</p>
@@ -98,12 +98,12 @@
 
 <p>Done.  If any of the above tests failed, please submit a bug report
 to the <a
-href=http://www.arsdigita.com/sdm/>ACS Software Development Manager</a>.  
-Note that you are running ACS [ad_acs_version] released
+href=http://openacs.org/sdm/>OpenACS Software Development Manager</a>.  
+Note that you are running OpenACS [ad_acs_version] released
 on [ad_acs_release_date].</p> 
 
 <hr>
-<address>bugs@arsdigita.com</address>
+<address>bugs@openacs.org</address>
 </body>
 </html>
 
Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	13 Jul 2001 10:25:28 -0000	1.2
+++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	29 Aug 2001 21:22:48 -0000	1.3
@@ -30,7 +30,7 @@
     Reads the contract from a Tcl content page.
 
     @param path the path of the Tcl file to examine, relative to the
-        ACS root directory.
+        OpenACS root directory.
     @return a list representation of the documentation element array, or
         an empty list if the file does not contain a <code>doc_page_contract</code>
         block.
@@ -151,7 +151,7 @@
     @param format the type of documentation to generate. Currently, only
         <code>text/html</code> is supported.
     @param path the path of the Tcl file to examine, relative to the
-        ACS root directory.
+        OpenACS root directory.
     @return the formatted documentation string.
     @error if the file does not exist.
 
@@ -248,7 +248,7 @@
     Generates formatted documentation for a Tcl library file (just the header,
     describing what the library does).
 
-    @param path the path to the file, relative to the ACS path root.
+    @param path the path to the file, relative to the OpenACS path root.
 
 } {
     if { ![string equal $format "text/html"] } {
Index: openacs-4/packages/acs-api-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/index.adp	29 Aug 2001 21:22:48 -0000	1.2
@@ -15,7 +15,7 @@
    <input type=text name=query_string><br>
    <input type=submit value=Search name=search_type>
    <input type=submit value="Feeling Lucky" name=search_type><br>
-   <a href=proc-browse>Browse ACS Tcl API</a><br>
+   <a href=proc-browse>Browse OpenACS Tcl API</a><br>
 
  </td>
  <td><font size=-1>
@@ -34,7 +34,7 @@
 </form></table>
 
   <h4>ACS PL/SQL API Search:</h4>
-  <a href="plsql-subprograms-all">Browse ACS PL/SQL API</a>
+  <a href="plsql-subprograms-all">Browse OpenACS PL/SQL API</a>
 
   <p>
 
@@ -81,4 +81,4 @@
   <li>@uninstalled_packages.pretty_name@ @uninstalled_packages.version_name@</a>
 </multiple>
 
-</ul>
\ No newline at end of file
+</ul>
Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	6 May 2001 22:35:28 -0000	1.4
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	29 Aug 2001 21:22:48 -0000	1.5
@@ -1,6 +1,6 @@
 # /packages/acs-tcl/bootstrap/bootstrap.tcl
 #
-# Code to bootstrap ACS, invoked by /tcl/0-acs-init.tcl.
+# Code to bootstrap OpenACS, invoked by /tcl/0-acs-init.tcl.
 #
 # @creation-date 12 May 2000
 # @author Jon Salz [jsalz@arsdigita.com]
@@ -71,8 +71,8 @@
 
     #####
     #
-    # Perform some checks to make sure that (a) a recent version of the Oracle driver
-    # is installed and (b) the ACS data model is properly loaded.
+    # Perform some checks to make sure that (a) a recent version of the Oracle or PG driver
+    # is installed and (b) the OpenACS data model is properly loaded.
     #
     #####
 
@@ -108,7 +108,7 @@
     apm_bootstrap_load_queries acs-tcl
     apm_bootstrap_load_queries acs-bootstrap-installer
 
-    # Is ACS installation complete? If not, source the installer and bail.
+    # Is OpenACS installation complete? If not, source the installer and bail.
     if { ![ad_verify_install] } {
 	ns_log "Notice" "Installation is not complete - sourcing the installer."
 	source "$root_directory/packages/acs-bootstrap-installer/installer.tcl"
@@ -146,7 +146,7 @@
 	bootstrap_fatal_error "The request processor routines have not been loaded."
     }
 
-    ns_log "Notice" "Done loading ACS."
+    ns_log "Notice" "Done loading OpenACS."
 }]
 
 if { $errno && $errno != 2 } {
Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl	12 Apr 2001 16:58:18 -0000	1.1
+++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl	29 Aug 2001 21:22:48 -0000	1.2
@@ -69,8 +69,8 @@
         set my_error_p 1
     } elseif { ![file exists "$env(ORACLE_HOME)/ctx/bin/ctxhx"] && ![ad_windows_p]} {
         append my_errors "<li><p><strong> The file <code>$env(ORACLE_HOME)/ctx/bin/ctxhx</code> which is needed 
-by the ACS Content Repository is not present in your filesystem.  You must be running Oracle 8.1.6 
-with Intermedia installed to use the ACS.  If you are using Linux, this file is missing because Oracle 
+by the OpenACS Content Repository is not present in your filesystem.  You must be running Oracle 8.1.6 
+with Intermedia installed to use OpenACS.  If you are using Linux, this file is missing because Oracle 
 does not distribute it with the Linux version of Oracle.  However, you can replace this file with a 
 shell script that acts as a workaround.<p>
 The program <code>ctxhx</code> is primarily used to convert files to HTML or TEXT and can
@@ -103,7 +103,7 @@
         if {!($usr_bin_p)} {
 	    append my_errors "<li><p><strong>The file <code>/bin/ksh</code> is not present.  This file is the Korn shell and
 	    is required by Oracle's <code>loadjava</code> utility for adding Java class files to the database.
-	    It must be installed in order for the ACS to install properly.  Please obtain it from 
+	    It must be installed in order for OpenACS to install properly.  Please obtain it from 
 	    <a href=\"http://www.kornshell.com/\">David Korn's Kornshell page</a>.  Install it and provide
 	    a symbolic link from <code>/bin/ksh</code> to the executable.  Alternatively, <code>loadjava</code>
 	    is known to work if <code>/bin/sh</code> is linked to <code>/bin/ksh</code>.  You can do this by typing
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	18 Apr 2001 15:28:19 -0000	1.3
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	29 Aug 2001 21:22:48 -0000	1.4
@@ -19,10 +19,10 @@
 
 <html>
   <head>
-    <title>ACS Installation: $title</title>
+    <title>OpenACS Installation: $title</title>
   </head>
   <body bgcolor=white>
-    <h2>ACS Installation: $title</h2>
+    <h2>OpenACS Installation: $title</h2>
     <hr>
 "
 }
@@ -31,7 +31,7 @@
 # This procedure must be called at the end of every installer page to end the critical section.
 proc install_footer {} {
     return "<hr>
-<a href=\"mailto:acs@arsdigita.com\"><address>acs@arsdigita.com</address></a>
+<a href=\"mailto:gatekeepers@openacs.org\"><address>gatekeepers@openacs.org</address></a>
 
   </body>
 </html>
Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	29 Jul 2001 23:16:50 -0000	1.3
+++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl	29 Aug 2001 21:22:48 -0000	1.4
@@ -157,6 +157,29 @@
     set error_p 1
 }   
 
+# OpenNSD must have a large stack size (at least 128K)
+set stacksize [ns_config "ns/threads" StackSize]
+if { $stacksize < [expr 128 * 1024] } {
+
+    append errors "<li><p>The configured OpenNSD Stacksize is too small ($stacksize).
+OpenACS requires a StackSize parameter of at least 131072 (ie 128K).
+Please add the following to your OpenNSD configuration file or 
+see the <a href=\"/doc/install-guide/\">Installation Guide</a> for more information.<p>
+<blockquote><pre>
+\[ns/threads\] 
+stacksize=131072 
+</blockquote></pre>
+<p>If you use a .tcl configuration file, add
+<blockquote><pre>
+ns_section \"ns/threads\"
+        ns_param StackSize [expr 128*1024]
+</blockquote></pre>
+After adding support the larger stacksize, please restart your web server.
+</strong></p>"
+    set error_p 1
+}   
+
+
 # APM needs to check its permissions.
 if { [catch {apm_workspace_dir} ] } {
     append errors "<li><p><strong>The [acs_root_dir] directory has incorrect permissions.  It must be owned by
Index: openacs-4/packages/acs-bootstrap-installer/installer/install-data-model.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/install-data-model.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-bootstrap-installer/installer/install-data-model.tcl	9 May 2001 22:32:25 -0000	1.2
+++ openacs-4/packages/acs-bootstrap-installer/installer/install-data-model.tcl	29 Aug 2001 21:22:48 -0000	1.3
@@ -1,6 +1,6 @@
 ad_page_contract {
 
-    Installs the ACS kernel data model, using the <code>sql/acs-kernel-create</code>
+    Installs the OpenACS kernel data model, using the <code>sql/acs-kernel-create</code>
     script.
 
     @author Jon Salz (jsalz@arsdigita.com)
@@ -24,7 +24,7 @@
 }
 
 ns_write "
-Now installing the ACS kernel data model...
+Now installing the OpenACS kernel data model...
 <blockquote><pre>
 "
 cd [file join [acs_root_dir] packages acs-kernel sql [db_type]]
@@ -56,7 +56,7 @@
 
 ns_write "</pre></blockquote>
 
-Done installing the ACS kernel data model.<p>
+Done installing the OpenACS kernel data model.<p>
 
 "
 
Index: openacs-4/packages/acs-bootstrap-installer/installer/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/packages-install.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-bootstrap-installer/installer/packages-install.tcl	9 May 2001 22:32:25 -0000	1.2
+++ openacs-4/packages/acs-bootstrap-installer/installer/packages-install.tcl	29 Aug 2001 21:22:48 -0000	1.3
@@ -20,7 +20,7 @@
     }
 }
 
-ns_write "[install_header 200 "Installing ACS Core Services"]
+ns_write "[install_header 200 "Installing OpenACS Core Services"]
 "
 
 # Attempt to install all packages.
Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	4 May 2001 11:56:30 -0000	1.4
+++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl	29 Aug 2001 21:22:48 -0000	1.5
@@ -463,11 +463,11 @@
 } -
 
 ad_proc acs_root_dir {} { 
-    Returns the path root for the ACS installation. 
+    Returns the path root for the OpenACS installation. 
 } -
 
 ad_proc acs_package_root_dir { package } { 
-    Returns the path root for a particular package within the ACS installation. 
+    Returns the path root for a particular package within the OpenACS installation. 
 } -
 
 ad_proc ad_make_relative_path { path } { 
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.8 -r1.9
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	26 Aug 2001 22:57:00 -0000	1.8
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	29 Aug 2001 21:22:48 -0000	1.9
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-content-repository" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-content-repository/" type="apm_service">
+<package key="acs-content-repository" url="http://openacs.org/repository/apm/packages/acs-content-repository/" type="apm_service">
     <package-name>ACS Content Repository</package-name>
     <pretty-plural>ACS Content Repository Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.1.2" url="http://www.arsdigita.com/acs-repository/download/apm/acs-content-repository-4.1.2.apm">
+    <version name="4.1.2" url="http://openacs.org/repository/download/apm/acs-content-repository-4.1.2.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:karl@arsdigita.com">Karl Goldstein</owner>
-        <summary>A canonical repository for all ACS content.		</summary>
+        <summary>A canonical repository for all OpenACS content.</summary>
         <release-date>2001-03-07</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org/">OpenACS</vendor>
 
         <provides url="acs-content-repository" version="4.1"/>
         <requires url="acs-kernel" version="4.0"/>
Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/acs-kernel.info	9 May 2001 22:32:25 -0000	1.3
+++ openacs-4/packages/acs-kernel/acs-kernel.info	29 Aug 2001 21:22:49 -0000	1.4
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-kernel" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-kernel/" type="apm_service">
+<package key="acs-kernel" url="http://openacs.org/repository/apm/packages/acs-kernel/" type="apm_service">
     <package-name>ACS Kernel</package-name>
     <pretty-plural>ACS Kernel Services</pretty-plural>
     <singleton-p>t</singleton-p>
     <initial-install-p>t</initial-install-p>
 
-    <version name="4.2" url="http://www.arsdigita.com/acs-repository/download/apm/acs-kernel-4.2.apm">
+    <version name="4.2" url="http://openacs.org/repository/download/apm/acs-kernel-4.2.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
-        <summary>Routines and data models providing the foundation for ACS-based Web services.</summary>
+        <summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
         <release-date>2001-03-06</release-date>
-        <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
+        <vendor url="http://openacs.org/">OpenACS</vendor>
 
         <provides url="acs-kernel" version="4.1"/>
 
Index: openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql	11 May 2001 00:14:48 -0000	1.6
+++ openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql	29 Aug 2001 21:22:49 -0000	1.7
@@ -1,7 +1,7 @@
 --
 -- /packages/acs-kernel/sql/apm-create.sql
 --
--- Data model for the ACS Package Manager (APM)
+-- Data model for the OpenACS Package Manager (APM)
 --
 -- @author Bryan Quinn (bquinn@arsdigita.com)
 -- @author Jon Salz (jsalz@mit.edu)
@@ -478,7 +478,7 @@
 -- Who owns a version?
 create table apm_package_owners (
     version_id         constraint apm_package_owners_ver_id_fk references apm_package_versions on delete cascade,
-    -- if the uri is an email address, it should look like 'mailto:alex@arsdigita.com'
+    -- if the uri is an email address, it should look like 'mailto:someguy@openacs.org'
     owner_uri          varchar2(1500),
     owner_name         varchar2(200)
                        constraint apm_package_owners_name_nn not null,
@@ -846,7 +846,7 @@
 );
 
 comment on table apm_applications is '
-This table records data on all of the applications registered in the ACS.
+This table records data on all of the applications registered in OpenACS.
 ';
 
 
@@ -858,7 +858,7 @@
 );
 
 comment on table apm_services is '
-This table records data on all of the services registered in the ACS. 
+This table records data on all of the services registered in OpenACS. 
 ';
 
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	29 Aug 2001 17:18:14 -0000	1.18
+++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql	29 Aug 2001 21:22:49 -0000	1.19
@@ -1,7 +1,7 @@
 --
 -- /packages/acs-kernel/sql/apm-create.sql
 --
--- Data model for the ACS Package Manager (APM)
+-- Data model for the OpenACS Package Manager (APM)
 --
 -- @author Bryan Quinn (bquinn@arsdigita.com)
 -- @author Jon Salz (jsalz@mit.edu)
@@ -651,7 +651,7 @@
 -- Who owns a version?
 create table apm_package_owners (
     version_id         integer constraint apm_package_owners_ver_id_fk references apm_package_versions on delete cascade,
-    -- if the uri is an email address, it should look like 'mailto:alex@arsdigita.com'
+    -- if the uri is an email address, it should look like 'mailto:someguy@openacs.org'
     owner_uri          varchar(1500),
     owner_name         varchar(200)
                        constraint apm_package_owners_name_nn not null,
@@ -1116,7 +1116,7 @@
 );
 
 comment on table apm_applications is '
-This table records data on all of the applications registered in the ACS.
+This table records data on all of the applications registered in OpenACS.
 ';
 
 
@@ -1128,7 +1128,7 @@
 );
 
 comment on table apm_services is '
-This table records data on all of the services registered in the ACS. 
+This table records data on all of the services registered in OpenACS. 
 ';
 
 
Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/acs-lang.info	2 May 2001 20:14:38 -0000	1.2
+++ openacs-4/packages/acs-lang/acs-lang.info	29 Aug 2001 21:22:49 -0000	1.3
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
-<package key="acs-lang" url="http://www.arsdgita.com/acs-repository/apm/packages/acs-lang" type="apm_service">
-    <package-name>ACS Localization Utils</package-name>
-    <pretty-plural>ACS Localization Utils</pretty-plural>
+<package key="acs-lang" url="http://www.openacs.org/acs-repository/apm/packages/acs-lang" type="apm_service">
+    <package-name>OpenACS Localization Utils</package-name>
+    <pretty-plural>OpenACS Localization Utils</pretty-plural>
     <singleton-p>t</singleton-p>
 
-    <version name="4.1b" url="http://www.arsdigita.com/acs-repository/download/apm/acs-lang-4.1b.apm">
+    <version name="4.1b" url="http://www.openacs.org/acs-repository/download/apm/acs-lang-4.1b.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:hqm@ai.mit.edu">Henry Minsky</owner>
-        <summary>ACS Internationalization Utilities</summary>
+        <summary>OpenACS Internationalization Utilities</summary>
         <release-date>2001-01-21</release-date>
         <vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
-        <description format="text/html">ACS Internationalization Utilities. Routines for manipulating Locales,
+        <description format="text/html">OpenACS Internationalization Utilities. Routines for manipulating Locales,
 request processor hooks, templating, message catalog, and
 locale-specific formatting functions.
 
Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -1,7 +1,7 @@
 #/packages/lang/tcl/ad-locale.tcl
 ad_library {
 
-    Localization procedures for the ArsDigita Publishing System
+    Localization procedures for OpenACS
     <p>
     This is free software distributed under the terms of the GNU Public
     License.  Full text of the license is available from the GNU Project:
@@ -13,7 +13,7 @@
 }
 
 
-ad_proc -public ad_locale_set_system_timezone { timezone }  { Tell the ACS 
+ad_proc -public ad_locale_set_system_timezone { timezone }  { Tell OpenACS 
 what timezone Oracle thinks it is running in. 
 
   @param timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
@@ -23,7 +23,7 @@
 }
 
 
-ad_proc -public ad_locale_get_system_timezone { }  { Ask the ACS 
+ad_proc -public ad_locale_get_system_timezone { }  { Ask OpenACS 
 what it thinks Oracle's timezone is.
 
   @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
Index: openacs-4/packages/acs-lang/www/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/Attic/index.html,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/index.html	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/acs-lang/www/index.html	29 Aug 2001 21:22:49 -0000	1.2
@@ -1,14 +1,14 @@
 <html>
-<title>ACS I18N Tests</title>
+<title>OpenACS I18N Tests</title>
 <body>
 
 <h1>Administration</h1>
 <ul>
-<li><a href=set-system-timezone>Set ACS System Timezone</a>
+<li><a href=set-system-timezone>Set OpenACS System Timezone</a>
 </ul>
 <p>
 
-<h1>ACS I18N Tests</h1>
+<h1>OpenACS I18N Tests</h1>
 
 Note, the timezone and currency formatting tests require the
 <tt>acs-reference</tt> package to be loaded.
Index: openacs-4/packages/acs-lang/www/set-system-timezone.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/Attic/set-system-timezone.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/set-system-timezone.tcl	20 Apr 2001 20:51:08 -0000	1.1
+++ openacs-4/packages/acs-lang/www/set-system-timezone.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -19,8 +19,10 @@
 <hr>
 
 
-ACS currently believes that Oracle is running in the
-timezone <b>[ad_locale_get_system_timezone]</b>
+OpenACS currently believes that the 
+[string totitle [nsv_get ad_database_type .]] database 
+is running in the timezone
+<b>[ad_locale_get_system_timezone]</b>
 <p>
 
 If this is correct, then the offset between the time returned by
@@ -50,8 +52,9 @@
 append page "
 <hr>
 
-You can use the form below to tell ACS what timezone Oracle is operating in.
-(There does not appear to be a nice way to ask Oracle this question automatically).
+You can use the form below to tell OpenACS what timezone the 
+[string totitle [nsv_get ad_database_type .]] database is operating in.
+(There does not appear to be a nice way to ask the database this question automatically).
 <p>
 
 <form action=set-system-timezone method=get>
Index: openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl	22 Aug 2001 19:36:08 -0000	1.3
+++ openacs-4/packages/acs-mail/tcl/acs-mail-procs.tcl	29 Aug 2001 21:22:49 -0000	1.4
@@ -294,7 +294,7 @@
 			# Defaults
 			return {
 				"text/plain; charset=us-ascii"
-				"An ACS object was unable to be encoded here.\n"
+				"An OpenACS object was unable to be encoded here.\n"
 			}
 		}
 		
@@ -323,7 +323,7 @@
 	# Defaults
 	return {
 		"text/plain; charset=us-ascii"
-		"An ACS object was unable to be encoded here.\n"
+		"An OpenACS object was unable to be encoded here.\n"
 	}
 }
 
@@ -537,7 +537,7 @@
         return 1
     }
     if ![acs_mail_body_p $value] {
-        ad_complain "$name does not refer to a valid ACS Mail body"
+        ad_complain "$name does not refer to a valid OpenACS Mail body"
         return 0
     }
     return 1
@@ -649,7 +649,7 @@
         return 1
     }
     if ![acs_mail_multipart_p $value] {
-      ad_complain "$name does not refer to a valid ACS Mail multipart"
+      ad_complain "$name does not refer to a valid OpenACS Mail multipart"
       return 0
     }
     return 1
@@ -751,7 +751,7 @@
         return 1
     }
     if ![acs_mail_link_p $value] {
-      ad_complain "$name does not refer to a valid ACS Mail link"
+      ad_complain "$name does not refer to a valid OpenACS Mail link"
       return 0
     }
     return 1
Index: openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -9,7 +9,7 @@
 ad_proc -public acs_message_p {
     {message_id}
 } {
-    Check if an integer is a valid ACS message id.
+    Check if an integer is a valid OpenACS message id.
 } {
     return [string equal [db_exec_plsql acs_message_p {
 	begin
@@ -20,14 +20,14 @@
 
 ad_page_contract_filter acs_message_id { name value } {
     Checks whether the value (assumed to be an integer) is the id
-    of an already-existing ACS message.
+    of an already-existing OpenACS message.
 } {
     # empty is okay (handled by notnull)
     if [empty_string_p $value] {
         return 1
     }
     if ![acs_message_p $value] {
-        ad_complain "$name ($value) does not refer to a valid ACS message"
+        ad_complain "$name ($value) does not refer to a valid OpenACS message"
         return 0
     }
     return 1
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.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	29 Aug 2001 21:22:49 -0000	1.2
@@ -11,10 +11,10 @@
 </ul>
 
 <if @acs_admin_available_p@ eq "t">
-  To administer the site-wide services of the ArsDigita Community System, use
+  To administer the site-wide services of OpenACS, use
   <a href="@acs_admin_url@">@instance_name@</a>.
 </if><else>
-  The ACS Administration service is not available.  If you are a site-wide administrator, 
-  use the <a href="site-map">Site Map</a> to mount the ACS Administration service.  This provides 
-  an interface for administering the site-wide services of the ArsDigita Community System.
+  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.
 </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.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -22,7 +22,7 @@
      where p.package_id = :package_id
 } -default "Subsite"]
 
-# Return the first available link to the ACS Admin page.
+# Return the first available link to the OpenACS 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
Index: openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -1,14 +1,14 @@
 ad_page_contract {
 
-    Home page for ACS Object Type administration
+    Home page for OpenACS Object Type administration
 
     @author Yonatan Feldman (yon@arsdigita.com)
     @creation-date August 13, 2000
     @cvs-id $Id$
 
 } {}
 
-set title "Object Type Administration"
+set title "OpenACS Object Type Administration"
 
 set page "
 [ad_admin_header $title]
@@ -30,4 +30,4 @@
 </ul>
 [ad_admin_footer]"
 
-ns_return 200 text/html $page
\ No newline at end of file
+ns_return 200 text/html $page
Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -2,7 +2,7 @@
 
 ad_page_contract {
 
-    View an ACS Object Type
+    View an OpenACS Object Type
 
     @author Yonantan Feldman (yon@arsdigita.com)
     @creation-date August 13, 2000
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	19 Aug 2001 21:26:05 -0000	1.8
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	29 Aug 2001 21:22:49 -0000	1.9
@@ -95,7 +95,7 @@
     }
     ns_log Debug "APM: Writing Package Specification for $pretty_name $version_name"
     append spec "<?xml version=\"1.0\"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
 <package key=\"[ad_quotehtml $package_key]\" url=\"[ad_quotehtml $package_uri]\" type=\"$package_type\">
     <package-name>[ad_quotehtml $pretty_name]</package-name>
Index: openacs-4/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/tcl/0-acs-init.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/tcl/0-acs-init.tcl	12 Apr 2001 17:17:32 -0000	1.3
+++ openacs-4/tcl/0-acs-init.tcl	29 Aug 2001 21:22:49 -0000	1.4
@@ -1,24 +1,24 @@
 # /tcl/0-acs-init.tcl
 #
-# The very first file invoked when ACS is started up. Sources
+# The very first file invoked when OpenACS is started up. Sources
 # /packages/acs-tcl/bootstrap/bootstrap.tcl.
 #
 # jsalz@mit.edu, 12 May 2000
 #
 # $Id$
 
-# Determine the ACS root directory, which is the directory right above the
+# Determine the OpenACS root directory, which is the directory right above the
 # Tcl library directory [ns_info tcllib].
 set root_directory [file dirname [string trimright [ns_info tcllib] "/"]]
 nsv_set acs_properties root_directory $root_directory
 
-ns_log "Notice" "Loading the ACS, rooted at $root_directory"
+ns_log "Notice" "Loading OpenACS, rooted at $root_directory"
 set bootstrap_file "$root_directory/packages/acs-bootstrap-installer/bootstrap.tcl"
 ns_log "Notice" "Sourcing $bootstrap_file"
 
 if { [file isfile $bootstrap_file] } {
     source $bootstrap_file
 } else {
-    ns_log "Error" "$bootstrap_file does not exist. Aborting the ACS load process."
+    ns_log "Error" "$bootstrap_file does not exist. Aborting the OpenACS load process."
 }
 
Index: openacs-4/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/www/index.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/www/index.tcl	29 Aug 2001 21:22:49 -0000	1.2
@@ -1,6 +1,6 @@
 ad_page_contract {
 
-    ACS main index page.  This is the standard page that is used to allow users
+    OpenACS main index page.  This is the standard page that is used to allow users
     to login to the site.  You can customize the presentation by editing index.adp.
     However, for a real web site, you will likely need to take this file as a boiler
     plate and add the necessary content and branding items.
@@ -87,4 +87,4 @@
 
 set acs_root_dir [acs_root_dir]
 
-ad_return_template
\ No newline at end of file
+ad_return_template