Index: openacs-4/packages/acs-core-docs/www/apm-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/apm-design.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/apm-design.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/apm-design.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -635,7 +635,7 @@
 centralization, but splitting this information into several files
 allows for flexible extensions to the APM architecture over
 time.</p><p>APM packages currently lack provisions to verify security
-information. There are plans to add MD5 time stamps and PGP
+information. There are plans to add MD5 timestamps and PGP
 signatures to packages to enable secure authentication of packages.
 These steps are necessary for APM to be usable as a scalable method
 to distribute packages on multiple repositories worldwide.</p><p>Another anticipated change is to split the APM UI into separate
Index: openacs-4/packages/acs-core-docs/www/apm-requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/apm-requirements.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/apm-requirements.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/apm-requirements.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -71,8 +71,7 @@
 </ul></div>
 </li><li class="listitem"><p>
 <span class="strong"><strong>A registry of installed
-packages</strong></span>, database-backed and integrated with file
-system-based version control</p></li><li class="listitem">
+packages</strong></span>, database-backed and integrated with filesystem-based version control</p></li><li class="listitem">
 <p><span class="strong"><strong>Web-based tools for package
 development:</strong></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle;">
 <li class="listitem"><p>Creating new packages locally</p></li><li class="listitem"><p>Releasing new versions of locally-created packages</p></li><li class="listitem"><p>Uploading packages to a global package repository on the web</p></li><li class="listitem"><p>Use of these tools should be safe, i.e. installing or removing a
@@ -262,7 +261,7 @@
 identified.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>
 <span class="strong"><strong>4.600.1</strong></span> Each
-package will have a PGP signature and there will be MD5 time stamps
+package will have a PGP signature and there will be MD5 timestamps
 for each file within the package.</p></li><li class="listitem"><p>
 <span class="strong"><strong>4.600.5</strong></span> The APM
 will provide a facility to validate both the PGP signature and MD5
@@ -310,18 +309,17 @@
 package</strong></span></p><p>
 <span class="strong"><strong>20.1</strong></span> The developer
 must be able to add files to the package. This is done by copying
-the files into the package directory in the host OS&#39;s file
-system. Files can be added at any point after package creation.</p><p>
+the files into the package directory in the host OS&#39;s filesystem. Files can be added at any point after package creation.</p><p>
 <span class="strong"><strong>20.3</strong></span> Once a package
 has been versioned and distributed, no new files should be added to
 the package without incrementing the version number.</p><p>
 <span class="strong"><strong>20.5</strong></span> The APM&#39;s
 UI should facilitate the process of adding new files, by scanning
-the file system for new files automatically, and allowing the
+the filesystem for new files automatically, and allowing the
 developer to confirm adding them.</p><p>
 <span class="strong"><strong>20.10</strong></span> The developer
 cannot add files to a given package via the UI that do not exist in
-the file system already.</p><p>
+the filesystem already.</p><p>
 <span class="strong"><strong>20.15</strong></span> Package file
 structure must follow a specified convention. Please see the
 <a class="link" href="apm-design" title="Package Manager Design">design document</a> for what we do
@@ -335,12 +333,12 @@
 <span class="strong"><strong>30.1</strong></span> Access the APM
 UI, browse the file list, and remove files.</p><p>
 <span class="strong"><strong>30.1.1</strong></span>If a file is
-removed from the package list, but not from the file system, an
+removed from the package list, but not from the filesystem, an
 error should be generated at package load time.</p>
 </li><li class="listitem">
 <p>
 <span class="strong"><strong>30.5</strong></span> Remove the
-file from file system.</p><p>
+file from filesystem.</p><p>
 <span class="strong"><strong>30.5.1</strong></span> The APM UI
 should take note of the fact that the file is gone and offer the
 developer an option to confirm the file&#39;s deletion.</p>
@@ -351,7 +349,7 @@
 <span class="strong"><strong>40.0 Modify files in a
 package</strong></span>.</p><p>
 <span class="strong"><strong>40.1</strong></span> The developer
-should be able to modify files in the file system. The APM UI
+should be able to modify files in the filesystem. The APM UI
 should not interfere with this.</p><p>
 <span class="strong"><strong>40.5</strong></span> However, if
 the developer modifies files containing procedural definitions, APM
@@ -393,7 +391,7 @@
 all package information.</p>
 </li><li class="listitem">
 <p><span class="strong"><strong>70.0 Write an XML package
-specification to the file system</strong></span></p><p>
+specification to the filesystem</strong></span></p><p>
 <span class="strong"><strong>70.1</strong></span> The developer
 should be able to write an up-to-date XML specification to
 disk.</p><p>
@@ -561,7 +559,7 @@
 <span class="strong"><strong>110.1.1</strong></span> Running any
 data model scripts necessary to drop the package.</p></li><li class="listitem"><p>
 <span class="strong"><strong>110.1.5</strong></span> Moving all
-of the files into a separate location in the file system from the
+of the files into a separate location in the filesystem from the
 installed packages.</p></li><li class="listitem"><p>
 <span class="strong"><strong>4.110.1.10</strong></span> If the
 package is a compound package, then the administrator must confirm
@@ -590,10 +588,10 @@
 <p><span class="strong"><strong>150.0 Scan for new or modified
 packages</strong></span></p><p>
 <span class="strong"><strong>150.1</strong></span> The
-administrator should be able to scan the file system for any
+administrator should be able to scan the filesystem for any
 changes made in any of the installed package files.</p><p>
 <span class="strong"><strong>150.5</strong></span> The
-administrator should be able to scan the file system for any newly
+administrator should be able to scan the filesystem for any newly
 installed packages.</p>
 </li>
 </ul></div>
Index: openacs-4/packages/acs-core-docs/www/configuring-new-site.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/configuring-new-site.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/configuring-new-site.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/configuring-new-site.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -27,7 +27,7 @@
 changes to a new OpenACS site through the web interface. In crude
 terms, these changes happen in the database, and are upgrade-safe.
 <span class="strong"><strong>Customizing</strong></span> refers to
-changes that touch the file system, and require some planning if
+changes that touch the filesystem, and require some planning if
 easy upgradability is to be maintained.</p>
 </div>
 <include src="/packages/acs-core-docs/lib/navfooter"
Index: openacs-4/packages/acs-core-docs/www/eng-standards-versioning.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/eng-standards-versioning.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/eng-standards-versioning.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/eng-standards-versioning.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -135,7 +135,7 @@
 supported databases.</p></li><li class="listitem"><p>
 <span class="strong"><strong>Level 4:
 Deprecated.</strong></span> The package was in some earlier version
-is use, but was probably replaced by a another package. The package
+is use, but was probably replaced by another package. The package
 description should point to a preferred version.</p></li>
 </ul></div>
 </div><div class="sect2">
Index: openacs-4/packages/acs-core-docs/www/ext-auth-requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/ext-auth-requirements.adp,v
diff -u -r1.6.2.4 -r1.6.2.5
--- openacs-4/packages/acs-core-docs/www/ext-auth-requirements.adp	26 Aug 2020 07:46:25 -0000	1.6.2.4
+++ openacs-4/packages/acs-core-docs/www/ext-auth-requirements.adp	5 Jan 2021 17:33:39 -0000	1.6.2.5
@@ -108,7 +108,7 @@
 <td class="seg">EXT-AUTH-28</td><td class="seg">A</td><td class="seg">Username is email switch</td>
 </tr>
 </tbody>
-</table></div><p>Users will log in using a username, a authority, and a password.
+</table></div><p>Users will log in using a username, an authority, and a password.
 The authority is the source for user/password verification. OpenACS
 can be an authority itself.</p><p>Each user in OpenACS will belong to exactly one authority, which
 can either be the "local" OpenACS users table, in which
@@ -177,7 +177,7 @@
 </tr></tbody>
 </table></div><p>Each authority is defined like this:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>Authority pretty-name, e.g. "URZ"</p></li><li class="listitem"><p>Authentication Driver, e.g. "RADIUS". In practice,
-this would be a reference to a service contract implementation.</p></li><li class="listitem"><p>Authentication Driver configuration settings, e.g. host name,
+this would be a reference to a service contract implementation.</p></li><li class="listitem"><p>Authentication Driver configuration settings, e.g. hostname,
 port, etc., as required by the particular driver. Note that this is
 per authority, not per driver, i.e., you can have multiple
 authorities with the same driver but different configuration
