Index: openacs-4/packages/acs-templating/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-templating/tcl/apm-callback-procs.tcl	7 Aug 2017 23:48:01 -0000	1.7
+++ openacs-4/packages/acs-templating/tcl/apm-callback-procs.tcl	1 May 2018 09:34:09 -0000	1.8
@@ -86,7 +86,7 @@
             5.3.0d1 5.3.0d2 {
                 db_transaction {
                     # mount acs-templating so we can address
-                    # executable Tcl scripts under www with a url
+                    # executable Tcl scripts under www with a URL
                     set package_id [apm_package_id_from_key acs-templating]
                     array set main_subsite \
                         [site_node::get_from_url \
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -N -r1.49 -r1.50
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	25 Apr 2018 19:23:26 -0000	1.49
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	1 May 2018 09:34:09 -0000	1.50
@@ -71,7 +71,7 @@
                             rendered form. Common use for this option is to set multipart
                             form encoding by specifying "-html { enctype multipart/form-data }".
                             Please note that to comply with newer security features, such as CSP,
-                            one should not specify javascript event handlers here, as they will
+                            one should not specify JavaScript event handlers here, as they will
                             be rendered inline.
     
     @option mode            If set to 'display', the form is shown in display-only mode, where 
@@ -127,7 +127,7 @@
 } {
   set level [template::adp_level]
 
-  # bump the form_count for widgets that use javascript to navigate through
+  # bump the form_count for widgets that use JavaScript to navigate through
   # the form (liberated from my Greenpeace work ages ago)
 
   incr ::ad_conn(form_count)
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 -N -r1.34 -r1.35
--- openacs-4/packages/acs-templating/tcl/head-procs.tcl	1 May 2018 09:30:43 -0000	1.34
+++ openacs-4/packages/acs-templating/tcl/head-procs.tcl	1 May 2018 09:34:09 -0000	1.35
@@ -485,8 +485,8 @@
     {-script:required}
     {-identifier anonymous}
 } {
-    Adds javascript code to an event handler in the body tag.  Several
-    javascript code blocks may be assigned to each handler by subsequent calls
+    Adds JavaScript code to an event handler in the body tag.  Several
+    JavaScript code blocks may be assigned to each handler by subsequent calls
     to template::add_body_handler.
 
     <p>If your script may only be added once you may supply an identifier.
@@ -511,8 +511,8 @@
 
     @param event      the event during which the supplied script should be
                       executed
-    @param script     the javascript code to execute
-    @param identifier a name, if supplied, used to ensure this javascript code
+    @param script     the JavaScript code to execute
+    @param identifier a name, if supplied, used to ensure this JavaScript code
                       is only added to the handler once
 } {
     variable ::template::body_handlers
@@ -882,7 +882,7 @@
     Get body event handlers specified with template::add_body_handler
 } {
     #
-    # Concatenate the javascript event handlers for the body tag
+    # Concatenate the JavaScript event handlers for the body tag
     #
     variable ::template::body_handlers
     set event_handlers ""
@@ -894,8 +894,8 @@
         #
         foreach name [array names body_handlers] {
             set event [lindex [split $name ","] 0]
-            foreach javascript $body_handlers($name) {
-                lappend body_handlers($event) "[string trimright $javascript {; }];"
+            foreach js $body_handlers($name) {
+                lappend body_handlers($event) "[string trimright $js {; }];"
             }
             unset body_handlers($name)
         }
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 -N -r1.80 -r1.81
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	1 May 2018 08:23:06 -0000	1.80
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	1 May 2018 09:34:09 -0000	1.81
@@ -233,7 +233,7 @@
     See <a href="/api-doc/proc-view?proc=template::list::format::create">template::list::format::create</a> for details.
 
     @param filter_form     Whether or not we create the form data structure for the listfilters-form tag to dynamically generate a form to specify filter criteria. Default 0 will not generate form. Set to 1 to generate form to use listfilters-form tag.
-    @param bulk_action_click_functon Javascript function name to call when bulk action buttons are clicked.
+    @param bulk_action_click_functon JavaScript function name to call when bulk action buttons are clicked.
 
     @see template::list::element::create
     @see template::list::filter::create
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -N -r1.62 -r1.63
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	25 Apr 2018 08:42:17 -0000	1.62
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	1 May 2018 09:34:09 -0000	1.63
@@ -353,7 +353,7 @@
     type of the field. E.g. a value of %text/% allows any kind of text
     files to be selected, while %pdf% could be used for pdf-files. If
     nothing is specified, all file-types are presented.
-    <li> <em>javascript</em>: provide javascript code to configure
+    <li> <em>javascript</em>: provide JavaScript code to configure
     the xinha widget and its plugins. The configure object is called <code>xinha_config</code>.
     </ul>
 
@@ -526,7 +526,7 @@
 
             #
             # The following trick with document.write is for providing
-            # reasonable behavior when javascript is turned completely
+            # reasonable behavior when JavaScript is turned completely
             # off.
             #
             append output \
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 -N -r1.14 -r1.15
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	1 Oct 2017 12:16:05 -0000	1.14
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	1 May 2018 09:34:09 -0000	1.15
@@ -271,7 +271,7 @@
 	  var f_url = document.getElementById('f_url');
 	  var url = f_url.value;
 	  if (!url) {
-	    alert('You have to enter an URL first');
+	    alert('You have to enter a URL first');
 	    f_url.focus();
 	    return false;
 	  }