Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -N -r1.140 -r1.141
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	3 Nov 2018 18:57:12 -0000	1.140
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	3 Nov 2018 18:58:49 -0000	1.141
@@ -1316,7 +1316,7 @@
     # Note: based on the ordering, char has lower priority over int*
     # which is probably a bug, but is not a problem in OpenACS.
     #
-    # Note, that we can as well get the type in future versions.
+    # Note that we can as well get the type in future versions.
     #
     ::xo::dc foreach get_function_params {
       select proname, pronargs, proargtypes, prosrc
@@ -1672,7 +1672,7 @@
       } elseif {![$class_name istype ::xo::db::Class]} {
         #
         # The methods of ::xo::db::sql::util like "table_exists" fall
-        # into this category. Make sure, that we do not create new
+        # into this category. Make sure that we do not create new
         # objects via the next command.
         #
         continue
@@ -2464,7 +2464,7 @@
     {-initialize true}
   } {
     Returns a set (ordered composite) of the answer tuples of
-    an 'instance_select_query' with the same attributes. Note, that
+    an 'instance_select_query' with the same attributes. Note that
     the returned objects might by partially instantiated.
 
     @return ordered composite
Index: openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl	27 Jun 2018 16:55:39 -0000	1.29
+++ openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl	3 Nov 2018 18:58:49 -0000	1.30
@@ -145,7 +145,7 @@
     Register the NaviServer/AOLserver filter and traces.
     This method is typically called via *-init.tcl.
 
-    Note, that the specified url must not have an entry
+    Note that the specified url must not have an entry
     in the site-nodes, otherwise the OpenACS request
     processor performs always the cockie-based authorization.
 
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -N -r1.74 -r1.75
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	29 Aug 2018 09:15:30 -0000	1.74
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	3 Nov 2018 18:58:49 -0000	1.75
@@ -404,7 +404,7 @@
 
     # "CrClasses" stores all attributes of the class hierarchy in
     # db_slot. This is due to the usage of the
-    # automatically created views. Note, that classes created with
+    # automatically created views. Note that classes created with
     # ::xo::db::Class keep only the class specific db slots.
     #
     foreach {slot_name slot} [[:info superclass] array get :db_slot] {
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 -N -r1.39 -r1.40
--- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	30 Sep 2018 15:56:17 -0000	1.39
+++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	3 Nov 2018 18:58:49 -0000	1.40
@@ -254,7 +254,7 @@
     # (C) If neither A or B apply (e.g., because an invalid charset
     # name was given to the charset parameter), we default to
     # "binary". This corresponds to the behavior of
-    # [ns_encodingfortype].  Also note, that the RFCs 3023 and 2616 do
+    # [ns_encodingfortype].  Also note that the RFCs 3023 and 2616 do
     # not state any procedure when "invalid" charsets etc. are
     # identified. I assume, RFC-compliant clients have to ignore them
     # which means keep the channel in- and output unfiltered (encoding
Index: openacs-4/packages/xowiki/tcl/category-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/xowiki/tcl/category-procs.tcl	9 May 2018 15:33:34 -0000	1.30
+++ openacs-4/packages/xowiki/tcl/category-procs.tcl	3 Nov 2018 18:59:55 -0000	1.31
@@ -48,7 +48,7 @@
         if {!$match} continue
       }
       # Get the values from info in "tree" into separate variables given by output.
-      # Note, that the order matters!
+      # Note that the order matters!
       lassign $tree {*}$output
       set l [list]
       foreach __var $output {lappend l [set $__var]}
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.279 -r1.280
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	5 Oct 2018 12:52:05 -0000	1.279
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Nov 2018 18:59:55 -0000	1.280
@@ -305,7 +305,7 @@
           #
           # Note: do not allow users to use [] via forms, since they might
           # execute arbitrary commands. The validator for the form fields
-          # makes sure, that the input specs are free from square brackets.
+          # makes sure that the input specs are free from square brackets.
           #
           if {[string match {\[*\]} $value]} {
             set value [subst $value]
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.328 -r1.329
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	5 Aug 2018 21:13:10 -0000	1.328
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	3 Nov 2018 18:59:55 -0000	1.329
@@ -695,7 +695,7 @@
       #
       # Handle cross package resolve requests
       #
-      # Note, that package::initialize might change the package id.
+      # Note that package::initialize might change the package id.
       # Preserving the package-url is just necessary, if for some
       # reason the same package is initialized here with a different
       # url. This could be done probably with a flag to initialize,
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.538 -r1.539
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Jul 2018 16:49:06 -0000	1.538
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	3 Nov 2018 18:59:55 -0000	1.539
@@ -526,6 +526,13 @@
   #
   # We do here the same way as in xotcl-core/tcl/05-db-procs.tcl
   #
+  # The sizes can be tailored in the config
+  # file like the following:
+  #
+  # ns_section ns/server/${server}/acs/xowiki
+  #   ns_param CacheSize                1000000
+  #   ns_param CachePartitions                3
+  #
   if {[catch {ns_cache flush xowiki_cache-0 NOTHING}]} {
     ns_log notice "xotcl-core: creating xowiki cache"
 
@@ -803,7 +810,7 @@
     # and not on xowiki::Forms, since a single xowiki::FormPages might
     # use different xowiki::Forms in its life-cycle.
     #
-    # Note, that only types of form-fields implied by the derived form
+    # Note that only types of form-fields implied by the derived form
     # constraints are recognized. E.g. In workflows, it might be
     # necessary to move e.g. category definitions into the global form
     # constraints.
@@ -816,7 +823,7 @@
     :build_instance_attribute_map $form_fields
 
     # In case we have a mapping from IDs to external values, use it
-    # and rewrite instance attributes. Note, that the marshalled
+    # and rewrite instance attributes. Note that the marshalled
     # objects have to be flushed from memory later since the
     # representation of instances_attributes is changed by this
     # method.
@@ -3562,7 +3569,7 @@
     #:msg "parent of self [:name] is [$form_obj name] type [$form_obj info class]"
     #
     # If it is as well a PageInstance, we find the information in the
-    # properties of this page. Note, that we cannot distinguish here between
+    # properties of this page. Note that we cannot distinguish here between
     # intrinsic (starting with _) and extension variables, since get_from
     # template does not know about the logic with "_" (just "property" does).
     #
@@ -3830,7 +3837,7 @@
       # The Form might come from a different package type (e.g. a
       # workflow) make sure, the source package is available.
       #
-      # Note, that global pages (site_wide_pages) might not belong to
+      # Note that global pages (site_wide_pages) might not belong to
       # a package and have therefore an empty package_id.
       #
       set package_id [$p package_id]
@@ -4093,7 +4100,7 @@
                    -object_class ::xowiki::FormPage -initialize $initialize]
 
     if {!$use_hstore && $wc(tcl) != "true"} {
-      # Make sure, that the expr method is available;
+      # Make sure that the expr method is available;
       # in xotcl 2.0 this will not be needed
       ::xotcl::alias ::xowiki::FormPage expr -objscope ::expr
 
Index: openacs-4/packages/xowiki/tcl/yui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-procs.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/xowiki/tcl/yui-procs.tcl	7 Jul 2018 10:58:20 -0000	1.15
+++ openacs-4/packages/xowiki/tcl/yui-procs.tcl	3 Nov 2018 18:59:55 -0000	1.16
@@ -313,7 +313,7 @@
     "::YUI::loader require menu" and "::YUI::loader require datatable"
     it should take care of selecting all the files needed and assemble them
     into one single resource, that may be delivered.
-    Note, that this is not implemented yet.
+    Note that this is not implemented yet.
   }
 
   loader set ajaxhelper 1
Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v
diff -u -N -r1.61 -r1.62
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	3 Nov 2018 10:40:10 -0000	1.61
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	3 Nov 2018 19:00:47 -0000	1.62
@@ -885,7 +885,7 @@
     next
     #
     # The following event is a heart-beat just necessary for idle
-    # systems. It makes sure, that per-minute objects don't hang
+    # systems. It makes sure that per-minute objects don't hang
     # around much longer than required (maximum 1 second), but that at
     # the same time that last_mkey never points to an invalid object.
     #