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.58 -r1.59
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	25 Jul 2018 20:58:32 -0000	1.58
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	5 Aug 2018 21:09:49 -0000	1.59
@@ -1168,11 +1168,11 @@
 } {
     Returns the url stub for the specified subsite.
 
-    If -absolute is supplied then this function will generate absolute urls.
+    If -absolute is supplied then this function will generate absolute URLs.
 
     If the site is currently being accessed via a host node mapping then URLs
     will omit the corresponding subsite url stub.  The host name will be used
-    for any appropriate subsite when absolute urls are generated.
+    for any appropriate subsite when absolute URLs are generated.
 
     @param node_id the subsite's node_id (defaults to nearest subsite node).
     @param absolute_p whether to include the host in the returned url.
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/www/group-master.tcl	27 Jun 2018 16:11:45 -0000	1.21
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	5 Aug 2018 21:09:49 -0000	1.22
@@ -74,7 +74,7 @@
 util_get_user_messages -multirow user_messages
 
 #
-# Set acs-lang urls
+# Set acs-lang URLs
 #
 set acs_lang_url [apm_package_url_from_key "acs-lang"]
 set num_of_locales [llength [lang::system::get_locales]]
Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl	30 May 2018 15:53:54 -0000	1.15
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl	5 Aug 2018 21:10:39 -0000	1.16
@@ -255,7 +255,7 @@
 }]
 
 
-# Add event listener for updating urls and checking mailto urls
+# Add event listener for updating URLs and checking mailto URLs
 
 template::add_event_listener -CSSclass "update-url" -event change -script {updateURLs();}
 template::add_event_listener -CSSclass "check-mailto" -event change -script {checkMailto(this);}
Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	25 Mar 2018 22:13:40 -0000	1.9
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	5 Aug 2018 21:13:10 -0000	1.10
@@ -34,7 +34,7 @@
     ::xo::Page requireJS urn:ad:js:jquery
     #
     # TODO: We should dynamically be able to determine (some of) the
-    # CSP directives. However, for the time being, the urls below are
+    # CSP directives. However, for the time being, the URLs below are
     # trusted.
     #
     security::csp::require script-src maxcdn.bootstrapcdn.com
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.327 -r1.328
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	26 Jul 2018 15:27:28 -0000	1.327
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	5 Aug 2018 21:13:10 -0000	1.328
@@ -1651,7 +1651,7 @@
 
     if {![regexp {^(download)/(.+)$} $(lang) _ (method) (lang)]} {
       set (method) ""
-      # The lang value "tag" is used for allowing tag-urls without
+      # The lang value "tag" is used for allowing tag-URLs without
       # parameters, since several tag harvester assume such a syntax
       # and don't process arguments. We rewrite in such cases simply
       # the url and query parameters and update the connection
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/Attic/test.tcl,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/xowiki/www/admin/test.tcl	21 Jul 2018 11:56:37 -0000	1.45
+++ openacs-4/packages/xowiki/www/admin/test.tcl	5 Aug 2018 21:13:10 -0000	1.46
@@ -688,7 +688,7 @@
 # Testing item refs and wiki links (between [[ .... ]])
 #
 # Still missing:
-#    - test reverse mappings from urls generated from item-refs back to item_ids
+#    - test reverse mappings from URLs generated from item-refs back to item_ids
 #    - syntax Person:de:p1 (if de:p1 does not exist, create an instance of Person name de:p1)
 #    - typed links (glossary app)... important?
 #    - interaction between PackagePath and folders (would be nice to inherit from folders, not packages)
Index: openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl,v
diff -u -r1.60 -r1.61
--- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	9 May 2018 15:33:34 -0000	1.60
+++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	5 Aug 2018 21:16:25 -0000	1.61
@@ -27,7 +27,7 @@
 
   return
 }
-#return ;# DONT COMMIT
+#return ;# DON'T COMMIT
 
 # catch {ns_conn contentsentlength} alone does not work, since we do not have
 # a connection yet, and the bgdelivery won't be activated
Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -r1.74 -r1.75
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	11 Jun 2018 09:14:55 -0000	1.74
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	5 Aug 2018 21:16:25 -0000	1.75
@@ -1,7 +1,7 @@
 xo::library doc  {
   Context handling interface
   
-  Definition of a connection context, containing user info, urls, parameters.
+  Definition of a connection context, containing user info, URLs, parameters.
   this is used via "Package initialize"... similar as page_contracts and
   for included content (includelets), and used for per-connection caching as well.
   The intention is similar as with ad_conn, but based on objects.
Index: openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	20 May 2018 11:23:00 -0000	1.36
+++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	5 Aug 2018 21:16:25 -0000	1.37
@@ -157,7 +157,7 @@
   HttpCore instproc parse_url {} {
     :instvar protocol url host port path
     if {[regexp {^(http|https)://([^/]+)(/.*)?$} $url _ protocol host path]} {
-      # Be friendly and allow strictly speaking invalid urls 
+      # Be friendly and allow strictly speaking invalid URLs 
       # like "http://www.openacs.org"  (no trailing slash)
       if {$path eq ""} {set path /}
       :set_default_port $protocol