- You can not simultaneously append to and cache a non-empty multirow. + You can not simultaneously append to and cache a nonempty multirow.
@@ -2017,7 +2017,7 @@ && $append_p && [info exists counter] && $counter > 0 } { - return -code error "Can't append and cache a non-empty multirow datasource simultaneously" + return -code error "Can't append and cache a nonempty multirow datasource simultaneously" } if { [info exists cache_key] } { @@ -2348,7 +2348,7 @@ if {[info commands ns_cache_transaction_begin] eq ""} { # # When the server has no support for ns_cache_transaction_*, - # provide dummy procs to avoid runtime "if" statements. + # provide dummy procs to avoid run time "if" statements. # proc ns_cache_transaction_begin args {;} proc ns_cache_transaction_commit args {;} @@ -2887,7 +2887,7 @@ file } { Loads a CSV formatted file into a table using PostgreSQL's COPY command or - Oracle's SQL*Loader utility. The file name format consists of a sequence + Oracle's SQL*Loader utility. The filename format consists of a sequence number used to control the order in which tables are loaded, and the table name with "-" replacing "_". This is a bit of a kludge but greatly speeds the loading of large amounts of data, such as is done when various "ref-*" @@ -3059,7 +3059,7 @@ @author Don Baccus (dhogaza@pacifier.com) @author Lars Pind (lars@pinds.com) - @change-log yon@arsdigita.com 20000711 changed to return lower case table names + @change-log yon@arsdigita.com 20000711 changed to return lowercase table names } { set proc_name {db_tables} set driverkey [db_driverkey $dbn] @@ -3158,7 +3158,7 @@ @author Lars Pind (lars@pinds.com) - @change-log yon@arsdigita.com 20000711 changed to return lower case column names + @change-log yon@arsdigita.com 20000711 changed to return lowercase column names } { set columns [list] @@ -3211,7 +3211,7 @@ if column name doesn't exist (mdettinger@arsdigita.com) - @change-log 11 July, 2000: changed to return lower case data types + @change-log 11 July, 2000: changed to return lowercase data types (yon@arsdigita.com) @change-log 11 July, 2000: changed to return error using the db_string default clause Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -N -r1.45.2.1 -r1.45.2.2 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 10 Aug 2019 14:33:26 -0000 1.45.2.1 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 3 Jul 2020 07:27:28 -0000 1.45.2.2 @@ -1,6 +1,6 @@ ad_library { - Functions that APM uses to interact with the file system and I/O. + Functions that APM uses to interact with the filesystem and I/O. @author Bryan Quinn (bquinn@arsdigita.com) @creation-date Fri Oct 6 21:46:05 2000 @@ -542,7 +542,7 @@ if {![file exists $file_path]} { apm_callback_and_log $callback " - The file cannot be found. Your URL or your file name is incorrect. Please verify that the file name + The file cannot be found. Your URL or your filename is incorrect. Please verify that the filename is correct and try again." ns_log Error "Error loading APM file form url $url: The file cannot be found." return Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -N -r1.126.2.6 -r1.126.2.7 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 9 Feb 2020 15:09:54 -0000 1.126.2.6 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 3 Jul 2020 07:27:28 -0000 1.126.2.7 @@ -1982,10 +1982,10 @@ {-array:required} } { Gets a list of packages available for install from either a remote package repository - or the local file system. + or the local filesystem. @param repository_url The URL for the repository channel to get from, or the empty string to - search the local file system instead. + search the local filesystem instead. @param array Name of an array where you want the repository stored. It will be keyed by package-key, and each entry will be an array list returned by apm_read_package_info_file. @@ -2641,7 +2641,7 @@ # foreach attribute_name [lsort [array names attributes]] { # - # Only output tag if its value is non-empty + # Only output tag if its value is nonempty # if { $attributes($attribute_name) ne "" } { Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -N -r1.114.2.11 -r1.114.2.12 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 23 May 2020 10:56:36 -0000 1.114.2.11 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 3 Jul 2020 07:27:28 -0000 1.114.2.12 @@ -879,7 +879,7 @@ ad_proc -private apm_package_reload_cmds {files} { - Map file names into reloading cmds. For every file, a loading + Map filenames into reloading cmds. For every file, a loading command is appended to the result. The command might be empty. @return list of Tcl cmds to be executed to load these files. @@ -1612,7 +1612,7 @@ } } - # We have a non-empty name of a callback proc to invoke + # We have a nonempty name of a callback proc to invoke # Form the full command including arguments set command [list {*}$proc_name {*}[apm_callback_format_args -type $type -arg_list $arg_list]] Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v diff -u -N -r1.33.2.2 -r1.33.2.3 --- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 10 Mar 2019 21:56:36 -0000 1.33.2.2 +++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl 3 Jul 2020 07:27:29 -0000 1.33.2.3 @@ -180,7 +180,7 @@
files: a list of files in the package,
containing elements of the form [list $path
$type] NOTE: Files are no longer stored in info files but are always retrieved
- directly from the file system. This element in the array will always be the empty list.
+ directly from the filesystem. This element in the array will always be the empty list.
callbacks: an array list of callbacks of the package
on the form [list callback_type1 proc_name1 callback_type2 proc_name2 ...]
base option will be
@@ -846,7 +846,6 @@
}
}
-
#####
#
# Parse the arguments
@@ -1232,7 +1231,7 @@
ad_proc -deprecated with_catch {error_var body on_error} {
execute code in body with the catch errorMessage in error_var
- and if there is a non-zero return code from body
+ and if there is a nonzero return code from body
execute the on_error block.
DEPRECATED: does not comply with OpenACS naming convention and can
@@ -1947,7 +1946,7 @@
@param message A message to display to the user. See util_user_message.
@param html Set this flag if your message contains HTML. If specified, you're responsible for proper quoting
of everything in your message. Otherwise, we quote it for you.
- @param allow_complete_url By default we disallow redirecting to URLs outside the current host. This is based on the currently set host header or the host name in the config file if there is no host header. Set allow_complete_url if you are redirecting to a known safe external web site. This prevents redirecting to a site by URL query hacking.
+ @param allow_complete_url By default we disallow redirecting to URLs outside the current host. This is based on the currently set host header or the hostname in the config file if there is no host header. Set allow_complete_url if you are redirecting to a known safe external web site. This prevents redirecting to a site by URL query hacking.
@see util_user_message
@see ad_script_abort
@@ -2119,7 +2118,7 @@
}
ad_proc util::split_host {hostspec hostnameVar portVar} {
- Split host potentially into a host name and a port
+ Split host potentially into a hostname and a port
} {
upvar $hostnameVar hostname $portVar port
if {![regexp {^(.*):(\d+)$} $hostspec . hostname port]} {
@@ -2213,7 +2212,7 @@
This function behaves like [ad_conn location], since it returns
the location string of the current request in the form
protocol://hostname?:port? but it honors the "Host:" header field
- (when the client addressed the server with a host name different
+ (when the client addressed the server with a hostname different
to the default one from the server configuration file) and
therefore as well the host-node mapping. If the "Host" header
field is missing or empty this function falls back to [ad_conn
@@ -2804,7 +2803,7 @@
str
} {
Sanitize the provided filename for modern Windows, OS X, and Unix
- file systems (NTFS, ext, etc.). FAT 8.3 filenames are not supported.
+ filesystems (NTFS, ext, etc.). FAT 8.3 filenames are not supported.
The generated strings should be safe against
https://github.com/minimaxir/big-list-of-naughty-strings
@@ -3200,7 +3199,7 @@
node
path_list
} {
- Return the first non-empty contents of a child node down a given path from the current node.
+ Return the first nonempty contents of a child node down a given path from the current node.
@@ -3672,7 +3671,7 @@ ad_proc util::name_to_path { -name:required } { - Transforms a pretty name to a reasonable path name. + Transforms a pretty name to a reasonable pathname. } { regsub -all -nocase { } [string trim [string tolower $name]] {-} name regsub -all {[^[:alnum:]\-]} $name {} name @@ -4184,7 +4183,7 @@ lassign $::errorCode - pid code # A child process, whose process ID was $pid, - # exited with a non-zero exit status, $code. + # exited with a nonzero exit status, $code. ns_log notice "util::catch_exec: Childstatus $pid $code $result" } @@ -4222,7 +4221,7 @@ check if this URL is external to the current host or a valid alternative valid alternatives include HTTPS or HTTP protocol change - HTTP or HTTPS port number added or removed from current host name + HTTP or HTTPS port number added or removed from current hostname or another hostname that the host responds to (from host_node_map) } { set external_url_p [util_complete_url_p $url] Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl,v diff -u -N -r1.23.2.7 -r1.23.2.8 --- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl 26 Dec 2019 14:44:08 -0000 1.23.2.7 +++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl 3 Jul 2020 07:27:29 -0000 1.23.2.8 @@ -232,7 +232,7 @@ set year "" } else { lassign [split $value "-"] year month day - # trim the day, in case we get as well a time stamp + # trim the day, in case we get as well a timestamp regexp {^([0-9]+) } $day _ day } Index: openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl,v diff -u -N -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl 10 Mar 2019 21:19:39 -0000 1.10.2.1 +++ openacs-4/packages/acs-tcl/tcl/xml-0-sgml-procs.tcl 3 Jul 2020 07:27:29 -0000 1.10.2.2 @@ -711,7 +711,7 @@ # req normalization required # # Results: -# Name returned as upper-case if normalization required +# Name returned as uppercase if normalization required proc sgml::Normalize {name req} { if {$req} { @@ -865,7 +865,7 @@ # parse:DTD:_element_ # For each of these procedures, the various regular expressions they use -# are created outside of the proc to avoid overhead at runtime +# are created outside of the proc to avoid overhead at run time # sgml::DTD:ELEMENT -- # Index: openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl,v diff -u -N -r1.71.2.26 -r1.71.2.27 --- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 3 Jun 2020 18:41:03 -0000 1.71.2.26 +++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl 3 Jul 2020 07:27:29 -0000 1.71.2.27 @@ -851,15 +851,15 @@ } { aa_equals "Empty value" [util::trim_leading_zeros {}] {} aa_equals "Real value (0.31)" [util::trim_leading_zeros 0.31] {.31} - aa_equals "Real value with multiple leading zeroes (000.31)" [util::trim_leading_zeros 0000.31] {.31} + aa_equals "Real value with multiple leading zeros (000.31)" [util::trim_leading_zeros 0000.31] {.31} aa_equals "Real value already trimmed (.31)" [util::trim_leading_zeros .31] {.31} aa_equals "Natural value (031)" [util::trim_leading_zeros 031] {31} - aa_equals "Natural value with multiple leading zeroes (000031)" [util::trim_leading_zeros 000031] {31} + aa_equals "Natural value with multiple leading zeros (000031)" [util::trim_leading_zeros 000031] {31} aa_equals "Natural value already trimmed (31)" [util::trim_leading_zeros 31] {31} aa_equals "String (0asfda)" [util::trim_leading_zeros 0asfda] {asfda} - aa_equals "String with multiple leading zeroes (000asfda)" [util::trim_leading_zeros 000asfda] {asfda} + aa_equals "String with multiple leading zeros (000asfda)" [util::trim_leading_zeros 000asfda] {asfda} aa_equals "String already trimmed (asfda)" [util::trim_leading_zeros asfda] {asfda} - aa_equals "Only zeroes (000)" [util::trim_leading_zeros 000] {0} + aa_equals "Only zeros (000)" [util::trim_leading_zeros 000] {0} aa_equals "Only one zero (0)" [util::trim_leading_zeros 0] {0} } Index: openacs-4/packages/acs-tcl/tcl/test/db-proc-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/Attic/db-proc-test-procs.tcl,v diff -u -N -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/acs-tcl/tcl/test/db-proc-test-procs.tcl 25 May 2020 10:21:08 -0000 1.1.2.3 +++ openacs-4/packages/acs-tcl/tcl/test/db-proc-test-procs.tcl 3 Jul 2020 07:27:29 -0000 1.1.2.4 @@ -113,7 +113,7 @@ SELECT person_id, first_names, last_name FROM persons where person_id = :user_id } - aa_equals "columns non-empty" [template::multirow columns person_mr2] \ + aa_equals "columns nonempty" [template::multirow columns person_mr2] \ "person_id first_names last_name" aa_log "Test End" Index: openacs-4/packages/acs-tcl/tcl/test/memoizing-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/memoizing-procs.tcl,v diff -u -N -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-tcl/tcl/test/memoizing-procs.tcl 25 Jul 2018 13:42:48 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/test/memoizing-procs.tcl 3 Jul 2020 07:27:29 -0000 1.4.2.1 @@ -20,10 +20,10 @@ ad_proc -private memoizing_procs_test::return_upper_case_text { {-txt:required} } { - Test proc that returns a string in upper case + Test proc that returns a string in uppercase } { set response $txt - append response " in upper case is " + append response " in uppercase is " append response [string toupper $txt] return $response } Index: openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl,v diff -u -N -r1.27.2.3 -r1.27.2.4 --- openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl 30 Jul 2019 16:01:21 -0000 1.27.2.3 +++ openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl 3 Jul 2020 07:27:29 -0000 1.27.2.4 @@ -59,7 +59,7 @@ @param params The parameters to pass to the template. Note that pass-by-reference params must be in the page namespace, they cannot be in a local procedure, or any other namespace. - @param template The template file name. + @param template The template filename. Example: @@ -88,7 +88,7 @@ @param status The HTTP status to return, by default HTTP 500 (Error) @param params The parameters to pass to the template. - @param template The template file name. + @param template The template filename. Example: Index: openacs-4/packages/acs-templating/tcl/currency-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/currency-procs.tcl,v diff -u -N -r1.19 -r1.19.2.1 --- openacs-4/packages/acs-templating/tcl/currency-procs.tcl 16 May 2018 22:04:59 -0000 1.19 +++ openacs-4/packages/acs-templating/tcl/currency-procs.tcl 3 Jul 2020 07:27:29 -0000 1.19.2.1 @@ -192,7 +192,7 @@ } { - # Erase leading zeroes from the value, but make sure that 00 + # Erase leading zeros from the value, but make sure that 00 # is not completely erased set value [util::trim_leading_zeros $value] Index: openacs-4/packages/acs-templating/tcl/data-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/data-procs.tcl,v diff -u -N -r1.23.2.5 -r1.23.2.6 --- openacs-4/packages/acs-templating/tcl/data-procs.tcl 14 Oct 2019 16:07:53 -0000 1.23.2.5 +++ openacs-4/packages/acs-templating/tcl/data-procs.tcl 3 Jul 2020 07:27:29 -0000 1.23.2.6 @@ -291,7 +291,7 @@ message_ref } { - Beautiful URL elements that may only contain lower case + Beautiful URL elements that may only contain lowercase characters, numbers and hyphens.
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v diff -u -N -r1.63.2.5 -r1.63.2.6 --- openacs-4/packages/acs-templating/tcl/date-procs.tcl 14 Jul 2019 22:59:26 -0000 1.63.2.5 +++ openacs-4/packages/acs-templating/tcl/date-procs.tcl 3 Jul 2020 07:27:29 -0000 1.63.2.6 @@ -443,7 +443,7 @@ return $date } - # Erase leading zeroes from the value, but make sure that 00 + # Erase leading zeros from the value, but make sure that 00 # is not completely erased - but only for single-element properties switch -- $value { @@ -512,7 +512,7 @@ } ansi { # Some initialization... - # Rip $date into $ansi_* as numbers, no leading zeroes + # Rip $date into $ansi_* as numbers, no leading zeros set matchdate {([0-9]{4})\-0?(1?[0-9])\-0?([1-3]?[0-9])} set matchtime {0?([1-2]?[0-9]):0?([1-5]?[0-9]):0?([1-6]?[0-9])} set matchfull "$matchdate $matchtime" @@ -687,7 +687,7 @@ foreach field [array names time_in] { # skip format if {$field ne "format" } { - # Coerce values to non-negative integers + # Coerce values to nonnegative integers if { $field ne "ampm" } { if { ![regexp {[0-9]+} $time_in($field) value] } { set value {} @@ -707,7 +707,7 @@ foreach field [array names date_in] { # skip format if {$field ne "format" } { - # Coerce values to non-negative integers + # Coerce values to nonnegative integers if { ![regexp {[0-9]+} $date_in($field) value] } { set value {} } @@ -820,7 +820,7 @@ ad_proc -public -deprecated template::util::leadingPad { string size } { - Pad a string with leading zeroes + Pad a string with leading zeros Deprecated: please use the new and more general 'ad_pad'. @@ -838,7 +838,7 @@ } ad_proc -public -deprecated template::util::leadingTrim { value } { - Trim the leading zeroes from the value, but preserve the value + Trim the leading zeros from the value, but preserve the value as "0" if it is "00" @see util::trim_leading_zeros @@ -1136,7 +1136,7 @@ set key "$element_id.$field" if { [ns_queryexists $key] } { set value [ns_queryget $key] - # Coerce values to non-negative integers + # Coerce values to nonnegative integers if { $field ne "ampm" } { if { ![regexp {[0-9]+} $value value] } { set value {} 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.94.2.8 -r1.94.2.9 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 17 Dec 2019 17:01:20 -0000 1.94.2.8 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 3 Jul 2020 07:27:29 -0000 1.94.2.9 @@ -703,7 +703,7 @@ -name:required -comma:boolean } { - @param comma Set this flag if you want the result to start with an ',' if the list of from clauses returned is non-empty. + @param comma Set this flag if you want the result to start with an ',' if the list of from clauses returned is nonempty. } { # Get an upvar'd reference to list_properties get_reference -name $name @@ -725,7 +725,7 @@ -name:required -comma:boolean } { - @param comma Set this flag if you want the result to start with a ',' if the list of select clauses returned is non-empty. + @param comma Set this flag if you want the result to start with a ',' if the list of select clauses returned is nonempty. } { # Get an upvar'd reference to list_properties get_reference -name $name @@ -747,7 +747,7 @@ -name:required -comma:boolean } { - @param comma Set this flag if you want the result to start with an ',' if the list of from clauses returned is non-empty. + @param comma Set this flag if you want the result to start with an ',' if the list of from clauses returned is nonempty. } { # Get an upvar'd reference to list_properties get_reference -name $name @@ -781,7 +781,7 @@ -name:required -comma:boolean } { - @param comma Set this flag if you want the result to start with a ',' if the list of select clauses returned is non-empty. + @param comma Set this flag if you want the result to start with a ',' if the list of select clauses returned is nonempty. } { # Get an upvar'd reference to list_properties get_reference -name $name @@ -803,7 +803,7 @@ -name:required -and:boolean } { - @param and Set this flag if you want the result to start with an 'and' if the list of where clauses returned is non-empty. + @param and Set this flag if you want the result to start with an 'and' if the list of where clauses returned is nonempty. } { # Get an upvar'd reference to list_properties get_reference -name $name @@ -824,7 +824,7 @@ -name:required -and:boolean } { - @param and Set this flag if you want the result to start with an 'and' if the list of where clauses returned is non-empty. + @param and Set this flag if you want the result to start with an 'and' if the list of where clauses returned is nonempty. } { # Get an upvar'd reference to list_properties get_reference -name $name @@ -847,7 +847,7 @@ -and:boolean {-key ""} } { - @param and Set this flag if you want the result to start with an 'and' if the list of where clauses returned is non-empty. + @param and Set this flag if you want the result to start with an 'and' if the list of where clauses returned is nonempty. @param key Specify the name of the primary key to be used in the query's where clause, if different from the list builder's key. @@ -1987,7 +1987,7 @@