Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -r1.93.2.59 -r1.93.2.60
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	24 May 2023 09:28:28 -0000	1.93.2.59
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	30 May 2023 10:01:46 -0000	1.93.2.60
@@ -132,7 +132,7 @@
     :method type=signed {name input} {
       #
       # Check, if a value is a signed value, signed by
-      # ::security::parameter::signed. Note, that this is a converting
+      # ::security::parameter::signed. Note that this is a converting
       # checker. Therefore, call it always with "signed,convert" to
       # obtain the value which was signed.
       #
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 -r1.68.2.17 -r1.68.2.18
--- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	13 Apr 2022 09:05:14 -0000	1.68.2.17
+++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	30 May 2023 10:01:46 -0000	1.68.2.18
@@ -37,7 +37,7 @@
   ns_log notice "AOLserver is not patched for bgdelivery, NOT loading bgdelivery"
 
   ad_proc -public ad_returnfile_background {-client_data status_code mime_type filename} {
-    Deliver the given file to the requestor in the background. This proc uses the
+    Deliver the given file to the requester in the background. This proc uses the
     background delivery thread to send the file in an event-driven manner without
     blocking a request thread. This is especially important when large files are
     requested over slow (e.g. dial-ip) connections.
@@ -521,7 +521,7 @@
   {-content_disposition}
   status_code mime_type filename} {
 
-    Deliver the given file to the requestor in the background. This proc uses the
+    Deliver the given file to the requester in the background. This proc uses the
     background delivery thread to send the file in an event-driven manner without
     blocking a request thread. This is especially important when large files are
     requested over slow connections.
@@ -720,13 +720,13 @@
     if {$use_h264} {
       #: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]] \
+          -context [list [::xo::cc requester],[::xo::cc url],$query [ns_conn start]] \
           -query $query \
           -client_data $client_data
     } else {
       #: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]] \
+          -context [list [::xo::cc requester],[::xo::cc url],$query [ns_conn start]] \
           -client_data $client_data
     }
     #
@@ -783,7 +783,7 @@
 
 ad_proc -public ad_returnfile_background {{-client_data ""} status_code mime_type filename} {
 
-  Deliver the given file to the requestor in the background.  When
+  Deliver the given file to the requester in the background.  When
   using NaviServer with its writer threads, ns_returnfile is perfectly
   fine since it delivers its contents already in the background.
 
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 -r1.75.2.39 -r1.75.2.40
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	27 Feb 2023 18:39:14 -0000	1.75.2.39
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	30 May 2023 10:01:46 -0000	1.75.2.40
@@ -228,7 +228,7 @@
 
   Class create ConnectionContext -superclass Context -parameter {
     user_id
-    requestor
+    requester
     user
     url
     mobile
@@ -374,6 +374,16 @@
       set ::ad_conn(file) ""
     }
   }
+
+  ConnectionContext instproc requestor {} {
+    #
+    # Helper method to ease migration to the name without the spelling
+    # error.
+    #
+    ad_log_deprecated method "... requestor" "... requester"
+    return [expr {[info exists :requester] ? ${:requester} : ${:requester}}]
+  }
+  
   ConnectionContext instproc lang {} {
     return [string range [:locale] 0 1]
   }
@@ -449,7 +459,7 @@
     set pa [expr {[ns_conn isconnected] ? [ad_conn peeraddr] : "nowhere"}]
 
     if {${:user_id} != 0} {
-      set :requestor ${:user_id}
+      set :requester ${:user_id}
     } else {
       #
       # For requests bypassing the ordinary connection setup
@@ -460,21 +470,21 @@
         set cookie_list [ad_get_signed_cookie_with_expr "ad_session_id"]
         set cookie_data [split [lindex $cookie_list 0] {,}]
         set untrusted_user_id [lindex $cookie_data 1]
-        set :requestor $untrusted_user_id
+        set :requester $untrusted_user_id
       } on error {errorMsg } {
-        set :requestor 0
+        set :requester 0
       }
     }
 
-    # if user not authorized, use peer address as requestor key
-    if {${:requestor} == 0} {
-      set :requestor $pa
+    # if user not authorized, use peer address as requester key
+    if {${:requester} == 0} {
+      set :requester $pa
       set :user "client from $pa"
     } else {
-      set user_url [acs_community_member_admin_url -user_id ${:requestor}]
-      set :user "<a href='$user_url'>${:requestor}</a>"
+      set user_url [acs_community_member_admin_url -user_id ${:requester}]
+      set :user "<a href='$user_url'>${:requester}</a>"
     }
-    #:log "--i requestor = ${:requestor}"
+    #:log "--i requester = ${:requester}"
 
     :process_query_parameter
   }
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 -r1.40.2.8 -r1.40.2.9
--- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	6 Dec 2020 08:37:05 -0000	1.40.2.8
+++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	30 May 2023 10:01:46 -0000	1.40.2.9
@@ -647,7 +647,7 @@
       set block [read $S]
       :notify reply_data $block
       append :data $block
-      #:debug "reveived [string length $block] bytes"
+      #:debug "received [string length $block] bytes"
     }
   }
 
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 -r1.67.2.55 -r1.67.2.56
--- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	24 Jan 2023 16:32:36 -0000	1.67.2.55
+++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl	30 May 2023 10:01:46 -0000	1.67.2.56
@@ -151,10 +151,10 @@
   #
   # A class to keep simple statistics
   #
