54721: illegal -> invalid, invalid option -> bad option

Combinations of options can remain invalid, though.

6 files changed, 16 insertions, 16 deletions

diff --git a/Test/B02typeset.ztst b/Test/B02typeset.ztst
index 8839e3891..32e79ced2 100644
--- a/Test/B02typeset.ztst
+++ b/Test/B02typeset.ztst
@@ -18,7 +18,7 @@
 #  Function tracing (typeset -ft)		E02xtrace
 
 # Not yet tested:
-#  Assorted illegal flag combinations
+#  Assorted invalid flag combinations
 
 # For a few tests, we include a
 #    typeset -p param
diff --git a/Test/B10getopts.ztst b/Test/B10getopts.ztst
index 5ababebcc..4e1893fc4 100644
--- a/Test/B10getopts.ztst
+++ b/Test/B10getopts.ztst
@@ -73,11 +73,11 @@
 >test_getopts:3: argument expected after +c option
 
   test_getopts -x
-1:one illegal option
+1:one invalid option
 >test_getopts:3: bad option: -x
 
   test_getopts +x
-1:one illegal option, + variant
+1:one invalid option, + variant
 >test_getopts:3: bad option: +x
 
   set -- -x
diff --git a/Test/B11kill.ztst b/Test/B11kill.ztst
index ed87f0996..655e00c80 100644
--- a/Test/B11kill.ztst
+++ b/Test/B11kill.ztst
@@ -35,17 +35,17 @@
     kill a b c
   )
 3:kill with multiple wrong inputs should increment status
-?(eval):kill:2: illegal pid: a
-?(eval):kill:2: illegal pid: b
-?(eval):kill:2: illegal pid: c
+?(eval):kill:2: invalid pid: a
+?(eval):kill:2: invalid pid: b
+?(eval):kill:2: invalid pid: c
 
   (
     kill -INT a b c
   )
 3:kill with sigspec and wrong inputs should increment status
-?(eval):kill:2: illegal pid: a
-?(eval):kill:2: illegal pid: b
-?(eval):kill:2: illegal pid: c
+?(eval):kill:2: invalid pid: a
+?(eval):kill:2: invalid pid: b
+?(eval):kill:2: invalid pid: c
 
   (
     kill
@@ -75,14 +75,14 @@
     kill -URG ''
   )
 1:kill with empty pid and sigspec should not send signal to current process group
-?(eval):kill:3: illegal pid: 
+?(eval):kill:3: invalid pid: 
 
   (
     trap 'exit 19' TERM
     kill ''
   )
 1:Plain kill with empty pid should not send signal to current process group
-?(eval):kill:3: illegal pid: 
+?(eval):kill:3: invalid pid: 
 
 # posix doesn't actually define which numbers map to which signals, but the
 # first three seem pretty universal so we'll trust them
diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
index e44af8ad7..97577fd4e 100644
--- a/Test/D04parameter.ztst
+++ b/Test/D04parameter.ztst
@@ -2429,13 +2429,13 @@ F:behavior, see http://austingroupbugs.net/view.php?id=888
   (
   IFS=$'\x80'
   if [[ $IFS = $' \t\n\0' ]]; then
-    echo OK     # if $'\x80' is illegal (e.g. Linux)
+    echo OK     # if $'\x80' is invalid (e.g. Linux)
   else          # otherwise (e.g. macOS), it should work as a separator
     s=$'foo\x80\bar'
     [[ ${${=s}[1]} = foo ]] && echo OK
   fi
   )
-0D:reset IFS to default if it contains illegal character
+0D:reset IFS to default if it contains invalid character
 >OK
 
   (
@@ -2955,7 +2955,7 @@ F:behavior, see http://austingroupbugs.net/view.php?id=888
 
   : ${(#X):-@}
 1:${(#X)...}: bad math expression
-?(eval):1: bad math expression: illegal character: @
+?(eval):1: bad math expression: invalid character: @
 
   echo a${(#):-@}z
 0:${(#)...}: bad math expression
diff --git a/Test/K01nameref.ztst b/Test/K01nameref.ztst
index 6cfe6d1d0..65386d6a4 100644
--- a/Test/K01nameref.ztst
+++ b/Test/K01nameref.ztst
@@ -277,7 +277,7 @@ F:note this causes "var" to become set
 >typeset -t var
 
  typeset -n ptr[1]=var
-1:illegal nameref name
+1:invalid nameref name
 *?*reference variable cannot be an array
 
  typeset var=value
diff --git a/Test/V13zformat.ztst b/Test/V13zformat.ztst
index 449b96338..74fc14ae8 100644
--- a/Test/V13zformat.ztst
+++ b/Test/V13zformat.ztst
@@ -181,7 +181,7 @@
   for 1 in % \) - . 0 9 ''; do
     zformat -F REPLY '' $1:
   done
-1:spec with illegal char
+1:spec with invalid char
 ?(eval):zformat:2: invalid spec: %:
 ?(eval):zformat:2: invalid spec: ):
 ?(eval):zformat:2: invalid spec: -: