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 -r1.22.2.1
--- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	7 Dec 2018 08:43:54 -0000	1.22
+++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl	8 May 2019 14:22:01 -0000	1.22.2.1
@@ -490,12 +490,12 @@
         if {$isFlag} {
           dict lappend doc switches $name
           dict lappend doc flags $name $flags
-          #my log "default_value $proc_name: $sw -> '[lindex $f 1]' <$pair/$f>"
+          #:log "default_value $proc_name: $sw -> '[lindex $f 1]' <$pair/$f>"
           if {$flags eq "switch" && $default eq ""} {
             set default "false"
           }
         }
-        #my log "default_value $proc_name: $sw -> 'default' <$pair/$f>"
+        #:log "default_value $proc_name: $sw -> 'default' <$pair/$f>"
         if {[llength $def] > 1} {lappend defaults $name $default}
       }
       dict set doc default_values $defaults
Index: openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl	21 Oct 2017 11:42:23 -0000	1.6
+++ openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl	8 May 2019 14:22:01 -0000	1.6.2.1
@@ -42,7 +42,7 @@
   library proc doc {comment} {
     ad_library $comment
     nsv_set [self]-loaded [info script] 1
-    #my log "--loaded nsv_set [self]-loaded [info script] 1"
+    #:log "--loaded nsv_set [self]-loaded [info script] 1"
   }
 
   library ad_proc require {{-package ""} filename} {
@@ -58,7 +58,7 @@
 
     @param filename filename without path and .tcl suffix
   } {
-    #my log "--loaded nsv_set [self]-loaded [info script] 1"
+    #:log "--loaded nsv_set [self]-loaded [info script] 1"
     nsv_set [self]-loaded [info script] 1
     set myfile [file tail [info script]]
     set dirname [file dirname [info script]]
@@ -68,16 +68,16 @@
       set otherfile [acs_root_dir]/packages/$package/tcl/$filename.tcl
     }
     set vn [self]
-    #my log "--exists otherfile $otherfile => [nsv_exists $vn $otherfile]"
+    #:log "--exists otherfile $otherfile => [nsv_exists $vn $otherfile]"
     if {[nsv_exists $vn $otherfile]} {
       nsv_set $vn $otherfile [lsort -unique [concat [nsv_get $vn $otherfile] [info script]]]
-      #my log "--setting nsv_set $vn $otherfile [lsort -unique [concat [nsv_get $vn $otherfile] $myfile]]"
+      #:log "--setting nsv_set $vn $otherfile [lsort -unique [concat [nsv_get $vn $otherfile] $myfile]]"
     } else {
       nsv_set $vn $otherfile [info script]
-      #my log "--setting nsv_set $vn $otherfile $myfile"
+      #:log "--setting nsv_set $vn $otherfile $myfile"
     }
