7 files changed, 61 insertions, 104 deletions
diff --git a/Completion/Cygwin/Command/_cygpath b/Completion/Cygwin/Command/_cygpath
index 570639e6c..0ecfccc2e 100644
--- a/Completion/Cygwin/Command/_cygpath
+++ b/Completion/Cygwin/Command/_cygpath
@@ -1,14 +1,12 @@
 #compdef cygpath cygpath.exe
 #Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments  \
   '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-d,--dos}'[print DOS (short) form of NAME (C:\PROGRA~1\)]' \
   '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-m,--mixed}'[like --windows, but with regular slashes (C:/WINNT)]' \
   '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-u,--unix}'[(default) print Unix form of NAME (/cygdrive/c/winnt)]' \
   '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-w,--windows}'[print Windows form of NAME (C:\WINNT)]' \
-  "(--dos --mixed --type --unix --windows -d -m -t -u -w)"{-t,--type}":print TYPE form\: 'dos', 'mixed', 'unix', or 'windows':(dos mixed unix windows)" \
+  '(--dos --mixed --type --unix --windows -d -m -t -u -w)'{-t,--type}':print type:(dos mixed unix windows)' \
   '(--absolute --long-name --path --short-name -a -l -p -s)'{-a,--absolute}'[output absolute path]' \
   '(--absolute --long-name --path --short-name -a -l -p -s)'{-l,--long-name}'[print Windows long form of NAME (with -w, -m only)]' \
   "(--absolute --long-name --path --short-name -a -l -p -s)"{-p,--path}"[NAME is a PATH list (i.e., '/bin:/usr/bin')]" \
@@ -21,13 +19,8 @@ _arguments  \
   "(--desktop --homeroot --smprograms --sysdir --windir -D -H -P -S -W)"{-W,--windir}"[output 'Windows' directory and exit]" \
   '(--file -f)'{-f,--file}':read FILE for input; use - to read from STDIN:_files' \
   '(--option -o)'{-o,--option}'[read options from FILE as well (for use with --file)]' \
-  '(--close -c)'{-c,--close}':close HANDLE (for use in captured process):->HANDLE' \
+  '(--close -c)'{-c,--close}'[close specified handle (for use in captured process)]:handle' \
   '(--ignore -i)'{-i,--ignore}'[ignore missing argument]' \
-  '(--help -h)'{-h,--help}'[output usage information and exit]' \
-  '(--version -v)'{-v,--version}'[output version information and exit]' \
+  '(- 1)'{-h,--help}'[display usage information]' \
+  '(- 1)'{-v,--version}'[display version information]' \
   '1: :_files'  && return 0
-            
-case $state in
-  "HANDLE");;
-esac
-    
diff --git a/Completion/Cygwin/Command/_cygrunsrv b/Completion/Cygwin/Command/_cygrunsrv
index 08c23058e..725ac46a0 100644
--- a/Completion/Cygwin/Command/_cygrunsrv
+++ b/Completion/Cygwin/Command/_cygrunsrv
@@ -1,39 +1,25 @@
 #compdef cygrunsrv cygrunsrv.exe
