Index: openacs-4/packages/acs-mail-lite/www/doc/imap-install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/www/doc/imap-install.adp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-mail-lite/www/doc/imap-install.adp	19 Jul 2019 08:50:14 -0000	1.2.2.2
+++ openacs-4/packages/acs-mail-lite/www/doc/imap-install.adp	5 Jan 2021 17:10:17 -0000	1.2.2.3
@@ -68,7 +68,7 @@
   <code>apt-get install libssl-dev libpam-unix2 libpam0g-dev libkrb5-dev</code>
   <p>Build panda-imap with:</p>
   <code>make ldb EXTRACFLAGS=-fPIC</code>
-  <p>If your system requires ipv4 only, add the flags:
+  <p>If your system requires IPv4 only, add the flags:
     <code>IP=4 IP6=4 SSLTYPE=nopwd</code> like this:</p>
   <code>make ldb EXTRACFLAGS=-fPIC IP=4 IP6=4 SSLTYPE=nopwd</code>
   <p>Some of these are defaults, but the defaults weren't recognized on the test system,
Index: openacs-4/packages/acs-tcl/lib/check-installed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/check-installed.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-tcl/lib/check-installed.adp	3 Aug 2018 09:46:35 -0000	1.1
+++ openacs-4/packages/acs-tcl/lib/check-installed.adp	5 Jan 2021 17:10:17 -0000	1.1.2.1
@@ -5,7 +5,7 @@
 <else><p>In the current installation the @resource_name@ is used via CDN <strong>@cdn@</strong>.
   <if @writable@ true>
   <p>Do you want to <a href="@download_url@" class="button">download</a>
-  version @version@ of @resource_name@ to your file system?</p>
+  version @version@ of @resource_name@ to your filesystem?</p>
   </if>
   <else>
   <p>The directory <strong>@path@</strong> is NOT writable for the server. In
Index: openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl,v
diff -u -r1.9.2.5 -r1.9.2.6
--- openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl	26 Dec 2020 16:39:05 -0000	1.9.2.5
+++ openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl	5 Jan 2021 17:10:17 -0000	1.9.2.6
@@ -54,7 +54,7 @@
     @return The possibly-cached value returned by <i>script</i>.
 } {
     #
-    # When util_memoize is called before the cache is created dont
+    # When util_memoize is called before the cache is created don't
     # raise an error but eval without caching.
     #
     # The AOLserver version of the proc says "no uplevel", so do not
Index: openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl,v
diff -u -r1.26.2.2 -r1.26.2.3
--- openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl	13 Feb 2020 10:42:42 -0000	1.26.2.2
+++ openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl	5 Jan 2021 17:10:17 -0000	1.26.2.3
@@ -61,7 +61,7 @@
     Get the value of a global package parameter.
 
     @param localize should we attempt to localize the parameter
-    @param boolean insure boolean parameters are normalized to 0 or 1
+    @param boolean ensure boolean parameters are normalized to 0 or 1
     @param package_key identifies the package to which the global param belongs
     @param parameter which parameter's value to get
     @param default what to return if we don't find a value. Defaults to returning the empty string.
@@ -139,7 +139,7 @@
     Get the value of a package instance parameter.
 
     @param localize should we attempt to localize the parameter
-    @param boolean insure boolean parameters are normalized to 0 or 1
+    @param boolean ensure boolean parameters are normalized to 0 or 1
     @param package_id what package to get the parameter from. Defaults to
     [ad_conn package_id]
     @param parameter which parameter's value to get
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.153.2.28 -r1.153.2.29
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	21 Nov 2020 16:45:52 -0000	1.153.2.28
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	5 Jan 2021 17:10:17 -0000	1.153.2.29
@@ -1577,7 +1577,7 @@
                             # error message, the templating system cannot
                             # determine the appropriate template without
                             # the node_id. In case of failure, the
-                            # toplevel node_is is returned.
+                            # top-level node_is is returned.
                             set node [site_node::get -url /]
                             set ad_conn($var) [dict get $node $var]
                             ns_log notice "ad_conn: request processor did not set <ad_conn $var>, fallback: $ad_conn($var)"
Index: openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl	28 Nov 2019 10:42:20 -0000	1.11.2.1
+++ openacs-4/packages/acs-tcl/tcl/xml-1-dom-procs.tcl	5 Jan 2021 17:10:17 -0000	1.11.2.2
@@ -190,7 +190,7 @@
 	    # Initialise child node list
 	    set ${varPrefix}1 {}
 
-	    # Return the new toplevel node
+	    # Return the new top-level node
 	    return ${name}(node1)
 
 	}
