Index: openacs-4/packages/xowf/tcl/atjob-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/atjob-procs.tcl,v diff -u -r1.8.2.6 -r1.8.2.7 --- openacs-4/packages/xowf/tcl/atjob-procs.tcl 17 Jun 2020 21:54:10 -0000 1.8.2.6 +++ openacs-4/packages/xowf/tcl/atjob-procs.tcl 1 Jul 2020 19:31:58 -0000 1.8.2.7 @@ -114,7 +114,7 @@ set cmd [dict get $__ia cmd] # - # Probably, we should add an URL to the form to get better + # Probably, we should add a URL to the form to get better # conformance for atjobs. # ::xo::ConnectionContext require -url / 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.69 -r1.7.2.70 --- openacs-4/packages/xowf/tcl/test-item-procs.tcl 17 Jun 2020 21:59:50 -0000 1.7.2.69 +++ openacs-4/packages/xowf/tcl/test-item-procs.tcl 1 Jul 2020 19:31:58 -0000 1.7.2.70 @@ -1248,7 +1248,7 @@ :method time_window_setup {parentObj:object {-time_window:required}} { # # Check the provided time_window values, adjust it if necessary, - # and make sure, accoding atjobs are provided. + # and make sure, according atjobs are provided. # set dtstart [dict get $time_window time_window.dtstart] set dtend [dict get $time_window time_window.dtend] @@ -2661,7 +2661,7 @@ :public method total_minutes {{-max_items:integer,0..1 ""} form_info} { # - # Compute the duration of an exam. When max_items is non-empty, + # Compute the duration of an exam. When max_items is nonempty, # sum the duration of all items. Otherwise, sum the duration # of the specified number of items. # Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v diff -u -r1.28.2.32 -r1.28.2.33 --- openacs-4/packages/xowf/tcl/xowf-procs.tcl 17 Jun 2020 22:01:52 -0000 1.28.2.32 +++ openacs-4/packages/xowf/tcl/xowf-procs.tcl 1 Jul 2020 19:31:58 -0000 1.28.2.33 @@ -466,7 +466,7 @@ set package_id [$object package_id] # # We have to load the form, maybe via a form loader. If the - # form_loader is set non-empty and the method exists, then use the + # form_loader is set nonempty and the method exists, then use the # form loader instead of the plain lookup. In case the form_loader # fails, it is supposed to return 0. # Index: openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl,v diff -u -r1.14.2.8 -r1.14.2.9 --- openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl 2 Jul 2019 13:27:14 -0000 1.14.2.8 +++ openacs-4/packages/xowf/tcl/test/xowf-test-procs.tcl 1 Jul 2020 19:31:58 -0000 1.14.2.9 @@ -265,10 +265,10 @@ ::xowf::WorkflowConstruct x aa_equals "non-conditional test with empty" [x get_value ""] "" - aa_equals "non-conditional test with non-empty scalar" [x get_value "a"] "a" + aa_equals "non-conditional test with nonempty scalar" [x get_value "a"] "a" - aa_equals "non-conditional test with non-empty list" [x get_value {a b}] "a b" - aa_equals "non-conditional test with non-empty list" [x get_value "a b"] "a b" + aa_equals "non-conditional test with nonempty list" [x get_value {a b}] "a b" + aa_equals "non-conditional test with nonempty list" [x get_value "a b"] "a b" aa_equals "conditional test, true branch" [x get_value "? true a default b"] "a" aa_equals "conditional test, false branch" [x get_value "? false a default b"] "b" Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.284.2.107 -r1.284.2.108 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 17 Jun 2020 18:50:58 -0000 1.284.2.107 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 1 Jul 2020 19:31:58 -0000 1.284.2.108 @@ -729,9 +729,9 @@ # Correct, when the answer is equal to the provided (sequence of) # words, but white-space is ignored. When the first word is # "*lower*" then the provided answer of the student is converted - # to lower case before the comparison is performed; as a + # to lowercase before the comparison is performed; as a # consequence the comparison is not case sensitive. Note that the - # answer_words have to be provided in lower case as well. + # answer_words have to be provided in lowercase as well. # set d [:process_correct_when_modifier] return [expr {[dict get $d value] eq [dict get $d words]}] @@ -1438,8 +1438,8 @@ args } { - Return the value of a named sub-component. When the named - sub-component is a repeated item, and the value of the 0th element + Return the value of a named subcomponent. When the named + subcomponent is a repeated item, and the value of the 0th element of the repeat (the template element) is omitted from the returned value. @@ -1578,7 +1578,7 @@ link_label } file instproc check=virus {value} { - # In case of an upgrade script, the (uploaded) tmp file might not exist + # In case of an upgrade script, the (uploaded) temporary file might not exist if {[:viruscheck] && [info exists :tmpfile] && $value ne "" @@ -5511,7 +5511,7 @@ # interface. # Currently, it does not do calendar integration, but if would be - # straightfoward to add it here as well. + # straightforward to add it here as well. # ########################################################### Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -r1.239.2.45 -r1.239.2.46 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 19 May 2020 15:35:59 -0000 1.239.2.45 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 1 Jul 2020 19:31:58 -0000 1.239.2.46 @@ -2177,7 +2177,7 @@ # # The "toc" includelet renders the page titles of the current files # based on the value of the "page_order" attributes. Only those - # pages are rendered that have a non-empty "page_order" field. + # pages are rendered that have a nonempty "page_order" field. # ::xowiki::IncludeletClass create toc \ -superclass ::xowiki::Includelet \ @@ -2207,7 +2207,7 @@ Show table of contents of the current wiki. The "toc" includelet renders the page titles of the current files based on the value of the "page_order" attributes. Only those - pages are rendered that have a non-empty "page_order" field. + pages are rendered that have a nonempty "page_order" field. @param style @param renderer 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 -r1.147.2.10 -r1.147.2.11 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 7 Oct 2019 19:47:31 -0000 1.147.2.10 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 1 Jul 2020 19:31:58 -0000 1.147.2.11 @@ -27,7 +27,7 @@ {name {\[::xowiki::validate_name\]} {Another item with this name exists \ already in this folder}} {page_order {\[::xowiki::validate_form_field page_order\]} {Page Order invalid; \ - might only contain upper and lower case letters, underscore, digits and dots}} + might only contain upper and lowercase letters, underscore, digits and dots}} }} {with_categories true} {submit_link "view"} @@ -259,7 +259,7 @@ set granted [::$package_id check_permissions -link $computed_link $package_id edit-new] #$data msg computed_link=$computed_link,granted=$granted if {!$granted} { - util_user_message -message "User not authorized to create a file named $name" + util_user_message -message "User not authorized to create a filenamed $name" return 0 } } else { @@ -486,7 +486,7 @@ {upload_file {\[::xowiki::validate_file\]} {For new entries, \ a upload file must be provided}} {page_order {\[::xowiki::validate_form_field page_order\]} {Page Order invalid; - might only contain upper and lower case letters, underscore, digits and dots}} + might only contain upper and lowercase letters, underscore, digits and dots}} {name {\[::xowiki::validate_name\]} {Another item with this name exists \ already in this folder}} }} @@ -559,7 +559,7 @@ {name {\[::xowiki::validate_name\]} {Another item with this name exists \ already in this folder}} {page_order {\[::xowiki::validate_form_field page_order\]} {Page Order invalid; - might only contain upper and lower case letters, underscore, digits and dots}} + might only contain upper and lowercase letters, underscore, digits and dots}} {duration {\[::xowiki::validate_duration\]} {Check duration and provide default}} }} } @@ -835,7 +835,7 @@ already in this folder}} {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 lower case letters, underscore, digits and dots}} + 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_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 -r1.542.2.75 -r1.542.2.76 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 26 May 2020 22:22:05 -0000 1.542.2.75 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 1 Jul 2020 19:31:58 -0000 1.542.2.76 @@ -3449,7 +3449,7 @@ if {[info exists :revision_id]} { # # For a given revision_id, the full_file_name will never - # change. Therefore, we can easily cache the full file name + # change. Therefore, we can easily cache the full filename # for the revision_id. # set :full_file_name [::xowiki::cache eval -partition_key ${:revision_id} ffn-${:revision_id} { Index: openacs-4/packages/xowiki/tcl/xowiki-uploader-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-uploader-procs.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/xowiki/tcl/xowiki-uploader-procs.tcl 8 May 2019 14:33:40 -0000 1.3.2.1 +++ openacs-4/packages/xowiki/tcl/xowiki-uploader-procs.tcl 1 Jul 2020 19:31:58 -0000 1.3.2.2 @@ -65,7 +65,7 @@ return {status_code 200 message ok} } # - # Mime type is ok, save the file under the file name either as a + # Mime type is ok, save the file under the filename either as a # new item or as a new revision. # set package_id [${:parent_object} package_id] Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.368.2.59 -r1.368.2.60 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 26 May 2020 22:22:05 -0000 1.368.2.59 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 1 Jul 2020 19:31:58 -0000 1.368.2.60 @@ -2765,7 +2765,7 @@ } else { :log validation_errors=$validation_errors # - # There were validation erros. Reset the value for form-fields + # There were validation errors. Reset the value for form-fields # of type "file" to avoid confusions, since a file-name was # provided, but the file was not uploaded due to the validation # error. If we would not reset the value, the provided name Index: openacs-4/packages/xowiki/tcl/test/check-method-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/check-method-procs.tcl,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/xowiki/tcl/test/check-method-procs.tcl 17 Jun 2020 19:04:03 -0000 1.1.2.2 +++ openacs-4/packages/xowiki/tcl/test/check-method-procs.tcl 1 Jul 2020 19:31:58 -0000 1.1.2.3 @@ -13,7 +13,7 @@ incr count regexp {www[-](.*)$} $m . suffix set wrong [regexp {[^a-z0-9-]} $suffix] - aa_false "web callable method '$cl instproc $m' does not follow naming guidelines (just lower case, digit and dash)" $wrong + aa_false "web callable method '$cl instproc $m' does not follow naming guidelines (just lowercase, digit and dash)" $wrong } } aa_log "Checked $count web callable methods" Index: openacs-4/packages/xowiki/tcl/test/test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/test-procs.tcl,v diff -u -r1.15.2.11 -r1.15.2.12 --- openacs-4/packages/xowiki/tcl/test/test-procs.tcl 19 Sep 2019 06:23:40 -0000 1.15.2.11 +++ openacs-4/packages/xowiki/tcl/test/test-procs.tcl 1 Jul 2020 19:31:58 -0000 1.15.2.12 @@ -290,10 +290,10 @@ } else { aa_true "create_form_page: page_name '$f_page_name' is empty" {$f_page_name eq ""} } - aa_true "create_form_page: creator '$f_creator' is non-empty" {$f_creator ne ""} + aa_true "create_form_page: creator '$f_creator' is nonempty" {$f_creator ne ""} set f_form_action [dict get $form @action] - aa_true "create_form_page: form_action '$f_form_action' is non-empty" {$f_form_action ne ""} + aa_true "create_form_page: form_action '$f_form_action' is nonempty" {$f_form_action ne ""} set names [dict keys $fields] aa_log "create_form_page: form names: [lsort $names]" @@ -379,10 +379,10 @@ set f_creator [dict get $form fields _creator] aa_true "page_name '$f_page_name' non empty" {$f_page_name ne ""} - aa_true "creator '$f_creator' is non-empty" {$f_creator ne ""} + aa_true "creator '$f_creator' is nonempty" {$f_creator ne ""} set f_form_action [dict get $form @action] - aa_true "form_action '$f_form_action' is non-empty" {$f_form_action ne ""} + aa_true "form_action '$f_form_action' is nonempty" {$f_form_action ne ""} set form_content [dict get $form fields] set names [dict keys $form_content] @@ -456,8 +456,8 @@ set f_form_action [dict get $form @action] aa_true "name '$f_page_name' is empty" {$f_page_name eq ""} - aa_true "creator '$f_creator' is non-empty" {$f_creator ne ""} - aa_true "form_action '$f_form_action' is non-empty" {$f_form_action ne ""} + aa_true "creator '$f_creator' is nonempty" {$f_creator ne ""} + aa_true "form_action '$f_form_action' is nonempty" {$f_form_action ne ""} set form_content [dict get $form fields] set names [dict keys $form_content] Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v diff -u -r1.1.2.32 -r1.1.2.33 --- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl 25 May 2020 20:23:03 -0000 1.1.2.32 +++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl 1 Jul 2020 19:31:58 -0000 1.1.2.33 @@ -371,7 +371,7 @@ # a) a checkbox box1, where a default is set # b) a repeated checkbox, where one value is provided # c) a compound field, where the compound field definition - # contains a default for the sub-component. + # contains a default for the subcomponent. ::xowiki::test::create_form \ -last_request $request_info \ Index: openacs-4/packages/xowiki/www/admin/import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v diff -u -r1.28.2.4 -r1.28.2.5 --- openacs-4/packages/xowiki/www/admin/import.tcl 6 Sep 2019 16:00:31 -0000 1.28.2.4 +++ openacs-4/packages/xowiki/www/admin/import.tcl 1 Jul 2020 19:31:58 -0000 1.28.2.5 @@ -29,7 +29,7 @@ } } \ -on_submit { - # check file name + # check filename if {$upload_file eq ""} { template::form::set_error upload_form upload_file \ [_ acs-templating.HTMLArea_SpecifyUploadFilename] Index: openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl,v diff -u -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl 7 Feb 2020 08:44:05 -0000 1.10.2.2 +++ openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl 1 Jul 2020 19:31:58 -0000 1.10.2.3 @@ -24,7 +24,7 @@ #if {$height ne ""} {append size x$height} set file_name [template::util::file::get_property filename $upload_file] - ns_log notice "upload_image: uploaded file name <$file_name>" + ns_log notice "upload_image: uploaded filename <$file_name>" set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file] set mime_type [::xowiki::guesstype $file_name] set tmp_size [file size $upload_tmpfile] Index: openacs-4/packages/xowiki/www/xinha/attach-file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/attach-file.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/xowiki/www/xinha/attach-file.tcl 7 Feb 2020 08:44:05 -0000 1.6.2.1 +++ openacs-4/packages/xowiki/www/xinha/attach-file.tcl 1 Jul 2020 19:31:58 -0000 1.6.2.2 @@ -49,7 +49,7 @@ set share site } \ -on_submit { - # check file name + # check filename if {$upload_file eq ""} { template::form::set_error upload_form upload_file \ [_ acs-templating.HTMLArea_SpecifyUploadFilename] Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v diff -u -r1.21.2.4 -r1.21.2.5 --- openacs-4/packages/xowiki/www/xinha/file-selector.tcl 1 Jul 2019 14:47:07 -0000 1.21.2.4 +++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl 1 Jul 2020 19:31:58 -0000 1.21.2.5 @@ -141,7 +141,7 @@ } } \ -on_submit { - # check file name + # check filename if {$upload_file eq ""} { template::form::set_error upload_form upload_file \ [_ acs-templating.HTMLArea_SpecifyUploadFilename] Index: openacs-4/packages/xowiki/www/xinha/insert-file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-file.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/xowiki/www/xinha/insert-file.tcl 7 Feb 2020 08:44:05 -0000 1.7.2.1 +++ openacs-4/packages/xowiki/www/xinha/insert-file.tcl 1 Jul 2020 19:31:58 -0000 1.7.2.2 @@ -38,7 +38,7 @@ set share site } \ -on_submit { - # check file name + # check filename if {$upload_file eq ""} { template::form::set_error upload_form upload_file \ [_ acs-templating.HTMLArea_SpecifyUploadFilename] Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v diff -u -r1.2.2.31 -r1.2.2.32 --- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 29 Jun 2020 08:15:48 -0000 1.2.2.31 +++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 1 Jul 2020 19:37:38 -0000 1.2.2.32 @@ -173,7 +173,7 @@ Synchronized Exam Is the exam duration strictly controlled by the lecturer, or does every student get his working time displayed, independent from his starting time. Allow Cut and Paste - Is the student allow to use cut and paste in multiline text fields? + Is the student allowed to use cut and paste in multiline text fields? Cut and Paste is allowed in multi-line text fields Cut and Paste is not allowed in multi-line text fields @@ -187,7 +187,7 @@ Exam Time Window Optional time window for automatically open/close exam. When these values are set, manual opening and closing of the exam is still possible. - Is the student allow to use cut and paste in multiline text fields? + Is the student allowed to use cut and paste in multiline text fields? Cut and Paste is allowed in multi-line text fields Cut and Paste is not allowed in multi-line text fields Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v diff -u -r1.71.2.16 -r1.71.2.17 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 29 Jun 2020 08:14:37 -0000 1.71.2.16 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 1 Jul 2020 19:37:38 -0000 1.71.2.17 @@ -203,7 +203,7 @@ Page Title %errorMsg% Another item with the name '%value%' exists already in this folder - Page Order invalid; might only contain upper and lower case letters, underscore, digits and dots + Page Order invalid; might only contain upper and lowercase letters, underscore, digits and dots Type XoWiki Page Wiki Pages