Index: openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl,v
diff -u -N -r1.22.2.4 -r1.22.2.5
--- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	20 Jan 2020 17:33:20 -0000	1.22.2.4
+++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	8 Aug 2020 08:08:20 -0000	1.22.2.5
@@ -203,7 +203,10 @@
 
   :public object method scope {} {
     if {[info exists ::xotcl::currentThread]} {
-      # we are in an xotcl thread; the body won't be accessible directly
+      #
+      # We are in an XOTcl thread; the body won't be accessible
+      # by default without the explicit scope.
+      #
       return $::xotcl::currentThread
     }
     return ""
Index: openacs-4/packages/xotcl-core/www/show-class-graph.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-class-graph.tcl,v
diff -u -N -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/xotcl-core/www/show-class-graph.tcl	10 Mar 2019 21:02:31 -0000	1.12.2.1
+++ openacs-4/packages/xotcl-core/www/show-class-graph.tcl	8 Aug 2020 08:08:20 -0000	1.12.2.2
@@ -1,5 +1,5 @@
 ad_page_contract {
-  Show an xotcl class or object
+  Show an XOTcl class or object
   
   @author Gustaf Neumann
   @cvs-id $Id$
Index: openacs-4/packages/xotcl-core/www/show-object.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-object.tcl,v
diff -u -N -r1.27.2.4 -r1.27.2.5
--- openacs-4/packages/xotcl-core/www/show-object.tcl	16 Oct 2019 10:24:43 -0000	1.27.2.4
+++ openacs-4/packages/xotcl-core/www/show-object.tcl	8 Aug 2020 08:08:20 -0000	1.27.2.5
@@ -1,5 +1,5 @@
 ad_page_contract {
-  Show an xotcl class or object
+  Show an XOTcl class or object
 
   @author Gustaf Neumann
   @cvs-id $Id$
Index: openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl,v
diff -u -N -r1.14.2.9 -r1.14.2.10
--- openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl	1 Jul 2020 19:31:58 -0000	1.14.2.9
+++ openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl	8 Aug 2020 08:08:20 -0000	1.14.2.10
@@ -21,7 +21,7 @@
         "::xo::Package instproc reply_to_user"
     } create_folder_with_page {
 
-        Create a folder in a xowf instance with a form page and edit this
+        Create a folder in an xowf instance with a form page and edit this
 
     } {
         #
@@ -99,7 +99,7 @@
         "::xo::Package instproc reply_to_user"
     } create_workflow_with_instance {
 
-        Create a xowf workflow and a instance in a folder.
+        Create an xowf workflow and a instance in a folder.
 
     } {
         #
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 -N -r1.11.2.15 -r1.11.2.16
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	28 Feb 2020 14:05:05 -0000	1.11.2.15
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	8 Aug 2020 08:08:20 -0000	1.11.2.16
@@ -520,7 +520,10 @@
       }
     } else {
       set name [::xowiki::Includelet js_name [self]]
-      #nesting forms inside a xowf page will place the action buttons at the wrong place!
+      #
+      # Nesting forms inside an xowf page will place the action
+      # buttons at the wrong place!
+      #
       html::div -id ${:id}_wrapper -class "table-responsive" {
         html::div -id ${:id}_container {
           html::table -id ${:id} -class ${:css.table-class} {
Index: openacs-4/packages/xowiki/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/notification-procs.tcl,v
diff -u -N -r1.23.2.2 -r1.23.2.3
--- openacs-4/packages/xowiki/tcl/notification-procs.tcl	13 Jul 2020 12:02:33 -0000	1.23.2.2
+++ openacs-4/packages/xowiki/tcl/notification-procs.tcl	8 Aug 2020 08:08:20 -0000	1.23.2.3
@@ -188,7 +188,7 @@
 
 
   ad_proc -private process_reply { reply_id} {
-    handles a reply to an xowiki notif
+    Handles a reply to an xowiki notification.
     
     @author Deds Castillo (deds@i-manila.com.ph)
     @creation-date 2006-06-08
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 -N -r1.332.2.58 -r1.332.2.59
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	4 Aug 2020 19:32:53 -0000	1.332.2.58
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Aug 2020 08:08:20 -0000	1.332.2.59
@@ -910,7 +910,7 @@
       }
       if {$method ne ""} {
         #
-        # Convention for calling methods on a xowiki::Page
+        # Convention for calling methods on an xowiki::Page
         #
         lappend args [list m $method]
       }
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 -N -r1.542.2.78 -r1.542.2.79
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	17 Jul 2020 13:55:01 -0000	1.542.2.78
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	8 Aug 2020 08:08:20 -0000	1.542.2.79
@@ -637,7 +637,7 @@
       set content [:serialize -target [string trimleft [self] :]]
     } else {
       #
-      # Since we serialize nx and xotcl objects, make objects the
+      # Since we serialize nx and XOTcl objects, make objects the
       # old-fashioned way relocatable. This is dangerous, since it
       # might substitute as well content.
       #
Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/Attic/xowiki-test-procs.tcl,v
diff -u -N -r1.1.2.33 -r1.1.2.34
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	1 Jul 2020 19:31:58 -0000	1.1.2.33
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	8 Aug 2020 08:08:20 -0000	1.1.2.34
@@ -139,7 +139,7 @@
             #
             # Force the system locale to en_US. The value is
             # automatically reset to the previous value, since we are
-            # running in an transaction.
+            # running in a transaction.
             #
             lang::system::set_locale en_US
 
Index: openacs-4/packages/xowiki/www/admin/samples/ajax-chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/samples/ajax-chat.tcl,v
diff -u -N -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/xowiki/www/admin/samples/ajax-chat.tcl	13 Jul 2020 12:02:34 -0000	1.8.2.2
+++ openacs-4/packages/xowiki/www/admin/samples/ajax-chat.tcl	8 Aug 2020 08:08:20 -0000	1.8.2.3
@@ -1,5 +1,5 @@
 ad_page_contract {
-  Sample page generating a xowiki object embedding a chat
+  Sample page generating an xowiki object embedding a chat
 } {
 }
 
Index: openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl,v
diff -u -N -r1.4.2.3 -r1.4.2.4
--- openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl	12 Apr 2019 21:29:46 -0000	1.4.2.3
+++ openacs-4/packages/xowiki-portlet/tcl/xowiki-admin-portlet-procs.tcl	8 Aug 2020 08:08:20 -0000	1.4.2.4
@@ -40,7 +40,7 @@
   {-portal_id:required}
   {-package_id:required}
 } {
-  Adds a xowiki admin PE to the given portal
+  Adds an xowiki admin PE to the given portal
 } {
   return [portal::add_element_parameters \
               -portal_id $portal_id \