Update upstream source from tag 'upstream/5.9'

Update to upstream version '5.9'
with Debian dir 9ec0c75153d850f8dda83cca1a9ed3ff6200c14b

1 files changed, 16 insertions, 16 deletions

diff --git a/Doc/help/setopt b/Doc/help/setopt
index 4478a1ed2..37eec1db4 100644
--- a/Doc/help/setopt
+++ b/Doc/help/setopt
@@ -1,27 +1,27 @@
 setopt [ {+|-}options | {+|-}o option_name ] [ -m ] [ name ... ]
-       Set  the  options  for  the shell.  All options specified either
+       Set the options for the shell.   All  options  specified  either
        with flags or by name are set.
 
        If no arguments are supplied, the names of all options currently
-       set  are printed.  The form is chosen so as to minimize the dif-
+       set are printed.  The form is chosen so as to minimize the  dif-
        ferences from the default options for the current emulation (the
-       default  emulation  being  native  zsh,  shown  as <Z> in zshop-
+       default emulation being native  zsh,  shown  as  <Z>  in  zshop-
        tions(1)).  Options that are on by default for the emulation are
-       shown  with  the prefix no only if they are off, while other op-
-       tions are shown without the prefix no and only if they  are  on.
-       In  addition  to  options  changed from the default state by the
-       user, any options activated automatically by the shell (for  ex-
-       ample,  SHIN_STDIN  or  INTERACTIVE)  will be shown in the list.
-       The format is further modified by the  option  KSH_OPTION_PRINT,
-       however  the  rationale for choosing options with or without the
+       shown with the prefix no only if they are off, while  other  op-
+       tions  are  shown without the prefix no and only if they are on.
+       In addition to options changed from the  default  state  by  the
+       user,  any options activated automatically by the shell (for ex-
+       ample, SHIN_STDIN or INTERACTIVE) will be  shown  in  the  list.
+       The  format  is further modified by the option KSH_OPTION_PRINT,
+       however the rationale for choosing options with or  without  the
        no prefix remains the same in this case.
 
-       If the -m flag is given the  arguments  are  taken  as  patterns
-       (which  should  be  quoted  to protect them from filename expan-
-       sion), and all options with names matching  these  patterns  are
+       If  the  -m  flag  is  given the arguments are taken as patterns
+       (which should be quoted to protect  them  from  filename  expan-
+       sion),  and  all  options with names matching these patterns are
        set.
 
-       Note  that  a bad option name does not cause execution of subse-
-       quent shell code to be aborted; this is behaviour  is  different
-       from  that  of  `set  -o'.  This is because set is regarded as a
+       Note that a bad option name does not cause execution  of  subse-
+       quent  shell  code to be aborted; this is behaviour is different
+       from that of `set -o'.  This is because set  is  regarded  as  a
        special builtin by the POSIX standard, but setopt is not.