Index: openacs-4/packages/acs-authentication/tcl/authority-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authority-procs.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	30 Mar 2018 10:32:06 -0000	1.33
+++ openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	23 Apr 2018 07:14:16 -0000	1.34
@@ -32,7 +32,7 @@
 
       <li> short_name          Short name for authority. Used as a key by applications to identify this authority.
 
-      <li> pretty_name         Label for the authority to be shown in a list to users picking a authority.
+      <li> pretty_name         Label for the authority to be shown in a list to users picking an authority.
 
       <li> enabled_p            't' if this authority available, 'f' if it's disabled. Defaults to 't'.
 
@@ -217,7 +217,7 @@
     {-authority_id:required}
     {-array:required}
 } {
-    Edit info about a authority. Note, that there's no checking that the columns you name exist.
+    Edit info about an authority. Note, that there's no checking that the columns you name exist.
 
     @param authority_id The authority you want to get.
 
Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl	11 Apr 2018 21:35:07 -0000	1.13
+++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl	23 Apr 2018 07:14:16 -0000	1.14
@@ -38,7 +38,7 @@
     } {
 	Returns 1 if there is a relationship type not being used by
 	the specified group_id or group_type. Useful for deciding when
-	to offer the user a link to create a add a new permissible
+	to offer the user a link to create or add a new permissible
 	relationship type
 
 	@author Michael Bryzek (mbryzek@arsdigita.com)
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.50 -r1.51
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	27 Mar 2018 11:18:00 -0000	1.50
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	23 Apr 2018 07:14:16 -0000	1.51
@@ -333,7 +333,7 @@
        object_type package_key package_id name pattern_p instance_name
        node_id parent_id url object_id
 
-    @paramm notrailing If true and the element requested is an url,
+    @param notrailing If true and the element requested is a url,
        then strip any trailing slash ('/'). This means the empty string
        is returned for the root.
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.514 -r1.515
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Apr 2018 06:52:09 -0000	1.514
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Apr 2018 07:14:16 -0000	1.515
@@ -1968,8 +1968,8 @@
     #
     # For security reasons, don't allow arbitrary paths to different
     # packages.  All allowed includelets must be made available
-    # under xowiki/www (preferable xowiki/www/portlets/*). If the
-    # provided path contains a admin/* admin rights are required.
+    # under xowiki/www (preferable xowiki/www/portlets/*). When the
+    # provided path contains "admin/*", admin rights are required.
     #
     if {[string match "admin/*" $adp_fn]} {
       set allowed [::xo::cc permission \
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.52 -r1.53
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	29 Mar 2018 08:00:01 -0000	1.52
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	23 Apr 2018 07:17:58 -0000	1.53
@@ -57,12 +57,12 @@
         }
         set arg_parser "[namespace tail $proc_name_old]__arg_parser"
         #
-        # In case a arg-parser was used in the old body, but is
+        # In case an arg-parser was used in the old body, but is
         # missing in the new version, add it automatically to the new
         # body.
         #
-        if {[string match *$arg_parser* $old_body]} {
-            if {![string match *$arg_parser* $new_body]} {
+        if {[string match "*$arg_parser*" $old_body]} {
+            if {![string match "*$arg_parser*" $new_body]} {
                 set new_body $arg_parser\n$new_body
                 #ns_log notice "... auto added arg_parser for '$proc_name_new' ====> new_body $new_body"
             }
@@ -1157,7 +1157,7 @@
                 aa_true "XPAth exception during evaluation of selector '$q': $errorMsg" 0
                 throw {XPATH {xpath triggered exception}} $errorMsg
             }
-            aa_true "XPath $q <$value>:" {[string length $value] > 0}
+            aa_true "XPath $q <$value>:" {$value ne ""}
         }
     }
     ad_proc -public ::aa_xpath::equals {node pairs} {
Index: openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	7 Apr 2018 20:32:07 -0000	1.10
+++ openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	23 Apr 2018 07:17:58 -0000	1.11
@@ -16,7 +16,7 @@
 #########################
 
 ad_proc twt::do_request { page_url } {
-    Takes a a url and invokes tclwebtest::do_request. Will retry
+    Takes a url and invokes tclwebtest::do_request. Will retry
     the request a number of times if it fails because of a socket
     connect problem.
 } {
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.48 -r1.49
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	11 Apr 2018 21:35:07 -0000	1.48
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	23 Apr 2018 07:17:58 -0000	1.49
@@ -2197,7 +2197,7 @@
 }
 
 ad_page_contract_filter localurl { name value } {
-    Checks whether the value is a an acceptable
+    Checks whether the value is an acceptable
     (non-external) url, which can be used
     in ad_returnredirect without throwing an error.
 
Index: openacs-4/packages/acs-templating/tcl/head-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/head-procs.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	10 Apr 2018 07:09:31 -0000	1.29
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	23 Apr 2018 07:17:58 -0000	1.30
@@ -172,7 +172,7 @@
 ad_proc -public template::head::flush_script {
     {-src:required}
 } {
-    Flush a a script tag, which was previously set in the head section via template::add_script.
+    Flush a script tag, which was previously set in the head section via template::add_script.
     One can provide a wild 
 
     @author Gustaf Neumann
@@ -229,7 +229,7 @@
     {-href:required}
     {-rel:required}
 } {
-    Flush a a link tag, which was previously set in the head section via template::head::add_link
+    Flush a link tag, which was previously set in the head section via template::head::add_link
 
     @author Gustaf Neumann
     @creation-date 2018-03-09