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.2.2 -r1.4.2.3
--- openacs-4/packages/acs-templating/www/doc/developer-guide.adp	3 Sep 2021 09:15:54 -0000	1.4.2.2
+++ openacs-4/packages/acs-templating/www/doc/developer-guide.adp	6 Jun 2023 09:30:30 -0000	1.4.2.3
@@ -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/developer-guide.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/developer-guide.html,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-templating/www/doc/developer-guide.html	7 Aug 2017 23:48:02 -0000	1.5
+++ openacs-4/packages/acs-templating/www/doc/developer-guide.html	6 Jun 2023 09:30:30 -0000	1.5.2.1
@@ -18,7 +18,7 @@
     use of templating.  The Tcl page should fill the data sources you
     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.5 -r1.6.2.6
--- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp	3 Sep 2021 09:15:57 -0000	1.6.2.5
+++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.adp	6 Jun 2023 09:30:30 -0000	1.6.2.6
@@ -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/no-quote-upgrade.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html,v
diff -u -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html	10 Aug 2021 13:26:58 -0000	1.4.2.3
+++ openacs-4/packages/acs-templating/www/doc/no-quote-upgrade.html	6 Jun 2023 09:30:30 -0000	1.4.2.4
@@ -124,7 +124,7 @@
     </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
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.4 -r1.5.2.5
--- openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp	28 Dec 2021 14:36:13 -0000	1.5.2.4
+++ openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp	6 Jun 2023 09:30:30 -0000	1.5.2.5
@@ -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/TclDocs/publish.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html	28 Dec 2021 14:36:13 -0000	1.5.2.2
+++ openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html	6 Jun 2023 09:30:30 -0000	1.5.2.3
@@ -242,7 +242,7 @@
   <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 contains the content blob</td></tr>
+  The name of the variable in the calling frame that will receive the relative URL of the file in the filesystem which contains the content blob</td></tr>
   
   <tr>
   <td align="right"><code>error_ref</code>
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.2.2 -r1.4.2.3
--- openacs-4/packages/acs-templating/www/doc/appendices/memory.adp	3 Sep 2021 09:16:17 -0000	1.4.2.2
+++ openacs-4/packages/acs-templating/www/doc/appendices/memory.adp	6 Jun 2023 09:30:30 -0000	1.4.2.3
@@ -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/appendices/memory.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/appendices/memory.html,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/doc/appendices/memory.html	7 Aug 2017 23:48:02 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/appendices/memory.html	6 Jun 2023 09:30:30 -0000	1.2.2.1
@@ -8,9 +8,9 @@
 <hr>
 
 <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>
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.3 -r1.7.2.4
--- openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.adp	3 Sep 2021 09:16:19 -0000	1.7.2.3
+++ openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.adp	6 Jun 2023 09:30:30 -0000	1.7.2.4
@@ -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/ats-for-designers.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.html,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.html	15 Aug 2019 10:18:49 -0000	1.5.2.1
+++ openacs-4/packages/acs-templating/www/doc/exercise/ats-for-designers.html	6 Jun 2023 09:30:30 -0000	1.5.2.2
@@ -150,7 +150,7 @@
   strings 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 numbers less than letters.  
+  <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 &lt;if 2 between 2 6&gt; 
@@ -201,12 +201,12 @@
   <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 including its ".adp" extension</li>
+      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
+  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>
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.3 -r1.5.2.4
--- openacs-4/packages/acs-templating/www/doc/guide/composite.adp	3 Sep 2021 09:16:20 -0000	1.5.2.3
+++ openacs-4/packages/acs-templating/www/doc/guide/composite.adp	6 Jun 2023 09:30:30 -0000	1.5.2.4
@@ -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/composite.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/composite.html,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-templating/www/doc/guide/composite.html	5 Oct 2019 13:29:58 -0000	1.5.2.1
+++ openacs-4/packages/acs-templating/www/doc/guide/composite.html	6 Jun 2023 09:30:30 -0000	1.5.2.2
@@ -227,7 +227,7 @@
     </p>
     <p>
       The "code" part can divert to another page by calling
-      <code>template::set_file</code> to modify the file name stub of
+      <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
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.2.2 -r1.3.2.3
--- openacs-4/packages/acs-templating/www/doc/guide/search.adp	3 Sep 2021 09:16:21 -0000	1.3.2.2
+++ openacs-4/packages/acs-templating/www/doc/guide/search.adp	6 Jun 2023 09:30:30 -0000	1.3.2.3
@@ -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/search.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/search.html,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-templating/www/doc/guide/search.html	7 Aug 2017 23:48:03 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/guide/search.html	6 Jun 2023 09:30:30 -0000	1.2.2.1
@@ -50,7 +50,7 @@
   <li><p>Initially, <kbd>user_id</kbd> is not specified.  In this
       case, the page includes a user search form.</p>
 
-  <li><p>The user enters part of a user name or screen name and submits
+  <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>
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.2.2 -r1.3.2.3
--- openacs-4/packages/acs-templating/www/doc/guide/tcl.adp	3 Sep 2021 09:16:21 -0000	1.3.2.2
+++ openacs-4/packages/acs-templating/www/doc/guide/tcl.adp	6 Jun 2023 09:30:30 -0000	1.3.2.3
@@ -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/tcl.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/tcl.html,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-templating/www/doc/guide/tcl.html	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/guide/tcl.html	6 Jun 2023 09:30:30 -0000	1.3.2.1
@@ -19,7 +19,7 @@
       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.
+      templating. Embedded Tcl makes templates nonportable to ACS/Java.
     </p>
 <hr>
 <!-- <a href="mailto:templating@arsdigita.com">templating@arsdigita.com</a> -->
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.3 -r1.6.2.4
--- openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.adp	3 Sep 2021 09:16:22 -0000	1.6.2.3
+++ openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.adp	6 Jun 2023 09:30:30 -0000	1.6.2.4
@@ -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
+have 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>
+for the filename.</p>
 </li>
 </ul>
Index: openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.html,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.html	15 Aug 2019 10:18:49 -0000	1.4.2.1
+++ openacs-4/packages/acs-templating/www/doc/guide/wizard-procs-doc.html	6 Jun 2023 09:30:30 -0000	1.4.2.2
@@ -186,8 +186,8 @@
    <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 wizard we have the param again called "name" 
-   but used for the file name.
+   the username.  And on on sub wizard we have the param again called "name" 
+   but used for the filename.
    </p>
    </li>