diff --git a/src/cmd/ksh93/bltins/regress.c b/src/cmd/ksh93/bltins/regress.c index 25f3c2517..6dbb26b62 100644 --- a/src/cmd/ksh93/bltins/regress.c +++ b/src/cmd/ksh93/bltins/regress.c @@ -91,7 +91,7 @@ USAGE_LICENSE "\aoriginal-euid\a.]" "}" "[103:p_suid?Specifies a value for SHOPT_P_SUID. Effective uids greater " - "than the non-privileged-uid disable the priveleged mode. The intercepts " + "than the non-privileged-uid disable the privileged mode. The intercepts " "are:]#?[non-privileged-uid:=1]" "{" "[+SHOPT_P_SUID?The SHOPT_P_SUID macro value is overridden by " diff --git a/src/cmd/ksh93/data/builtins.c b/src/cmd/ksh93/data/builtins.c index 31dbf39e6..59b567235 100644 --- a/src/cmd/ksh93/data/builtins.c +++ b/src/cmd/ksh93/data/builtins.c @@ -206,7 +206,7 @@ const char sh_set[] = "invoked with a \b+\b the options will be written in a format " "that can be reinput to the shell to restore the settings. " "Options \b-o\b \aname\a can also be specified with \b--\b\aname\a " - "and \b+o \aname\a can be specifed with \b--no\b\aname\a except that " + "and \b+o \aname\a can be specified with \b--no\b\aname\a except that " "options names beginning with \bno\b are turned on by omitting \bno\b." "This option can be repeated to enable/disable multiple options. " "The value of \aoption\a must be one of the following:]{" @@ -968,12 +968,12 @@ USAGE_LICENSE "[+?If \afirst\a is specified and \alast\a is omitted, then \alast\a will " "default to \afirst\a unless \b-l\b is specified in which case " "it will default to \b-1\b.]" -"[+?If no editor is specified, then the editor specfied by the \bHISTEDIT\b " +"[+?If no editor is specified, then the editor specified by the \bHISTEDIT\b " "variable will be used if set, or the \bFCEDIT\b variable will be " "used if set, otherwise, \bed\b will be used.]" "[e]:[editor?\aeditor\a specifies the editor to use to edit the history " "command. A value of \b-\b for \aeditor\a is equivalent to " - "specifiying the \b-s\b option.]" + "specifying the \b-s\b option.]" "[l?List the commands rather than editing and reexecuting them.]" "[N]#[num?Start at \anum\a commands back.]" "[n?Suppress the command numbers when the commands are listed.]" @@ -1196,9 +1196,9 @@ USAGE_LICENSE "[+-?The escape sequence \b\\C[.\b\aname\a\b.]]\b expands to " "the collating element \aname\a.]" "[+-?The escape sequence \b\\x{\b\ahex\a\b}\b expands to the " - "character corresponding to the hexidecimal value \ahex\a.]" + "character corresponding to the hexadecimal value \ahex\a.]" "[+-?The escape sequence \b\\u{\b\ahex\a\b}\b expands to the unicode " - "character corresponding to the hexidecimal value \ahex\a.]" + "character corresponding to the hexadecimal value \ahex\a.]" "[+-?The format modifier flag \b=\b can be used to center a field to " "a specified width.]" "[+-?The format modifier flag \bL\b can be used with the \bc\b and " @@ -1383,7 +1383,7 @@ USAGE_LICENSE "will be set to this value. If there is no file with this pathname, " "and this pathame does not contain a \b/\b, then the \bPATH\b " "will be searched for an executable with this name. Any remaining " - "\aarg\as will be used to initialize the positional parmaeters.]" + "\aarg\as will be used to initialize the positional parameters.]" "[+?Any option can use a \b+\b instead of a \b-\b to disable the corresponding " "option.]" "[c?Read the commands from the first \aarg\a.]" @@ -1654,7 +1654,7 @@ USAGE_LICENSE "[l?Without \b-i\b, sets character mapping to \btolower\b. When used " "with \b-i\b, \b-E\b, or \b-F\b indicates long variant.]" "[m?Move. The value is the name of a variable whose value will be " - "moved to \aname\a. The orignal variable will be unset. Cannot be " + "moved to \aname\a. The original variable will be unset. Cannot be " "used with any other options.]" "[n?Name reference. The value is the name of a variable that \aname\a " "references. \aname\a cannot contain a \b.\b. Cannot be use with " diff --git a/src/cmd/ksh93/sh/bash.c b/src/cmd/ksh93/sh/bash.c index fd2f3a14a..8e960a765 100644 --- a/src/cmd/ksh93/sh/bash.c +++ b/src/cmd/ksh93/sh/bash.c @@ -43,7 +43,7 @@ extern const char bash_pre_rc[]; static char *login_files[4]; const char sh_bash1[] = - "[B?Enable brace group expansion. This option is only availabe in bash " + "[B?Enable brace group expansion. This option is only available in bash " "compatibility mode. In ksh mode, brace group expansion is always on.]" "[P?Do not follow symbolic links, use physical directory structure " "instead. Only available in bash compatibility mode.]"; diff --git a/src/cmd/ksh93/tests/arith.sh b/src/cmd/ksh93/tests/arith.sh index 0dfea0e08..288b4c5ab 100755 --- a/src/cmd/ksh93/tests/arith.sh +++ b/src/cmd/ksh93/tests/arith.sh @@ -312,7 +312,7 @@ typeset -ui42 x=50 if [[ $x != 42#18 ]] then err_exit 'display of unsigned integers in non-decimal bases wrong' fi -$SHELL -c 'i=0;(( ofiles[i] != -1 && (ofiles[i] < mins || mins == -1) ));exit 0' 2> /dev/null || err_exit 'lexical error with arithemtic expression' +$SHELL -c 'i=0;(( ofiles[i] != -1 && (ofiles[i] < mins || mins == -1) ));exit 0' 2> /dev/null || err_exit 'lexical error with arithmetic expression' $SHELL -c '(( +1 == 1))' 2> /dev/null || err_exit 'unary + not working' typeset -E20 val=123.01234567890 [[ $val == 123.0123456789 ]] || err_exit "rounding error val=$val" @@ -664,7 +664,7 @@ done [[ $($SHELL 2> /dev/null -c 'print -- $(( ldexp(1, 4) ))' ) == 16 ]] || err_exit 'function ldexp not implement or not working correctly' -$SHELL 2> /dev/null -c 'str="0x1.df768ed398ee1e01329a130627ae0000p-1";typeset -l -E x;((x=str))' || err_exit '((x=var)) fails for hexfloat with var begining with 0x1.nnn' +$SHELL 2> /dev/null -c 'str="0x1.df768ed398ee1e01329a130627ae0000p-1";typeset -l -E x;((x=str))' || err_exit '((x=var)) fails for hexfloat with var beginning with 0x1.nnn' x=(3 6 12) (( x[2] /= x[0])) diff --git a/src/cmd/ksh93/tests/arrays.sh b/src/cmd/ksh93/tests/arrays.sh index e9b5ce95c..7845f7352 100755 --- a/src/cmd/ksh93/tests/arrays.sh +++ b/src/cmd/ksh93/tests/arrays.sh @@ -314,7 +314,7 @@ integer i for ((i=0; i < 40; i++)) do x[i]=$i done -[[ ${#x[@]} == 40 ]] || err_exit 'index arrays loosing values' +[[ ${#x[@]} == 40 ]] || err_exit 'index arrays losing values' [[ $( ($SHELL -c 'typeset -A var; (IFS=: ; set -A var a:b:c ;print ${var[@]});:' )2>/dev/null) == 'a b c' ]] || err_exit 'change associative to index failed' unset foo [[ $(foo=good diff --git a/src/cmd/ksh93/tests/arrays2.sh b/src/cmd/ksh93/tests/arrays2.sh index 3d5fe1b95..ff9e21f64 100755 --- a/src/cmd/ksh93/tests/arrays2.sh +++ b/src/cmd/ksh93/tests/arrays2.sh @@ -163,7 +163,7 @@ done [[ ${#ar[*]} == 9 ]] || err_exit "\${#ar[*]} is '${#ar[*]}', should be 9" [[ ${ar[4][4]} == 40 ]] || err_exit "ar[4][4] is '${ar[4][4]}', should be 40" -$SHELL 2> /dev/null -c 'compound c;float -a c.ar;(( c.ar[2][3][3] = 5))' || 'multi-dimensional arrays in arithemtic expressions not working' +$SHELL 2> /dev/null -c 'compound c;float -a c.ar;(( c.ar[2][3][3] = 5))' || 'multi-dimensional arrays in arithmetic expressions not working' expected='typeset -a -l -E c.ar=([2]=([3]=([3]=5) ) )' unset c diff --git a/src/cmd/ksh93/tests/attributes.sh b/src/cmd/ksh93/tests/attributes.sh index feca411e7..fdf79e54e 100755 --- a/src/cmd/ksh93/tests/attributes.sh +++ b/src/cmd/ksh93/tests/attributes.sh @@ -182,8 +182,8 @@ typeset -b x=$b1 typeset -b -Z5 a=$b1 [[ $(printf "%B" a) == $w1 ]] || err_exit 'typeset -b -Z5 not working' typeset -b q=$x$x -[[ $q == $b2 ]] || err_exit 'typeset -b not working with concatination' -[[ $(printf "%B" q) == $t1$t1 ]] || err_exit 'typeset -b concatination not working' +[[ $q == $b2 ]] || err_exit 'typeset -b not working with concatenation' +[[ $(printf "%B" q) == $t1$t1 ]] || err_exit 'typeset -b concatenation not working' x+=$b1 [[ $x == $b2 ]] || err_exit 'typeset -b not working with append' [[ $(printf "%B" x) == $t1$t1 ]] || err_exit 'typeset -b append not working' diff --git a/src/cmd/ksh93/tests/basic.sh b/src/cmd/ksh93/tests/basic.sh index 1cab8e00b..4613baee2 100755 --- a/src/cmd/ksh93/tests/basic.sh +++ b/src/cmd/ksh93/tests/basic.sh @@ -223,7 +223,7 @@ exec 9>& 1 exec 1>&- x=$(print hello) if [[ $x != hello ]] -then err_exit "command subsitution with stdout closed failed" +then err_exit "command substitution with stdout closed failed" fi exec >& 9 cd $pwd diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh index 1d24904e7..3b191546c 100755 --- a/src/cmd/ksh93/tests/builtins.sh +++ b/src/cmd/ksh93/tests/builtins.sh @@ -525,7 +525,7 @@ $SHELL -c "( sleep 1; kill -ALRM \$\$ ) & sleep $del" 2> /dev/null exitval=$? (( sec = SECONDS - sec )) exec 2>&3- -(( exitval )) && err_exit "sleep doesn't exit 0 with ALRM interupt" +(( exitval )) && err_exit "sleep doesn't exit 0 with ALRM interrupt" (( sec > (del - 1) )) || err_exit "ALRM signal causes sleep to terminate prematurely -- expected 3 sec, got $sec" typeset -r z=3 y=5 diff --git a/src/cmd/ksh93/tests/comvar.sh b/src/cmd/ksh93/tests/comvar.sh index 0084566f3..cc60ba29c 100755 --- a/src/cmd/ksh93/tests/comvar.sh +++ b/src/cmd/ksh93/tests/comvar.sh @@ -63,7 +63,7 @@ unset x typeset -A x x=( [foo]=bar ) if [[ ${x[@]} != bar ]] -then err_exit 'compound assignemnt of associative arrays not working' +then err_exit 'compound assignment of associative arrays not working' fi unset -n foo x unset foo x @@ -424,7 +424,7 @@ data.samples+=( [[ $data == %(()) ]] || err_exit "unbalanced parenthesis with compound variable containing array of compound variables" typeset -C -A hello=( [foo]=bar) -[[ $(typeset -p hello) == 'typeset -C -A hello=([foo]=bar)' ]] || err_exit 'typeset -A -C with intial assignment not working' +[[ $(typeset -p hello) == 'typeset -C -A hello=([foo]=bar)' ]] || err_exit 'typeset -A -C with initial assignment not working' # this caused a core dump before ksh93t+ [[ $($SHELL -c 'foo=(x=3 y=4);function bar { typeset z=4;: $z;};bar;print ${!foo.@}') == 'foo.x foo.y' ]] 2> /dev/null || err_exit '${!foo.@} after function not working' @@ -536,7 +536,7 @@ compound x=( integer a=1 compound b=cpv1 ) -[[ $x == *f=2* ]] || err_exit "The field b containg 'f=2' is missing" +[[ $x == *f=2* ]] || err_exit "The field b containing 'f=2' is missing" unset x compound x=( @@ -602,12 +602,12 @@ expected=$'(\n\t[0]=(\n\t\ta=1\n\t)\n\t[1]=(\n\t\tb=2\n\t)\n)' compound -a x=( [0]=(a=1) [1]=(b=2) ) typeset -m "z=x[1]" -[[ $(typeset -p z 2>/dev/null) == 'typeset -C z=(b=2)' ]] || err_exit 'typeset -m not working with commpound -a variable' +[[ $(typeset -p z 2>/dev/null) == 'typeset -C z=(b=2)' ]] || err_exit 'typeset -m not working with compound -a variable' unset x z compound -A x=( [0]=(a=1) [1]=(b=2) ) typeset -m "z=x[1]" -[[ $(typeset -p z 2>/dev/null) == 'typeset -C z=(b=2)' ]] || err_exit 'typeset -m not working with commpound -a variable' +[[ $(typeset -p z 2>/dev/null) == 'typeset -C z=(b=2)' ]] || err_exit 'typeset -m not working with compound -a variable' typeset -m "x[1]=x[0]" typeset -m "x[0]=z" exp='([0]=(b=2) [1]=(a=1))' diff --git a/src/cmd/ksh93/tests/expand.sh b/src/cmd/ksh93/tests/expand.sh index 2547be8aa..123698cd5 100755 --- a/src/cmd/ksh93/tests/expand.sh +++ b/src/cmd/ksh93/tests/expand.sh @@ -111,9 +111,9 @@ done set -- ~(N)/dev/null [[ $# == 1 && $1 == /dev/null ]] || err_exit "~(N)/dev/null not matching /dev/null" set -- ~(N)/dev/non_existant_file -[[ $# == 0 ]] || err_exit "~(N)/dev/nonexistant not empty" +[[ $# == 0 ]] || err_exit "~(N)/dev/nonexistent not empty" set -- ""~(N)/dev/non_existant_file -[[ $# == 1 && ! $1 ]] || err_exit '""~(N)/dev/nonexistant not null argument' +[[ $# == 1 && ! $1 ]] || err_exit '""~(N)/dev/nonexistent not null argument' set -- ~(N)/dev/non_existant_file"" [[ $# == 1 && ! $1 ]] || err_exit '~(N)/dev/nonexistent"" not null argument' for i in ~(N)/dev/non_existent_file diff --git a/src/cmd/ksh93/tests/functions.sh b/src/cmd/ksh93/tests/functions.sh index ecbc7f564..a7a607ba7 100755 --- a/src/cmd/ksh93/tests/functions.sh +++ b/src/cmd/ksh93/tests/functions.sh @@ -341,7 +341,7 @@ then err_exit "export inside function not working -- expected 'fun', got '$val'" fi val=$(export | sed -e '/^zzz=/!d' -e 's/^zzz=//') if [[ $val ]] -then err_exit "unset varaible exported after function call -- expected '', got '$val'" +then err_exit "unset variable exported after function call -- expected '', got '$val'" fi unset zzz diff --git a/src/cmd/ksh93/tests/heredoc.sh b/src/cmd/ksh93/tests/heredoc.sh index 61b0110d6..436b4361f 100755 --- a/src/cmd/ksh93/tests/heredoc.sh +++ b/src/cmd/ksh93/tests/heredoc.sh @@ -244,7 +244,7 @@ eval "$( EOF } > $script chmod +x $script -[[ $($SHELL $script) == hello ]] 2> /dev/null || err_exit 'heredoc embeded in command substitution fails at buffer boundary' +[[ $($SHELL $script) == hello ]] 2> /dev/null || err_exit 'heredoc embedded in command substitution fails at buffer boundary' got=$( cat << EOF \ @@ -491,7 +491,7 @@ EOF print EOF } > $f $SHELL $f > $g -[[ $(grep meep $g | grep -v foobar) != '' ]] && err_exit 'here-doc loosing $var expansions on boundaries in rare cases' +[[ $(grep meep $g | grep -v foobar) != '' ]] && err_exit 'here-doc losing $var expansions on boundaries in rare cases' print foo > $tmp/foofile x=$( $SHELL 2> /dev/null 'read <<< $(<'"$tmp"'/foofile) 2> /dev/null;print -r "$REPLY"') diff --git a/src/cmd/ksh93/tests/nameref.sh b/src/cmd/ksh93/tests/nameref.sh index 5c0a7497b..467e369ac 100755 --- a/src/cmd/ksh93/tests/nameref.sh +++ b/src/cmd/ksh93/tests/nameref.sh @@ -126,7 +126,7 @@ set foo nameref bar=$1 foo=hello if [[ $bar != hello ]] -then err_exit 'nameref of positional paramters outside of function not working' +then err_exit 'nameref of positional parameters outside of function not working' fi unset foo bar bar=123 diff --git a/src/cmd/ksh93/tests/namespace.sh b/src/cmd/ksh93/tests/namespace.sh index 057470ada..77769a3fa 100755 --- a/src/cmd/ksh93/tests/namespace.sh +++ b/src/cmd/ksh93/tests/namespace.sh @@ -95,8 +95,8 @@ false } [[ $(fn) == 'global fn abc' ]] || err_exit 'fn outside namespace should run global function' [[ $(.x.fn) == 'local fn bar' ]] || err_exit 'namespace function called from global failed' -[[ ${z[abc]} == qqq ]] || err_exit 'global associative array should not be affected by definiton in namespace' -[[ ${bar.y} == 4 ]] || err_exit 'global compound variable should not be affected by definiton in namespace' +[[ ${z[abc]} == qqq ]] || err_exit 'global associative array should not be affected by definition in namespace' +[[ ${bar.y} == 4 ]] || err_exit 'global compound variable should not be affected by definition in namespace' [[ ${bar.z} == '' ]] || err_exit 'global compound variable should not see elements in namespace' [[ $(xfun) == 'xfun global abc' ]] || err_exit 'global function on FPATH failed' [[ $(run $foo) == 'global prog abc' ]] || err_exit 'global binary on PATH failed' diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh index 491de73d0..e7affb09f 100755 --- a/src/cmd/ksh93/tests/path.sh +++ b/src/cmd/ksh93/tests/path.sh @@ -380,7 +380,7 @@ PATH=$tmp/bin:$tmp/new/bin:$PATH x=$(whence -p echo 2> /dev/null) [[ $x == "$tmp/new/bin/echo" ]] || err_exit 'nonexistant FPATH directory in .paths file causes path search to fail' -$SHELL 2> /dev/null <<- \EOF || err_exit 'path search problem with non-existant directories in PATH' +$SHELL 2> /dev/null <<- \EOF || err_exit 'path search problem with non-existent directories in PATH' PATH=/usr/nogood1/bin:/usr/nogood2/bin:/bin:/usr/bin tail /dev/null && tail /dev/null EOF diff --git a/src/cmd/ksh93/tests/quoting.sh b/src/cmd/ksh93/tests/quoting.sh index 01aae0dc1..80c47b375 100755 --- a/src/cmd/ksh93/tests/quoting.sh +++ b/src/cmd/ksh93/tests/quoting.sh @@ -301,7 +301,7 @@ fi ########################################################### ########################################################### ########################################################### -print foo) ]] || err_exit "command subsitution with long comments broken" +print foo) ]] || err_exit "command substitution with long comments broken" subject='some/other/words' re='@(?*)/@(?*)/@(?*)' [[ ${subject/${re}/\3} != words ]] && err_exit 'string replacement with \3 not working' diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh index a6d7475b5..5b774c242 100755 --- a/src/cmd/ksh93/tests/subshell.sh +++ b/src/cmd/ksh93/tests/subshell.sh @@ -594,7 +594,7 @@ dot=$(cat <<-EOF EOF ) ) & sleep 1 if kill -0 $! 2> /dev/null -then err_exit 'command substitution containg here-doc with command substitution fails' +then err_exit 'command substitution containing here-doc with command substitution fails' fi printf=$(whence -p printf) diff --git a/src/cmd/ksh93/tests/substring.sh b/src/cmd/ksh93/tests/substring.sh index 197461557..d33b7f9a8 100755 --- a/src/cmd/ksh93/tests/substring.sh +++ b/src/cmd/ksh93/tests/substring.sh @@ -177,10 +177,10 @@ do [[ $(eval print -r -- \"\${xx//:/\\${str:i:1}}\") == "a${str:i:1}b" ]] | [[ $(eval print -rn -- \"\${xx//:/\'${str:i:1}\'}\") == "a${str:i:1}b" ]] || err_exit "substitution of '${str:i:1}' failed" [[ $(eval print -r -- \"\${xx//:/\"${str:i:1}\"}\") == "a${str:i:1}b" ]] || err_exit "substitution of \"${str:i:1}\" failed" done -[[ ${xx//:/\\n} == 'a\nb' ]] || err_exit "substituion of \\\\n failed" -[[ ${xx//:/'\n'} == 'a\nb' ]] || err_exit "substituion of '\\n' failed" -[[ ${xx//:/"\n"} == 'a\nb' ]] || err_exit "substituion of \"\\n\" failed" -[[ ${xx//:/$'\n'} == $'a\nb' ]] || err_exit "substituion of \$'\\n' failed" +[[ ${xx//:/\\n} == 'a\nb' ]] || err_exit "substitution of \\\\n failed" +[[ ${xx//:/'\n'} == 'a\nb' ]] || err_exit "substitution of '\\n' failed" +[[ ${xx//:/"\n"} == 'a\nb' ]] || err_exit "substitution of \"\\n\" failed" +[[ ${xx//:/$'\n'} == $'a\nb' ]] || err_exit "substitution of \$'\\n' failed" unset foo foo=one/two/three if [[ ${foo//'/'/_} != one_two_three ]] @@ -495,8 +495,8 @@ x=$'-(-\\"\')\\\'\\"\'-)-' pattern=00 var=100 -[[ $( print $(( ${var%%00} )) ) == 1 ]] || err_exit "arithmetic with embeddded patterns fails" -[[ $( print $(( ${var%%$pattern} )) ) == 1 ]] || err_exit "arithmetic with embeddded pattern variables fails" +[[ $( print $(( ${var%%00} )) ) == 1 ]] || err_exit "arithmetic with embedded patterns fails" +[[ $( print $(( ${var%%$pattern} )) ) == 1 ]] || err_exit "arithmetic with embedded pattern variables fails" if [[ ax == @(a)* ]] && [[ ${.sh.match[1]:0:${#.sh.match[1]}} != a ]] then err_exit '${.sh.match[1]:1:${#.sh.match[1]}} not expanding correctly' fi diff --git a/src/cmd/ksh93/tests/types.sh b/src/cmd/ksh93/tests/types.sh index ca2e3eca4..b0cbfc661 100755 --- a/src/cmd/ksh93/tests/types.sh +++ b/src/cmd/ksh93/tests/types.sh @@ -401,7 +401,7 @@ typeset -T olist=( ) olist foo foo.l[1]=x -[[ ${!foo.l[*]} == *0* ]] && '0-th elment of foo.l should not be set' +[[ ${!foo.l[*]} == *0* ]] && '0-th element of foo.l should not be set' typeset -T oset2=( typeset -A foo ) oset2 bar diff --git a/src/lib/libcmd/chmod.c b/src/lib/libcmd/chmod.c index beaab6722..5aad30965 100644 --- a/src/lib/libcmd/chmod.c +++ b/src/lib/libcmd/chmod.c @@ -36,7 +36,7 @@ USAGE_LICENSE "of changes to make, or an octal number representing the bit " "pattern for the new permissions.]" "[+?Symbolic mode strings consist of one or more comma separated list " - "of operations that can be perfomed on the mode. Each operation is of " + "of operations that can be performed on the mode. Each operation is of " "the form \auser\a \aop\a \aperm\a where \auser\a is zero or more of " "the following letters:]{" "[+u?User permission bits.]" diff --git a/src/lib/libcmd/head.c b/src/lib/libcmd/head.c index 426e7db80..e5b756dfc 100644 --- a/src/lib/libcmd/head.c +++ b/src/lib/libcmd/head.c @@ -50,10 +50,10 @@ USAGE_LICENSE "\anumber\a.]" "[n:lines?Copy \alines\a lines from each file.]#[lines:=10]" "[c:bytes?Copy \achars\a bytes from each file.]#[chars]" -"[q:quiet|silent?Never ouput filename headers.]" +"[q:quiet|silent?Never output filename headers.]" "[s:skip?Skip \askip\a characters or lines from each file before " "copying.]#[skip]" -"[v:verbose?Always ouput filename headers.]" +"[v:verbose?Always output filename headers.]" "\n\n" "[ file ... ]" "\n\n" diff --git a/src/lib/libcmd/mktemp.c b/src/lib/libcmd/mktemp.c index d95f86463..ce7550404 100644 --- a/src/lib/libcmd/mktemp.c +++ b/src/lib/libcmd/mktemp.c @@ -35,7 +35,7 @@ USAGE_LICENSE "[+*?Lower case to avoid clashes on case ignorant filesystems.]" "[+*?Pseudo-random part to deter denial of service attacks.]" "[+*?Default pseudo-random part (no specific \bX...\b template) " - "formatted to accomodate 8.3 filesystems.]" + "formatted to accommodate 8.3 filesystems.]" "}" "[+?A consecutive trailing sequence of \bX\b's in \aprefix\a is replaced " "by the pseudo-random part. If there are no \bX\b's then the " diff --git a/src/lib/libcmd/tail.c b/src/lib/libcmd/tail.c index c8df4ba3b..5f26fcd96 100644 --- a/src/lib/libcmd/tail.c +++ b/src/lib/libcmd/tail.c @@ -64,7 +64,7 @@ USAGE_LICENSE "[h!:headers?Output filename headers.]" "[l:lines?Copy units of lines. This is the default.]" "[L:log?When a \b--forever\b file times out via \b--timeout\b, verify that " - "the curent file has not been renamed and replaced by another file " + "the current file has not been renamed and replaced by another file " "of the same name (a common log file practice) before giving up on " "the file.]" "[q:quiet?Don't output filename headers. For GNU compatibility.]" @@ -86,7 +86,7 @@ USAGE_LICENSE "[+y?years]" "[+S?scores]" "}" -"[v:verbose?Always ouput filename headers.]" +"[v:verbose?Always output filename headers.]" "\n" "\n[file ...]\n" diff --git a/src/lib/libcmd/uname.c b/src/lib/libcmd/uname.c index cece94ac6..a295a757b 100644 --- a/src/lib/libcmd/uname.c +++ b/src/lib/libcmd/uname.c @@ -35,7 +35,7 @@ USAGE_LICENSE " standard output. When options are specified, one or more" " system characteristics are written to standard output, space" " separated, on a single line. When more than one option is specified" -" the output is in the order specfied by the \b-A\b option below." +" the output is in the order specified by the \b-A\b option below." " Unsupported option values are listed as \a[option]]\a. If any unknown" " options are specified then the local \b/usr/bin/uname\b is called.]" "[+?If any \aname\a operands are specified then the \bsysinfo\b(2) values"