@@ -191,7 +191,7 @@
 this would be a reference to a service contract implementation. The
 reason we have separate drivers for authentication and account
 creation is that organizations are likely to have a home-grown
-account registration process.</p></li><li class="listitem"><p>Account Creation Driver configuration settings, e.g. host name,
+account registration process.</p></li><li class="listitem"><p>Account Creation Driver configuration settings, e.g. hostname,
 port, etc., as required by the particular driver. Note that this is
 per authority, not per driver, i.e., you can have multiple
 authorities with the same driver but different configuration
@@ -283,7 +283,7 @@
 <a name="Account_Registratio" id="Account_Registratio"></a>Account Registration</h4></div></div></div><p>If a user doesn&#39;t have an account, the site-wide
 configuration can allow the user to register for one, as defined in
 the configuration discussed above. This section is about normal
-account registration through a authority driver.</p><p>The account creation service contract implementation will need
+account registration through an authority driver.</p><p>The account creation service contract implementation will need
 to tell us which information to ask the user for:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>Required Fields: A list of fields which are required.</p></li><li class="listitem"><p>Optional Fields: A list of fields which are optional.</p></li>
 </ul></div><p>The fields to choose from are these:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
Index: openacs-4/packages/acs-core-docs/www/groups-requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/groups-requirements.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/groups-requirements.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/groups-requirements.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -167,7 +167,7 @@
 who has registered with an OpenACS site. A user may have additional
 attributes, such as a screen name.</p><p>The data model should enforce these constraints:</p><p>
 <span class="strong"><strong>40.10</strong></span> A user must
-have a non-empty email address.</p><p>
+have a nonempty email address.</p><p>
 <span class="strong"><strong>40.20</strong></span> Two different
 users may not have the same email address on a single OpenACS
 installation; i.e., an email address identifies a single user on
Index: openacs-4/packages/acs-core-docs/www/i18n-introduction.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/i18n-introduction.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/i18n-introduction.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/i18n-introduction.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -36,7 +36,7 @@
 and localized ADP files. For ADP pages which are mostly code,
 replacing the message text with message key placeholders is
 simpler. This approach also allows new translation in the database,
-without affecting the file system. For ADP pages which are static
+without affecting the filesystem. For ADP pages which are static
 and mostly text, it may be easier to create a new ADP page for each
 language. In this case, the pages are distinguished by a file
 naming convention.</p><div class="sect2">
@@ -118,7 +118,7 @@
 <li class="listitem"><p>Typical static key lookup: <code class="computeroutput">[_
 package_key.message_key]</code> - The message key and package key
 used here must be string literals, they can&#39;t result from
-variable evaluation.</p></li><li class="listitem"><p>Static key lookup with non-default locale: <code class="computeroutput">[lang::message::lookup $locale
+variable evaluation.</p></li><li class="listitem"><p>Static key lookup with nondefault locale: <code class="computeroutput">[lang::message::lookup $locale
 package_key.message_key]</code> - The message key and package key
 used here must be string literals, they can&#39;t result from
 variable evaluation.</p></li><li class="listitem"><p>Dynamic key lookup: <code class="computeroutput">[lang::util::localize
Index: openacs-4/packages/acs-core-docs/www/i18n-requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/i18n-requirements.adp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/acs-core-docs/www/i18n-requirements.adp	26 Aug 2020 07:46:25 -0000	1.5.2.3
+++ openacs-4/packages/acs-core-docs/www/i18n-requirements.adp	5 Jan 2021 17:33:39 -0000	1.5.2.4
@@ -291,7 +291,7 @@
 <a name="Submitted_Form_Data_Character_Set" id="Submitted_Form_Data_Character_Set"></a>Submitted Form Data
 Character Set</h4></div></div></div><p>
 <span class="emphasis"><em>50.30</em></span> Data which is
-submitted with a HTTP request using a GET or POST method may be in
+submitted with an HTTP request using a GET or POST method may be in
 any character set. The system must be able to determine the
 encoding of the form data and convert it to Unicode on demand.</p><p>
 <span class="emphasis"><em>50.35</em></span> The developer must
@@ -401,23 +401,23 @@
 <a name="VI.G_Time_Zones" id="VI.G_Time_Zones"></a>Time Zones</h3></div></div></div><div class="blockquote"><blockquote class="blockquote">
 <p>
 <span class="emphasis"><em>90.10</em></span> Provide API support
-for specifying a time zone</p><p>
+for specifying a timezone</p><p>
 <span class="emphasis"><em>90.20</em></span> Provide an API for
 computing time and date operations which are aware of timezones. So
 for example a calendar module can properly synchronize items
-inserted into a calendar from users in different time zones using
+inserted into a calendar from users in different timezones using
 their own local times.</p><p>
 <span class="emphasis"><em>90.30</em></span> Store all dates and
-times in universal time zone, UTC.</p><p>
+times in universal timezone, UTC.</p><p>
 <span class="emphasis"><em>90.40</em></span> For a registered
-users, a time zone preference should be stored.</p><p>
+users, a timezone preference should be stored.</p><p>
 <span class="emphasis"><em>90.50</em></span> For a
-non-registered user a time zone preference should be attached via a
+non-registered user a timezone preference should be attached via a
 session or else UTC should be used to display every date and
 time.</p><p>
 <span class="emphasis"><em>90.60</em></span> The default if we
-can&#39;t determine a time zone is to display all dates and times
-in some universal time zone such as GMT.</p>
+can&#39;t determine a timezone is to display all dates and times
+in some universal timezone such as GMT.</p>
 </blockquote></div>
 </div><div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
Index: openacs-4/packages/acs-core-docs/www/individual-programs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/individual-programs.adp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-core-docs/www/individual-programs.adp	26 Aug 2020 07:46:25 -0000	1.5.2.2
+++ openacs-4/packages/acs-core-docs/www/individual-programs.adp	5 Jan 2021 17:33:39 -0000	1.5.2.3
@@ -240,7 +240,7 @@
 external load balancing system.</p></li><li class="listitem">
 <p>
 <strong>Database. </strong>The data on your site (for
-example, user names and passwords, calendar entries, and notes) is
+example, usernames and passwords, calendar entries, and notes) is
 stored in the database. OpenACS separates the database with an
 abstraction layer, which means that several different databases all
 function identically. While you can run the core OpenACS on any
Index: openacs-4/packages/acs-core-docs/www/install-ldap-radius.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-ldap-radius.adp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-core-docs/www/install-ldap-radius.adp	26 Aug 2020 07:46:25 -0000	1.5.2.2
+++ openacs-4/packages/acs-core-docs/www/install-ldap-radius.adp	5 Jan 2021 17:33:39 -0000	1.5.2.3
@@ -58,10 +58,10 @@
 use. </strong>Traditionally OpenACS has supported ns_ldap for
 authentication by storing the OpenACS password in an encrypted
 field within the LDAP server called "userPassword".
-Furthermore a CN field was used for searching for the username,
+Furthermore, a CN field was used for searching for the username,
 usually userID or something similar. This field is identical to the
 <span class="emphasis"><em>username</em></span>stored in OpenACS.
-Therefore the login will only work if you change login method to
+Therefore, the login will only work if you change login method to
 make use of the username instead.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;"><li class="listitem"><p>Change <span class="emphasis"><em>config.tcl</em></span>. Remove
 the <span class="emphasis"><em>#</em></span> in front of
 <code class="computeroutput">ns_param nsldap
@@ -71,7 +71,7 @@
 <a name="configure-ns_ldap-bind" id="configure-ns_ldap-bind"></a><p>
 <strong>Configure ns_ldap for use with LDAP
 bind. </strong>LDAP authentication usually is done by trying
-to bind (a.k.a. login) a user with the LDAP server. The password of
+to bind (aka login) a user with the LDAP server. The password of
 the user is not stored in any field of the LDAP server, but kept
 internally. The latest version of ns_ldap supports this method with
 the <span class="emphasis"><em>ns_ldap bind</em></span> command.
Index: openacs-4/packages/acs-core-docs/www/install-next-add-server.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-next-add-server.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/install-next-add-server.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/install-next-add-server.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -17,13 +17,13 @@
 <span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>, and change
 the</p><pre class="programlisting">set httpport              8000
 set httpsport             8443 </pre><p>to different values.</p><p>
-<strong>Services on different host names. </strong>For
+<strong>Services on different hostnames. </strong>For
 example, suppose you want to support <code class="computeroutput">http://service0.com</code> and <code class="computeroutput">http://bar.com</code> on the same machine. The
-easiest way is to assign each one a different ip address. Then you
+easiest way is to assign each one a different IP address. Then you
 can install two services as above, but with different values
 for</p><pre class="programlisting">
 set hostname               [ns_info hostname]
-set address                127.0.0.1 </pre><p>If you want to install two services with different host names
+set address                127.0.0.1 </pre><p>If you want to install two services with different hostnames
 sharing the same ip, you&#39;ll need nsvhr to redirect requests
 based on the contents of the tcp headers. See <a class="ulink" href="http://borkware.com/rants/aolserver-vhosting/" target="_top">AOLserver Virtual Hosting with TCP</a> by <a class="ulink" href="mailto:markd\@borkware.com" target="_top">markd</a>.</p>
 </div>
Index: openacs-4/packages/acs-core-docs/www/install-openacs-inittab.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-openacs-inittab.adp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/acs-core-docs/www/install-openacs-inittab.adp	26 Aug 2020 07:46:25 -0000	1.3.2.2
+++ openacs-4/packages/acs-core-docs/www/install-openacs-inittab.adp	5 Jan 2021 17:33:39 -0000	1.3.2.3
@@ -25,7 +25,7 @@
 </li><li class="listitem"><p>Copy this <a class="ulink" href="files/restart-aolserver.txt" target="_top">file</a> into <code class="computeroutput">/var/tmp/restart-aolserver.txt</code>.</p></li><li class="listitem">
 <p>This script needs to be SUID-root, which means that the script
 will run as root. This is necessary to ensure that the AOLserver
-processes are killed regardless of who owns them. However the
+processes are killed regardless of who owns them. However, the
 script should be executable by the <code class="computeroutput">web</code> group to ensure that the users updating
 the web page can use the script, but that general system users
 cannot run the script. You also need to have Perl installed and
Index: openacs-4/packages/acs-core-docs/www/install-php.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-php.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/install-php.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/install-php.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -25,7 +25,7 @@
 [root php-4.3.4]# <strong class="userinput"><code>make install</code></strong>
 </pre><p>Once installed you can enable this by configuring your config
 file. Make sure your config file supports php (it should have a php
-section with it). Furthermore add <strong class="userinput"><code>index.php</code></strong> as the last element to
+section with it). Furthermore, add <strong class="userinput"><code>index.php</code></strong> as the last element to
 your <code class="computeroutput">directoryfile</code>
 directive.</p>
 </div>
Index: openacs-4/packages/acs-core-docs/www/install-qmail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-qmail.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/acs-core-docs/www/install-qmail.adp	26 Aug 2020 07:46:25 -0000	1.5.2.4
+++ openacs-4/packages/acs-core-docs/www/install-qmail.adp	5 Jan 2021 17:33:39 -0000	1.5.2.5
@@ -32,7 +32,7 @@
 not, you&#39;ll want to read <code class="computeroutput">/var/qmail/doc/INSTALL.ctl</code> to find out how
 to configure qmail.</p><pre class="screen">[root qmail-1.03]# <strong class="userinput"><code>./config-fast <span class="replaceable"><span class="replaceable">yourserver.test</span></span>
 </code></strong>
-Your fully qualified host name is yourserver.test.
+Your fully qualified hostname is yourserver.test.
 Putting yourserver.test into control/me...
 Putting yourserver.test into control/defaultdomain...
 Putting yourserver.test into control/plusdomain...
Index: openacs-4/packages/acs-core-docs/www/install-redhat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/install-redhat.adp,v
diff -u -r1.5.2.5 -r1.5.2.6
--- openacs-4/packages/acs-core-docs/www/install-redhat.adp	26 Aug 2020 07:46:25 -0000	1.5.2.5
+++ openacs-4/packages/acs-core-docs/www/install-redhat.adp	5 Jan 2021 17:33:39 -0000	1.5.2.6
@@ -87,7 +87,7 @@
 guess. Click <code class="computeroutput"><span class="guibutton"><span class="guibutton">Edit</span></span></code>,
 uncheck <code class="computeroutput"><span class="guilabel"><span class="guilabel">Configure using <u><span class="accel">D</span></u>HCP</span></span></code> and type in your IP
 and netmask. Click <code class="computeroutput"><span class="guibutton"><span class="guibutton">
-<u><span class="accel">O</span></u>k</span></span></code>.</p></li><li class="listitem"><p>Type in your host name, gateway, and DNS server(s). Then click
+<u><span class="accel">O</span></u>k</span></span></code>.</p></li><li class="listitem"><p>Type in your hostname, gateway, and DNS server(s). Then click
 <code class="computeroutput"><span class="guibutton"><span class="guibutton">
 <u><span class="accel">N</span></u>ext</span></span></code>.</p></li><li class="listitem"><p>We&#39;re going to use the firewall template for high security,
 meaning that we&#39;ll block almost all incoming traffic. Then
@@ -105,7 +105,7 @@
 <a class="indexterm" name="idp140520348490504" id="idp140520348490504"></a>Select any additional languages you want
 the computer to support and then click <code class="computeroutput"><span class="guibutton"><span class="guibutton">
 <u><span class="accel">N</span></u>ext</span></span></code>
-</p></li><li class="listitem"><p>Choose your time zone and click <code class="computeroutput"><span class="guibutton"><span class="guibutton">
+</p></li><li class="listitem"><p>Choose your timezone and click <code class="computeroutput"><span class="guibutton"><span class="guibutton">
 <u><span class="accel">N</span></u>ext</span></span></code>.</p></li><li class="listitem"><p>Type in a root password, twice.</p></li><li class="listitem">
 <p>On the Package selection page, we&#39;re going to uncheck a lot
 of packages that install software we don&#39;t need, and add
Index: openacs-4/packages/acs-core-docs/www/maint-performance.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/maint-performance.adp,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/acs-core-docs/www/maint-performance.adp	26 Aug 2020 07:46:25 -0000	1.4.2.4
+++ openacs-4/packages/acs-core-docs/www/maint-performance.adp	5 Jan 2021 17:33:39 -0000	1.4.2.5
@@ -12,7 +12,7 @@
 <a name="maint-performance" id="maint-performance"></a>Diagnosing Performance Problems</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>Did performance problems happen overnight, or did they sneak up
 on you? Any clue what caused the performance problems (e.g. loading
-20K users into .LRN)</p></li><li class="listitem"><p>Is the file system out of space? Is the machine swapping to disk
+20K users into .LRN)</p></li><li class="listitem"><p>Is the filesystem out of space? Is the machine swapping to disk
 constantly?</p></li><li class="listitem">
 <p>Isolating and solving database problems.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle;">
 <li class="listitem"><p>Without daily internal maintenance, most databases slowly
Index: openacs-4/packages/acs-core-docs/www/maintenance-deploy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/maintenance-deploy.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/acs-core-docs/www/maintenance-deploy.adp	26 Aug 2020 07:46:25 -0000	1.5.2.4
+++ openacs-4/packages/acs-core-docs/www/maintenance-deploy.adp	5 Jan 2021 17:33:39 -0000	1.5.2.5
@@ -113,8 +113,7 @@
 additional measures typically take the form of source control tags
 and system version numbers. The parallel-server approach also
 guarantees rollback because the original working service is not
-touched; it is merely set aside.</p><p>This approach can has limitations. If the database or file
-system regularly receiving new data, you must interrupt this
+touched; it is merely set aside.</p><p>This approach can has limitations. If the database or filesystem regularly receiving new data, you must interrupt this
 function or risk losing data in the shuffle. It also requires extra
 steps if the database will be affected.</p><div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
Index: openacs-4/packages/acs-core-docs/www/object-system-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/object-system-design.adp,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-core-docs/www/object-system-design.adp	26 Aug 2020 07:46:25 -0000	1.4.2.3
+++ openacs-4/packages/acs-core-docs/www/object-system-design.adp	5 Jan 2021 17:33:39 -0000	1.4.2.4
@@ -229,7 +229,7 @@
 still keeping track of the fact that each member of a subtype (i.e.
 for each row in the subtype&#39;s table), is also a member of the
 parent type (i.e. there is a corresponding row in the parent type
-table). Therefore, applications an use this mechanism without
+table). Therefore, applications use this mechanism without
 worrying about this bookkeeping themselves, and we avoid having
 applications pollute the core data model with their specific
 information.</p>
@@ -345,7 +345,7 @@
 existing SQL or SQL-like database engine. Examples of systems like
 this include the new Informix, PostgreSQL 7, and Oracle has
 something like this too. The main problem with these systems: each
-one implements their own non-portable extensions to SQL to
+one implements their own nonportable extensions to SQL to
 implement subtyping. Thus, making OpenACS data models portable
 would become even more difficult. In addition, each of these object
 systems have strange limitations that make using inheritance
Index: openacs-4/packages/acs-core-docs/www/openacs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/openacs.adp,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/acs-core-docs/www/openacs.adp	26 Aug 2020 07:46:25 -0000	1.4.2.4
+++ openacs-4/packages/acs-core-docs/www/openacs.adp	5 Jan 2021 17:33:39 -0000	1.4.2.5
@@ -57,7 +57,7 @@
 </pre>
 </div><div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="openacs-setup" id="openacs-setup"></a>Set up the file system for one or more OpenACS
+<a name="openacs-setup" id="openacs-setup"></a>Set up the filesystem for one or more OpenACS
 Sites</h3></div></div></div><p>For Linux Standard Base compliance and ease of backup, all of
 the files in each OpenACS site are stored in a subdirectory of
 <code class="computeroutput">/var/lib/aolserver</code>, one
@@ -359,8 +359,7 @@
 [$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$ <strong class="userinput"><code>cd /var/lib/aolserver/<span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>/etc</code></strong>
 [$OPENACS_SERVICE_NAME etc]$ <strong class="userinput"><code>emacs config.tcl</code></strong>
 </pre><p>You can continue without changing any values in the file.
-However, if you don&#39;t change <code class="computeroutput">address</code> to match the computer&#39;s ip
-address, you won&#39;t be able to browse to your server from other
+However, if you don&#39;t change <code class="computeroutput">address</code> to match the computer&#39;s IP address, you won&#39;t be able to browse to your server from other
 machines.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>
 <span class="emphasis"><em>httpport</em></span> - If you want
Index: openacs-4/packages/acs-core-docs/www/oracle.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/oracle.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/oracle.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/oracle.adp	5 Jan 2021 17:33:39 -0000	1.4.2.3
@@ -110,7 +110,7 @@
 that password.</p>
 </li><li class="listitem">
 <p>Setup the installation location for Oracle. While Oracle can
-reside in a variety of places in the file system, OpenACS has
+reside in a variety of places in the filesystem, OpenACS has
 adopted <code class="computeroutput">/ora8</code> as the base
 directory.</p><p>
 <span class="strong"><strong>Note:</strong></span> the Oracle
@@ -403,7 +403,7 @@
 </li>
 </ul></div><p>Congratulations, you have just installed Oracle 8.1.7 Server!
 However, you still need to create a database which can take about
-an hour of non-interactive time, so don&#39;t quit yet.</p>
+an hour of noninteractive time, so don&#39;t quit yet.</p>
 </div><div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="install-oracle-create" id="install-oracle-create"></a>Creating the First Database</h3></div></div></div><p>This step will take you through the steps of creating a
@@ -450,7 +450,7 @@
 going to examine the contents of this file before creating our
 database.)</p></li><li class="listitem"><p>Click the "<code class="computeroutput">Save</code>"
 button. Oracle will automatically save it to the correct directory
-and with the correct file name. This will likely be <code class="computeroutput">/ora8/m01/app/oracle/product/8.1.7/assistants/dbca/jlib/sqlora8.sh</code>
+and with the correct filename. This will likely be <code class="computeroutput">/ora8/m01/app/oracle/product/8.1.7/assistants/dbca/jlib/sqlora8.sh</code>
 </p></li><li class="listitem"><p>It will alert you that the script has been saved
 successfully.</p></li><li class="listitem">
 <p>Now we need to customize the database configuration a bit. While
Index: openacs-4/packages/acs-core-docs/www/packages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/packages.adp,v
diff -u -r1.7.2.4 -r1.7.2.5
--- openacs-4/packages/acs-core-docs/www/packages.adp	26 Aug 2020 07:46:25 -0000	1.7.2.4
+++ openacs-4/packages/acs-core-docs/www/packages.adp	5 Jan 2021 17:33:39 -0000	1.7.2.5
@@ -18,7 +18,7 @@
 OpenACS. OpenACS packages are installed and maintained with the
 OpenACS Package Manager (APM) which is part of the acs-admin
 package. This document presents reasons for packaging software,
-conventions for the file system and naming that must be followed,
+conventions for the filesystem and naming that must be followed,
 and step by step instructions for creating a new package for the
 "Notes" example package.</p>
 </div><div class="sect2">
@@ -51,7 +51,7 @@
 <a name="packages-looks" id="packages-looks"></a>What a Package Looks Like</h3></div></div></div><p>Each package encapsulates all of its data model, library code,
 logic, administration pages and user pages in a single part of the
 file tree. This means developers can track down <span class="emphasis"><em>everything</em></span> that is related to a
-particular package without hunting all over the file system.
+particular package without hunting all over the filesystem.
 Encapsulating everything about a package in one place also makes it
 much easier to distribute packages independently from the OpenACS
 Core.</p><p>In order to make this work, we need a system that keeps track of
@@ -277,7 +277,7 @@
 <dt><span class="term">Package Key</span></dt><dd><p>This is a short text string that should uniquely name your
 package to distinguish it from all the others. It is used as a
 database key to keep track of the package and as the name of the
-directory in the file system where all the files related to your
+directory in the filesystem where all the files related to your
 package will live. Example package keys in the current system
 include: <code class="computeroutput">forums</code>, <code class="computeroutput">acs-kernel</code> and so on. For the example
 application, we will use the package key <code class="computeroutput">notes</code>.</p></dd><dt><span class="term">Package Name</span></dt><dd><p>This is a short human readable name for your package. For our
@@ -309,8 +309,7 @@
 click the link called "notes" to go to the management
 page for the new package. Now click the link called "Manage
 file information", then the "Scan the <code class="computeroutput">packages/notes</code> directory for additional
-files in this package" link on that page to scan the file
-system for new files. This will bring you do a page that lists all
+files in this package" link on that page to scan the filesystem for new files. This will bring you to a page that lists all
 the files you just added and lets you add them to the <code class="computeroutput">notes</code> package.</p><p>Note that while the <code class="computeroutput">.sql</code>
 files have been added to the package, they <span class="emphasis"><em>have not</em></span> been loaded into the database.
 For the purposes of development, you have to load the data model by
@@ -350,8 +349,7 @@
 What we have to do is <span class="emphasis"><em>mount</em></span>
 the application into the site map. That is, we have to define the
 URL from which the application will serve its pages.</p><p>In OpenACS 5, administrators can define an arbitrary mapping
-between the URLs the user types and the actual file in the file
-system that is served. This mapping is called the <span class="emphasis"><em>site map</em></span> and entries in the site map are
+between the URLs the user types and the actual file in the filesystem that is served. This mapping is called the <span class="emphasis"><em>site map</em></span> and entries in the site map are
 called <span class="emphasis"><em>site nodes</em></span>. Each site
 node maps a URL to an OpenACS object. Since package instances are
 objects, the site map allows us to easily map package instances to
@@ -408,4 +406,4 @@
 System"
 			homeLink="index" homeLabel="Home" 
 			upLink="dev-guide" upLabel="Up"> 
-		    
\ No newline at end of file
+		    
Index: openacs-4/packages/acs-core-docs/www/packages.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/packages.html,v
diff -u -r1.57.2.3 -r1.57.2.4
--- openacs-4/packages/acs-core-docs/www/packages.html	27 Jun 2019 18:22:22 -0000	1.57.2.3
+++ openacs-4/packages/acs-core-docs/www/packages.html	5 Jan 2021 17:33:40 -0000	1.57.2.4
@@ -331,7 +331,7 @@
           file information", then the "Scan the
           <code class="computeroutput">packages/notes</code> directory for
           additional files in this package" link on that page to scan
-          the file system for new files.  This will bring you do a page
+          the file system for new files.  This will bring you to a page
           that lists all the files you just added and lets you add them to
           the <code class="computeroutput">notes</code> package.
         </p><p>
Index: openacs-4/packages/acs-core-docs/www/parties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/parties.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/parties.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/parties.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -154,7 +154,7 @@
 example, a person might be listed in a system as both an individual
 (direct membership) and a member of a household (indirect
 membership) at a video rental store.</p><pre class="programlisting"><code class="computeroutput">
-# sql code
+# SQL code
 create or replace package membership_rel
 as
 
@@ -203,7 +203,7 @@
 is maintained for you by the API. So users do not see some random
 PL/SQL error message, do not give them the option to create a
 composition relation that would result in a circular reference.</p><pre class="programlisting"><code class="computeroutput">
-# sql code
+# SQL code
 create or replace package composition_rel
 as
 
Index: openacs-4/packages/acs-core-docs/www/permissions-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/permissions-design.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/permissions-design.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/permissions-design.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -211,7 +211,7 @@
 returns true or false, the other presents an error page.</p><p>To receive a true or false value, Tcl code should call:</p><pre class="programlisting">
 permission::permission_p -object_id $object_id -party_id $user_id -privilege $method
 </pre><p>If the <code class="computeroutput">user_id</code> argument is
-left out, then the currently logged in user is checked. To create
+left out, then the currently logged-in user is checked. To create
 an error page, Tcl code should call:</p><pre class="programlisting">
 permission::require_permission -object_id $object_id -privilege $method
 </pre><p>These procedures are defined in <code class="computeroutput">acs-permissions-procs.tcl</code>.</p>
Index: openacs-4/packages/acs-core-docs/www/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/permissions.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/permissions.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/permissions.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -109,7 +109,7 @@
 explicitly require admin privileges. No substitutions.</p><p>To give a user permission to perform a particular operation on a
 particular object you call <code class="computeroutput">acs_permission.grant_permission</code> like
 this:</p><pre class="programlisting">
-# sql code
+# SQL code
     acs_permission.grant_permission (
       object_id =&gt; some_object_id,
       grantee_id =&gt; some_party_id,
@@ -119,7 +119,7 @@
 </pre><p>Using just these mechanisms is enough for developers and
 administrators to effectively define access control for every
 object in a system.</p><p>Explicitly defining permissions to every object individually
-would become very tedious. OpenACS provides a object contexts as a
+would become very tedious. OpenACS provides object contexts as a
 means for controlling permissions of a large group of objects at
 the same time.</p>
 </div><div class="sect2">
@@ -206,4 +206,4 @@
 Pages"
 			homeLink="index" homeLabel="Home" 
 			upLink="dev-guide" upLabel="Up"> 
-		    
\ No newline at end of file
+		    
Index: openacs-4/packages/acs-core-docs/www/permissions.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/permissions.html,v
diff -u -r1.53.2.3 -r1.53.2.4
--- openacs-4/packages/acs-core-docs/www/permissions.html	27 Jun 2019 18:22:22 -0000	1.53.2.3
+++ openacs-4/packages/acs-core-docs/www/permissions.html	5 Jan 2021 17:33:40 -0000	1.53.2.4
@@ -133,7 +133,7 @@
 in a system. 
 </p><p>Explicitly defining permissions to every object individually
 would become very tedious.
-OpenACS provides a object contexts as a means for controlling permissions of a large group
+OpenACS provides object contexts as a means for controlling permissions of a large group
 of objects at the same time. 
 </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="permissions-object-context"></a>Object Context</h3></div></div></div><p>
 In OpenACS 5.9.0, object context is a scoping
Index: openacs-4/packages/acs-core-docs/www/release-notes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/release-notes.adp,v
diff -u -r1.8.2.6 -r1.8.2.7
--- openacs-4/packages/acs-core-docs/www/release-notes.adp	26 Aug 2020 07:46:25 -0000	1.8.2.6
+++ openacs-4/packages/acs-core-docs/www/release-notes.adp	5 Jan 2021 17:33:40 -0000	1.8.2.7
@@ -67,15 +67,15 @@
 in OpenACS 5.9.0):</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>36 files deleted</p></li><li class="listitem"><p>Removed more than 100 obsolete named queries</p></li><li class="listitem"><p>Stripped misleading SQL statements</p></li>
 </ul></div>
-</li><li class="listitem"><p>Marked redundant / uncalled sql functions as deprecated</p></li><li class="listitem"><p>Replaced usages of obsolete view
+</li><li class="listitem"><p>Marked redundant / uncalled SQL functions as deprecated</p></li><li class="listitem"><p>Replaced usages of obsolete view
 "all_object_party_privilege_map" by
 "acs_object_party_privilege_map"</p></li><li class="listitem">
 <p>Removed type discrepancy introduced in 2002:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>acs_object_types.object_type has type varchar(1000), while</p></li><li class="listitem"><p>acs_object_types.supertype has type varchar(100)</p></li><li class="listitem"><p>... several more data types are involved, using
 acs_object_types.object_type as foreign key</p></li>
 </ul></div>
 </li><li class="listitem">
-<p>Simplified core sql functions by using defaults:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
+<p>Simplified core SQL functions by using defaults:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>Number of functions reduced by a factor of 2 compared to OpenACS
 5.9.0 (while providing compatibility for clients using old
 versions),</p></li><li class="listitem"><p>Reduced code redundancy</p></li><li class="listitem">