-    #my log "--source when not loaded [self]-loaded $otherfile: [nsv_exists [self]-loaded $otherfile]"
-    #my log "--loaded = [lsort [nsv_array names [self]-loaded]]"
+    #:log "--source when not loaded [self]-loaded $otherfile: [nsv_exists [self]-loaded $otherfile]"
+    #:log "--loaded = [lsort [nsv_array names [self]-loaded]]"
 
     if {![nsv_exists [self]-loaded $otherfile]} {
       :log "--sourcing $otherfile"
@@ -101,7 +101,7 @@
     set myfile [file tail [info script]]
     set dirname [file dirname [info script]]
     set vn [self]
-    #my log "--check nsv_exists $vn $dirname/$myfile [nsv_exists $vn $dirname/$myfile]"
+    #:log "--check nsv_exists $vn $dirname/$myfile [nsv_exists $vn $dirname/$myfile]"
     if {[nsv_exists $vn $dirname/$myfile]} {
       foreach file [nsv_get $vn $dirname/$myfile] {
         :log "--sourcing dependent $file"
Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v
diff -u -N -r1.41.2.3 -r1.41.2.4
--- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	15 Mar 2019 08:48:21 -0000	1.41.2.3
+++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	8 May 2019 14:22:01 -0000	1.41.2.4
@@ -88,7 +88,7 @@
     keep_cc true means that the original connection context
     is preserved (i.e. not altered) in case it exists already.
   } {
-    #my msg "--i [self args], URL=$url, init_url=$init_url"
+    #:msg "--i [self args], URL=$url, init_url=$init_url"
 
     if {[info exists ad_doc] && [api_page_documentation_mode_p]} {
       ad_parse_documentation_string $ad_doc doc_elements
@@ -98,7 +98,7 @@
 
     if {$url eq "" && $init_url} {
       set url [root_of_host [ad_host]][ns_conn url]
-      #my log "--CONN ns_conn url -> $url"
+      #:log "--CONN ns_conn url -> $url"
     }
 
     # get package_id from url in case it is not known
@@ -133,9 +133,9 @@
     # it want to force a refresh of the login, even if some pages 
     # might not require the real user_id.
     #
-    #my msg "force [$package_id force_refresh_login] &&\
+    #:msg "force [::$package_id force_refresh_login] &&\
         #    [::xo::cc set untrusted_user_id] != [::xo::cc user_id]"
-    if {[$package_id force_refresh_login] && 
+    if {[::$package_id force_refresh_login] && 
         [::xo::cc set untrusted_user_id] != [::xo::cc user_id]} {
       auth::require_login
     }
@@ -173,10 +173,10 @@
       error "package_id must not be empty"
     }
 
-    #my log "--R $package_id exists? [:isobject ::$package_id] url='$url'"
+    #:log "--R $package_id exists? [:isobject ::$package_id] url='$url'"
 
     if {![:isobject ::$package_id]} {
-      #my log "--R we have to create ::$package_id //url='$url'"
+      #:log "--R we have to create ::$package_id //url='$url'"
       #
       # To make initialization code generic, we obtain from the
       # package_id the class of the package.
@@ -275,7 +275,7 @@
   ::xo::Package instproc init args {
     set id ${:id}
     set package_url [lindex [site_node::get_url_from_object_id -object_id $id] 0]
-    #my log "--R creating package_url='$package_url'"
+    #:log "--R creating package_url='$package_url'"
     if {$package_url ne ""} {
       array set info [site_node::get -url $package_url]
       #set package_url $info(url)
@@ -296,13 +296,13 @@
       set root [root_of_host [ad_host]]
       regexp "^${root}(.*)$" $package_url _ package_url
     }
-    #my log "--R package_url= $package_url (was $info(url))"
+    #:log "--R package_url= $package_url (was $info(url))"
     :package_url $package_url
 
     if {[info exists :url] && [info exists root]} {
       regexp "^${root}(.*)$" ${:url} _ :url
     } elseif {![info exists :url]} {
-      #my log "--R we have no url, use package_url '$package_url'"
+      #:log "--R we have no url, use package_url '$package_url'"
       # if we have no more information, we use the package_url as actual url
       set :url $package_url
     }
@@ -352,17 +352,17 @@
       ::xo::db::CrFolder register_content_types \
           -folder_id $folder_id \
           -content_types $content_types
-      #my log "returning from cache folder_id $folder_id"
+      #:log "returning from cache folder_id $folder_id"
       return $folder_id
     }]
-    #my log "returning from require folder_id $folder_id"
+    #:log "returning from require folder_id $folder_id"
     return $folder_id
   }
 
   ::xo::Package instproc set_url {-url} {
     :url $url
     set :object [string range [:url] [string length [:package_url]] end]
-    #my msg "--R object set to ${:object}, url=$url, [:serialize]"
+    #:msg "--R object set to ${:object}, url=$url, [:serialize]"
   }
 
   ::xo::Package instproc handle_http_caching {} {
@@ -403,7 +403,7 @@
   }
 
   ::xo::Package instproc return_page {-adp:required -variables -form} {
-    #my log "--vars=[self args]"
+    #:log "--vars=[self args]"
     set __vars [list]
     foreach _var $variables {
       if {[llength $_var] == 2} {
@@ -443,7 +443,7 @@
     if { [lang::util::translator_mode_p] } {
       set text [::xo::localize $text 1]
     }
-    #my log "--after adp $text"
+    #:log "--after adp $text"
 
     return [::xo::remove_escapes $text]
   }
Index: openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl,v
diff -u -N -r1.24 -r1.24.2.1
--- openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl	22 Jun 2018 20:11:55 -0000	1.24
+++ openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl	8 May 2019 14:22:02 -0000	1.24.2.1
@@ -192,7 +192,7 @@
       # there).  We simply iterate here of the classes of packages
       # (only a few exist).
       # 
-      #my log "--p looking for $parameter_name in superclass of package_key=$package_key"
+      #:log "--p looking for $parameter_name in superclass of package_key=$package_key"
       set success 0
       set pkg_class [::xo::PackageMgr get_package_class_from_package_key $package_key]
       if {$pkg_class ne ""} {
@@ -309,7 +309,7 @@
     set key [:parameter_name]
     set nsv_array_name [:per_package_id_name $package_id]
     if {[nsv_exists $nsv_array_name $key]} {
-      #my log "--parameter get <$key> from $nsv_array_name --> '[nsv_get $nsv_array_name $key]'"
+      #:log "--parameter get <$key> from $nsv_array_name --> '[nsv_get $nsv_array_name $key]'"
       set :__success 1
       return [nsv_get $nsv_array_name $key]
     }
@@ -322,12 +322,12 @@
     #     foreach cls $package_class_hierarchy {
     #       set nsv_array_name [:per_package_class_name $cls]
     #       if {[nsv_exists $nsv_array_name $key]} {
-    #         #my log "--parameter get <$key> from $nsv_array_name --> '[nsv_get $nsv_array_name $key]'"
+    #         #:log "--parameter get <$key> from $nsv_array_name --> '[nsv_get $nsv_array_name $key]'"
     #         return [nsv_get $nsv_array_name $key]
     #       }
     #     }
     #
-    #my log "--parameter get <$key> from default of [:package_key] --> '[:default_value]'"
+    #:log "--parameter get <$key> from default of [:package_key] --> '[:default_value]'"
     set :__success 0
     return [:default_value]
   }
Index: openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl,v
diff -u -N -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl	7 May 2019 12:38:01 -0000	1.13.2.1
+++ openacs-4/packages/xotcl-core/tcl/10-recreation-procs.tcl	8 May 2019 14:22:02 -0000	1.13.2.2
@@ -57,12 +57,12 @@
     {instreinit}
   } -superclass ::xotcl::Class \
       -instproc recreate {obj args} {
-        #my log "### recreateclass instproc $obj <$args>"
+        #:log "### recreateclass instproc $obj <$args>"
         # the minimal reconfiguration is to set the class and remove methods
         $obj class [self]
         foreach p [$obj info procs] {$obj proc $p {} {}}
         if {![info exists :instrecreate]} {
-          #my log "### no instrecreate for $obj <$args>"
+          #:log "### no instrecreate for $obj <$args>"
           next
           return
         }
@@ -72,15 +72,15 @@
           # set defaults and run configure
           $obj set_instance_vars_defaults
           $obj configure {*}$args
-          #my log "### instproc recreate $obj + configure $args ..."
+          #:log "### instproc recreate $obj + configure $args ..."
         }
         if {[info exists :instreinit]} {
-          #my log "### instreinit for $obj <$args>"
+          #:log "### instreinit for $obj <$args>"
           $obj init 
-          #my log "### instproc recreate $obj + init ..."
+          #:log "### instproc recreate $obj + init ..."
         }
       } -proc recreate {obj args} {
-        #my log "### recreateclass proc $obj <$args>"
+        #:log "### recreateclass proc $obj <$args>"
         # the minimal reconfiguration is to set the class and remove methods
         $obj class [self]
         foreach p [$obj info instprocs] {$obj instproc $p {} {}}
@@ -116,7 +116,7 @@
     @param args arguments passed to recreate (might contain parameters)
   } {
     # clean on the class level
-    #my log "proc recreate $obj $args"
+    #:log "proc recreate $obj $args"
     foreach p [$obj info instprocs] {$obj instproc $p {} {}}
     $obj instmixin set {}
     $obj instfilter set {}
@@ -135,7 +135,7 @@
     @param args arguments passed to recreate (might contain parameters)
   } {
     # clean on the object level
-    #my log "+++ instproc recreate $obj <$args> old class = [$obj info class], new class = [self]"
+    #:log "+++ instproc recreate $obj <$args> old class = [$obj info class], new class = [self]"
     $obj filter set {}
     $obj mixin set {}
     set cl [self] 
Index: openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl,v
diff -u -N -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	18 Apr 2019 08:02:37 -0000	1.27.2.1
+++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl	8 May 2019 14:22:02 -0000	1.27.2.2
@@ -61,7 +61,7 @@
   OrderedComposite instproc add obj {
     lappend :__children $obj
     $obj set __parent [self]
-    #my log "-- adding __parent [self] to $obj -- calling after_insert"
+    #:log "-- adding __parent [self] to $obj -- calling after_insert"
     #$obj __after_insert
   }
   OrderedComposite instproc delete obj {
@@ -78,12 +78,12 @@
   OrderedComposite instproc destroy {} {
     # destroy all children of the ordered composite
     if {[info exists :__children]} {
-      #my log "--W destroying children ${:__children}"
+      #:log "--W destroying children ${:__children}"
       foreach c ${:__children} { 
         if {[:isobject $c]} {$c destroy}
       }
     }
-    #show_stack;my log "--W children murdered, now next, chlds=[:info children]"
+    #show_stack;:log "--W children murdered, now next, chlds=[:info children]"
     #namespace eval [self] {namespace forget *}  ;# for pre 1.4.0 versions
     next
   }
@@ -171,7 +171,7 @@
     $parent lappend __children [self]
     set :__parent $parent
     #my __after_insert
-    #my log "-- adding __parent  $parent to [self]"
+    #:log "-- adding __parent  $parent to [self]"
     return $r
   }
 
@@ -182,7 +182,7 @@
     set by ${:__orderby}
     set x [$a set $by]
     set y [$b set $by]
-    #my log "--value compare  $x $y] => [:__value_compare $x $y 0]"
+    #:log "--value compare  $x $y] => [:__value_compare $x $y 0]"
     return [:__value_compare $x $y 0]
   }
   OrderedComposite::IndexCompare instproc __value_compare {x y def} {
Index: openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl,v
diff -u -N -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl	10 Mar 2019 22:13:52 -0000	1.20.2.1
+++ openacs-4/packages/xotcl-core/tcl/40-thread-mod-procs.tcl	8 May 2019 14:22:02 -0000	1.20.2.2
@@ -87,9 +87,9 @@
 }
 
 ::xotcl::Object setExitHandler {
-  #my log "EXITHANDLER of request thread [pid]"
+  #:log "EXITHANDLER of request thread [pid]"
   #if {[catch {::xotcl::THREAD::Proxy detachAll} m]} {
-  #  #my log "EXITHANDLER error in detachAll $m"
+  #  #:log "EXITHANDLER error in detachAll $m"
   #}
 }
 
@@ -198,7 +198,7 @@
 
     ad_mutex_eval ${:mutex} {
       #my check_blueprint
-      #my log "after lock"
+      #:log "after lock"
       if {![nsv_exists [self class] [self]]} {
         if {[:lightweight]} {
           :log "CREATE lightweight thread"
@@ -212,7 +212,7 @@
         } else {
           :log "--created new [self class] as $tid pid=[pid]"
         }
-        #my log "--THREAD DO send [self] epoch = [ns_ictl epoch]"
+        #:log "--THREAD DO send [self] epoch = [ns_ictl epoch]"
         if {[:lightweight]} {
         } elseif {![ns_ictl epoch]} {
           #ns_log notice "--THREAD send [self] no epoch"
@@ -249,7 +249,7 @@
     }
     set :tid $tid
   }
-  #my log "calling [self class] ($tid, [pid]) $args"
+  #:log "calling [self class] ($tid, [pid]) $args"
   if {$async} {
     return [thread::send -async $tid $args]
   } else {
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 -N -r1.68.2.3 -r1.68.2.4
--- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	10 Apr 2019 13:11:21 -0000	1.68.2.3
+++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	8 May 2019 14:23:40 -0000	1.68.2.4
@@ -340,7 +340,7 @@
     :log ""
     ::sec_handler_reset
     set smsg [::xo::mr::bgdelivery encode_message [:mode] $msg]
-    #my log "-- sending to subscriber for [:key] $smsg ch=[:channel] \
+    #:log "-- sending to subscriber for [:key] $smsg ch=[:channel] \
         #        mode=[:mode], user_id [:user_id]"
     try {
       puts -nonewline [:channel] $smsg
@@ -400,7 +400,7 @@
     [:info class] instvar subscriptions
     lappend subscriptions([:key]) [self]
     incr ::subscription_count
-    #my log "-- cl=[:info class], subscriptions([:key]) = $subscriptions([:key])"
+    #:log "-- cl=[:info class], subscriptions([:key]) = $subscriptions([:key])"
     fconfigure [:channel] -translation binary
 
     fconfigure [:channel] -encoding utf-8
@@ -442,7 +442,7 @@
       :log "--enqueue"
       lappend :queue $data $request $encoding
     } else {
-      #my log "--send"
+      #:log "--send"
       set :spooling 1
       # puts -nonewline [:channel] $data
       # :done
@@ -715,13 +715,13 @@
     }
 
     if {$use_h264} {
-      #my log "MP4 q=[::xo::cc actual_query], h=[ns_set array [ns_conn outputheaders]]"
+      #:log "MP4 q=[::xo::cc actual_query], h=[ns_set array [ns_conn outputheaders]]"
       :do -async ::h264Spooler spool -delete $delete -channel $ch -filename $filename \
           -context [list [::xo::cc requestor],[::xo::cc url],$query [ns_conn start]] \
           -query $query \
           -client_data $client_data
     } else {
-      #my log "FILE SPOOL $filename"
+      #:log "FILE SPOOL $filename"
       :do -async ::fileSpooler spool -ranges $ranges -delete $delete -channel $ch -filename $filename \
           -context [list [::xo::cc requestor],[::xo::cc url],$query [ns_conn start]] \
           -client_data $client_data
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 -N -r1.75 -r1.75.2.1
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	5 Aug 2018 21:16:25 -0000	1.75
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	8 May 2019 14:23:40 -0000	1.75.2.1
@@ -52,14 +52,14 @@
       if {[ns_conn isconnected]} {
         set :actual_query [ns_conn query]
       }
-      #my log "--CONN ns_conn query = <$actual_query>"
+      #:log "--CONN ns_conn query = <$actual_query>"
     }
 
     set decodeCmd ns_urldecode
     if {$::xo::naviserver} {lappend decodeCmd --}
 
     # get the query parameters (from the url)
-    #my log "--P processing actual query ${:actual_query}"
+    #:log "--P processing actual query ${:actual_query}"
     foreach querypart [split ${:actual_query} &] {
       set name_value_pair [split $querypart =]
       set att_name [{*}$decodeCmd [lindex $name_value_pair 0]]
@@ -79,19 +79,19 @@
     # get the query parameters (from the form if necessary)
     if {[:istype ::xo::ConnectionContext]} {
       foreach param [array names ""] {
-        #my log "--cc check $param [info exists passed_args($param)]"
+        #:log "--cc check $param [info exists passed_args($param)]"
         set name [string range $param 1 end]
         if {![info exists passed_args($param)] &&
             [:exists_form_parameter $name]} {
-          #my log "--cc adding passed_args(-$name) [:form_parameter $name]"
+          #:log "--cc adding passed_args(-$name) [:form_parameter $name]"
           set passed_args($param) [:form_parameter $name]
         }
       }
     }
     
     # get the caller parameters (e.g. from the includelet call)
     if {[info exists caller_parameters]} {
-      #my log "--cc caller_parameters=$caller_parameters"
+      #:log "--cc caller_parameters=$caller_parameters"
       array set caller_param $caller_parameters
       
       foreach param [array names caller_param] {
@@ -108,12 +108,12 @@
       lappend parse_args $param $passed_args($param)
     }
     
-    #my log "--cc calling parser eval [self] __parse $parse_args"
+    #:log "--cc calling parser eval [self] __parse $parse_args"
     if {[catch {[self] __parse {*}$parse_args} errorMsg]} {
       ad_return_complaint 1 [ns_quotehtml $errorMsg]
       ad_script_abort
     }
-    #my msg "--cc qp [array get :queryparm] // ${:actual_query}"
+    #:msg "--cc qp [array get :queryparm] // ${:actual_query}"
   }
 
   Context instproc original_url_and_query args {
@@ -134,7 +134,7 @@
   }
   
   Context instproc exists_query_parameter {name} {
-    #my log "--qp exists $name => [info exists :queryparm($name)]"
+    #:log "--qp exists $name => [info exists :queryparm($name)]"
     info exists :queryparm($name)
   }
   Context instproc get_all_query_parameter {} {
@@ -240,11 +240,11 @@
     }
 
     if {![info exists url]} {
-      #my log "--CONN ns_conn url"
+      #:log "--CONN ns_conn url"
       set url [ns_conn url]
     }
     set package_id [:require_package_id_from_url -package_id $package_id $url]
-    #my log "--i [self args] URL='$url', pkg=$package_id"
+    #:log "--i [self args] URL='$url', pkg=$package_id"
 
     # get locale; TODO at some time, we should get rid of the ad_conn init problem
     if {[ns_conn isconnected]} {
@@ -268,10 +268,10 @@
           -locale $locale \
           -url $url
       #::xo::show_stack
-      #my msg "--cc ::xo::cc created $url [::xo::cc serialize]"
+      #:msg "--cc ::xo::cc created $url [::xo::cc serialize]"
       ::xo::cc destroy_on_cleanup
     } else {
-      #my msg "--cc ::xo::cc reused $url -package_id $package_id"
+      #:msg "--cc ::xo::cc reused $url -package_id $package_id"
       ::xo::cc configure \
           -url $url \
           -actual_query $actual_query \
@@ -335,7 +335,7 @@
   }
 
   ConnectionContext instproc returnredirect {-allow_complete_url:switch url} {
-    #my log "--rp"
+    #:log "--rp"
     set :__continuation [expr {$allow_complete_url 
                                  ? [list ad_returnredirect -allow_complete_url $url] 
                                  : [list ad_returnredirect $url]}]
@@ -369,7 +369,7 @@
       set user_url [acs_community_member_admin_url -user_id ${:requestor}]
       set :user "<a href='$user_url'>${:requestor}</a>"
     }
-    #my log "--i requestor = ${:requestor}"
+    #:log "--i requestor = ${:requestor}"
     
     :process_query_parameter
   }
@@ -442,26 +442,26 @@
       set granted [permission::permission_p -no_login -party_id $party_id \
                        -object_id $object_id \
                        -privilege $privilege]
-      #my msg "--p lookup $key ==> $granted uid=[:user_id] uuid=${:untrusted_user_id}"
+      #:msg "--p lookup $key ==> $granted uid=[:user_id] uuid=${:untrusted_user_id}"
       if {$granted || ${:user_id} == ${:untrusted_user_id}} {
         set $key $granted
         return $granted
       }
       # The permission is not granted for the public.
       # We force the user to login
-      #my log "-- require login"
+      #:log "-- require login"
       #auth::require_login
       return 0
     }
 
     set key :permission($object_id,$privilege,$party_id)
     if {[info exists $key]} {return [set $key]}
-    #my msg "--p lookup $key"
+    #:msg "--p lookup $key"
     set $key [permission::permission_p -no_login \
                   -party_id $party_id \
                   -object_id $object_id \
                   -privilege $privilege]
-    #my log "--  context return [set :$key]"
+    #:log "--  context return [set :$key]"
     #set :$key
   }
   
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.76.2.13 -r1.76.2.14
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	24 Apr 2019 12:22:44 -0000	1.76.2.13
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	8 May 2019 14:23:40 -0000	1.76.2.14
@@ -789,7 +789,7 @@
 
     CrItem instproc fix_content {revision_id content} {
       [:info class] instvar storage_type
-      # :my msg "--long_text_slots: [[:info class] array get long_text_slots]"
+      # ::msg "--long_text_slots: [[:info class] array get long_text_slots]"
       # foreach {slot_name slot} [[:info class] array get long_text_slots] {
       #   set cls [$slot domain]
       #   set content [set :$slot_name]
@@ -1247,7 +1247,7 @@
     set page_id ${:item_id}
     set live_revision_id [::xo::db::sql::content_item get_live_revision -item_id $page_id]
     set package_id ${:package_id}
-    set base [$package_id url]
+    set base [::$package_id url]
     set sql [::xo::dc select \
                  -map_function_names true \
                  -vars "ci.name, r.revision_id as version_id,\
Index: openacs-4/packages/xotcl-core/tcl/doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/doc-procs.tcl,v
diff -u -N -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/xotcl-core/tcl/doc-procs.tcl	5 Apr 2019 12:11:40 -0000	1.6.2.2
+++ openacs-4/packages/xotcl-core/tcl/doc-procs.tcl	8 May 2019 14:23:40 -0000	1.6.2.3
@@ -28,7 +28,7 @@
         foreach methodName [xo::getObjectProperty $e $kind] {
             if {$documented_methods} {
                 set proc_index [::xo::api proc_index $scope $e $kind $methodName]
-                #my msg "check $methodName => [nsv_exists api_proc_doc $proc_index]"
+                #:msg "check $methodName => [nsv_exists api_proc_doc $proc_index]"
                 if {[nsv_exists api_proc_doc $proc_index]} {
                     lappend methods $prefix$methodName
                 }
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.40 -r1.40.2.1
--- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	3 Nov 2018 18:58:49 -0000	1.40
+++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	8 May 2019 14:23:40 -0000	1.40.2.1
@@ -683,7 +683,7 @@
 
       } -instproc success {payload obj} {
         :debug "[string length $payload] bytes payload"
-        #if {[string length $payload]<600} {my log payload=$payload}
+        #if {[string length $payload]<600} {:log payload=$payload}
         # this is called as after a successful request
         :finalize $obj "JOB_COMPLETED" $payload
 
Index: openacs-4/packages/xotcl-core/tcl/policy-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/policy-procs.tcl,v
diff -u -N -r1.29 -r1.29.2.1
--- openacs-4/packages/xotcl-core/tcl/policy-procs.tcl	15 May 2018 21:41:34 -0000	1.29
+++ openacs-4/packages/xotcl-core/tcl/policy-procs.tcl	8 May 2019 14:23:40 -0000	1.29.2.1
@@ -21,21 +21,21 @@
     -package_id
     privilege object method
   } {
-    #my log "--p [self proc] [self args]"
+    #:log "--p [self proc] [self args]"
     if {$privilege eq "nobody"} {
       return 0
     }
     if {$privilege eq "everybody" || $privilege eq "public" || $privilege eq "none"} {
       return 1
     }
 
-    #my log "--login $login user_id=$user_id uid=[::xo::cc user_id] untrusted=[::xo::cc set untrusted_user_id]"
+    #:log "--login $login user_id=$user_id uid=[::xo::cc user_id] untrusted=[::xo::cc set untrusted_user_id]"
     if {$login && $user_id == 0} {
       #
       # The tests below depend on the user_id.
       # The main reason, we call auth:require_login here is to check for exired logins.
       #
-      #my log "--p [self proc] calls require_login"
+      #:log "--p [self proc] calls require_login"
       set user_id [auth::require_login]
     }
 
@@ -66,7 +66,7 @@
       if {![info exists package_id]} {set package_id [::xo::cc package_id]}
       set allowed [$object privilege=$privilege -login $login $user_id $package_id $method]
     }
-    #my msg "--check_privilege {$privilege $object $method} ==> $allowed"
+    #:msg "--check_privilege {$privilege $object $method} ==> $allowed"
     return $allowed
   }
 
@@ -76,7 +76,7 @@
     # or it might be conditional (primitive or complex) in a list of privileges
 
     foreach p $permission {
-      #my msg "checking permission '$p'"
+      #:msg "checking permission '$p'"
       set condition [lindex $p 0]
       if {[llength $condition]>1} {
         # we have a condition
@@ -136,7 +136,7 @@
     if {![info exists package_id]} {
       set package_id [::xo::cc package_id]
     }
-    #my msg [info exists package_id]=>$package_id-[info exists :logical_package_id]
+    #:msg [info exists package_id]=>$package_id-[info exists :logical_package_id]
     set ctx "::xo::cc"
     if {$link ne ""} {
       #
@@ -154,12 +154,12 @@
 
     set allowed 0
     set permission [:get_permission $object $method]
-    #my log "--permission for o=$object, m=$method => $permission"
+    #:log "--permission for o=$object, m=$method => $permission"
 
-    #my log "--     user_id=$user_id uid=[::xo::cc user_id] untrusted=[::xo::cc set untrusted_user_id]"
+    #:log "--     user_id=$user_id uid=[::xo::cc user_id] untrusted=[::xo::cc set untrusted_user_id]"
     if {$permission ne ""} {
       lassign [:get_privilege -query_context $ctx $permission $object $method] kind p
-      #my msg "--privilege = $p kind = $kind"
+      #:msg "--privilege = $p kind = $kind"
       switch -- $kind {
         primitive {set allowed [:check_privilege -login false \
                                     -package_id $package_id -user_id $user_id \
@@ -171,7 +171,7 @@
         }
       }
     }
-    #my log "--p check_permissions {$object $method} : $permission ==> $allowed"
+    #:log "--p check_permissions {$object $method} : $permission ==> $allowed"
     return $allowed
   }
 
@@ -209,7 +209,7 @@
       }
     }
 
-    #my log "--p enforce_permissions {$object $method} : $permission ==> $allowed"
+    #:log "--p enforce_permissions {$object $method} : $permission ==> $allowed"
 
     if {!$allowed} {
       set untrusted_user_id [::xo::cc set untrusted_user_id]