Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -r1.59 -r1.60
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	29 Jun 2018 18:57:51 -0000	1.59
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	19 Sep 2018 00:38:52 -0000	1.60
@@ -189,7 +189,7 @@
 
     Returns a property of a date list, usually created by ad_form.
 
-    @param what the name of the property. one of:<ul>
+    @param what the name of the property. One of:<ul>
     <li>year</li>
     <li>month</li>
     <li>day</li>
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.43 -r1.44
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	5 Aug 2018 08:48:11 -0000	1.43
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	19 Sep 2018 00:38:52 -0000	1.44
@@ -76,7 +76,7 @@
 } {
     @param async   whether execution of the script should be executed asynchronously
                    as soon as it is available
-    @param charset the charset attribute of the script tag, ie. the character
+    @param charset the charset attribute of the script tag, i.e. the character
                    set of the script if it differs from the main document
     @param crossorigin  Enumerated attribute to indicate whether CORS
                    (Cross-Origin Resource Sharing) should be used
@@ -87,7 +87,7 @@
     @param script  the inline script for the body of the script tag.  This
                    parameter will be ignored if a value has been supplied for src
     @param section section, where script is added ("head" or "body")
-    @param src     the src attribute of the script tag, ie. the source url of the
+    @param src     the src attribute of the script tag, i.e. the source url of the
                    script
     @param type    the type attribute of the script tag, e.g. 'text/javascript'
 } {
@@ -129,7 +129,7 @@
 
     @param async   whether execution of the script should be executed asynchronously
                    as soon as it is available
-    @param charset the charset attribute of the script tag, ie. the character
+    @param charset the charset attribute of the script tag, i.e. the character
                    set of the script if it differs from the main document
     @param crossorigin  Enumerated attribute to indicate whether CORS
                    (Cross-Origin Resource Sharing) should be used
@@ -139,7 +139,7 @@
     @param order   specify inclusion order
     @param script  the inline script for the body of the script tag.  This
                    parameter will be ignored if a value has been supplied for src
-    @param src     the src attribute of the script tag, ie. the source url of the
+    @param src     the src attribute of the script tag, i.e. the source url of the
                    script
     @param type    the type attribute of the script tag, e.g. 'text/javascript'
 
@@ -199,7 +199,7 @@
     @author Gustaf Neumann
     @creation-date 2018-03-09
 
-    @param src     src attribute of the script tag, ie. the source url of the
+    @param src     src attribute of the script tag, i.e. the source url of the
                    script. A glob pattern similar link in "string match" can be provided.
     @see ::template::head::add_script
 } {
@@ -342,10 +342,10 @@
     once; subsequent calls to add_meta will replace the existing entry.  You
     <strong>must</strong> supply either name or http_equiv.
 
-    @param http_equiv the http-equiv attribute of the meta tag, ie. the
+    @param http_equiv the http-equiv attribute of the meta tag, i.e. the
                       HTTP header which this metadata is equivalent to
                       e.g. 'content-type'
-    @param name       the name attribute of the meta tag, ie. the metadata
+    @param name       the name attribute of the meta tag, i.e. the metadata
                       identifier
     @param scheme     the scheme attribute of the meta tag defining which
                       metadata scheme should be used to interpret the metadata,
@@ -429,7 +429,7 @@
 
     @param async   whether execution of the script should be executed asynchronously
                    as soon as it is available
-    @param charset the charset attribute of the script tag, ie. the character
+    @param charset the charset attribute of the script tag, i.e. the character
                    set of the script if it differs from the main document
     @param crossorigin  Enumerated attribute to indicate whether CORS
                    (Cross-Origin Resource Sharing) should be used
@@ -440,7 +440,7 @@
     @param script  the inline script for the body of the script tag.  This
                    parameter will be ignored if a value has been supplied for
                    src
-    @param src     the src attribute of the script tag, ie. the source url of the
+    @param src     the src attribute of the script tag, i.e. the source url of the
                    script
 
     @see template::head::add_script
@@ -561,7 +561,7 @@
 
     @param async   whether execution of the script should be executed asynchronously
                    as soon as it is available
-    @param charset the charset attribute of the script tag, ie. the character
+    @param charset the charset attribute of the script tag, i.e. the character
                    set of the script if it differs from the main document
     @param crossorigin  Enumerated attribute to indicate whether CORS
                    (Cross-Origin Resource Sharing) should be used
@@ -571,7 +571,7 @@
     @param script  the inline script for the body of the script tag.  This
                    parameter will be ignored if a value has been supplied for
                    src
-    @param src     the src attribute of the script tag, ie. the source url of the
+    @param src     the src attribute of the script tag, i.e. the source url of the
                    script
     @param type    the type attribute of the script tag, e.g. 'text/javascript'
 } {
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.92 -r1.93
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	25 Jul 2018 20:58:32 -0000	1.92
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	19 Sep 2018 00:38:52 -0000	1.93
@@ -3227,8 +3227,8 @@
         # and group by/order by are preserved when the filter
         # form is used
 
-        # grab the current value of the filter out of the list if
-        # it exists
+        # Grab the current value of the filter out of the list if
+        # it exists.
         upvar $list_properties(ulevel) $filter_properties(name) current_filter_value
         if {[info exists current_filter_value] && $current_filter_value ne ""} {
 
@@ -3240,11 +3240,9 @@
         }
     }
     upvar #[template::adp_level] __list_filter_form_client_property_key list_filter_form_client_property_key
