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.332.2.67 -r1.332.2.68 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 16 Dec 2020 17:09:10 -0000 1.332.2.67 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 18 Jan 2021 14:01:38 -0000 1.332.2.68 @@ -560,7 +560,7 @@ } if {$parent_id eq -100} { - # In case, we have a CR toplevel entry, we assume, we can + # In case, we have a CR top-level entry, we assume, we can # resolve it at least against the root folder of the current # package. set folder_path "" @@ -1320,7 +1320,7 @@ set standard_page [${:id} get_parameter $(stripped_name)_page] if {$standard_page ne ""} { # - # Allow for now mapped standard pages just on the toplevel + # Allow for now mapped standard pages just on the top-level # set page [:get_page_from_item_ref \ -allow_cross_package_item_refs false \ Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v diff -u -N -r1.23.2.7 -r1.23.2.8 --- openacs-4/packages/xowiki/tcl/tree-procs.tcl 15 Oct 2020 06:38:00 -0000 1.23.2.7 +++ openacs-4/packages/xowiki/tcl/tree-procs.tcl 18 Jan 2021 14:01:38 -0000 1.23.2.8 @@ -452,7 +452,7 @@ TreeRenderer=listdnd proc render {tree} { #:log "=== TreeRenderer=listdnd render $tree" # - # Do we allow reorder on the toplevel? + # Do we allow reorder on the top-level? # set id [$tree id]-topul if {[:min_level] == -1} { Index: openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/Attic/xowiki-admin-tests-procs.tcl,v diff -u -N -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl 9 Dec 2020 14:41:23 -0000 1.1.2.7 +++ openacs-4/packages/xowiki/tcl/test/xowiki-admin-tests-procs.tcl 18 Jan 2021 14:02:18 -0000 1.1.2.8 @@ -893,7 +893,7 @@ && $(parent_id) eq $folder_id && $(item_id) == 0}} 1 "\n$test:\n [array get {}]\n " ################################ - test subsection "Absolute to toplevel:" + test subsection "Absolute to top-level:" set l "/f1" set test [label "item_ref" "absolute existing topfolder short" $l] @@ -1310,7 +1310,7 @@ ? {expr {$(item_id) == $childpage_id && $(stripped_name) eq "childpage"}} 1 "\n$test:\n [array get {}]\n " set l [$p4 pretty_link] - set test [label "url" "toplevel en page" $l] + set test [label "url" "top-level en page" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $enpage_id && $(stripped_name) eq "page" && $(name) eq "en:page"}} 1 "\n$test:\n [array get {}]\n " @@ -1324,19 +1324,19 @@ # image links set l [$i1 pretty_link] - set test [label "url" "toplevel image" $l] + set test [label "url" "top-level image" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $image_id && $(stripped_name) eq "image.png" && $(name) eq "file:image.png"}} 1 "\n$test:\n [array get {}]\n " set l [$i2 pretty_link] - set test [label "url" "toplevel image" $l] + set test [label "url" "top-level image" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $subimage_id && $(stripped_name) eq "image2.png" && $(name) eq "file:image2.png"}} 1 "\n$test:\n [array get {}]\n " set l [$i3 pretty_link] - set test [label "url" "toplevel image" $l] + set test [label "url" "top-level image" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $childimage_id && $(stripped_name) eq "image3.png" && $(name) eq "file:image3.png" && $(method) eq ""}} 1 "\n$test:\n [array get {}]\n " @@ -1345,31 +1345,31 @@ # links set l [$l1 pretty_link] - set test [label "url" "toplevel link to page" $l] + set test [label "url" "top-level link to page" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $pagelink_id && $(stripped_name) eq "link1" && $(name) eq "link1" && $(method) eq ""}} 1 "\n$test:\n [array get {}]\n " set l [$l2 pretty_link] - set test [label "url" "toplevel link to folder" $l] + set test [label "url" "top-level link to folder" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $folderlink_id && $(stripped_name) eq "link2" && $(name) eq "link2" && $(method) eq ""}} 1 "\n$test:\n [array get {}]\n " set l [$l3 pretty_link] - set test [label "url" "toplevel link to page under folder" $l] + set test [label "url" "top-level link to page under folder" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $subpagelink_id && $(stripped_name) eq "link3" && $(name) eq "link3" && $(method) eq ""}} 1 "\n$test:\n [array get {}]\n " set l [$l4 pretty_link] - set test [label "url" "toplevel link to folder under folder" $l] + set test [label "url" "top-level link to folder under folder" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $subfolderlink_id && $(stripped_name) eq "link4" && $(name) eq "link4" && $(method) eq ""}} 1 "\n$test:\n [array get {}]\n " set l [$l5 pretty_link] - set test [label "url" "toplevel link to image under folder" $l] + set test [label "url" "top-level link to image under folder" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $subimagelink_id && $(stripped_name) eq "link5" && $(name) eq "link5" && $(method) eq ""}} 1 "\n$test:\n [array get {}]\n " @@ -1380,14 +1380,14 @@ # download set l /XOWIKI-TEST/download/file/image.png - set test [label "url" "toplevel image download" $l] + set test [label "url" "top-level image download" $l] array set "" [::$package_id item_info_from_url $l] ? {expr {$(item_id) == $image_id && $(stripped_name) eq "image.png" && $(name) eq "file:image.png" && $(method) eq "download"}} 1 "\n$test:\n [array get {}]\n " # download via link #set l /XOWIKI-TEST/download/file/link5 - #set test [label "url" "toplevel image download" $l] + #set test [label "url" "top-level image download" $l] #array set "" [::$package_id item_info_from_url $l] #test hint "

found $(item_id) should be $subimagelink_id" # ? {expr {$(item_id) == $subimagelink_id && $(stripped_name) eq "link5" Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v diff -u -N -r1.147.2.14 -r1.147.2.15 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 18 Dec 2020 14:37:06 -0000 1.147.2.14 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 18 Jan 2021 14:02:53 -0000 1.147.2.15 @@ -843,7 +843,7 @@ {text {\[::xowiki::validate_form_text\]} {Form must contain a valid template}} {page_order {\[::xowiki::validate_form_field page_order\]} {Page Order invalid; might only contain upper and lowercase letters, underscore, digits and dots}} - {form {\[::xowiki::validate_form_form\]} {Form must contain a toplevel HTML form element}} + {form {\[::xowiki::validate_form_form\]} {Form must contain a top-level HTML form element}} {form_constraints {\[::xowiki::validate_form_field form_constraints\]} {Invalid form constraints}} }} } 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.542.2.98 -r1.542.2.99 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 8 Jan 2021 11:45:30 -0000 1.542.2.98 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 18 Jan 2021 14:02:53 -0000 1.542.2.99 @@ -2624,7 +2624,7 @@ # The provided content and the returned result are strings # containing HTML (unless we have other rich-text encodings). # - # First get the potentially class sepcific regular expression + # First get the potentially class specific regular expression # definitions. # set baseclass [expr {[[:info class] exists RE] ? [:info class] : [self class]}]