Index: openacs-4/packages/acs-subsite/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-new.tcl,v
diff -u -r1.23.2.2 -r1.23.2.3
--- openacs-4/packages/acs-subsite/lib/user-new.tcl	28 Nov 2019 12:10:03 -0000	1.23.2.2
+++ openacs-4/packages/acs-subsite/lib/user-new.tcl	8 Aug 2020 11:19:23 -0000	1.23.2.3
@@ -209,7 +209,7 @@
     }
 
     # If the user is self registering, then try to set the preferred
-    # locale (assuming the user has set it as a anonymous visitor
+    # locale (assuming the user has set it as an anonymous visitor
     # before registering).
     if { $self_register_p } {
         # We need to explicitly get the cookie and not use
Index: openacs-4/packages/acs-subsite/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/package-procs.tcl,v
diff -u -r1.40.2.5 -r1.40.2.6
--- openacs-4/packages/acs-subsite/tcl/package-procs.tcl	21 Jul 2020 13:58:55 -0000	1.40.2.5
+++ openacs-4/packages/acs-subsite/tcl/package-procs.tcl	8 Aug 2020 11:19:23 -0000	1.40.2.6
@@ -661,7 +661,7 @@
     @param creation_user The current user. Defaults to <code>[ad_conn
                                                               user_id]</code> if not specified and there is a connection
 
-    @param creation_ip The current user's ip address. Defaults to <code>[ad_conn
+    @param creation_ip The current user's IP address. Defaults to <code>[ad_conn
                                                                          peeraddr]</code> if not specified and there is a connection
 
     @param package_name The PL/SQL package associated with this object
