Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v
diff -u -r1.96 -r1.97
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	6 Apr 2018 16:31:36 -0000	1.96
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	25 Apr 2018 08:46:13 -0000	1.97
@@ -400,13 +400,13 @@
             # occurrences.
             #
             # Note, that the sequence handling in OpenACS is quite a
-            # mess.  Some sequences are named t_SEQUENCE (10 in dotlrn),
-            # others are are called just SEQUENCE (18 in dotlrn), for
-            # some sequences, additional views are defined with an
+            # mess.  Some sequences are named t_SEQUENCE (10 in
+            # dotlrn), others are called just SEQUENCE (18 in dotlrn),
+            # for some sequences, additional views are defined with an
             # attribute 'nextval', and on top of this, db_nextval is
-            # called sometimes with the view name and sometimes with the
-            # sequence name. Checking this at runtime is unnecessary
-            # complex and costly.
+            # called sometimes with the view name and sometimes with
+            # the sequence name. Checking this at runtime is
+            # unnecessary complex and costly.
             #
             # The best solution would certainly be to call "db_nextval"
             # only with real sequence names (as defined in SQL). In that
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.116 -r1.117
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	23 Apr 2018 18:24:56 -0000	1.116
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	25 Apr 2018 08:46:13 -0000	1.117
@@ -2004,7 +2004,7 @@
     search the local file system instead.
 
     @param array          Name of an array where you want the repository stored. It will be keyed by package-key,
-    and each entry will be an array list list what's returned by apm_read_package_info_file.
+    and each entry will be an array list returned by apm_read_package_info_file.
 
     @see apm_read_package_info_file
 
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.101 -r1.102
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	18 Apr 2018 20:58:59 -0000	1.101
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	25 Apr 2018 08:46:13 -0000	1.102
@@ -1295,7 +1295,7 @@
     Return the id of the (per default enabled) version of the given package_key.
     If no such version id can be found, returns the empty string.
 
-    @param all when specified, return the the enabled or disabled version_ids of the package_key.
+    @param all when specified, return the enabled or disabled version_ids of the package_key.
     @param package_key
     @author Peter Marklund
 
Index: openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl,v
diff -u -r1.67 -r1.68
--- openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	3 Mar 2018 16:54:05 -0000	1.67
+++ openacs-4/packages/acs-tcl/tcl/community-core-procs.tcl	25 Apr 2018 08:46:13 -0000	1.68
@@ -80,7 +80,7 @@
     if {$person_id eq "" && $email eq ""} {
         error "You need to provide either person_id or email"
     } elseif {"" ne $person_id && "" ne $email } {
-        error "Only provide provide person_id OR email, not both"
+        error "Only provide person_id OR email, not both"
     } else {
         return [util_memoize [list person::name_not_cached -person_id $person_id -email $email]]
     }
Index: openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl	12 Apr 2018 06:40:32 -0000	1.14
+++ openacs-4/packages/acs-tcl/tcl/deprecated-procs.tcl	25 Apr 2018 08:46:13 -0000	1.15
@@ -1861,7 +1861,7 @@
 }
 
 ad_proc -deprecated ad_order_by_from_sort_spec {sort_by tabledef} {
-    Takes a sort_by spec, and translates it into into an "order by" clause
+    Takes a sort_by spec, and translates it into an "order by" clause
     with each sort_by key dictated by the sort info in tabledef
 } {
     set order_by_clause {}
@@ -2086,10 +2086,11 @@
 
 
 
-#
+########################################################################
 # was in set-operation-procs.tcl
-#
+########################################################################
 
+
 ad_proc -deprecated set_member? { s v } {
     <p>Tests whether or not $v is a member of set $s.</p>
 } {
@@ -2216,9 +2217,10 @@
     return $result
 }
 
-#
+########################################################################
 # from tcl/navigation-procs.tcl
-#
+########################################################################
+
 ad_proc -deprecated -public ad_context_bar_ws args {
     Returns a Yahoo-style hierarchical navbar. Use ad_context_bar instead.
 
@@ -2257,9 +2259,9 @@
 }
 
 
-#
+########################################################################
 # From tcl/http-client-procs.tcl
-#
+########################################################################
 
 #########################
 ## Deprecated HTTP api ##
@@ -2767,11 +2769,10 @@
     return $page
 }
 