-#Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments  \
-  '(--install -I)'{-I,--install}':Installes a new service named <svc_name>.:->svc_name' \
-  '(--remove -R)'{-R,--remove}':Removes a service named <svc_name>.:->svc_name' \
-  '(--start -S)'{-S,--start}':Starts a service named <svc_name>.:->svc_name' \
-  '(--stop -E)'{-E,--stop}':Stops a service named <svc_name>.:->svc_name' \
-  '(--path -p)'{-p,--path}':Application path which is run as a service.:->app_path' \
-  '(--args -a)'{-a,--args}':Optional string with command line options which is given to the service application on startup.:->args' \
-  '(--chdir -c)'{-c,--chdir}':Optional directory which will be used as working directory for the application.:_directories' \
-  '(--env -e)'{-e,--env}':Optional environment strings which are added to the environment when service is started. You can add up to 255 environment strings using:->VAR=VALUE' \
-  '(--disp -d)'{-d,--disp}':Optional string which contains the display name of the service. Defaults to service name.:->display_name' \
-  '(--desc -f)'{-f,--desc}':Optional string which contains the service description.:->description' \
-  "(--type -t)"{-t,--type}"[Optional start type of service. Defaults to 'auto'.]: :(auto manual)" \
-  '(--user -u)'{-u,--user}':Optional user name to start service as. Defaults to SYSTEM account.:_users' \
-  '(--passwd -w)'{-w,--passwd}':Optional password for user. Only needed if a user is given. If a user has an empty:->password' \
-  '(--termsig -s)'{-s,--termsig}':Optional signal to send to service application when service is stopped. <signal> can be a number or a signal name such as HUP, INT, QUIT, etc. Default is TERM.:_signals' \
-  '(--dep -y)'{-y,--dep}':Optional name of service that must be started:->svc_name2' \
-  '(--stdin -0)'{-0,--stdin}':Optional input file used for stdin redirection. Default is /dev/null.:_files' \
-  '(--stdout -1)'{-1,--stdout}':Optional output file used for stdout redirection. Default is /var/log/<svc_name>.log.:_files' \
-  '(--stderr -2)'{-2,--stderr}':Optional output file used for stderr redirection. Default is /var/log/<svc_name>.log.:_files' \
-  '(--shutdown -o)'{-o,--shutdown}'[Stop service application during system shutdown.]' \
-  '(--help -h)'{-h,--help}'[print this help, then exit.]' \
-  '(--version -v)'{-v,--version}'[print cygrunsrv program version number, then exit.]' \
-  '*: :_files'  && return 0
-            
-case $state in
-  "VAR=VALUE");;
-  "app_path");;
-  "args");;
-  "description");;
-  "display_name");;
-  "password");;
-  "svc_name");;
-  "svc_name2");;
-esac
+  '(-I --install)'{-I,--install}'[install a new service]:service' \
+  '(-R --remove)'{-R,--remove}'[remove specified service]:service' \
+  '(-S --start)'{-S,--start}'[start specified service]:service' \
+  '(-E --stop)'{-E,--stop}'[stop specified service]:service' \
+  '(-p --path)'{-p,--path}'[specify application path which is run as a service]:application path' \
+  '(-a --args)'{-a,--args}'[specify options to give service on startup]:args' \
+  '(-c --chdir)'{-c,--chdir}'[specify working directory for the application]:directory:_directories' \
+  '(-e --env)'{-e,--env}'[specify environment strings exported to service]:var=value' \
+  '(-d --disp)'{-d,--disp}'[specify display name for service]:display name' \
+  '(-f --desc)'{-f,--desc}'[specify service description]:description' \
+  '(-t --type)'{-t,--type}'[specify service start type]:start type:(auto manual)' \
+  '(-u --user)'{-u,--user}'[specify user to start service under]:user:_users' \
+  '(-w --passwd)'{-w,--passwd}'[specify password for user]:password' \
+  '(-s --termsig)'{-s,--termsig}'[specify signal to use to stop service]:signal:_signals' \
+  '(-y --dep)'{-y,--dep}'[specify name of service that must be started]:service' \
+  '(-0 --stdin)'{-0,--stdin}'[specify file for stdin redirection]:file:_files' \
+  '(-1 --stdout)'{-1,--stdout}'[specify file for stdout redirection]:file:_files' \
+  '(-2 --stderr)'{-2,--stderr}'[specify file for stderr redirection]:file:_files' \
+  '(-o --shutdown)'{-o,--shutdown}'[stop service application during system shutdown]' \
+  '(- *)'{-h,--help}'[print help information]' \
+  '(- *)'{-v,--version}'[print version information]' \
+  '*: :_files'
diff --git a/Completion/Cygwin/Command/_getclip b/Completion/Cygwin/Command/_getclip
index 0cb7b093f..c27e2dfdd 100644
--- a/Completion/Cygwin/Command/_getclip
+++ b/Completion/Cygwin/Command/_getclip
@@ -1,13 +1,10 @@
 #compdef getclip getclip.exe
 #Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments \
-  '(--dos -d)'{-d,--dos}'[Output text will have DOS line endings.]' \
-  '(--unix -u)'{-u,--unix}'[Output text will have UNIX line endings.]' \
-  '(--help -?)'{'-?',--help}'[Show this help message]' \
-  '--usage[Display brief usage message]' \
-  '--version[Display version information]' \
-  '--license[Display licensing information]'
-            
+  '(--dos -d)'{-d,--dos}'[output text will have DOS line endings]' \
+  '(--unix -u)'{-u,--unix}'[output text will have UNIX line endings]' \
+  '(-)'{-\?,--help}'[show this help message]' \
+  '(-)--usage[display brief usage message]' \
+  '(-)--version[display version information]' \
+  '(-)--license[display licensing information]'
diff --git a/Completion/Cygwin/Command/_getfacl b/Completion/Cygwin/Command/_getfacl
index a0adf6866..8e794131f 100644
--- a/Completion/Cygwin/Command/_getfacl
+++ b/Completion/Cygwin/Command/_getfacl
@@ -1,12 +1,10 @@
 #compdef getfacl getfacl.exe
 #Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments  \
-  '(--all -a)'{-a,--all}'[display the filename, the owner, the group, and the ACL of the file]' \
-  '(--dir -d)'{-d,--dir}'[display the filename, the owner, the group, and the default ACL of the directory, if it exists]' \
-  '(--help -h)'{-h,--help}'[output usage information and exit]' \
+  '(--all -a)'{-a,--all}'[display the filename, owner, group, and ACL of the file]' \
+  '(--dir -d)'{-d,--dir}'[display the filename, owner, group, and default ACL of the directory]' \
   '(--noname -n)'{-n,--noname}'[display user and group IDs instead of names]' \
-  '(--version -v)'{-v,--version}'[output version information and exit]' \
+  '(- *)'{-h,--help}'[display help information]' \
+  '(- *)'{-v,--version}'[display version information]' \
   '*: :_files'