Index: openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl	8 Oct 2019 16:30:26 -0000	1.2.2.1
+++ openacs-4/packages/acs-tcl/tcl/memoize-procs-aolserver.tcl	8 Aug 2020 11:19:23 -0000	1.2.2.2
@@ -26,7 +26,7 @@
 } {
     #
     # The ::util_memoize_flush proc is defined in the *-init script,
-    # after the util_memoize cache was created. Therefore, is save to
+    # after the util_memoize cache was created. Therefore, is safe to
     # use the util_memoize when this proc is available.
     #
     if {[info commands ::util_memoize_flush] ne ""} {
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.1 -r1.9.2.2
--- openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl	8 Oct 2019 16:30:26 -0000	1.9.2.1
+++ openacs-4/packages/acs-tcl/tcl/memoize-procs-naviserver.tcl	8 Aug 2020 11:19:23 -0000	1.9.2.2
@@ -55,7 +55,7 @@
 } {
     #
     # The ::util_memoize_flush proc is defined in the *-init script,
-    # after the util_memoize cache was created. Therefore, is save to
+    # after the util_memoize cache was created. Therefore, is safe to
     # use the util_memoize when this proc is available.
     #
     if {[info commands ::util_memoize_flush] ne ""} {
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.126.2.34 -r1.126.2.35
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	21 Jul 2020 14:02:09 -0000	1.126.2.34
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	8 Aug 2020 11:19:23 -0000	1.126.2.35
@@ -2816,7 +2816,7 @@
 
         The optional argument user_id is currently ignored, but it is
         there, since there are algorithms published to calculate the
-        CSRF token based on an user_id. So far, i found no evidence
+        CSRF token based on a user_id. So far, i found no evidence
         that these should be used, but the argument is there as a
         reminder, such the interface does not have to be used, when we
         switch to such an algorithm.
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.189.2.63 -r1.189.2.64
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	6 Aug 2020 13:09:53 -0000	1.189.2.63
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	8 Aug 2020 11:19:23 -0000	1.189.2.64
@@ -1394,7 +1394,7 @@
     ns_log debug "Done running scheduled proc $proc."
 
     #
-    # In case there are temporary xotcl objects, clean these up to
+    # In case there are temporary XOTcl objects, clean these up to
     # avoid surprises in schedued threads about pre-existing objects.
     #
     if {[info commands ::xo::at_cleanup] ne ""} {
Index: openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl,v
diff -u -r1.71.2.27 -r1.71.2.28
--- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl	3 Jul 2020 07:27:29 -0000	1.71.2.27
+++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl	8 Aug 2020 11:19:23 -0000	1.71.2.28
@@ -347,7 +347,7 @@
     # Test offending post sent by Dave Bauer
 
     set offending_post {
-I have a dynamically assigned ip address, so I use dyndns.org to
+I have a dynamically assigned IP address, so I use dyndns.org to
 change
 addresses for my acs server.
 Mail is sent to any yahoo address fine. Mail sent to aol fails. I am
Index: openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl,v
diff -u -r1.20.2.6 -r1.20.2.7
--- openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl	6 Jun 2020 09:42:23 -0000	1.20.2.6
+++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl	8 Aug 2020 11:19:23 -0000	1.20.2.7
@@ -533,7 +533,7 @@
     # Test offending post sent by Dave Bauer
 
     set offending_post {
-I have a dynamically assigned ip address, so I use dyndns.org to
+I have a dynamically assigned IP address, so I use dyndns.org to
 change
 addresses for my acs server.
 Mail is sent to any yahoo address fine. Mail sent to aol fails. I am
Index: openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl	2 Sep 2019 16:22:07 -0000	1.7.2.1
+++ openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl	8 Aug 2020 11:19:23 -0000	1.7.2.2
@@ -22,7 +22,7 @@
 
 } {
     aa_run_with_teardown -rollback -test_code {
-        # We get an user_id as party_id.
+        # We get a user_id as party_id.
         set user_id [db_nextval acs_object_id_seq]
 
         # Create the user
@@ -105,7 +105,7 @@
 
 } {
     aa_run_with_teardown -rollback -test_code {
-        # We get an user_id as party_id.
+        # We get a user_id as party_id.
         set user_id [db_nextval acs_object_id_seq]
 
         # Create the user
Index: openacs-4/packages/assessment/tcl/as-qti-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-qti-procs.tcl,v
diff -u -r1.50.2.2 -r1.50.2.3
--- openacs-4/packages/assessment/tcl/as-qti-procs.tcl	15 Nov 2019 08:19:56 -0000	1.50.2.2
+++ openacs-4/packages/assessment/tcl/as-qti-procs.tcl	8 Aug 2020 11:19:23 -0000	1.50.2.3
@@ -124,7 +124,7 @@
     }
 }
 
-ad_proc -public as::qti::parse_qti_xml { {-prop ""} xmlfile } { Parse a XML QTI file } {
+ad_proc -public as::qti::parse_qti_xml { {-prop ""} xmlfile } { Parse an XML QTI file } {
     set as_assessments__assessment_id {}
 
     # Parser
@@ -133,7 +133,7 @@
     # DOM document => DOM root
     $document documentElement root
     # XPath v1.0
-    # get all <questestinterop> elements of a XML instance file
+    # get all <questestinterop> elements of an XML instance file
     set questestinteropNodes [$root selectNodes {/questestinterop}]
     foreach questestinterop $questestinteropNodes {
         # Looks for assessments
@@ -453,7 +453,7 @@
 return $as_assessments__assessment_id
 }
 
-ad_proc -private as::qti::parse_item {{-prop ""} qtiNode basepath} { Parse items from a XML QTI file } {
+ad_proc -private as::qti::parse_item {{-prop ""} qtiNode basepath} { Parse items from an XML QTI file } {
 
     #get all <item> elements
     set itemNodes [$qtiNode selectNodes {item}]
Index: openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl	19 Jul 2018 12:24:40 -0000	1.6
+++ openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl	8 Aug 2020 11:19:23 -0000	1.6.2.1
@@ -189,7 +189,7 @@
 
 
 aa_register_case -cats { api } as_assessment_copy {
-  Test of a assessment copy
+  Test of an assessment copy
 } {
    aa_run_with_teardown	\
      -rollback \
@@ -225,7 +225,7 @@
 
 
 aa_register_case -cats { api } as_assessment_new_revisions {
-  Test of a assessment new revisions
+  Test of an assessment new revisions
 } {
    aa_run_with_teardown \
      -rollback \
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.59.2.22 -r1.59.2.23
--- openacs-4/packages/forums/tcl/messages-procs.tcl	21 Jul 2020 14:03:49 -0000	1.59.2.22
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	8 Aug 2020 11:19:23 -0000	1.59.2.23
@@ -372,7 +372,7 @@
     }]
     if {[db_0or1row select_message $sql -column_array row]} {
         set user [acs_user::get -user_id $row(user_id)]
-        set row(user_name)   [dict get $user name]
+        set row(user_name)   [dict get $username]
         set row(user_email)  [dict get $user email]
         set row(screen_name) [dict get $user screen_name]
 
@@ -560,7 +560,7 @@
                 upvar juggling is questionable and most of the data
                 returned is already provided from the start.
 
-    @see direct idioms on the api used in here
+    @see direct idioms on the API used in here
     @see forum::format::reply_subject
 } {
     upvar $message init_msg
Index: openacs-4/packages/forums/www/user-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/user-history.tcl,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/forums/www/user-history.tcl	28 Jun 2018 08:26:35 -0000	1.16
+++ openacs-4/packages/forums/www/user-history.tcl	8 Aug 2020 11:19:23 -0000	1.16.2.1
@@ -18,7 +18,7 @@
     }
 }
 
-# Get user name
+# Get username
 set user_name [person::name -person_id $user_id]
 
 set context [list [_ forums.Posting_History]]
Index: openacs-4/packages/news/www/doc/requirements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/doc/requirements.adp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/news/www/doc/requirements.adp	24 Nov 2019 11:23:28 -0000	1.3.2.2
+++ openacs-4/packages/news/www/doc/requirements.adp	8 Aug 2020 11:19:23 -0000	1.3.2.3
@@ -22,7 +22,7 @@
 the primary intention of the News application is simply to give
 members access to community related news items. News items are
 listed by date, and when news items are no longer current, they are
-automatically archived after a administrator-specifiable number of
+automatically archived after an administrator-specifiable number of
 days.
 <p>Since administrators may wish to give access to these news items
 by appeal to a variety of access schemes, the News application is
@@ -104,7 +104,7 @@
 10.10.10 cr_news: subtype cr_revisions to define news content
 type<br>
 
-10.10.20 news_templates: use file system for new templates, no
+10.10.20 news_templates: use filesystem for new templates, no
 extra table
 <p>10.30 Privilege<br>
 10.30.10 Provide a site-wide admin level privilege: admin<br>
Index: openacs-4/packages/news/www/doc/requirements.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/doc/requirements.html,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/news/www/doc/requirements.html	24 Nov 2019 11:23:28 -0000	1.2.2.2
+++ openacs-4/packages/news/www/doc/requirements.html	8 Aug 2020 11:19:23 -0000	1.2.2.3
@@ -26,7 +26,7 @@
 primary intention of the News application is simply to give members
 access to community related news items.  News items are listed by
 date, and when news items are no longer current, they are automatically
-archived after a administrator-specifiable number of days.<p>
+archived after an administrator-specifiable number of days.<p>
 
 Since administrators may wish to give access to these news items by
 appeal to a variety of access schemes, the News application is built
@@ -118,7 +118,7 @@
 10.10 The News application should use the ACS Content Repository
 and/or ACS Content as well as tie in with the ACS Interface service package.
 <br>10.10.10 cr_news: subtype cr_revisions to define news content type
-<br>10.10.20 news_templates: use file system for new templates, no extra table
+<br>10.10.20 news_templates: use filesystem for new templates, no extra table
 <p>10.30 Privilege
 <br>10.30.10 Provide a site-wide admin level privilege: admin
 <br>10.30.20 Provide an instance-wide admin level privilege: news_admin
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl	11 Jul 2019 11:54:46 -0000	1.4.2.4
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/templates/packages/acs-subsite/lib/login.tcl	8 Aug 2020 11:19:23 -0000	1.4.2.5
@@ -81,7 +81,7 @@
 
 if { $return_url ne "" } {
     if { [util::external_url_p $return_url] } {
-      ad_returnredirect -message "only URLs without a host name are permitted" "."
+      ad_returnredirect -message "only URLs without a hostname are permitted" "."
       ad_script_abort
     }
 } else {
Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v
diff -u -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl	18 May 2020 20:56:34 -0000	1.5.2.4
+++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl	8 Aug 2020 11:19:23 -0000	1.5.2.5
@@ -5,7 +5,7 @@
 
 	Get information about available version(s) of the bootstrap
 	packages. The goal is to deliver resources either from the
-	local file system, or from CDN.
+	local filesystem, or from CDN.
 
 	@return dict containing resourceDir, resourceName, cdn,
 		cdnHost, prefix, cssFiles, jsFiles and extraFiles.