-    # we only get 50 characters
-    # to save our clienty property name, we can encode it into an
-    # ns_sha1 hash to make it fit. we don't extract the data from the
-    # property name so this should work fine
-    #    set list_filter_form_client_property_key [ns_sha1 [list [ad_conn url] $name $filter_key_filters]]
+    # To save the client property name, it is hashed with ns_sha1 hash
+    # to fit it into toe attribute. We don't extract the data from the
+    # property name so this should work fine.
     set list_filter_form_client_property_key [ns_sha1 [list [ad_conn url] $name]]
     upvar \#[template::adp_level] __client_property_filters client_property_filters
     set client_property_filters [ad_get_client_property acs-templating $list_filter_form_client_property_key]
@@ -3279,9 +3277,10 @@
         set clear_one [ns_set get $__form clear_one]
 
         if {$clear_one ne ""} {
-            # loop through the saved filters and remove
-            # the filter from the client property if its
-            # specified in clear_one
+            #
+            # Loop through the saved filters and remove the filter
+            # from the client property if its specified in clear_one.
+            #
             set __old_client_property_filters [ad_get_client_property acs-templating $__list_filter_form_client_property_key]
             set __client_property_filters [list]
 
@@ -3290,12 +3289,16 @@
                     lappend __client_property_filters $__ref $__value
                 }
             }
-            # if we changed the list of filters, save it in the
+            #
+            # If we changed the list of filters, save it in the
             # client property, we read it later on to build the
             # form of selected filters
+            #
             set client_property_filters $__client_property_filters
             ad_set_client_property acs-templating $__list_filter_form_client_property_key $__client_property_filters
-            # now reload the form. excluding var clear_one
+            #
+            # Now reload the form, excluding variable clear_one.
+            #
             set pattern [ns_urlencode "clear_one"]=[ns_urlencode "$clear_one"]
             regsub "${pattern}&?" [ad_return_url] {} url
             ad_returnredirect $url
Index: openacs-4/packages/acs-templating/tcl/wizard-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/wizard-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-templating/tcl/wizard-procs.tcl	17 Jul 2018 13:32:18 -0000	1.19
+++ openacs-4/packages/acs-templating/tcl/wizard-procs.tcl	19 Sep 2018 00:38:52 -0000	1.20
@@ -67,8 +67,7 @@
     <li>action - the url where the wizard will always submit, normally is the
     same as your current wizard file.  Has no effect for subwizards.</li>
     <li>name - use to distinguish between the different wizards, since you can
-    have 1 or more subwizard. name must be no spaces, alphanumeric similar
-    to normal Tcl variable naming convention</li>
+    have 1 or more subwizard. "name" must be a bare Tcl word (no spaces etc.)</li>
     <li>params - are used to keep values that you would like to pass on to
     the other steps</li>
     <li>steps - are used to define what includes to use for each step of the
Index: openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl	9 May 2018 15:33:29 -0000	1.5
+++ openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl	19 Sep 2018 00:38:52 -0000	1.6
@@ -25,12 +25,12 @@
     lappend actions "Create Note" add-edit "Create Note"
 }
 
-# notice how -bulk_actions is different inside...
+# Notice how -bulk_actions is different inside...
 # -bulk_actions { "text for button" "name of page" "tooltip text" }
 # weird, huh?
 #
-# anyway, here we are adding an action (not bulk, so doesn't respond
-# to the checkboxes) for adding a note. see the if test above? if
+# Anyway, here we are adding an action (not bulk, so doesn't respond
+# to the checkboxes) for adding a note. See the if test above? If
 # the user does not have permission to create, then the actions list
 # will be empty and the create-a-note button will not appear.
 
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	14 Sep 2018 18:28:16 -0000	1.25
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	19 Sep 2018 00:38:52 -0000	1.26
@@ -245,7 +245,7 @@
     set write_p 0
 }
 
-# default to xinha but tinymce will work too. no plugins for rte
+# Default to xinha but tinymce will work too. No plugins for rte.
 set richtextEditor [parameter::get \
                         -package_id $package_id \
                         -parameter "RichTextEditor" \
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	14 Sep 2018 18:28:16 -0000	1.18
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	19 Sep 2018 00:38:52 -0000	1.19
@@ -181,7 +181,7 @@
 } else {
     set write_p 0
 }
-# default to xinha but tinymce will work too. no plugins for rte
+# Default to xinha but tinymce will work too. No plugins for rte.
 set richtextEditor [parameter::get \
                         -package_id [ad_conn package_id] \
                         -parameter "RichTextEditor" \