Index: openacs-4/packages/acs-templating/www/doc/developer-guide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/developer-guide.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-templating/www/doc/developer-guide.adp	25 Apr 2018 08:42:17 -0000	1.4
+++ openacs-4/packages/acs-templating/www/doc/developer-guide.adp	5 Jan 2021 17:10:17 -0000	1.4.2.1
@@ -15,7 +15,7 @@
 promised in the contract, and not write to the connection. At the
 end of your Tcl page, call <code>ad_return_template</code>
 . The
-template system will look for an adp page with the file name stub
+template system will look for an adp page with the filename stub
 you indicate (defaulting to the same stub as the Tcl page), process
 that, and deliver it to the client. The adp page can use the
 datasources defined in the Tcl page.
Index: openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp	1 Nov 2019 13:16:18 -0000	1.6.2.2
+++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp	5 Jan 2021 17:10:17 -0000	1.6.2.3
@@ -104,7 +104,7 @@
 &lt;/form&gt;
       </pre></blockquote>
 <p>
-<strong>Snippets of HTML produced by Tcl code, a.k.a.
+<strong>Snippets of HTML produced by Tcl code, aka
 <em>widgets</em>
 </strong>.<br>
 Normally we try to fit all HTML code into the ADP template and have
Index: openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp	11 Mar 2019 08:25:47 -0000	1.5.2.1
+++ openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp	5 Jan 2021 17:10:17 -0000	1.5.2.2
@@ -129,7 +129,7 @@
 <td align="right">
 <code>url_ref</code><font color="red">*</font>
 </td><td align="left">The name of the variable in the calling frame that
-will receive the relative URL of the file in the file system which
+will receive the relative URL of the file in the filesystem which
 contains the content blob</td>
 </tr><tr>
 <td align="right">
Index: openacs-4/packages/acs-templating/www/doc/appendices/memory.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/appendices/memory.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-templating/www/doc/appendices/memory.adp	25 Apr 2018 08:42:18 -0000	1.4
+++ openacs-4/packages/acs-templating/www/doc/appendices/memory.adp	5 Jan 2021 17:10:17 -0000	1.4.2.1
@@ -7,9 +7,9 @@
 <h2>Parsing Templates in Memory</h2>
 <strong><a href="../index">Templating System</a></strong>
 <p>The templating system code is oriented towards parsing templates
-stored in the file system, in conjunction with a Tcl script that is
+stored in the filesystem, in conjunction with a Tcl script that is
 also stored as a file. However, when the template is not actually
-stored in the file system, you will need to parse it as a string in
+stored in the filesystem, you will need to parse it as a string in
 memory. Two common situations in which this occurs are:</p>
 <ul>
 <li>Templates are stored in the database.</li><li>Templates are generated dynamically, possibly based in turn on
Index: openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.adp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.adp	15 Aug 2019 10:18:49 -0000	1.7.2.1
+++ openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.adp	5 Jan 2021 17:10:17 -0000	1.7.2.2
@@ -133,7 +133,7 @@
 with quantitative values, so conditions like less than, greater
 than, and (not) between can also be used with text to determine
 alphabetical order: <em>a</em> &lt; <em>b</em> &lt; ... &lt;
-<em>z</em>, lower-case letters are greater than upper-case, and
+<em>z</em>, lowercase letters are greater than uppercase, and
 numbers less than letters. Example: "you" are greater
 than "me", and "I" am less than
 "you"</li><li>the "between" conditions checks inclusively, so
@@ -176,11 +176,11 @@
 <ul>
 <li>the &lt;slave&gt; tag indicates where on the master page the
 slave section is inserted</li><li>slave pages indicate the source of the master file with the
-&lt;master&gt; tag, referring by the file name only, and not
+&lt;master&gt; tag, referring by the filename only, and not
 including its ".adp" extension</li><li>as mentioned earlier, slave sections do not require
 &lt;html&gt;, &lt;head&gt;, and &lt;body&gt; tags when contained
 within a master tag already formatted for HTML</li><li>as the demonstration points out, pages are browsed at the .acs