-  Class create ThrottleStat -parameter { type requestor timestamp ip_address url }
+  Class create ThrottleStat -parameter { type requester timestamp ip_address url }
 
   #
-  # class for throtteling eager requestors or to block duplicate requests
+  # class for throtteling eager requesters or to block duplicate requests
   #
   Class create Throttle -parameter {
     {timeWindow 10}
@@ -172,12 +172,12 @@
     next
   }
 
-  Throttle instproc add_statistics { type requestor ip_address url query } {
+  Throttle instproc add_statistics { type requester ip_address url query } {
     #set furl [expr {$query ne "" ? "$url?$query" : $url}]
     incr :${type}s
-    # :log "++++ add_statistics   -type $type -user_id $requestor "
+    # :log "++++ add_statistics   -type $type -user_id $requester "
     set entry [ThrottleStat new -childof [self]::stats \
-                   -type $type -requestor $requestor \
+                   -type $type -requester $requester \
                    -timestamp [clock seconds] \
                    -ip_address $ip_address -url $url]
   }
@@ -191,7 +191,7 @@
       return ""
     } else {
       foreach stat $data {
-        lappend output [list [$stat type] [$stat requestor] \
+        lappend output [list [$stat type] [$stat requester] \
                             [$stat timestamp] [$stat ip_address] [$stat url]]
       }
       return $output
@@ -700,10 +700,10 @@
       } \
       -set seconds [clock seconds]
 
-  UrlCounter instproc add_url_stat {url ms requestor} {
-    #ns_log notice "UrlCounter.add_url_stat($url,$ms,$requestor)"
+  UrlCounter instproc add_url_stat {url ms requester} {
+    #ns_log notice "UrlCounter.add_url_stat($url,$ms,$requester)"
     my ++
-    # :log "[self proc] $url /$ms/ $requestor (${:c})"
+    # :log "[self proc] $url /$ms/ $requester (${:c})"
     incr :t $ms
     #
     # Set up a value for the right ordering in last 100.  We take the
@@ -713,7 +713,7 @@
     #
     set now [clock seconds]
     set order [expr {($now - [[self class] set seconds]) * 10000 + ${:c}}]
-    set :last100([expr {$order%99}]) [list $now $order $url $ms $requestor]
+    set :last100([expr {$order%99}]) [list $now $order $url $ms $requester]
 
     set has_param [regexp {^(.*)[?]} $url _ url]
     if {$has_param} {set url $url?...}
@@ -827,11 +827,11 @@
     Return a list of lists containing information about current
     users. If the switch 'full' is used this list contains these users
     who have used the server within the monitoring time window (per
-    default: 10 minutes). Otherwise, just a list of requestors
+    default: 10 minutes). Otherwise, just a list of requesters
     (user_ids or peer addresses for unauthenticated requests) is
     returned.
 
-    If "-full" is used for each requestor the last peer address, the
+    If "-full" is used for each requester the last peer address, the
     last timestamp, the number of hits, a list of values for the
     activity calculations and the number of ip-switches the user is
     returned.
@@ -1027,8 +1027,8 @@
     }
   }
 