@@ -314,7 +314,7 @@
 <p>acs-kernel (recommended to be set via config file in section
 "ns/server/${server}/&gt;acs"</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle;">
 <li class="listitem"><p>NsShutdownWithNonZeroExitCode: tell NaviServer to return with a
-non-zero return code to cause restart (important under windows)</p></li><li class="listitem"><p>LogIncludeUserId: include user_id in access log</p></li>
+nonzero return code to cause restart (important under windows)</p></li><li class="listitem"><p>LogIncludeUserId: include user_id in access log</p></li>
 </ul></div>
 </li><li class="listitem">
 <p>acs-api-browser:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle;"><li class="listitem"><p>ValidateCSRFP: make checking of CSRF optional (default 1)</p></li></ul></div>
@@ -391,7 +391,7 @@
 </ul></div>
 </li><li class="listitem">
 <p>xotcl-request-monitor</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
-<li class="listitem"><p>Added class "BanUser" (use. e.g. ip address to
+<li class="listitem"><p>Added class "BanUser" (use. e.g. IP address to
 disallow requests from a user via request monitor)</p></li><li class="listitem"><p>Added support for optional user tracking in database</p></li><li class="listitem"><p>Added support for monitoring response-time for certain URLs via
 munin</p></li><li class="listitem"><p>Increased usage of XOTcl 2.0 variable resolver (potentially
 speed improvement 4x)</p></li><li class="listitem"><p>Performed some refactoring of response-time handling to allow
@@ -443,7 +443,7 @@
 <p>Cleanup of .xql files in acs-subsite:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>Some cleanup of .xql files: removed misleading sql-statements
 from db_* calls, which were ignored due .xql files</p></li><li class="listitem"><p>Removed bug where same query-name was used in different branches
-of an if-statement for different sql statements, but the query-name
+of an if-statement for different SQL statements, but the query-name
 lead to the wrong result.</p></li><li class="listitem"><p>Removed multiple entries of same query name from .xql files
 (e.g. the entry
 "package_create_attribute_list.select_type_info" was 7
@@ -474,7 +474,7 @@
 of paths, HTML etc.</p></li><li class="listitem"><p>Improved include-handling: All includes are now theme-able,
 interfaces of includes can be defined with
 "ad_include_contract" (similar to ad_page_contract).</p></li><li class="listitem"><p>Improved them-ability for display_templates. One can now provide
-a display_template_name (similar to the sql statement name) to
+a display_template_name (similar to the SQL statement name) to
 refer to display templates. This enables reusability and is
 theme-able.</p></li><li class="listitem"><p>Dimensional slider reform (ad_dimensional): Removed hard-coded
 table layout from dimensional slider. Add backwards compatible
@@ -496,7 +496,7 @@
 (controlled via package parameter
 "TclTraceLogServerities" in the acs-tcl package
 parameters)</p></li><li class="listitem"><p>Added ability to save data sent by ns_return in files on the
-file system. This can be used to validate HTML content also for
+filesystem. This can be used to validate HTML content also for
 password protected pages (controlled via package parameter
 "TclTraceSaveNsReturn" in the acs-tcl package
 parameters)</p></li><li class="listitem"><p>New API function "ad_log" having the same interface as
@@ -594,7 +594,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="release-notes-5-7-0" id="release-notes-5-7-0"></a>Release 5.7.0</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;"><li class="listitem"><p>Made changes that extend acs-kernel&#39;s create_type and
 create_attribute procs, so they&#39;re optionally able to create
-sql tables and columns. Optional metadata params allow for the
+SQL tables and columns. Optional metadata params allow for the
 automatic generation of foreign key references, check exprs,
 etc.</p></li></ul></div>
 </div><div class="sect2">
Index: openacs-4/packages/acs-core-docs/www/requirements-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/requirements-template.adp,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-core-docs/www/requirements-template.adp	26 Aug 2020 07:46:25 -0000	1.4.2.3
+++ openacs-4/packages/acs-core-docs/www/requirements-template.adp	5 Jan 2021 17:33:40 -0000	1.4.2.4
@@ -106,7 +106,7 @@
 <a name="yourpackage-requirements-implementation" id="yourpackage-requirements-implementation"></a>Optional:
 Implementation Notes</h3></div></div></div><p><span class="emphasis"><em>Although in theory coding comes after
 design, which comes after requirements, we do not, and perhaps
-should not, always follow such a rigid process (a.k.a. the
+should not, always follow such a rigid process (aka the
 waterfall lifecycle). Often, there is a pre-existing system or
 prototype first, and thus you may want to write some thoughts on
 implementation, for aiding and guiding yourself or other
Index: openacs-4/packages/acs-core-docs/www/rp-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/rp-design.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/rp-design.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/rp-design.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -60,7 +60,7 @@
 file in the filesystem.</p></li><li class="listitem"><p>
 <span class="strong"><strong>abstract file</strong></span> or
 <span class="strong"><strong>abstract path</strong></span> -- A URL
-that has been translated into a file system path (probably by
+that has been translated into a filesystem path (probably by
 prepending the appropriate pageroot), but still doesn&#39;t have
 any extension and so does not directly correspond to a file in the
 filesystem.</p></li><li class="listitem"><p>
@@ -86,7 +86,7 @@
 figure out which <span class="strong"><strong>package_id</strong></span> is associated with a
 given package_url, and package mountings must be persistent across
 server restarts and users must be able to manipulate the mountings
-on a live site, therefore this mapping is stored in the
+on a live site, therefore, this mapping is stored in the
 database.</p><p><span class="strong"><strong>Authentication and
 Authorization</strong></span></p><p>Once the request processor has located both the package_id and
 concrete file associated with the request, authentication is
Index: openacs-4/packages/acs-core-docs/www/security-design.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/security-design.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/security-design.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/security-design.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -64,7 +64,7 @@
 reauthenticate themselves over SSL when performing some action that
 requires secure authentication.</p><p>Although this makes the site less user friendly, this design
 significantly increases the security of the system because this
-insures that the authentication tokens presented to a secure
+ensures that the authentication tokens presented to a secure
 section of the web site were not sniffed. The system is not
 entirely secure, since the actual authentication password can be
 sniffed from the system, after which the sniffer can apply for a
@@ -206,7 +206,7 @@
 <a name="session-creation" id="session-creation"></a>Session Creation</h4></div></div></div><p>The creation and setup of sessions is handled in <code class="computeroutput">sec_setup_session</code>, which is called either
 to create a new session from <code class="computeroutput">sec_handler</code> or from <code class="computeroutput">ad_user_login</code> when there is a change in
 authorization level. The session management code must do two
-things: insure that session-level data does not float between
+things: ensure that session-level data does not float between
 users, and update the users table which has columns for
 <code class="computeroutput">n_sessions</code>, <code class="computeroutput">last_visit</code>, and <code class="computeroutput">second_to_last_visit</code>.</p><p>If there is no session already setup on this hit, a new session
 is created. This happens when <code class="computeroutput">sec_setup_session</code> is called from
@@ -215,8 +215,8 @@
 the current session is continued, simply with a higher
 authorization state. This allows for data associated with a session
 to be carried over when a user logs in.</p><p>The users table is updated by <code class="computeroutput">sec_update_user_session_info</code> which is
-called when an existing session is assigned a non-zero user_id, or
-when a session is created with a non-zero user_id.</p>
+called when an existing session is assigned a nonzero user_id, or
+when a session is created with a nonzero user_id.</p>
 </div><div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="passwords" id="passwords"></a>Passwords</h4></div></div></div><p>
@@ -495,7 +495,7 @@
 nice to expand the interface to allow for more persistent
 properties. In the past, there was a sec_browser_properties table
 that held permanent properties about each unique visitor (for
-logged in users, these are just user properties). This was
+logged-in users, these are just user properties). This was
 unscalable because there was no way to delete these properties, and
 the table tended to grow to millions of rows. It would be nice to
 view browser and session properties as two types of client
Index: openacs-4/packages/acs-core-docs/www/security-notes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/security-notes.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/security-notes.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/security-notes.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -19,7 +19,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="security-notes-https-sessions" id="security-notes-https-sessions"></a>HTTPS and the sessions
 system</h3></div></div></div><p>If a user switches to HTTPS after logging into the system via
-HTTP, the user must obtain a secure token. To insure security, the
+HTTP, the user must obtain a secure token. To ensure security, the
 <span class="emphasis"><em>only way</em></span> to obtain a secure
 token in the security system is to authenticate yourself via
 password over an HTTPS connection. Thus, users may need to log on
Index: openacs-4/packages/acs-core-docs/www/snapshot-backup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/snapshot-backup.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/snapshot-backup.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/snapshot-backup.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -15,7 +15,7 @@
 and just before an upgrade. First, you back up the database to a
 file within the file tree. Then, you back up the file tree. All of
 the information needed to rebuild the site, including the AOLserver
-config files, is then in tree for regular file system backup.</p><div class="orderedlist"><ol class="orderedlist" type="1">
+config files, is then in tree for regular filesystem backup.</p><div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
 <p><strong>Back up the database to a file. </strong></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem">
@@ -101,7 +101,7 @@
 </ul></div>
 </li><li class="listitem">
 <a name="backup-file-system" id="backup-file-system"></a><p>
-<strong>Back up the file system. </strong>Back up all of
+<strong>Back up the filesystem. </strong>Back up all of
 the files in the service, including the database backup file but
 excluding the auto-generated <code class="filename">supervise</code> directory, which is unnecessary and has
 complicated permissions.</p><p>In the tar command,</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
@@ -188,7 +188,7 @@
 running the OpenACS initialization script is always sufficient to
 create any out-of-order database objects. Next, restore the
 database from the dump file. The restoration will show some error
-messages at the beginning for objects that were pre-created from
+messages at the beginning for objects that were precreated from
 the OpenACS initialization script, which can be ignored.</p><pre class="screen">[root root]# <strong class="userinput"><code>su - <span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>
 </code></strong>
 [$OPENACS_SERVICE_NAME ~]$ <strong class="userinput"><code>createdb <span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>
Index: openacs-4/packages/acs-core-docs/www/style-guide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/style-guide.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/style-guide.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/style-guide.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -14,7 +14,7 @@
 <a name="style-guide-motivation" id="style-guide-motivation"></a>Motivation</h3></div></div></div><p>Why have coding standards for OpenACS? And if the code works why
 change it to adhere to some arbitrary rules?</p><p>Well, first lets consider the OpenACS code base (all this as of
 December 2003 and including dotLRN). There are about 390,000 lines
-of Tcl code, about 460,000 lines of sql (in datamodel scripts and
+of Tcl code, about 460,000 lines of SQL (in datamodel scripts and
 .xql files), about 80,000 lines of markup in .adp files, and about
 100,000 lines of documentation. All told, just about a million
 lines of "stuff". In terms of logical units there are
Index: openacs-4/packages/acs-core-docs/www/subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/subsites.adp,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-core-docs/www/subsites.adp	26 Aug 2020 07:46:25 -0000	1.4.2.3
+++ openacs-4/packages/acs-core-docs/www/subsites.adp	5 Jan 2021 17:33:40 -0000	1.4.2.4
@@ -37,7 +37,7 @@
 the site map. We&#39;ll repeat this description here, assuming that
 you have mounted an instance of Notes at the URL <code class="computeroutput">/notes</code> as we did in the <a class="link" href="packages" title="What a Package Looks Like">packages-example</a>:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>AOLserver receives your request for the URL <code class="computeroutput">/notes/somepage</code>.</p></li><li class="listitem"><p>This URL is passed to the request processor.</p></li><li class="listitem"><p>The RP looks up the URL in the site map, and sees that the
-object mounted at that location is an instance of the <code class="computeroutput">notes</code> application.</p></li><li class="listitem"><p>The RP asks the package manager where in the file system the
+object mounted at that location is an instance of the <code class="computeroutput">notes</code> application.</p></li><li class="listitem"><p>The RP asks the package manager where in the filesystem the
 Notes package lives. In the standard case, this would be
 <code class="computeroutput">ROOT/packages/notes</code>.</p></li><li class="listitem"><p>The RP translates the URL to serve a page relative to the page
 root of the application, which is <code class="computeroutput">ROOT/packages/notes/www/</code>. Therefore, the
Index: openacs-4/packages/acs-core-docs/www/tutorial-admin-pages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-admin-pages.adp,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/acs-core-docs/www/tutorial-admin-pages.adp	26 Aug 2020 07:46:25 -0000	1.6.2.2
+++ openacs-4/packages/acs-core-docs/www/tutorial-admin-pages.adp	5 Jan 2021 17:33:40 -0000	1.6.2.3
@@ -61,7 +61,7 @@
 a link to it somewhere in the system so that admins don&#39;t have
 to type in the <code class="computeroutput">/admin</code> every
 time they need to reach it. You could put a static link to the
-toplevel <code class="computeroutput">index.adp</code> but that
+top-level <code class="computeroutput">index.adp</code> but that
 might be distracting for people who are not admins. Besides, some
 people consider it impolite to first offer a link and then display
 a nasty "You don&#39;t have permission to access this
Index: openacs-4/packages/acs-core-docs/www/tutorial-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-categories.adp,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-core-docs/www/tutorial-categories.adp	26 Aug 2020 07:46:25 -0000	1.4.2.3
+++ openacs-4/packages/acs-core-docs/www/tutorial-categories.adp	5 Jan 2021 17:33:40 -0000	1.4.2.4
@@ -265,7 +265,7 @@
                         &lt;/group&gt;
                 &lt;/multiple&gt;
                 &lt;a href="\@package_url\@view?\@YOURPARAMS\@"&gt;All Items&lt;/if&gt;
-          </pre><p>Finally you need a an <code class="computeroutput">index.vuh</code> in your www folder to rewrite the
+          </pre><p>Finally you need an <code class="computeroutput">index.vuh</code> in your www folder to rewrite the
 URLs correctly, <a class="xref" href="tutorial-vuh" title="Using .vuh files for pretty URLs">the section called “Using .vuh
 files for pretty URLs”</a>:</p><pre class="programlisting">
           set url /[ad_conn extra_url]
Index: openacs-4/packages/acs-core-docs/www/tutorial-database.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-database.adp,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/acs-core-docs/www/tutorial-database.adp	26 Aug 2020 07:46:25 -0000	1.4.2.4
+++ openacs-4/packages/acs-core-docs/www/tutorial-database.adp	5 Jan 2021 17:33:40 -0000	1.4.2.5
@@ -44,7 +44,7 @@
 Repository</a>.)</p><div class="figure">
 <a name="idp140520359845544" id="idp140520359845544"></a><p class="title"><strong>Figure 9.2. Tutorial Data
 Model</strong></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/tutorial-data-model.png" align="middle" alt="Tutorial Data Model"></div></div>
-</div><br class="figure-break"><p>The top of each sql file has some standard comments, including
+</div><br class="figure-break"><p>The top of each SQL file has some standard comments, including
 doc tags such as <code class="computeroutput">\@author</code> which
 will be picked up by the API browser. The string <code class="computeroutput">$&zwnj;Id:$</code> will automatically be expanded when
 the file is checked in to cvs.</p><pre class="screen">[$OPENACS_SERVICE_NAME ~]$ <strong class="userinput"><code>cd /var/lib/aolserver/<span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>/packages/myfirstpackage/sql/postgresql</code></strong>
@@ -105,7 +105,7 @@
                          0
 (1 row)
 
-[$OPENACS_SERVICE_NAME postgresql]$</pre><p>If there are errors, use them to debug the sql file and try
+[$OPENACS_SERVICE_NAME postgresql]$</pre><p>If there are errors, use them to debug the SQL file and try
 again. If there are errors in the database table creation, you may
 need to run the drop script to drop the table so that you can
 recreate it. The drop script will probably have errors since some
Index: openacs-4/packages/acs-core-docs/www/tutorial-debug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-debug.adp,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/acs-core-docs/www/tutorial-debug.adp	26 Aug 2020 07:46:25 -0000	1.4.2.4
+++ openacs-4/packages/acs-core-docs/www/tutorial-debug.adp	5 Jan 2021 17:33:40 -0000	1.4.2.5
@@ -78,7 +78,7 @@
 I&#39;ve done several tests by now and have found the process to be
 extremely easy and useful. It&#39;s a joy to work with automated
 testing once you get the hang of it.</p><p>Create the directory that will contain the test script and edit
-the script file. The directory location and file name are standards
+the script file. The directory location and filename are standards
 which are recognized by the automated testing package:</p><pre class="screen">[$OPENACS_SERVICE_NAME www]$<strong class="userinput"><code> mkdir /var/lib/aolserver/<span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>/packages/myfirstpackage/tcl/test</code></strong>
 [$OPENACS_SERVICE_NAME www]$<strong class="userinput"><code> cd /var/lib/aolserver/<span class="replaceable"><span class="replaceable">$OPENACS_SERVICE_NAME</span></span>/packages/myfirstpackage/tcl/test</code></strong>
 [$OPENACS_SERVICE_NAME test]$ <strong class="userinput"><code>emacs myfirstpackages-procs.tcl</code></strong>
Index: openacs-4/packages/acs-core-docs/www/tutorial-notifications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/tutorial-notifications.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/tutorial-notifications.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/tutorial-notifications.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -21,7 +21,7 @@
 script similar to the one below needs to be loaded into Postgresql.
 I create this script in a
 package-name/sql/postgresql/package-name-notifications-init.sql
-file. I then load this file from my create sql file. The following
+file. I then load this file from my create SQL file. The following
 code snippet is taken from Weblogger. It creates a
 lars_blogger_notif notification type (which was created above).</p><pre class="programlisting">
     create function inline_0() returns integer as $$
Index: openacs-4/packages/acs-core-docs/www/update-translations.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/update-translations.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/update-translations.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/update-translations.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -14,14 +14,14 @@
 <p>Identify any new locales that have been created. For each new
 locale, check the parameters, especially that the locale is in the
 format <span class="emphasis"><em>[two-letter code for language,
-lower-case]_[TWO-LETTER CODE FOR COUNTRY, UPPER-CASE]</em></span>,
+lowercase]_[TWO-LETTER CODE FOR COUNTRY, UPPER-CASE]</em></span>,
 and create a sql command. A example sql command for creating a
 locale is:</p><pre class="programlisting">insert into ad_locales 
        (locale, label, language, country, nls_language, nls_territory, 
         nls_charset, mime_charset, default_p, enabled_p)
        values ('fa_IR', 'Farsi (IR)', 'fa', 'IR', 'FARSI', 'IRAN', 'AL24UTFFSS', 
         'windows-1256', 't', 'f');</pre><p>Put this command into the following four files. For the upgrade
-files, the correct file name will depend on the exact version.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
+files, the correct filename will depend on the exact version.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p><code class="computeroutput">/packages/acs-lang/sql/postgresql/ad-locales.sql</code></p></li><li class="listitem"><p><code class="computeroutput">/packages/acs-lang/sql/postgresql/upgrade/upgrade-<span class="replaceable"><span class="replaceable">current-version</span></span>.sql</code></p></li><li class="listitem"><p><code class="computeroutput">/packages/acs-lang/sql/oracle/ad-locales.sql</code></p></li><li class="listitem"><p><code class="computeroutput">/packages/acs-lang/sql/oracle/upgrade/upgrade-<span class="replaceable"><span class="replaceable">current-version</span></span>.sql</code></p></li>
 </ul></div>
 </li><li class="listitem"><p>Make a backup of the production database. Restore it as a new
Index: openacs-4/packages/acs-core-docs/www/upgrade-4.5-to-4.6.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/upgrade-4.5-to-4.6.adp,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/acs-core-docs/www/upgrade-4.5-to-4.6.adp	26 Aug 2020 07:46:25 -0000	1.4.2.4
+++ openacs-4/packages/acs-core-docs/www/upgrade-4.5-to-4.6.adp	5 Jan 2021 17:33:40 -0000	1.4.2.5
@@ -21,7 +21,7 @@
 </ul></div><div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>
 <strong>Make a Backup. </strong>Back up the database and
-file system (see <a class="xref" href="snapshot-backup" title="Manual backup and recovery">the section called “Manual backup and
+filesystem (see <a class="xref" href="snapshot-backup" title="Manual backup and recovery">the section called “Manual backup and
 recovery”</a>).</p></li><li class="listitem"><p>
 <strong>OPTIONAL: Upgrade OpenFTS. </strong><a class="xref" href="upgrade-supporting" title="Upgrading OpenFTS from 0.2 to 0.3.2">the section called “Upgrading
 OpenFTS from 0.2 to 0.3.2”</a>
@@ -30,7 +30,7 @@
 </code></strong>
 </pre>
 </li><li class="listitem"><p>
-<strong>Upgrade the file system. </strong><a class="xref" href="upgrade-openacs-files" title="Upgrading the OpenACS files">the section called “Upgrading the
+<strong>Upgrade the filesystem. </strong><a class="xref" href="upgrade-openacs-files" title="Upgrading the OpenACS files">the section called “Upgrading the
 OpenACS files”</a>
 </p></li><li class="listitem">
 <p><span class="strong"><strong>Start the
Index: openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/upgrade-4.6.3-to-5.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -19,9 +19,8 @@
 7.3</a>; <a class="xref" href="individual-programs" title="Table 2.2. Version Compatibility Matrix">Table 2.2,
 “Version Compatibility Matrix”</a>
 </p><div class="orderedlist"><ol class="orderedlist" type="1">
-<li class="listitem"><p><a class="link" href="snapshot-backup" title="Manual backup and recovery">Back up the database and file
-system.</a></p></li><li class="listitem"><p>
-<strong>Upgrade the file system for
+<li class="listitem"><p><a class="link" href="snapshot-backup" title="Manual backup and recovery">Back up the database and filesystem.</a></p></li><li class="listitem"><p>
+<strong>Upgrade the filesystem for
 packages/acs-kernel. </strong><a class="xref" href="upgrade-openacs-files" title="Upgrading the OpenACS files">the section called “Upgrading the
 OpenACS files”</a>
 </p></li><li class="listitem">
Index: openacs-4/packages/acs-core-docs/www/upgrade-5-0-dot.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/upgrade-5-0-dot.adp,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-core-docs/www/upgrade-5-0-dot.adp	26 Aug 2020 07:46:25 -0000	1.4.2.2
+++ openacs-4/packages/acs-core-docs/www/upgrade-5-0-dot.adp	5 Jan 2021 17:33:40 -0000	1.4.2.3
@@ -27,11 +27,11 @@
 have custom code, and your site is in a CVS repository, upgrade
 with these steps:</p><div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>
-<strong>Upgrade the file system for all packages in
+<strong>Upgrade the filesystem for all packages in
 use. </strong><a class="xref" href="upgrade-openacs-files" title="Upgrading the OpenACS files">the section called “Upgrading the
 OpenACS files”</a>
 </p></li><li class="listitem"><p>Go to <a class="ulink" href="/acs-admin/install" target="_top">/acs-admin/install/</a> and click "Upgrade Your
-System" in "Install from local file system"</p></li><li class="listitem"><p>Select all of the packages you want to upgrade and proceed</p></li><li class="listitem"><p>After upgrade is complete, restart the server as indicated.</p></li><li class="listitem"><p>If you are using locales other than en_US, go to acs-lang/admin
+System" in "Install from local filesystem"</p></li><li class="listitem"><p>Select all of the packages you want to upgrade and proceed</p></li><li class="listitem"><p>After upgrade is complete, restart the server as indicated.</p></li><li class="listitem"><p>If you are using locales other than en_US, go to acs-lang/admin
 and "Import all Messages" to load the new translated
 messages. Your local translations, if any, will take precedence
 over imported translations.</p></li>
Index: openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.adp,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.adp	26 Aug 2020 07:46:25 -0000	1.5.2.4
+++ openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.adp	5 Jan 2021 17:33:40 -0000	1.5.2.5
@@ -14,11 +14,10 @@
 <a name="idp140520283780216" id="idp140520283780216"></a>Choosing a Method to Upgrade your
 Files</h3></div></div></div><p>OpenACS is distributed in many different ways:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc;">
 <li class="listitem"><p>as a collection of files</p></li><li class="listitem"><p>as one big tarball</p></li><li class="listitem"><p>via CVS</p></li><li class="listitem"><p>via automatic download from within the APM (package manager)</p></li>
-</ul></div><p>Upgrades work by first changing the file system (via any of the
-previous methods), and then using the APM to scan the file system,
+</ul></div><p>Upgrades work by first changing the filesystem (via any of the
+previous methods), and then using the APM to scan the filesystem,
 find upgrade scripts, and execute them. Starting with OpenACS 5.0,
-the last method was added, which automatically changes the file
-system for you. If you are using the last method, you can skip this
+the last method was added, which automatically changes the filesystem for you. If you are using the last method, you can skip this
 page. This page describes whether or not you need to be upgrading
 using this page or not: <a class="xref" href="upgrade-5-0-dot" title="Upgrading an OpenACS 5.0.0 or greater installation">the
 section called “Upgrading an OpenACS 5.0.0 or greater
Index: openacs-4/packages/acs-core-docs/www/unit-testing-guide/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/unit-testing-guide/index.adp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/acs-core-docs/www/unit-testing-guide/index.adp	26 Aug 2020 07:46:26 -0000	1.3.2.2
+++ openacs-4/packages/acs-core-docs/www/unit-testing-guide/index.adp	5 Jan 2021 17:33:40 -0000	1.3.2.3
@@ -39,14 +39,14 @@
 need to give it a base URL, a username, and password for that user.
 are the "JVMARG" lines in the "JUNIT" section.
 ). In the near future, this will be moved out of the subdirectories
-and either into the toplevel build.xml file or into a configuration
+and either into the top-level build.xml file or into a configuration
 file.</p>
 <p>You should now be ready to run the tests. Go to your
 server&#39;s "packages" directory and type <code>source
 ./paths.sh</code> to set up your classpath. Now type
-<code>ant</code>. Ant should find the toplevel build.xml file,
+<code>ant</code>. Ant should find the top-level build.xml file,
 check that it can see JUnit, compile your java files, and finally
-call Ant on each of the sub-directory build.xml files to run the
+call Ant on each of the subdirectory build.xml files to run the
 tests. You should be shown a report of which tests failed and which
 succeeded.</p>
 <h3>Adding Your Own Unit Tests</h3>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml	2 Jul 2020 08:39:25 -0000	1.13.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/packages.xml	5 Jan 2021 17:33:40 -0000	1.13.2.2
@@ -576,7 +576,7 @@
           file information&quot;, then the &quot;Scan the
           <computeroutput>packages/notes</computeroutput> directory for
           additional files in this package&quot; link on that page to scan
-          the filesystem for new files.  This will bring you do a page
+          the filesystem for new files.  This will bring you to a page
           that lists all the files you just added and lets you add them to
           the <computeroutput>notes</computeroutput> package.
         </para>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml	2 Jul 2020 08:39:25 -0000	1.18.2.2
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/permissions.xml	5 Jan 2021 17:33:40 -0000	1.18.2.3
@@ -213,7 +213,7 @@
 </para>
 <para>Explicitly defining permissions to every object individually
 would become very tedious.
-OpenACS provides an object contexts as a means for controlling permissions of a large group
+OpenACS provides object contexts as a means for controlling permissions of a large group
 of objects at the same time. 
 </para>