-#
+########################################################################
 # from tcl/community-core-procs.tcl
-#
+########################################################################
 
-
 ad_proc -deprecated -private cc_lookup_screen_name_user { screen_name } {
     @see acs_user::get_user_id_by_screen_name
 } {
@@ -2888,8 +2889,9 @@
 
 }
 
-#
+########################################################################
 # from tcl/00-database-procs.tcl
+########################################################################
 #
 ad_proc -deprecated db_package_supports_rdbms_p { db_type_list } {
     @return 1 if db_type_list contains the current RDMBS type.  A package intended to run with a given RDBMS must note this in its package info file regardless of whether or not it actually uses the database.
@@ -2910,20 +2912,22 @@
     return 0
 }
 
-#
+########################################################################
 #  from tcl/apm-procs.tcl
-# 
+########################################################################
 
+
 ad_proc -public -deprecated apm_doc_body_callback { string } {
     This callback uses the document api to append more text to the stream.
 } {
     doc_body_append $string
 }
 
-#
+########################################################################
 #  from tcl/apm-file-procs.tcl
-# 
+########################################################################
 
+
 ad_proc -public -deprecated pkg_home {package_key} {
 
     @return A server-root relative path to the directory for a package.  Usually /packages/package-key
@@ -2933,9 +2937,9 @@
     return "/packages/$package_key"
 }
 
-#
-# deprecated-utilities-procs.tcl
-#
+########################################################################
+# deprecated utilities-procs.tcl
+########################################################################
 
 # ad_library {
 #
@@ -3169,7 +3173,11 @@
     }
 }
 
+########################################################################
+# deprecated site-nodes-procs.tcl
+########################################################################
 
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/acs-tcl/tcl/install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/install-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/acs-tcl/tcl/install-procs.tcl	7 Aug 2017 23:47:59 -0000	1.31
+++ openacs-4/packages/acs-tcl/tcl/install-procs.tcl	25 Apr 2018 08:46:13 -0000	1.32
@@ -138,7 +138,7 @@
         set parent_id [site_node::get_node_id -url "/$parent_url"]
 
         # technically this isn't safe - between us checking that the node exists
-        # and using it it may have been deleted. 
+        # and using it, the node may have been deleted. 
         # We could "select for update" but since it's in a memory cache anyway,
         # it won't help us very much!
         # Instead we just press on and if there's an error handle it at the top level.
@@ -216,7 +216,7 @@
         set parent_id [site_node::get_node_id -url "/$parent_url"]
 
         # technically this isn't safe - between us checking that the node exists
-        # and using it it may have been deleted. 
+        # and using it, the node may have been deleted. 
         # We could "select for update" but since it's in a memory cache anyway,
         # it won't help us very much!
         # Instead we just press on and if there's an error handle it at the top level.
Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl	7 Aug 2017 23:47:59 -0000	1.9
+++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl	25 Apr 2018 08:46:13 -0000	1.10
@@ -48,7 +48,7 @@
             # This will trigger an update of the acs_objects.modified_date column.
             # We use this in the ApprovalExpiration feature to make sure that a user isn't 
             # bumped back to needs_approval right after an administrator has approved them,