-  Users proc community_access {requestor pa community_id} {
-    [:current_object] community_access $requestor $pa $community_id
+  Users proc community_access {requester pa community_id} {
+    [:current_object] community_access $requester $pa $community_id
   }
 
   Users proc entered_community {key now community_id data reason} {
@@ -1769,7 +1769,7 @@
     ::xo::ConnectionContext require -url ${:url}
   }
 
-  set :requestor [::xo::cc requestor]
+  set :requester [::xo::cc requester]
   set :user      [::xo::cc user]
   set :query     [ad_conn query]
   set :pa        [ad_conn peeraddr]
@@ -1803,7 +1803,7 @@
   # actually needed.
   #
   set hdrs [ns_conn headers]
-  lassign [:throttle_check ${:requestor} ${:pa} ${:url} \
+  lassign [:throttle_check ${:requester} ${:pa} ${:url} \
                [ns_conn start] [ns_guesstype [ns_conn url]] ${:community_id} \
                [list \
                     pool [ns_conn pool] \
@@ -1819,21 +1819,21 @@
   # result > 0 This web server is only open for interactive usage
   #
   if {$repeat > 0} {
-    :add_statistics repeat ${:requestor} ${:pa} ${:url} ${:query}
+    :add_statistics repeat ${:requester} ${:pa} ${:url} ${:query}
     if {$repeat > 1} {
       set result 1
     } else {
       set result -1
     }
   } elseif {$toMuch} {
-    :log "*** we have to refuse user ${:requestor} with $toMuch requests"
-    :add_statistics reject ${:requestor} ${:pa} ${:url} ${:query}
+    :log "*** we have to refuse user ${:requester} with $toMuch requests"
+    :add_statistics reject ${:requester} ${:pa} ${:url} ${:query}
     set result $toMuch
   } elseif {$ms} {
-    :log "*** we have to block user ${:requestor} for $ms ms"
-    :add_statistics throttle ${:requestor} ${:pa} ${:url} ${:query}
+    :log "*** we have to block user ${:requester} for $ms ms"
+    :add_statistics throttle ${:requester} ${:pa} ${:url} ${:query}
     after $ms
-    :log "*** continue for user ${:requestor}"
+    :log "*** continue for user ${:requester}"
     set result 0
   } else {
     set result 0
@@ -1875,7 +1875,7 @@
 ####
 throttle proc postauth args {
   # :log "+++ [self proc] [ad_conn url] auth ms [:partialtimes] [ns_conn isconnected]"
-  # :do set ::cookies(${:requestor}) [ns_set get [ns_conn headers] Cookie]
+  # :do set ::cookies(${:requester}) [ns_set get [ns_conn headers] Cookie]
   set r [:check]
   if {$r < 0} {
     set url ${:url}
@@ -1910,7 +1910,7 @@
   :get_context
   # :log "CT=[ns_set array [ns_conn outputheaders]] -- ${:url}"
 
-  :add_url_stat ${:method} ${:url} [:partialtimes] ${:requestor} ${:pa} \
+  :add_url_stat ${:method} ${:url} [:partialtimes] ${:requester} ${:pa} \
       [ns_set iget [ns_conn outputheaders] Content-Type] [ns_conn pool]
   unset :context_initialized
   return filter_ok
@@ -1919,7 +1919,7 @@
 throttle proc community_access {community_id} {
   :get_context
   if {${:community_id} eq ""} {
-    :users community_access ${:requestor} ${:pa} $community_id
+    :users community_access ${:requester} ${:pa} $community_id
   }
 }
 
Index: openacs-4/packages/xotcl-request-monitor/www/last100.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last100.tcl,v
diff -u -r1.12.2.4 -r1.12.2.5
--- openacs-4/packages/xotcl-request-monitor/www/last100.tcl	25 Mar 2022 19:49:55 -0000	1.12.2.4
+++ openacs-4/packages/xotcl-request-monitor/www/last100.tcl	30 May 2023 10:01:46 -0000	1.12.2.5
@@ -41,9 +41,9 @@
     $att
 
 foreach l $stat {
-  lassign $l timestamp c url ms requestor
+  lassign $l timestamp c url ms requester
 
-  set user_info   [xo::request_monitor_user_info $requestor]
+  set user_info   [xo::request_monitor_user_info $requester]
   set user_string [dict get $user_info label]
 
   #
@@ -63,7 +63,7 @@
   }
   t1 add -time [clock format $timestamp -format "%H:%M:%S"] \
       -user $user_string \
-      -user.href [export_vars -base last-requests {{request_key $requestor}}] \
+      -user.href [export_vars -base last-requests {{request_key $requester}}] \
       -ms $ms \
       -url $url \
       -url.href $href
Index: openacs-4/packages/xotcl-request-monitor/www/last101.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last101.tcl,v
diff -u -r1.9.2.5 -r1.9.2.6
--- openacs-4/packages/xotcl-request-monitor/www/last101.tcl	25 Mar 2022 19:49:55 -0000	1.9.2.5
+++ openacs-4/packages/xotcl-request-monitor/www/last101.tcl	30 May 2023 10:01:46 -0000	1.9.2.6
@@ -39,13 +39,13 @@
     $att
 
 foreach l $stat {
-  lassign $l timestamp c url ms requestor
-  set user_info   [xo::request_monitor_user_info $requestor]
+  lassign $l timestamp c url ms requester
+  set user_info   [xo::request_monitor_user_info $requester]
   set user_string [dict get $user_info label]
 
   t1 add -time [clock format $timestamp -format "%H:%M:%S"] \
       -user $user_string \
-      -user.href [export_vars -base last-requests {{request_key $requestor}}] \
+      -user.href [export_vars -base last-requests {{request_key $requester}}] \
       -ms $ms \
       -url $url
 }
Index: openacs-4/packages/xotcl-request-monitor/www/running.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/running.tcl,v
diff -u -r1.10.2.5 -r1.10.2.6
--- openacs-4/packages/xotcl-request-monitor/www/running.tcl	22 Dec 2022 02:51:37 -0000	1.10.2.5
+++ openacs-4/packages/xotcl-request-monitor/www/running.tcl	30 May 2023 10:01:46 -0000	1.10.2.6
@@ -50,20 +50,20 @@
 
 set sortable_requests [list]
 foreach {key elapsed} $running_requests {
-  lassign [split $key ,] requestor url
+  lassign [split $key ,] requester url
   set ms [format %.2f [expr {[throttle ms -start_time $elapsed]/1000.0}]]
-  set user_info [xo::request_monitor_user_info $requestor]
+  set user_info [xo::request_monitor_user_info $requester]
   set user_string [dict get $user_info label]
-  set user_url "last-requests?request_key=$requestor"
+  set user_url "last-requests?request_key=$requester"
   lappend sortable_requests [list $user_string $user_url $url $ms ""]
 }
 foreach {index entry} $background_requests {
   lassign $entry key elapsed
-  lassign [split $key ,] requestor url
+  lassign [split $key ,] requester url
   set ms [format %.2f [expr {[throttle ms -start_time $elapsed]/-1000.0}]]
-  set user_info [xo::request_monitor_user_info $requestor]
+  set user_info [xo::request_monitor_user_info $requester]
   set user_string [dict get $user_info label]
-  set user_url "last-requests?request_key=$requestor"
+  set user_url "last-requests?request_key=$requester"
   lappend sortable_requests [list $user_string $user_url $url $ms "::bgdelivery"]
 }
 if {[ns_info name] eq "NaviServer"}  {
@@ -84,17 +84,17 @@
       ns_log notice "ns_writer list returns unknown number ([llength $entry]) of elements"
       continue
     }
-    lassign $clientdata requestor url
+    lassign $clientdata requester url
     set size [expr {$remaining+$done}]
     set percentage [expr {$done*100.0/$size}]
     set progress [format {%5.2f%% of %5.2f MB} $percentage [expr {$size/1000000.0}]]
     set ms [format %.2f [expr {([clock milliseconds] - $starttime*1000)/-1000.0}]]
-    if {[nsf::is integer $requestor]} {
-      set user_string [person::name -person_id $requestor]
+    if {[nsf::is integer $requester]} {
+      set user_string [person::name -person_id $requester]
     } else {
-      set user_string $requestor
+      set user_string $requester
     }
-    set user_url "last-requests?request_key=$requestor"
+    set user_url "last-requests?request_key=$requester"
     lappend sortable_requests [list $user_string $user_url $url $ms $thread $progress]
   }
 }
Index: openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl	6 Apr 2020 17:16:59 -0000	1.8.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/users-in-community.tcl	30 May 2023 10:01:46 -0000	1.8.2.3
@@ -24,10 +24,10 @@
 
 foreach e [lsort -decreasing -index 0 \
                [throttle users in_community $community_id]] {
-  lassign $e timestamp requestor
-  if {[info exists listed($requestor)]} continue
-  set listed($requestor) 1
-  set user_info [xo::request_monitor_user_info $requestor]
+  lassign $e timestamp requester
+  if {[info exists listed($requester)]} continue
+  set listed($requester) 1
+  set user_info [xo::request_monitor_user_info $requester]
   set time [clock format $timestamp -format "%H:%M"]
   t1 add -time $time -user [dict get $user_info label]
 }
Index: openacs-4/packages/xowf/lib/inclass-quiz-answer.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/inclass-quiz-answer.wf,v
diff -u -r1.1.2.6 -r1.1.2.7
--- openacs-4/packages/xowf/lib/inclass-quiz-answer.wf	21 Feb 2020 13:45:15 -0000	1.1.2.6
+++ openacs-4/packages/xowf/lib/inclass-quiz-answer.wf	30 May 2023 10:02:37 -0000	1.1.2.7
@@ -30,10 +30,10 @@
   # via a workflow definition ($obj is a workflow definition)
   set parent_id [$obj parent_id]
   #
-  # Use requestor instead of user_id to allow also participants, which
+  # Use requester instead of user_id to allow also participants, which
   # are not authroized.
   #
-  set name [ns_md5 $parent_id-[::xo::cc requestor]]
+  set name [ns_md5 $parent_id-[::xo::cc requester]]
   set parent_obj [::xo::db::CrClass get_instance_from_db -item_id $parent_id]
   :payload [list title [$parent_obj title] name $name]
 }
Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -r1.7.2.275 -r1.7.2.276
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	23 Mar 2023 08:40:13 -0000	1.7.2.275
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	30 May 2023 10:02:37 -0000	1.7.2.276
@@ -110,7 +110,7 @@
     } else {
       set correct_when "AND $correct_whens"
     }
-    #ns_log notice FINAL-correct_when='$correct_when'
+    ns_log notice FINAL-correct_when([self])='$correct_when'
     return $correct_when
   }
 
@@ -659,7 +659,9 @@
     dict set fc_dict cols [:get_named_sub_component_value columns]
 
     if {${:auto_correct}} {
-      dict set fc_dict correct_when [:comp_correct_when_from_value [:get_named_sub_component_value correct_when]]
+      dict set fc_dict correct_when \
+          [:comp_correct_when_from_value \
+               [:get_named_sub_component_value correct_when]]
     }
 
     set form [:form_markup -interaction text -intro_text $intro_text -body @answer@]
@@ -6391,7 +6393,7 @@
               set op ""
               regexp {^(\S+)\s} $a . op
               if {$op ni {eq lt le gt ge btwn AND}} {
-                ns_log notice "question_info [$form_obj name]: not suited for autoGrade: '$a'"
+                ns_log notice "question_info [$form_obj name]: not suited for autoGrade: '$a' op <$op>"
                 set autoGrade 0
                 break
               }
@@ -6424,6 +6426,7 @@
       } else {
         set autoGrade 0
       }
+      ns_log notice "question_is_autograded -> $autoGrade"
       return $autoGrade
     }