diff --git a/Completion/Cygwin/Command/_mkshortcut b/Completion/Cygwin/Command/_mkshortcut
index 2a9d558aa..8718fa146 100644
--- a/Completion/Cygwin/Command/_mkshortcut
+++ b/Completion/Cygwin/Command/_mkshortcut
@@ -1,24 +1,15 @@
 #compdef mkshortcut mkshortcut.exe
-#Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments  \
-  '(--arguments -a)'{-a,--arguments=-}':Use arguments ARGS:->ARGS' \
-  '(--icon -i)'{-i,--icon=-}':icon file for link to use:_files' \
-  '(--iconoffset -j)'{-j,--iconoffset=-}':offset of icon in icon file (default is 0):->INT' \
-  '(--name -n)'{-n,--name=-}':name for link (defaults to TARGET):_files' \
-  "(--allusers -A)"{-A,--allusers}"[use 'All Users' instead of current user for -D,-P]" \
-  "(--desktop -D)"{-D,--desktop}"[create link relative to 'Desktop' directory]" \
-  "(--smprograms -P)"{-P,--smprograms}"[create link relative to Start Menu 'Programs' directory]" \
-  '(--help -h)'{-h,--help}'[Show this help message]' \
-  '--usage[Display brief usage message]' \
-  '(--version -v)'{-v,--version}'[Display version information]' \
-  '--license[Display licensing information]' \
-  '1:Target:_files'  && return 0
-            
-case $state in
-  "ARGS");;
-  "INT");;
-esac
-    
+  '(--arguments -a)'{-a,--arguments=-}'[use specified arguments]:arguments' \
+  '(--icon -i)'{-i,--icon=-}'[specify icon file for link to use]:icon file:_files' \
+  '(--iconoffset -j)'{-j,--iconoffset=-}'[specify offset of icon in icon file]:offset' \
+  '(--name -n)'{-n,--name=-}'[specify name for link]:file:_files' \
+  '(--allusers -A)'{-A,--allusers}"[use 'All Users' instead of current user for -D,-P]" \
+  '(--desktop -D)'{-D,--desktop}"[create link relative to 'Desktop' directory]" \
+  '(--smprograms -P)'{-P,--smprograms}"[create link relative to Start Menu 'Programs' directory]" \
+  '(- 1)'{-h,--help}'[show help information]' \
+  '(- 1)--usage[display brief usage message]' \
+  '(- 1)'{-v,--version}'[show version information]' \
+  '(- 1)--license[display licensing information]' \
+  '1:target:_files'
diff --git a/Completion/Cygwin/Command/_pscp b/Completion/Cygwin/Command/_pscp
index f04afb8d1..c2b8dd979 100644
--- a/Completion/Cygwin/Command/_pscp
+++ b/Completion/Cygwin/Command/_pscp
@@ -1,24 +1,18 @@
 #compdef pscp pscp.exe
 #Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
-_arguments  \
+_arguments \
   '-p[preserve file attributes]' \
   "-q[quiet, don't show statistics]" \
   '-r[copy directories recursively]' \
   '-v[show verbose messages]' \
-  '-load:Load settings from saved session:->sessname' \
-  '-P:connect to specified port:_ports' \
-  '-l:connect with specified username:_users' \
-  '-pw[passw login with specified password]' \
+  '-load[load settings from saved session]:session' \
+  '-P[connect to specified port]:port:_ports' \
+  '-l[connect with specified username]:username:_users' \
+  '-pw[login with specified password]:password' \
   '(-1 -2)'{-1,-2}'[force use of particular SSH protocol version]' \
   '-C[enable compression]' \
-  '-i:private key file for authentication:_files' \
+  '-i[specify private key file for authentication]:private key file:_files' \
   '-batch[disable all interactive prompts]' \
   '-unsafe[allow server-side wildcards (DANGEROUS)]' \
-  '*: :_files'  && return 0
-            
-case $state in
-  "sessname");;
-esac
+  '*: :_files'
diff --git a/Completion/Cygwin/Command/_putclip b/Completion/Cygwin/Command/_putclip
index db61f438d..484d054ee 100644
--- a/Completion/Cygwin/Command/_putclip
+++ b/Completion/Cygwin/Command/_putclip
@@ -1,12 +1,10 @@
 #compdef putclip putclip.exe
 #Generated by Felix Rosencrantz
 
-local context state line
-typeset -A opt_args
 _arguments \
-  '(--dos -d)'{-d,--dos}'[Clipboard text will have DOS line endings.]' \
-  '(--unix -u)'{-u,--unix}'[Clipboard text will have UNIX line endings.]' \
-  '(--help -?)'{'-?',--help}'[Show this help message]' \
-  '--usage[Display brief usage message]' \
-  '--version[Display version information]' \
-  '--license[Display licensing information]'
+  '(--dos -d)'{-d,--dos}'[clipboard text will have DOS line endings]' \
+  '(--unix -u)'{-u,--unix}'[clipboard text will have UNIX line endings]' \
+  '(-)'{'-?',--help}'[show this help message]' \
+  '(-)--usage[display brief usage message]' \
+  '(-)--version[display version information]' \
+  '(-)--license[display licensing information]'