-            # even if the user doesn't log in in the meantime.
+            # even if the user doesn't log in the meantime.
 
             if { [ad_conn isconnected] } {
                 set user_id [ad_conn user_id]
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs-aolserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs-aolserver.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/utilities-procs-aolserver.tcl	24 Mar 2018 08:26:03 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs-aolserver.tcl	25 Apr 2018 08:46:13 -0000	1.3
@@ -164,17 +164,16 @@
     without the replace option being specified, the client will
     receive both copies of the cookie.
 
-    @param discard instructs the user agent to discard the
-    cookie when when the user agent terminates.
+    @param discard instructs the user agent to discard the cookie when
+    the user agent terminates.
 
-    @param scriptable If the scriptable option is false or not
-    given the cookie is unavailable to javascript on the
-    client. This can prevent cross site scripting attacks (XSS) on
-    clients which support the HttpOnly option. Set -scriptable to
-    true if you need to access the cookie via javascript. For
-    compatibility reasons with earlier versions, OpenACS 5.8 has
-    the default set to "true". OpenACS 5.9 will have the flag per
-    default set to "false".
+    @param scriptable If the scriptable option is false or not given
+    the cookie is unavailable to javascript on the client. This can
+    prevent cross site scripting attacks (XSS) on clients which
+    support the HttpOnly option. Set -scriptable to true if you need
+    to access the cookie via javascript. For compatibility reasons
+    with earlier versions, OpenACS 5.8 has the default set to
+    "true". OpenACS 5.9 will have the flag per default set to "false".
 
     @param value is autmatically URL encoded.
 
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl	26 Feb 2018 19:07:07 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl	25 Apr 2018 08:46:13 -0000	1.2
@@ -130,17 +130,16 @@
     without the replace option being specified, the client will
     receive both copies of the cookie.
 
-    @param discard instructs the user agent to discard the
-    cookie when when the user agent terminates.
+    @param discard instructs the user agent to discard the cookie when
+    the user agent terminates.
 
-    @param scriptable If the scriptable option is false or not
-    given the cookie is unavailable to javascript on the
-    client. This can prevent cross site scripting attacks (XSS) on
-    clients which support the HttpOnly option. Set -scriptable to
-    true if you need to access the cookie via javascript. For
-    compatibility reasons with earlier versions, OpenACS 5.8 has
-    the default set to "true". OpenACS 5.9 will have the flag per
-    default set to "false".
+    @param scriptable If the scriptable option is false or not given
+    the cookie is unavailable to javascript on the client. This can
+    prevent cross site scripting attacks (XSS) on clients which
+    support the HttpOnly option. Set -scriptable to true if you need
+    to access the cookie via javascript. For compatibility reasons
+    with earlier versions, OpenACS 5.8 has the default set to
+    "true". OpenACS 5.9 will have the flag per default set to "false".
 
     @param value is autmatically URL encoded.
 
Index: openacs-4/packages/acs-admin/www/apm/packages-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/acs-admin/www/apm/packages-install.tcl	7 Aug 2017 23:47:45 -0000	1.25
+++ openacs-4/packages/acs-admin/www/apm/packages-install.tcl	25 Apr 2018 08:49:03 -0000	1.26
@@ -28,7 +28,7 @@
 
 ### Get all the spec files
 #
-# If a package is in the apm_workspace dir then we assume that that is
+# If a package is in the apm_workspace dir then we assume that this is
 # the package that should be installed and we ignore any such package
 # in the packages dir.  
 #
Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	19 Jan 2018 13:40:40 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	25 Apr 2018 08:49:03 -0000	1.9
@@ -59,16 +59,17 @@
 		      -operation MergeUser \
 		      -call_args $parameters]
 
-    # TODO: Add to the SC implementations of the SC
-    # an output to improve the  msg's of the the final 
-    # status of auth_authentication merge.
-    # It could be a list as we did with callbacks implementations.
+    # TODO: Add to the SC implementations of the SC an output to
+    # improve the messages of the final status of auth_authentication
+    # merge.  It could be a list as we did with callbacks
+    # implementations.
+    #
     #     foreach item $user_res {
-    # 	append results "<li>[lindex $item 0]<ul>"
-    # 	for { set idx 1 } { $idx < [llength $item] } {incr idx} {
-    # 	    append results "<li>[lindex $item $idx]</li>"
-    # 	}
-    # 	append results "</ul></li></ul>"
+    # 	     append results "<li>[lindex $item 0]<ul>"
+    # 	     for { set idx 1 } { $idx < [llength $item] } {incr idx} {
+    # 	        append results "<li>[lindex $item $idx]</li>"
+    # 	     }
+    # 	     append results "</ul></li></ul>"
     #     }
     #     append results "</ul>"