-page sharing the same file name as the slave, not master</li><li>the master page can be viewed at its own .acs page, but shows
+page sharing the same filename as the slave, not master</li><li>the master page can be viewed at its own .acs page, but shows
 nothing in place of the &lt;slave&gt; tag</li><li>you can have nested slave sections, that is, a slave section
 within another slave</li><li>you <strong>cannot</strong> have two different slave sections
 within the same master (go ahead and try adding an extra
Index: openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/exercise/slave-sample-3.adp	5 Jan 2021 17:10:17 -0000	1.3.2.1
@@ -2,7 +2,7 @@
 <property name="header">&lt;master&gt; and &lt;slave&gt; Demo:</property>
 <p align="center">
 
-<strong>Be sure to note how the url has changed to reflect the slave's file name, and not the master's.<br>
+<strong>Be sure to note how the url has changed to reflect the slave's filename, and not the master's.<br>
 (In this case the master file is the same one you've been working with all along, of course)</strong>
 
 <p align="center">
Index: openacs-4/packages/acs-templating/www/doc/guide/composite.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/composite.adp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-templating/www/doc/guide/composite.adp	5 Oct 2019 13:29:58 -0000	1.5.2.1
+++ openacs-4/packages/acs-templating/www/doc/guide/composite.adp	5 Jan 2021 17:10:17 -0000	1.5.2.2
@@ -110,7 +110,7 @@
 them. In some situations, the following facility can help to reduce
 duplication or to handle special situations more effectively.</p>
 <p>The "code" part can divert to another page by calling
-<code>template::set_file</code> to modify the file name stub of the
+<code>template::set_file</code> to modify the filename stub of the
 page being processed. For convenience,
 <code>ad_return_template</code> can be used with the same effect;
 it is a wrapper for <code>template::set_file</code>, and it
Index: openacs-4/packages/acs-templating/www/doc/guide/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/search.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/www/doc/guide/search.adp	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/guide/search.adp	5 Jan 2021 17:10:17 -0000	1.3.2.1
@@ -42,7 +42,7 @@
 a user. The administrator requests a page,
 <kbd>user-edit.acs</kbd>. The page looks for a query parameter
 named <kbd>user_id</kbd> to specify which user to edit.</p></li><li><p>Initially, <kbd>user_id</kbd> is not specified. In this case,
-the page includes a user search form.</p></li><li><p>The user enters part of a user name or screen name and submits
+the page includes a user search form.</p></li><li><p>The user enters part of a username or screen name and submits
 the form, which returns to the same URL with the query parameter
 <kbd>user_search</kbd>. If this parameter is defined, the page
 queries the database for potential matches.</p></li><li><p>If one match is found, the page sets a <kbd>user_id</kbd>
Index: openacs-4/packages/acs-templating/www/doc/guide/tcl.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/tcl.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/www/doc/guide/tcl.adp	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/guide/tcl.adp	5 Jan 2021 17:10:17 -0000	1.3.2.1
@@ -16,6 +16,6 @@
 <p>Generally, avoid putting escaped Tcl code in adp files, or
 generating HTML fragments in Tcl procedures. It subverts the
 separation of code and layout, one of the benefits of templating.
-Embedded Tcl makes templates non-portable to ACS/Java.</p>
+Embedded Tcl makes templates nonportable to ACS/Java.</p>
 <hr>
 <!-- <a href="mailto:templating\@arsdigita.com">templating\@arsdigita.com</a> -->
\ No newline at end of file
Index: openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.adp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.adp	15 Aug 2019 10:18:49 -0000	1.6.2.1
+++ openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.adp	5 Jan 2021 17:10:17 -0000	1.6.2.2
@@ -158,8 +158,8 @@
 save_last_visited_step -key $yourkey"</p><p>Also the wizard params name is present across the current wizards
 being used, so the developer has to be aware not to use the same
 names with different purpose. For example on main wizard with have
-a param called "name" for the user name. And on on sub
+a param called "name" for the username. And on on sub
 wizard we have the param again called "name" but used for
-the file name.</p>
+the filename.</p>
 </li>
 </ul>