unposted: fix incorrectly capitalized completion descriptions

64 files changed, 1377 insertions, 1336 deletions

diff --git a/ChangeLog b/ChangeLog
index daa8403fc..a3ea981cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2010-06-06  Doug Kearns  <dougkearns@gmail.com>
+
+	* unposted: Completion/BSD/Command/_csup,
+	Completion/BSD/Command/_fetch, Completion/BSD/Command/_freebsd-update,
+	Completion/BSD/Command/_fstat, Completion/BSD/Command/_pfctl,
+	Completion/BSD/Command/_portaudit, Completion/BSD/Command/_portmaster,
+	Completion/BSD/Command/_portsnap, Completion/BSD/Command/_powerd,
+	Completion/BSD/Command/_procstat, Completion/Darwin/Command/_open,
+	Completion/Darwin/Command/_softwareupdate,
+	Completion/Debian/Command/_apt-file,
+	Completion/Linux/Command/_analyseplugin,
+	Completion/Linux/Command/_ethtool, Completion/Linux/Command/_ipset,
+	Completion/Linux/Command/_mdadm, Completion/Linux/Command/_rpmbuild,
+	Completion/Linux/Command/_strace,
+	Completion/Mandriva/Command/_rebootin, Completion/Redhat/Command/_yum,
+	Completion/Solaris/Command/_coreadm,
+	Completion/Solaris/Command/_dhcpinfo,
+	Completion/Solaris/Command/_dladm, Completion/Solaris/Command/_dumpadm,
+	Completion/Solaris/Command/_gcore, Completion/Solaris/Command/_inetadm,
+	Completion/Solaris/Command/_ptree,
+	Completion/Solaris/Command/_savecore,
+	Completion/Solaris/Command/_svcadm, Completion/Solaris/Command/_svccfg,
+	Completion/Solaris/Command/_svcprop, Completion/Solaris/Command/_svcs,
+	Completion/Solaris/Command/_zlogin, Completion/Unix/Command/_arp,
+	Completion/Unix/Command/_arping, Completion/Unix/Command/_bzr,
+	Completion/Unix/Command/_cdcd, Completion/Unix/Command/_ecasound,
+	Completion/Unix/Command/_feh, Completion/Unix/Command/_git,
+	Completion/Unix/Command/_gnupod, Completion/Unix/Command/_gnutls,
+	Completion/Unix/Command/_locate, Completion/Unix/Command/_module,
+	Completion/Unix/Command/_perforce, Completion/Unix/Command/_pkgadd,
+	Completion/Unix/Command/_pkginfo, Completion/Unix/Command/_pkgrm,
+	Completion/Unix/Command/_sisu, Completion/Unix/Command/_sqsh,
+	Completion/Unix/Command/_surfraw, Completion/Unix/Command/_tcpdump,
+	Completion/Unix/Command/_tmux, Completion/Unix/Command/_todo.sh,
+	Completion/Unix/Command/_wget, Completion/Unix/Command/_yafc,
+	Completion/Unix/Command/_zfs, Completion/Unix/Command/_zpool,
+	Completion/Unix/Type/_printers, Completion/X/Command/_mplayer,
+	Completion/X/Command/_setxkbmap, Completion/Zsh/Command/_cd: fix
+	incorrectly capitalized completion descriptions as per the
+	recommendations in Etc/completion-style-guide.
+
 2010-06-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 27983: Src/prompt.c: colours could be output twice.
@@ -167,7 +208,7 @@
 	Completion/Redhat/Command/_service
 	Completion/Unix/Command/.distfiles,
 	Completion/Unix/Command/_init_d,
-        Completion/Unix/Command/_service (moved from Redhat),
+	Completion/Unix/Command/_service (moved from Redhat),
 	Completion/Unix/Type/_services: updates for FreeBSD.
 
 2010-04-15  Peter Stephenson  <pws@csr.com>
@@ -528,7 +569,7 @@
 	Doc/Zsh/builtins.yo, Doc/Zsh/grammar.yo,
 	Etc/zsh-development-guide, Src/builtin.c, Src/init.c,
 	Src/mkbltnmlst.sh, Src/Builtins/rlimits.mdd: "repeat"
-        is not available when starting in emulation mode,
+	is not available when starting in emulation mode,
 	"ulimit" is; document that "sched", "limit", "unlimit"
 	already aren't.
 
@@ -681,7 +722,7 @@
 2009-12-28  Clint Adams  <clint@zsh.org>
 
 	* Chris Lamb: 27545: Completion/Unix/Command/_django:
-        runserver_plus and files completion for django.
+	runserver_plus and files completion for django.
 
 2009-12-18  Wayne Davison  <wayned@users.sourceforge.net>
 
@@ -902,7 +943,7 @@
 
 2009-11-06  Peter Stephenson  <pws@csr.com>
 
-        * Frank Terbeck: 27353: Functions/VCS_Info/VCS_INFO_bydir_detect,
+	* Frank Terbeck: 27353: Functions/VCS_Info/VCS_INFO_bydir_detect,
 	Functions/VCS_Info/vcs_info: More sanity checks for vcs_info
 
 2009-11-05  Peter Stephenson  <pws@csr.com>
@@ -1676,7 +1717,7 @@
 2009-04-06  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	*  Frank Terbeck <ft@bewatermyfriend.org>:  Functions/VCS_Info/*:
-        26816: vcs_info: add revision and "misc" argument to
+	26816: vcs_info: add revision and "misc" argument to
 	VCS_INFO_formats(); 26817: updates for get-revision, %i and %m;
 	26818:  Add git's sha1 hash as revision information; 26819: Add
 	information about hg's local revision number and the  commit's
@@ -1691,7 +1732,7 @@
 2009-04-04  Clint Adams  <clint@zsh.org>
 
 	* Simon Ruderich: 26800: Completion/Unix/Command/_git: fixes for "git add"
-        completion.
+	completion.
 
 2009-04-01  Peter Stephenson  <pws@csr.com>
 
@@ -4326,7 +4367,7 @@
 	* 24878: NEWS, Doc/Zsh/zle.yo, Src/glob.c, Src/pattern.c,
 	Src/zsh.h, Src/Zle/iwidgets.list, Src/Zle/zle_hist.c:
 	add history-incremental-pattern-search-backward and
-        history-incremental-pattern-search-forward, also optimize
+	history-incremental-pattern-search-forward, also optimize
 	history searches a bit more.
 
 	* 24876: don't install manual pages if empty.
@@ -8040,7 +8081,7 @@
 
 2006-09-29  Vin Shelton  <acs@xemacs.org>
 
-       * 22789: Src/init.c: Source zshenv even if non-interactive.
+	* 22789: Src/init.c: Source zshenv even if non-interactive.
 
 2006-09-29  Andrey Borzenkov <bor@zsh.org>
 
@@ -13203,5 +13244,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4991 $
+* $Revision: 1.4992 $
 *****************************************************
diff --git a/Completion/BSD/Command/_csup b/Completion/BSD/Command/_csup
index b4d345ee5..69e13f3d1 100644
--- a/Completion/BSD/Command/_csup
+++ b/Completion/BSD/Command/_csup
@@ -2,21 +2,21 @@
 
 _arguments -s \
     '-1[disable automatic retries]' \
-    '-4[Force usage of IPv4 addresses]' \
-    '-6[Force usage of IPv6 addresses]' \
-    '-A[Local address to bind to when connecting to the server]:local address:_hosts' \
-    '-b[Base directory]:base directory:_files -/' \
-    '-c[Subdirectory of base for information about collections]:collections directory:_files -/' \
+    '-4[force usage of IPv4 addresses]' \
+    '-6[force usage of IPv6 addresses]' \
+    '-A[local address to bind to when connecting to the server]:local address:_hosts' \
+    '-b[base directory]:base directory:_files -/' \
+    '-c[subdirectory of base for information about collections]:collections directory:_files -/' \
     '-d[maximum number of deleted files]:maximum number of deleted files:' \
-    '-h[Server host]:server host:_hosts' \
-    '-i[Include only files and directories matching]:file pattern:' \
+    '-h[server host]:server host:_hosts' \
+    '-i[include only files and directories matching]:file pattern:' \
     '-k[keep temporary copies of failed updates]' \
-    '-l[Lock file]:lock file:_files' \
-    '-L[Verbosity level]:verbosity level:(0 1 2)' \
-    '-L0[Verbosity level 0]' \
-    '-L1[Verbosity level 1]' \
-    '-L2[Verbosity level 2]' \
-    '-p[Server port]:port:_ports' \
+    '-l[lock file]:lock file:_files' \
+    '-L[verbosity level]:verbosity level:(0 1 2)' \
+    '-L0[verbosity level 0]' \
+    '-L1[verbosity level 1]' \
+    '-L2[verbosity level 2]' \
+    '-p[server port]:port:_ports' \
     '-r[maximum number of retries]:maximum number of retries:' \
     '-s[suppress status checks]' \
     '-v[print version information]' \
diff --git a/Completion/BSD/Command/_fetch b/Completion/BSD/Command/_fetch
index 7ca59b2e0..3136763a0 100644
--- a/Completion/BSD/Command/_fetch
+++ b/Completion/BSD/Command/_fetch
@@ -2,29 +2,29 @@
 # Deprecated arguments are removed from the completion
 
 _arguments -s \
-	'-1[Stop and return exit code 0 at the first successfully retrieved file]' \
-	'-4[Forces fetch to use IPv4 addresses only]' \
-	'-6[Forces fetch to use IPv6 addresses only]' \
-	'-A[Do not automatically follow "temporary" (302) redirects]' \
-	'-a[Automatically retry the transfer upon soft failures]' \
-	'-B[Specify the read buffer size in bytes]:bytes:' \
-	'-d[Use a direct connection even if a proxy is configured]' \
-	'-F[In combination with the -r flag, forces a restart]' \
-	'-l[If the target is a file-scheme URL, make a symbolic link to the target]' \
+	'-1[stop and return exit code 0 at the first successfully retrieved file]' \
+	'-4[forces fetch to use IPv4 addresses only]' \
+	'-6[forces fetch to use IPv6 addresses only]' \
+	'-A[do not automatically follow "temporary" (302) redirects]' \
+	'-a[automatically retry the transfer upon soft failures]' \
+	'-B[specify the read buffer size in bytes]:bytes:' \
+	'-d[use a direct connection even if a proxy is configured]' \
+	'-F[in combination with the -r flag, forces a restart]' \
+	'-l[if the target is a file-scheme URL, make a symbolic link to the target]' \
 	'-M' \
-	'-m[Mirror mode]' \
-	'-N[Use file instead of ~/.netrc to look up login names and pass- words for FTP sites]' \
-	'-n[Do not preserve the modification time]' \
-	'-o[Set the output file name]:file:_files' \
+	'-m[mirror mode]' \
+	'-N[use file instead of ~/.netrc to look up login names and pass- words for FTP sites]' \
+	'-n[do not preserve the modification time]' \
+	'-o[set the output file name]:file:_files' \
 	'-P' \
-	'-p[Use passive FTP]' \
-	'-q[Quiet mode]' \
-	'-R[Do not delete the output file in any circumstances]' \
-	'-r[Restart a previously interrupted transfer]' \
-	'-S[Require the file size reported by the server to match the specified value]' \
-	'-s[Print the size in bytes, without fetching it]' \
-	'-T[Set timeout value]:seconds:' \
-	'-U[When using passive FTP, allocate the port for the data connection from the low port range]' \
-	'-v[Increase verbosity level]' \
+	'-p[use passive FTP]' \
+	'-q[quiet mode]' \
+	'-R[do not delete the output file in any circumstances]' \
+	'-r[restart a previously interrupted transfer]' \
+	'-S[require the file size reported by the server to match the specified value]' \
+	'-s[print the size in bytes, without fetching it]' \
+	'-T[set timeout value]:seconds:' \
+	'-U[when using passive FTP, allocate the port for the data connection from the low port range]' \
+	'-v[increase verbosity level]' \
 	'-w[wait successive retries]:seconds:' \
 	'*:URL to fetch:_urls'
diff --git a/Completion/BSD/Command/_freebsd-update b/Completion/BSD/Command/_freebsd-update
index a47ac21d6..11235bad0 100644
--- a/Completion/BSD/Command/_freebsd-update
+++ b/Completion/BSD/Command/_freebsd-update
@@ -2,19 +2,19 @@
 
 local flags
 flags=(
-  '(cron)fetch[Fetch a compressed snapshot or update existing one]'
-  '(fetch)cron[Sleep rand(3600) seconds, and then fetch updates]'
-  '(install rollback)upgrade[Fetch files necessary for upgrading to a new release]'
-  '(upgrade rollback)install[Install the most recently fetched updates or upgrade]'
-  '(upgrade install)rollback[Uninstall the most recently installed updates]'
+  '(cron)fetch[fetch a compressed snapshot or update existing one]'
+  '(fetch)cron[sleep rand(3600) seconds, and then fetch updates]'
+  '(install rollback)upgrade[fetch files necessary for upgrading to a new release]'
+  '(upgrade rollback)install[install the most recently fetched updates or upgrade]'
+  '(upgrade install)rollback[uninstall the most recently installed updates]'
 )
 
 _arguments -s \
-  '-b[Operate on a system mounted at basedir]:basedir:_files -/' \
-  '-d[Store working files in workdir]:workdir:_files -/' \
-  '-f[Read configuration options from conffile]:conf file:_files' \
-  '-k[Trust an RSA key with SHA256 of KEY]:RSA key:' \
-  '-r[Specify the new release]:new release:' \
-  '-s[Fetch files from the specified server or server pool]:server:_hosts' \
-  '-f[Mail output of cron command, if any, to address]:address:' \
+  '-b[operate on a system mounted at basedir]:basedir:_files -/' \
+  '-d[store working files in workdir]:workdir:_files -/' \
+  '-f[read configuration options from conffile]:conf file:_files' \
+  '-k[trust an RSA key with SHA256 of KEY]:RSA key:' \
+  '-r[specify the new release]:new release:' \
+  '-s[fetch files from the specified server or server pool]:server:_hosts' \
+  '-f[mail output of cron command, if any, to address]:address:' \
   ':command:_values -S " " -w "commands" $flags[@]'
diff --git a/Completion/BSD/Command/_fstat b/Completion/BSD/Command/_fstat
index 81948b21d..3e8d61733 100644
--- a/Completion/BSD/Command/_fstat
+++ b/Completion/BSD/Command/_fstat
@@ -4,12 +4,12 @@ local pids
 pids=(${${${(f)"$(/usr/bin/procstat -ah)"}/[[:space:]]#/}/[[:space:]]*[[:space:]](ELF[[:digit:]]#[[:space:]]|-[[:space:]]#)/:})
 
 _arguments -s \
-'-f[Restrict examination to files open in the same file systems as the named file arguments]' \
-'-M[Extract values associated with the name list from the specified core]:core:_files' \
-'-N[Extract the name list from the specified system]:system:' \
-'-m[Include memory-mapped files in the listing]' \
-'-n[Numerical format]' \
-'-p[Report all files open by the specified process]:Process id:(($pids))' \
-'-u[Report all files open by the specified user]:User:_users' \
-'-v[Verbose mode]' \
-'*:Files:_files'
+'-f[restrict examination to files open in the same file systems as the named file arguments]' \
+'-M[extract values associated with the name list from the specified core]:core:_files' \
+'-N[extract the name list from the specified system]:system:' \
+'-m[include memory-mapped files in the listing]' \
+'-n[numerical format]' \
+'-p[report all files open by the specified process]:process id:(($pids))' \
+'-u[report all files open by the specified user]:user:_users' \
+'-v[verbose mode]' \
+'*:files:_files'
diff --git a/Completion/BSD/Command/_pfctl b/Completion/BSD/Command/_pfctl
index bb185f463..1a2345b66 100644
--- a/Completion/BSD/Command/_pfctl
+++ b/Completion/BSD/Command/_pfctl
@@ -3,56 +3,56 @@
 local pfctl_flush_modifiers pfctl_optimizer_level pfctl_show_modifiers pfctl_tables_command pfctl_debug_level
 
 pfctl_flush_modifiers=(
-    'all:Flush all'
-    'info:Flush the filter information'
-    'nat:Flush the NAT rules'
-    'osfp:Flush the passive operating system fingerprints'
-    'queue:Flush the queue rules'
-    'rules:Flush the filter rules'
-    'state:Flush the stable table'
-    'Sources:Flush the source tracking table'
-    'Tables:Flush the tables'
+    'all:flush all'
+    'info:flush the filter information'
+    'nat:flush the NAT rules'
+    'osfp:flush the passive operating system fingerprints'
+    'queue:flush the queue rules'
+    'rules:flush the filter rules'
+    'state:flush the stable table'
+    'Sources:flush the source tracking table'
+    'Tables:flush the tables'
 )
 
 pfctl_show_modifiers=(
-    'nat:Show the currently loaded NAT rules'
-    'queue:Show the currently loaded queue rules'
-    'rules:Show the currently loaded filter rules'
-    'Anchors:Show the currently loaded anchors directly attached to the main ruleset'
-    'state:Show the contents of the state table'
-    'Sources:Show the contents of the source tracking table'
-    'info:Show filter information'
-    'labels:Show per-rule statistics of filter rules with labels'
-    'timeouts:Show the current global timeouts'
-    'memory:Show the current pool memory hard limits'
-    'Tables:Show the list of tables'
-    'osfp:Show the list of operating system fingerprints'
-    'Interfaces:Show the list of interfaces and interface drivers available to PF'
-    'all:Show all except for the lists of interfaces and operating system fingerprints'
+    'nat:show the currently loaded NAT rules'
+    'queue:show the currently loaded queue rules'
+    'rules:show the currently loaded filter rules'
+    'Anchors:show the currently loaded anchors directly attached to the main ruleset'
+    'state:show the contents of the state table'
+    'Sources:show the contents of the source tracking table'
+    'info:show filter information'
+    'labels:show per-rule statistics of filter rules with labels'
+    'timeouts:show the current global timeouts'
+    'memory:show the current pool memory hard limits'
+    'Tables:show the list of tables'
+    'osfp:show the list of operating system fingerprints'
+    'Interfaces:show the list of interfaces and interface drivers available to PF'
+    'all:show all except for the lists of interfaces and operating system fingerprints'
 )
 
 pfctl_optimizer_level=(
-    'none:Disable the ruleset optimizer'
-    'basic:Enable basic ruleset optimizations'
-    'profile:Enable basic ruleset optimizations with profiling'
+    'none:disable the ruleset optimizer'
+    'basic:enable basic ruleset optimizations'
+    'profile:enable basic ruleset optimizations with profiling'
 )
 pfctl_tables_command=(
-    'kill:Kill a table'
-    'flush:Flush all addresses of a table'
-    'add:Add one or more addresses in a table'
-    'delete:Delete one or more addresses from a table'
-    'expire:Delete addresses which had their statistics cleared more than number seconds ago'
-    'replace:Replace the addresses of the table'
-    'show:Show the content (addresses) of a table'
-    'test:Test if the given addresses match a table'
-    'zero:Clear all the statistics of a table'
-    'load:Load only the table definitions from pf.conf(5)'
+    'kill:kill a table'
+    'flush:flush all addresses of a table'
+    'add:add one or more addresses in a table'
+    'delete:delete one or more addresses from a table'
+    'expire:delete addresses which had their statistics cleared more than number seconds ago'
+    'replace:replace the addresses of the table'
+    'show:show the content (addresses) of a table'
+    'test:test if the given addresses match a table'
+    'zero:clear all the statistics of a table'
+    'load:load only the table definitions from pf.conf(5)'
 )
 pfctl_debug_level=(
-    "none:Don\'t generate debug messages" 
-    'urgent:Generate debug messages only for serious errors' 
-    'misc:Generate debug messages for various errors' 
-    'loud:Generate debug messages for common conditions'
+    "none:don\'t generate debug messages" 
+    'urgent:generate debug messages only for serious errors' 
+    'misc:generate debug messages for various errors' 
+    'loud:generate debug messages for common conditions'
 )
 _iface() {
     local pfctl_iface
@@ -68,29 +68,29 @@ _tables() {
 # Missing -a
 #
 _arguments -s \
-    '-F[Flush the filter parameters specified by modifier]:modifier:(($pfctl_flush_modifiers))' \
-    '-A[Load only the queue rules present in the rule file]' \
-    '-D[Define macro to be set to value]:macro:' \
-    '-d[Disable the packet filter]' \
-    '-e[Enable the packet filter]' \
-    '-f[Load the rules contained in a file]:configuration file:_files' \
-    '-g[Include output helpful for debugging]' \
-    '-h[Help]' \
-    '-i[Restrict the operation to the given interface]:interface:_iface' \
-    '-K[Kill all of the source tracking entries originating from the specified host or network]:host or network:_hosts' \
-    '-k[Kill all of the state entries originating from the specified host or network]:host or network:_hosts' \
-    '-m[Merge in explicitly given options]' \
-    '-N[Load only the NAT rules present in the rule file]' \
-    '-n[Do not actually load rules, just parse them]' \
-    '-O[Load only the options present in the rule file]' \
-    '-o[Control the ruleset optimizer]:level:(($pfctl_optimizer_level))' \
-    '-p[Use the device file device instead of the default /dev/pf]:device:_files' \
-    '-q[Only print errors and warnings]' \
-    '-R[Load only the filter rules present in the rule file]' \
-    '-r[Perform reverse DNS lookups on states when displaying them]' \
-    '-s[Show the filter parameters specified by modifier]:modifier:(($pfctl_show_modifiers ))' \
-    '-T[Specify the command to apply to the table]:command:(($pfctl_tables_command))' \
-    '-t[Specify the name of the table]:table:_tables' \
-    '-v[Produce more verbose output]' \
-    '-x[Set the debug level]:debug level:(($pfctl_debug_level))' \
-    '-z[Clear per-rule statistics]'
+    '-F[flush the filter parameters specified by modifier]:modifier:(($pfctl_flush_modifiers))' \
+    '-A[load only the queue rules present in the rule file]' \
+    '-D[define macro to be set to value]:macro:' \
+    '-d[disable the packet filter]' \
+    '-e[enable the packet filter]' \
+    '-f[load the rules contained in a file]:configuration file:_files' \
+    '-g[include output helpful for debugging]' \
+    '-h[help]' \
+    '-i[restrict the operation to the given interface]:interface:_iface' \
+    '-K[kill all of the source tracking entries originating from the specified host or network]:host or network:_hosts' \
+    '-k[kill all of the state entries originating from the specified host or network]:host or network:_hosts' \
+    '-m[merge in explicitly given options]' \
+    '-N[load only the NAT rules present in the rule file]' \
+    '-n[do not actually load rules, just parse them]' \
+    '-O[load only the options present in the rule file]' \
+    '-o[control the ruleset optimizer]:level:(($pfctl_optimizer_level))' \
+    '-p[use the device file device instead of the default /dev/pf]:device:_files' \
+    '-q[only print errors and warnings]' \
+    '-R[load only the filter rules present in the rule file]' \
+    '-r[perform reverse DNS lookups on states when displaying them]' \
+    '-s[show the filter parameters specified by modifier]:modifier:(($pfctl_show_modifiers ))' \
+    '-T[specify the command to apply to the table]:command:(($pfctl_tables_command))' \
+    '-t[specify the name of the table]:table:_tables' \
+    '-v[produce more verbose output]' \
+    '-x[set the debug level]:debug level:(($pfctl_debug_level))' \
+    '-z[clear per-rule statistics]'
diff --git a/Completion/BSD/Command/_portaudit b/Completion/BSD/Command/_portaudit
index 36f6d5f1c..bb942a824 100644
--- a/Completion/BSD/Command/_portaudit
+++ b/Completion/BSD/Command/_portaudit
@@ -1,14 +1,14 @@
 #compdef portaudit
 
 _arguments -s \
-    '-a[Vulnerability report for all installed packages]' \
-    '-C[Vulnerability report for the port in the current working directory]' \
-    '-d[Print creation date of the database]' \
-    '-F[Fetch the current database]' \
-    '-q[Quiet mode]' \
-    '-V[Show portaudit version number]' \
-    '-v[Verbose mode]' \
-    '-X[Download a fresh database from least days old]:days:' \
-    '-f[Check the packages listed in file]:file:_files' \
-    '-r[Restrict listed vulnerabilities with eregex pattern]:eregex:' \
+    '-a[vulnerability report for all installed packages]' \
+    '-C[vulnerability report for the port in the current working directory]' \
+    '-d[print creation date of the database]' \
+    '-F[fetch the current database]' \
+    '-q[quiet mode]' \
+    '-V[show portaudit version number]' \
+    '-v[verbose mode]' \
+    '-X[download a fresh database from least days old]:days:' \
+    '-f[check the packages listed in file]:file:_files' \
+    '-r[restrict listed vulnerabilities with eregex pattern]:eregex:' \
     ':pkg-name:'
diff --git a/Completion/BSD/Command/_portmaster b/Completion/BSD/Command/_portmaster
index 0fd34dc60..4c16e2d1b 100644
--- a/Completion/BSD/Command/_portmaster
+++ b/Completion/BSD/Command/_portmaster
@@ -77,7 +77,7 @@ _portmaster() {
       _arguments -s \
       $standalone_args \
       $common_args \
-      '*:Packages and Ports:_portmaster_pkgs_and_ports'
+      '*:packages and ports:_portmaster_pkgs_and_ports'
     else 
       case "$words[2]" in
 	--clean-distfiles|--clean-distfiles-all|--check-depends|--check-port-dbdir|--version|-help|-h)
@@ -86,14 +86,14 @@ _portmaster() {
 	*)
 	if (( $words[(I)-(e|r)] ));then
 	  _arguments -s \
-	  '*:Packages:_portmaster_pkgs'
+	  '*:packages:_portmaster_pkgs'
 	elif (( kid=$words[(I)-o] ));then
 	  if (( CURRENT == $kid + 1 ));then
 	    _arguments -s \
-	    '*:Ports replacing:_portmaster_ports'
+	    '*:ports replacing:_portmaster_ports'
 	  elif (( CURRENT == $kid + 2 )); then
 	    _arguments -s \
-	    '*:Package to replace:_portmaster_pkgs'
+	    '*:package to replace:_portmaster_pkgs'
 	  else 
 	    return 0
 	  fi
@@ -102,7 +102,7 @@ _portmaster() {
 	else
 	  _arguments -s \
 	  $common_args \
-	  '*:Packages and Ports:_portmaster_pkgs_and_ports'
+	  '*:packages and ports:_portmaster_pkgs_and_ports'
 	fi
 	;;
       esac
diff --git a/Completion/BSD/Command/_portsnap b/Completion/BSD/Command/_portsnap
index 505c7a321..db71fbc60 100644
--- a/Completion/BSD/Command/_portsnap
+++ b/Completion/BSD/Command/_portsnap
@@ -4,20 +4,20 @@ local context state line
 typeset -A opt_args
 
 flags=(
-  '(cron)fetch[Fetch a compressed snapshot or update existing one]'
-  '(fetch)cron[Sleep rand(3600) seconds, and then fetch updates]'
-  '(update)extract[Extract snapshot, replacing existing files and dirs]'
-  '(extract)update[Update ports tree to match current snapshot]'
+  '(cron)fetch[fetch a compressed snapshot or update existing one]'
+  '(fetch)cron[sleep rand(3600) seconds, and then fetch updates]'
+  '(update)extract[extract snapshot, replacing existing files and dirs]'
+  '(extract)update[update ports tree to match current snapshot]'
 )
 
 _arguments -C -s \
-    '-d[Store working files in workdir]:workdir:_files -/' \
-    '-f[Read configuration options from conffile]:conf file:_files' \
-    '-I[Update INDEX only. (update command only)]' \
-    '-k[Trust an RSA key with SHA256 hash of KEY]:RSA key:_files' \
-    '-l[Merge the specified local describes file into the INDEX]:file:_files' \
-    '-p[Location of uncompressed ports tree]:uncompressed ports tree:_files -/' \
-    '-s[Server from which to fetch updates]:server:_hosts' \
+    '-d[store working files in workdir]:workdir:_files -/' \
+    '-f[read configuration options from conffile]:conf file:_files' \
+    '-I[update INDEX only. (update command only)]' \
+    '-k[trust an RSA key with SHA256 hash of KEY]:RSA key:_files' \
+    '-l[merge the specified local describes file into the INDEX]:file:_files' \
+    '-p[location of uncompressed ports tree]:uncompressed ports tree:_files -/' \
+    '-s[server from which to fetch updates]:server:_hosts' \
     '*:principal:->principal' && ret=0
 
 if [[ $state == principal ]]; then
diff --git a/Completion/BSD/Command/_powerd b/Completion/BSD/Command/_powerd
index 8b275ed89..18a9fb437 100644
--- a/Completion/BSD/Command/_powerd
+++ b/Completion/BSD/Command/_powerd
@@ -3,11 +3,11 @@
 local powerd_mode
 powerd_mode=(minimum maximum adaptative)
 _arguments -s \
-    "-a[Mode to use while on AC power]:mode:($powerd_mode)" \
-    "-b[Mode to use while on battery power]:mode:($powerd_mode)" \
+    "-a[mode to use while on AC power]:mode:($powerd_mode)" \
+    "-b[mode to use while on battery power]:mode:($powerd_mode)" \
     '-i[CPU idle percent level when begin to degrade performance]:percent:' \
     "-n[mode to use normally when the AC line state is unknown]:mode:($powerd_mode)" \
     '-p[polling interval (in milliseconds) for AC line state and system idle levels]:interval:' \
-    '-P[Alternative pidfile]:pidfile:_files' \
+    '-P[alternative pidfile]:pidfile:_files' \
     '-r[CPU idle percent level where to increase performance]:percent:' \
-    '-v[Verbose mode]'
+    '-v[verbose mode]'
diff --git a/Completion/BSD/Command/_procstat b/Completion/BSD/Command/_procstat
index b6343beff..f8bc54290 100644
--- a/Completion/BSD/Command/_procstat
+++ b/Completion/BSD/Command/_procstat
@@ -5,13 +5,13 @@ local pids
 pids=(${${${(f)"$(/usr/bin/procstat -ah)"}/[[:space:]]#/}/[[:space:]]*[[:space:]](ELF[[:digit:]]#[[:space:]]|-[[:space:]]#)/:})
 
 _arguments -s \
-'-b[Display binary information for the process]' \
-'-c[Display command line arguments for the process]' \
-'-f[Display file descriptor information for the process]' \
-'-k[Display the stacks of kernel threads in the process]' \
-'-s[Display security credential information for the process]' \
-'-t[Display thread information for the process]' \
-'-v[Display virtual memory mappings for the process]' \
-'-h[Suppress table headers.]' \
-'-a[All processes]' \
-':Process id:(($pids))'
+'-b[display binary information for the process]' \
+'-c[display command line arguments for the process]' \
+'-f[display file descriptor information for the process]' \
+'-k[display the stacks of kernel threads in the process]' \
+'-s[display security credential information for the process]' \
+'-t[display thread information for the process]' \
+'-v[display virtual memory mappings for the process]' \
+'-h[suppress table headers]' \
+'-a[all processes]' \
+':process id:(($pids))'
diff --git a/Completion/Darwin/Command/_open b/Completion/Darwin/Command/_open
index 3926276c6..eadad1831 100644
--- a/Completion/Darwin/Command/_open
+++ b/Completion/Darwin/Command/_open
@@ -13,7 +13,7 @@ _open() {
   _arguments -C \
     '-a[specify application]: :->open_mac_applications' \
     '-e[open with TextEdit]' \
-    '-f[Reads input from standard input and opens with TextEdit]' \
+    '-f[reads input from standard input and opens with TextEdit]' \
     '*: :->open_files'
 
   case "$state" in
diff --git a/Completion/Darwin/Command/_softwareupdate b/Completion/Darwin/Command/_softwareupdate
index cec16f30d..6db577b06 100644
--- a/Completion/Darwin/Command/_softwareupdate
+++ b/Completion/Darwin/Command/_softwareupdate
@@ -36,7 +36,7 @@ _softwareupdate() {
 
   _arguments -R \
     '(-h --help -l --list)-q[quiet mode]' \
-    {-l,--list}'[List all available updates]:*:' \
+    {-l,--list}'[list all available updates]:*:' \
     {-d,--download}'[download to directory set in InternetConfig]:*:' \
     {-i,--install}'[install (requires root)]:*: :->install' \
     '--ignored[show or manage ignored updates list (per-user)]:*:: :->ignored' \
diff --git a/Completion/Debian/Command/_apt-file b/Completion/Debian/Command/_apt-file
index fcc0482e9..eddbbdcf5 100644
--- a/Completion/Debian/Command/_apt-file
+++ b/Completion/Debian/Command/_apt-file
@@ -24,10 +24,10 @@ _apt-file() {
     case $state in
       cmds)
         cmds=(
-            'update:Resynchronize package contents'
-            'search:Search in which package file is included'
-            'list:List contents of a package'
-            'show:Alias for list'
+            'update:resynchronize package contents'
+            'search:search in which package file is included'
+            'list:list contents of a package'
+            'show:alias for list'
             'purge:remove all Contents-<ARCH>.gz files in cache directory'
         )
         _describe -t commands 'apt-list command' cmds && ret=0
diff --git a/Completion/Linux/Command/_analyseplugin b/Completion/Linux/Command/_analyseplugin
index e7f90ba7b..f7f36db50 100644
--- a/Completion/Linux/Command/_analyseplugin
+++ b/Completion/Linux/Command/_analyseplugin
@@ -4,7 +4,7 @@ local expl context state line nopts ret=1
 typeset -A opt_args
 
 _arguments \
-    '-l[Gives a brief listing (one line per plugin)]' \
+    '-l[gives a brief listing (one line per plugin)]' \
     '(-)1:plugin file:->pfile' \
     '(-)2::plugin label:->plabel' && ret=0
 
diff --git a/Completion/Linux/Command/_ethtool b/Completion/Linux/Command/_ethtool
index 2fabd81da..a01d38823 100644
--- a/Completion/Linux/Command/_ethtool
+++ b/Completion/Linux/Command/_ethtool
@@ -24,29 +24,29 @@ if [[ $CURRENT -ge 4 ]]; then
 	  ;;
 	  advertise)
 		_values 'hexidecimal value (or a combination of the following)' \
-			'0x001[10 Half]' \
-			'0x002[10 Full]' \
-			'0x004[100 Half]' \
-			'0x008[100 Full]' \
-			'0x010[1000 Half(not supported by IEEE standards)]' \
-			'0x020[1000 Full]' \
-			'0x8000[2500 Full(not supported by IEEE standards)]' \
-			'0x800[10000 Full]' \
-			'0x03F[Auto]'
+			'0x001[10 half]' \
+			'0x002[10 full]' \
+			'0x004[100 half]' \
+			'0x008[100 full]' \
+			'0x010[1000 half(not supported by IEEE standards)]' \
+			'0x020[1000 full]' \
+			'0x8000[2500 full(not supported by IEEE standards)]' \
+			'0x800[10000 full]' \
+			'0x03F[auto]'
 	  ;;
 	  xcvr)
 		_wanted -x xcvr expl 'transceiver type' compadd internal external
 	  ;;
 	  wol)
 		_values -s '' 'Wake-on-LAN options' \
-			'(d)p[Wake on phy activity]' \
-			'(d)u[Wake on unicast messages]' \
-			'(d)m[Wake on multicast messages]' \
-			'(d)b[Wake on broadcast messages]' \
-			'(d)a[Wake on ARP]' \
-			'(d)g[Wake on MagicPacket(tm)]' \
-			'(d)s[Enable SecureOn(tm) password for MagicPacket(tm)]' \
-			'(p u m b a g s)d[Disable (wake on nothing)]'
+			'(d)p[wake on phy activity]' \
+			'(d)u[wake on unicast messages]' \
+			'(d)m[wake on multicast messages]' \
+			'(d)b[wake on broadcast messages]' \
+			'(d)a[wake on ARP]' \
+			'(d)g[wake on MagicPacket(tm)]' \
+			'(d)s[enable SecureOn(tm) password for MagicPacket(tm)]' \
+			'(p u m b a g s)d[disable (wake on nothing)]'
 	  ;;
 	  sopass)
 		_message -e secureon 'password - 6 bytes in ethernet MAC hex format (xx:yy:zz:aa:bb:cc)'
@@ -58,9 +58,9 @@ if [[ $CURRENT -ge 4 ]]; then
 	case $words[2]; in
 	  -A|--pause)
 		_values -S ' ' -w 'pause options' \
-			'autoneg[Specify if pause autonegotiation is enabled]' \
-			'rx[Specify if RX pause is enabled]' \
-			'tx[Specify if TX pause is enabled]'
+			'autoneg[specify if pause autonegotiation is enabled]' \
+			'rx[specify if RX pause is enabled]' \
+			'tx[specify if TX pause is enabled]'
 	  ;;
 	  -C|--coalesce)
 		_values -S ' ' -w 'coalescing settings' \
@@ -78,10 +78,10 @@ if [[ $CURRENT -ge 4 ]]; then
 	  ;;
 	  -G|--set-ring)
 		_values -S ' ' -w 'ring parameters' \
-			'rx[Change number of ring entries for the RX ring]' \
-			'rx-mini[Change number of ring entries for the RX Mini ring]' \
-			'rx-jumbo[Change number of ring entries for the RX Jumbo ring]' \
-			'tx[Change number of ring entries for the TX ring]'
+			'rx[change number of ring entries for the RX ring]' \
+			'rx-mini[change number of ring entries for the RX Mini ring]' \
+			'rx-jumbo[change number of ring entries for the RX Jumbo ring]' \
+			'tx[change number of ring entries for the TX ring]'
 	  ;;
 	  -d|--register-dump)
 		_values -S ' ' -w 'register dump options' \
@@ -103,12 +103,12 @@ if [[ $CURRENT -ge 4 ]]; then
 	  ;;
 	  -K|--offload)
 		_values -S ' ' -w 'offload options' \
-			'rx[Specify if RX checksumming is enabled]' \
-			'tx[Specify if TX checksumming is enabled]' \
-			'sg[Specify if scatter-gather is enabled]' \
-			'tso[Specify if TCP segmentation offload is enabled]' \
-			'ufo[Specify if UDP segmentation offload is enabled]' \
-			'gso[Specify if generic segmentation offload is enabled]'
+			'rx[specify if RX checksumming is enabled]' \
+			'tx[specify if TX checksumming is enabled]' \
+			'sg[specify if scatter-gather is enabled]' \
+			'tso[specify if TCP segmentation offload is enabled]' \
+			'ufo[specify if UDP segmentation offload is enabled]' \
+			'gso[specify if generic segmentation offload is enabled]'
 	  ;;
 	  -p|--identify)
 		if [[ $CURRENT -eq 4 ]] && _message -e length 'seconds'
@@ -120,16 +120,16 @@ if [[ $CURRENT -ge 4 ]]; then
 	  ;;
 	  -s|--change)
 		_values -S ' ' -w 'change setting' \
-			'speed[Set speed in Mb/s]' \
-			'duplex[Set full or half duplex mode]' \
-			'port[Select device port]' \
-			'autoneg[Specify if autonegotiation is enabled]' \
-			'advertise[Set the speed and duplex advertised by autonegotiation]' \
+			'speed[set speed in Mb/s]' \
+			'duplex[set full or half duplex mode]' \
+			'port[select device port]' \
+			'autoneg[specify if autonegotiation is enabled]' \
+			'advertise[set the speed and duplex advertised by autonegotiation]' \
 			'phyad[PHY address]' \
-			'xcvr[Select transceiver type]' \
-			'wol[Set Wake-on-LAN options]' \
-			'sopass[Set the SecureOn(tm) password]' \
-			'msglvl[Set the driver message level]'
+			'xcvr[select transceiver type]' \
+			'wol[set Wake-on-LAN options]' \
+			'sopass[set the SecureOn(tm) password]' \
+			'msglvl[set the driver message level]'
 	  ;;
 	esac
 	  ;;
@@ -153,7 +153,7 @@ _arguments \
 	"($cmds)"{-i,--driver}'[queries the specified ethernet device for associated driver information]' \
 	"($cmds)"{-d,--register-dump}'[retrieves and prints a register dump for the specified ethernet device]' \
 	"($cmds)"{-e,--eeprom-dump}'[retrieves and prints an EEPROM dump for the specified ethernet device]' \
-	"($cmds)"{-E,--change-eeprom}'[Changes EEPROM byte for the specified ethernet device]' \
+	"($cmds)"{-E,--change-eeprom}'[changes EEPROM byte for the specified ethernet device]' \
 	"($cmds)"{-k,--show-offload}'[queries the specified ethernet device for offload information]' \
 	"($cmds)"{-K,--offload}'[change the offload parameters of the specified ethernet device]' \
 	"($cmds)"{-p,--identify}'[initiates adapter-specific action intended to identify the adapter by sight]' \
diff --git a/Completion/Linux/Command/_ipset b/Completion/Linux/Command/_ipset
index 244cb8f22..7896eace7 100644
--- a/Completion/Linux/Command/_ipset
+++ b/Completion/Linux/Command/_ipset
@@ -5,17 +5,17 @@ local -a args from_to hash cmds listopts
 
 _set_types () {
 	_values -S \  "Set type" \
-		'ipmap[Up to 65536 IP addresses]' \
-		'macipmap[Up to 65536 IP addresses with MAC]' \
-		'portmap[Up to 65536 ports]' \
-		'iphash[Hash of IP addresses]' \
-		'nethash[Hash of network addresses]' \
-		'ipporthash[Hash of IP address and port pairs]' \
-		'ipportiphash[Hash of IP address,port and IP address triples]' \
-		'ipportnethash[Hash of IP address,port and network address triples]' \
-		'iptree[Tree of IP addresses, optionally with timeout]' \
-		'iptreemap[Tree of IP addresses or networks]' \
-		'setlist[List of sets]'
+		'ipmap[up to 65536 IP addresses]' \
+		'macipmap[up to 65536 IP addresses with MAC]' \
+		'portmap[up to 65536 ports]' \
+		'iphash[hash of IP addresses]' \
+		'nethash[hash of network addresses]' \
+		'ipporthash[hash of IP address and port pairs]' \
+		'ipportiphash[hash of IP address,port and IP address triples]' \
+		'ipportnethash[hash of IP address,port and network address triples]' \
+		'iptree[tree of IP addresses, optionally with timeout]' \
+		'iptreemap[tree of IP addresses or networks]' \
+		'setlist[list of sets]'
 }
 
 if [[ $words[2] = (-q|--quiet) ]]; then
@@ -50,9 +50,9 @@ from_to=('(--network)--from[from IP or network (with --netmask)]:IP'
 	'(--network)--to[to IP or network (with --netmask)]:IP'
 	'(--from --to)--network[network]:IP/mask'
 )
-hash=(	'--hashsize[The initial hash size (default 1024)]:hash size'
-	'--probes[Max number of tries to resolve clashing (default 8)]:probes'
-	'--resize[Ratio of increasing hash size after unsuccessful <probes> number of double-hashing]:percent'
+hash=(	'--hashsize[the initial hash size (default 1024)]:hash size'
+	'--probes[max number of tries to resolve clashing (default 8)]:probes'
+	'--resize[ratio of increasing hash size after unsuccessful <probes> number of double-hashing]:percent'
 )
 
 case $words[offset+2]; in
@@ -65,7 +65,7 @@ case $words[offset+2]; in
 	  ;;
 	  macipmap)
 		args=(	$from_to
-			'--matchunset[Always match IP addresses which could be stored in the set but are not]'
+			'--matchunset[always match IP addresses which could be stored in the set but are not]'
 		)
 	  ;;
 	  portmap)
@@ -85,21 +85,21 @@ case $words[offset+2]; in
 		args=(	$from_to $hash )
 	  ;;
 	  iptree)
-	  	args=(	'--timeout[Timeout value for the entries in seconds (default 0)]:timeout' )
+	  	args=(	'--timeout[timeout value for the entries in seconds (default 0)]:timeout' )
 	  ;;
 	  iptreemap)
-	  	args=(	'--gc[Garbage collection inverval (default 300 seconds)]:timeout' )
+	  	args=(	'--gc[garbage collection inverval (default 300 seconds)]:timeout' )
 	  ;;
 	  setlist)
-	  	args=(	'--size[Size of the new setlist (default 8)]:size' )
+	  	args=(	'--size[size of the new setlist (default 8)]:size' )
 	  ;;
 	esac
   ;;
   -T|--test)
-	args=(	'(-b --binding)'{-b,--binding}'[Test wether '$words[offset+4]' points to the specified binding]:::_ipsets' )
+	args=(	'(-b --binding)'{-b,--binding}'[test whether '$words[offset+4]' points to the specified binding]:::_ipsets' )
   ;;
   -B|--bind)
-	args=(	'(-b --binding)'{-b,--binding}'[Value of the binding]:::_ipsets' )
+	args=(	'(-b --binding)'{-b,--binding}'[value of the binding]:::_ipsets' )
   ;;
 esac
 
@@ -139,25 +139,25 @@ cmds=(-N -X -F -E -W -S -R -A -D -T -B -U -H --create --destroy --flush --rename
 listopts=(-n --numeric -s --sorted -L --list -nL -sL -nsL -snL -ns -sn)
 
 _arguments \
-	"($cmds $listopts)"{-N,--create}'[Create a set]:set name::::_set_types' \
-	"($cmds $listopts)"{-X,--destroy}'[Destroy specified set (or all if none specified)]:set name:_sets' \
-	"($cmds $listopts)"{-F,--flush}'[Flush specified set (or all if none specified)]:set name:_sets' \
+	"($cmds $listopts)"{-N,--create}'[create a set]:set name::::_set_types' \
+	"($cmds $listopts)"{-X,--destroy}'[destroy specified set (or all if none specified)]:set name:_sets' \
+	"($cmds $listopts)"{-F,--flush}'[flush specified set (or all if none specified)]:set name:_sets' \
 	"($cmds $listopts)"{-E,--rename}'[rename set]:current set name:_ipsets:new set name:' \
 	"($cmds $listopts)"{-W,--swap}'[swap two sets]:::_ipsets:::_ipsets' \
-	"($cmds -L --list -q --quiet -nL -sL -nsL -snL)"{-L,--list}'[List the entries and bindings for the specified set (or all if none specified)]:::_sets' \
-	"($cmds -L --list -q --quiet -n --numeric -snL -nsL -sL -ns -sn)"-nL'[List the entries and bindings for the specified set (or all if none specified) \- numeric output]:::_sets' \
-	"($cmds -L --list -q --quiet -s --sorted  -snL -nsL -nL -ns -sn)"-sL'[List the entries and bindings for the specified set (or all if none specified) \- sorted output]:::_sets' \
-	"($cmds $listopts -q --quiet)"{-nsL,-snL}'[List the entries and bindings for the specified set (or all if none specified) \- sorted numeric output]:::_sets' \
-	"($cmds $listopts)"{-S,--save}'[Save the given set (or all if none specified)]:::_sets' \
-	"($cmds $listopts)"{-R,--restore}'[Restore a saved session generated by --save from stdin]' \
-	"($cmds $listopts)"{-A,--add}'[Add an IP to a set]:::_ipsets:IP' \
-	"($cmds $listopts)"{-D,--del}'[Delete an IP from a set]:::_ipsets:::_ips' \
-	"($cmds $listopts)"{-T,--test}'[Test wether an IP is in a set or the IP points to the specified binding]:::_ipsets:::_ips' \
-	"($cmds $listopts)"{-B,--bind}'[Bind the IP in setname to to-setname]:::_ipsets:::_ips' \
-	"($cmds $listopts)"{-U,--unbind}'[Delete the binding belonging to IP in set setname]:::_ipsets:::_ips' \
-	"($cmds $listopts)"{-H,--help}'[Print help and settype specific help if settype specified]:::_set_types' \
-	"(-q --quiet $listopts)"{-q,--quiet}'[Suppress any output to stdout and stderr]' \
-	"($cmds -s --sorted  -q --quiet -sL -nsL -snL -ns -sn)"{-s,--sorted}'[Sorted output]' \
-	"($cmds -n --numeric -q --quiet -nL -nsL -snL -ns -sn)"{-n,--numeric}"[Numeric output; don't resolve host names, network names and services]" \
-	"($cmds -ns -sn  -q --quiet -nL -sL -nsL -snL -n --numeric -s --sorted)"{-ns,-sn}'[Sorted numeric output]' \
+	"($cmds -L --list -q --quiet -nL -sL -nsL -snL)"{-L,--list}'[list the entries and bindings for the specified set (or all if none specified)]:::_sets' \
+	"($cmds -L --list -q --quiet -n --numeric -snL -nsL -sL -ns -sn)"-nL'[list the entries and bindings for the specified set (or all if none specified) \- numeric output]:::_sets' \
+	"($cmds -L --list -q --quiet -s --sorted  -snL -nsL -nL -ns -sn)"-sL'[list the entries and bindings for the specified set (or all if none specified) \- sorted output]:::_sets' \
+	"($cmds $listopts -q --quiet)"{-nsL,-snL}'[list the entries and bindings for the specified set (or all if none specified) \- sorted numeric output]:::_sets' \
+	"($cmds $listopts)"{-S,--save}'[save the given set (or all if none specified)]:::_sets' \
+	"($cmds $listopts)"{-R,--restore}'[restore a saved session generated by --save from stdin]' \
+	"($cmds $listopts)"{-A,--add}'[add an IP to a set]:::_ipsets:IP' \
+	"($cmds $listopts)"{-D,--del}'[delete an IP from a set]:::_ipsets:::_ips' \
+	"($cmds $listopts)"{-T,--test}'[test wether an IP is in a set or the IP points to the specified binding]:::_ipsets:::_ips' \
+	"($cmds $listopts)"{-B,--bind}'[bind the IP in setname to to-setname]:::_ipsets:::_ips' \
+	"($cmds $listopts)"{-U,--unbind}'[delete the binding belonging to IP in set setname]:::_ipsets:::_ips' \
+	"($cmds $listopts)"{-H,--help}'[print help and settype specific help if settype specified]:::_set_types' \
+	"(-q --quiet $listopts)"{-q,--quiet}'[suppress any output to stdout and stderr]' \
+	"($cmds -s --sorted  -q --quiet -sL -nsL -snL -ns -sn)"{-s,--sorted}'[sorted output]' \
+	"($cmds -n --numeric -q --quiet -nL -nsL -snL -ns -sn)"{-n,--numeric}"[numeric output; don't resolve host names, network names and services]" \
+	"($cmds -ns -sn  -q --quiet -nL -sL -nsL -snL -n --numeric -s --sorted)"{-ns,-sn}'[sorted numeric output]' \
 	"$args[@]"
diff --git a/Completion/Linux/Command/_mdadm b/Completion/Linux/Command/_mdadm
index 84f4748ec..461e66617 100644
--- a/Completion/Linux/Command/_mdadm
+++ b/Completion/Linux/Command/_mdadm
@@ -36,24 +36,24 @@ _layouts () {
 			;;
 		10|raid10)
 	                _values -s ' ' 'RAID10 layout with number of copies of each datablock' \
-        	                'n1[Near copies]' \
-        	                'n2[Near copies]' \
-        	                'n3[Near copies]' \
-        	                'n4[Near copies]' \
-        	                'n5[Near copies]' \
-        	                'n6[Near copies]' \
-        	                'n7[Near copies]' \
-        	                'n8[Near copies]' \
-        	                'n8[Near copies]' \
-        	                'f1[Far copies]' \
-        	                'f2[Far copies]' \
-        	                'f3[Far copies]' \
-        	                'f4[Far copies]' \
-        	                'f5[Far copies]' \
-        	                'f6[Far copies]' \
-        	                'f7[Far copies]' \
-        	                'f8[Far copies]' \
-        	                'f9[Far copies]'
+        	                'n1[near copies]' \
+        	                'n2[near copies]' \
+        	                'n3[near copies]' \
+        	                'n4[near copies]' \
+        	                'n5[near copies]' \
+        	                'n6[near copies]' \
+        	                'n7[near copies]' \
+        	                'n8[near copies]' \
+        	                'n8[near copies]' \
+        	                'f1[far copies]' \
+        	                'f2[far copies]' \
+        	                'f3[far copies]' \
+        	                'f4[far copies]' \
+        	                'f5[far copies]' \
+        	                'f6[far copies]' \
+        	                'f7[far copies]' \
+        	                'f8[far copies]' \
+        	                'f9[far copies]'
 			;;
 		faulty)
 			_values -S \  "Failure mode" \
@@ -70,46 +70,46 @@ _layouts () {
 
 if (( $+words[(r)-(A|-assemble)] )); then
 	args=(
-		'(--bitmap)'--bitmap='[bitmap file to use with the array]::Bitmap file:_files'
+		'(--bitmap)'--bitmap='[bitmap file to use with the array]::bitmap file:_files'
 		'(--uuid -u)'{--uuid=,-u}'[UUID of array to assemble]:UUID'
-		'(--super-minor -m)'{--super-minor=,-m}'[minor number to look for in super-block]:Minor number'
-		'(--name -N)'{--name=,-N}'[Array name to look for in super-block]:Array name'
-		'(--config -c)'{--config=,-c}'[config file]::Config file:_files'
+		'(--super-minor -m)'{--super-minor=,-m}'[minor number to look for in super-block]:minor number'
+		'(--name -N)'{--name=,-N}'[array name to look for in super-block]:array name'
+		'(--config -c)'{--config=,-c}'[config file]::config file:_files'
 		'(--scan -s)'{--scan,-s}'[scan config file for missing information]'
-		'(--run -R)'{--run,-R}'[Try to start the array even if not enough devices for a full array are present]'
-		'(--force -f)'{--force,-f}'[Assemble the array even if some superblocks appear out-of-date]'
-		'(--update,-U)'{--update=,-U}'[Update superblock]::Update the superblock:(sparc2.2 summaries uuid resync byteorder super-minor)'
+		'(--run -R)'{--run,-R}'[try to start the array even if not enough devices for a full array are present]'
+		'(--force -f)'{--force,-f}'[assemble the array even if some superblocks appear out-of-date]'
+		'(--update,-U)'{--update=,-U}'[update superblock]::update the superblock:(sparc2.2 summaries uuid resync byteorder super-minor)'
 	)
 fi
 
 if (( $+words[(r)-(B|-build)] )); then
 	args=(
-		'(--bitmap)'--bitmap='[file to store/find bitmap information in]::Bitmap file:_files'
-		'(--chunk -c)'{--chunk=,-c}'[chunk size of kibibytes]:Chunk size'
-		'(--rounding)'--rounding='[rounding factor for linear array (==chunk size)]:Rounding factor'
+		'(--bitmap)'--bitmap='[file to store/find bitmap information in]::bitmap file:_files'
+		'(--chunk -c)'{--chunk=,-c}'[chunk size of kibibytes]:chunk size'
+		'(--rounding)'--rounding='[rounding factor for linear array (==chunk size)]:rounding factor'
 		'(--level -l)'{--level=,-l}'[RAID level]::RAID level:_raids_build'
 		'(--raid-devices -n)'{--raid-devices=,-n}'[number of active devices in array]:active devices number'
-		'(--bitmap-chunk)'--bitmap-chunk='[bitmap chunksize in Kilobytes]:Bitmap chunk'
-		'(--delay -d)'{--delay=,-d}'[bitmap update delay in seconds]:Bitmap update delay'
+		'(--bitmap-chunk)'--bitmap-chunk='[bitmap chunksize in Kilobytes]:bitmap chunk'
+		'(--delay -d)'{--delay=,-d}'[bitmap update delay in seconds]:bitmap update delay'
 	)
 fi
 
 if (( $+words[(r)-(C|-create)] )); then
 	args=(
-		'(--bitmap)'--bitmap='[create a bitmap for the array with the given filename]::Bitmap file:_files'
-		'(--chunk -c)'{--chunk=,-c}'[chunk size of kibibytes]:Chunk size'
-		'(--rounding)'--rounding='[rounding factor for linear array (==chunk size)]:Rounding factor'
+		'(--bitmap)'--bitmap='[create a bitmap for the array with the given filename]::bitmap file:_files'
+		'(--chunk -c)'{--chunk=,-c}'[chunk size of kibibytes]:chunk size'
+		'(--rounding)'--rounding='[rounding factor for linear array (==chunk size)]:rounding factor'
 		'(--level -l)'{--level=,-l}'[RAID level]::RAID level:_raids'
-		'(--parity -p --layout)'{--parity=,-p,--layout=}'[RAID5/6/10 parity algorithm, faulty mode]::Layout:_layouts'
+		'(--parity -p --layout)'{--parity=,-p,--layout=}'[RAID5/6/10 parity algorithm, faulty mode]::layout:_layouts'
 		'(--raid-devices -n)'{--raid-devices=,-n}'[number of active devices in array]:active devices number'
-		'(--spare-devices -x)'{--spare-devices=,-x}'[number of spares (eXtras) devices in initial array]:Spare devices number'
-		'(--size -z)'{--size=,-z}'[size (in K) of each drive in RAID1/4/5/6/10]:Size of each drive'
+		'(--spare-devices -x)'{--spare-devices=,-x}'[number of spares (eXtras) devices in initial array]:spare devices number'
+		'(--size -z)'{--size=,-z}'[size (in K) of each drive in RAID1/4/5/6/10]:size of each drive'
 		'(--force -f)'{--force,-f}'[honour devices as listed on command line]'
 		'(--run -R)'{--run,-R}'[insist of running the array even if not all devices are present or some look odd]'
 		'(--readonly -o)'{--readonly,-o}'[start the array readonly]'
-		'(--name -N)'{--name=,-N}'[textual name for array - max 32 characters]:Array name'
-		'(--bitmap-chunk)'--bitmap-chunk='[bitmap chunksize in Kilobytes]:Bitmap chunk'
-		'(--delay -d)'{--delay,-d}'[bitmap update delay in seconds]:Bitmap update delay'
+		'(--name -N)'{--name=,-N}'[textual name for array - max 32 characters]:array name'
+		'(--bitmap-chunk)'--bitmap-chunk='[bitmap chunksize in Kilobytes]:bitmap chunk'
+		'(--delay -d)'{--delay,-d}'[bitmap update delay in seconds]:bitmap update delay'
 	)
 fi
 
@@ -126,22 +126,22 @@ fi
 
 if (( $+words[(r)-(F|-follow|-monitor)] )); then
 	args=(
-		'(--mail -m)'{--mail=,-m}'[Address to mail alerts of failure to]:::_email_addresses'
-		'(--program -p --alert)'{--program=,-p,--alert=}'[Program to run when an event is detected]::Program:_files'
+		'(--mail -m)'{--mail=,-m}'[address to mail alerts of failure to]:::_email_addresses'
+		'(--program -p --alert)'{--program=,-p,--alert=}'[program to run when an event is detected]::program:_files'
 		'(--delay -d)'{--delay=,-d}'[seconds of delay between polling state]:seconds'
-		'(--config -c)'{--config=,-c}'[specify a different config file]::Config file:_files'
+		'(--config -c)'{--config=,-c}'[specify a different config file]::config file:_files'
 		'(--scan -s)'{--scan,-s}'[find mail-address/program in config file]'
-		'(--daemonise -f)'{--daemonise,-f}'[Fork and continue in child, parent exits]'
-		'(--pid-file -i)'{--pid-file=,-i}'[In daemon mode write pid to specified file instead of stdout]::PID file:_files'
-		'(--oneshot -1)'{--oneshot,-1}'[Check for degraded arrays, then exit]'
-		'(--test -t)'{--test,-t}'[Generate a TestMessage event against each array at startup]'
+		'(--daemonise -f)'{--daemonise,-f}'[fork and continue in child, parent exits]'
+		'(--pid-file -i)'{--pid-file=,-i}'[in daemon mode write pid to specified file instead of stdout]::PID file:_files'
+		'(--oneshot -1)'{--oneshot,-1}'[check for degraded arrays, then exit]'
+		'(--test -t)'{--test,-t}'[generate a TestMessage event against each array at startup]'
 	)
 fi
 
 if (( $+words[(r)-(G|-grow)] )); then
 	args=(
-		'(--size -z)'{--size=,-z}'[Change the active size of devices in an array]:active size'
-		'(--raid-disks -n)'{--raid-disks=,-n}'[Change the number of active devices in a RAID1 array]:number of active devices'
+		'(--size -z)'{--size=,-z}'[change the active size of devices in an array]:active size'
+		'(--raid-disks -n)'{--raid-disks=,-n}'[change the number of active devices in a RAID1 array]:number of active devices'
 	)
 fi
 
@@ -150,22 +150,22 @@ _mds () {
 	vals=( ${${${(M)${(f)"$(< /etc/mdadm.conf)"}##ARRAY *}//ARRAY /}%%[[:blank:]]*} )
 	_describe -t mds "RAID devices" vals
 	_arguments \
-		"(-h --help)"{-h,--help}'[Display a mode specific help message]'
+		"(-h --help)"{-h,--help}'[display a mode specific help message]'
 }
 
 modes=(-A --assemble -B --build -C --create -F --follow --monitor -G --grow -h --help -V --version)
 misc=(-D --detail -E --examine -X --examine-bitmap -Q --query)
 
 _arguments \
-	"($misc $modes)"{-A,--assemble}'[Assemble a pre-existing array]:::_mds' \
-	"($misc $modes)"{-B,--build}'[Build a legacy array without superblocks]:::_mds' \
-	"($misc $modes)"{-C,--create}'[Create a new array]' \
-	"($misc $modes)"{-F,--follow,--monitor}'[Select Monitor mode]' \
-	"($misc $modes)"{-G,--grow}'[Change the size or shape of an active array]' \
-	"($modes -D --detail -E --examine -X --examine-bitmap)"{-D,--detail}'[Print detail of one or more md devices]' \
-	"($modes -D --detail -E --examine -X --examine-bitmap -Q --query)"{-E,--examine}'[Print content of md superblock on device(s)]' \
-	"($modes -Q --query)"{-Q,--query}'[Examine a device]' \
-	"($modes -E --examine -X --examine-bitmap)"{-X,--examine-bitmap}'[Report information about a bitmap file]' \
-	"(-)"{-h,--help}'[Display general help message]' \
-	"(-)"{-V,--version}'[Print version information for mdadm]' \
+	"($misc $modes)"{-A,--assemble}'[assemble a pre-existing array]:::_mds' \
+	"($misc $modes)"{-B,--build}'[build a legacy array without superblocks]:::_mds' \
+	"($misc $modes)"{-C,--create}'[create a new array]' \
+	"($misc $modes)"{-F,--follow,--monitor}'[select Monitor mode]' \
+	"($misc $modes)"{-G,--grow}'[change the size or shape of an active array]' \
+	"($modes -D --detail -E --examine -X --examine-bitmap)"{-D,--detail}'[print detail of one or more md devices]' \
+	"($modes -D --detail -E --examine -X --examine-bitmap -Q --query)"{-E,--examine}'[print content of md superblock on device(s)]' \
+	"($modes -Q --query)"{-Q,--query}'[examine a device]' \
+	"($modes -E --examine -X --examine-bitmap)"{-X,--examine-bitmap}'[report information about a bitmap file]' \
+	"(-)"{-h,--help}'[display general help message]' \
+	"(-)"{-V,--version}'[print version information for mdadm]' \
 	"$args[@]"
diff --git a/Completion/Linux/Command/_rpmbuild b/Completion/Linux/Command/_rpmbuild
index 59f997b0c..74d4464d8 100644
--- a/Completion/Linux/Command/_rpmbuild
+++ b/Completion/Linux/Command/_rpmbuild
@@ -10,44 +10,44 @@ options=(--quiet -v -vv --verbose --rcfile --pipe --dbpath -r --root --buildroot
 b_options=(--clean --nobuild --nodeps --nodigest --nosignature --rmsource --rmspec --short-circuit --sign --target --debug --with --without)
 
 _arguments \
-	"($cmds $b_cmds $t_cmds)"{-ba,-ta}'[Build binary and source packages]' \
-	"($cmds $b_cmds $t_cmds)"{-bb,-tb}'[Build a binary package]' \
-	"($cmds $b_cmds $t_cmds)"{-bp,-tp}'[Execute the "%prep" stage]' \
-	"($cmds $b_cmds $t_cmds)"{-bc,-tc}'[Do the "%build" stage]' \
-	"($cmds $b_cmds $t_cmds)"{-bi,-ti}'[Do the "%install" stage]' \
-	"($cmds $b_cmds $t_cmds)"{-bl,-tl}'[Do a "list check"]' \
-	"($cmds $b_cmds $t_cmds)"{-bs,-ts}'[Build just the source package]' \
-	"($cmds $b_cmds $t_cmds * $b_options $options)"{-\?,--help}'[Show help message]' \
-	"($cmds $b_cmds $t_cmds * $b_options $options)"--querytags'[Display known query tags]' \
-	"($cmds $b_cmds $t_cmds * $b_options)"--showrc'[Display final rpmrc and macro configuration]' \
-	"($cmds $b_cmds $t_cmds * $b_options $options)"--usage'[Display brief usage message]' \
-	"($cmds $b_cmds $t_cmds * $b_options $options)"--version'[Print the version of rpm being used]' \
-	"(-v --verbose -vv)"--quiet'[Print as little as possible]' \
-	"(-v --verbose --quiet)"{-v,--verbose}'[Print verbose information]' \
-	"(-v --verbose --quiet)"-vv'[Print lots of ugly debugging information]' \
+	"($cmds $b_cmds $t_cmds)"{-ba,-ta}'[build binary and source packages]' \
+	"($cmds $b_cmds $t_cmds)"{-bb,-tb}'[build a binary package]' \
+	"($cmds $b_cmds $t_cmds)"{-bp,-tp}'[execute the "%prep" stage]' \
+	"($cmds $b_cmds $t_cmds)"{-bc,-tc}'[do the "%build" stage]' \
+	"($cmds $b_cmds $t_cmds)"{-bi,-ti}'[do the "%install" stage]' \
+	"($cmds $b_cmds $t_cmds)"{-bl,-tl}'[do a "list check"]' \
+	"($cmds $b_cmds $t_cmds)"{-bs,-ts}'[build just the source package]' \
+	"($cmds $b_cmds $t_cmds * $b_options $options)"{-\?,--help}'[show help message]' \
+	"($cmds $b_cmds $t_cmds * $b_options $options)"--querytags'[display known query tags]' \
+	"($cmds $b_cmds $t_cmds * $b_options)"--showrc'[display final rpmrc and macro configuration]' \
+	"($cmds $b_cmds $t_cmds * $b_options $options)"--usage'[display brief usage message]' \
+	"($cmds $b_cmds $t_cmds * $b_options $options)"--version'[print the version of rpm being used]' \
+	"(-v --verbose -vv)"--quiet'[print as little as possible]' \
+	"(-v --verbose --quiet)"{-v,--verbose}'[print verbose information]' \
+	"(-v --verbose --quiet)"-vv'[print lots of ugly debugging information]' \
 	--rcfile'[RC files]:RC files:_files -S\:' \
-	--macros'[Macros files]:Macros files:_files -S\:' \
-	--pipe'[Command to pipe the output of rpm to]:command' \
-	--dbpath'[Set database directory]:Database directory:_files -/' \
-	"(-r --root)"{-r,--root}'[Root file system tree]:Chroot directory:_files -/' \
-	--buildroot'[Override the BuildRoot]:BuildRoot directory:_files -/' \
-	--clean'[Remove the build tree after the packages are made]' \
-	--nobuild'[Do not execute any build stages (for spec testing purposes]' \
-	--nodeps'[Do not verify build dependencies]' \
-	--nodigest"[Don't verify package digest(s)]" \
-	--nosignature"[Don't verify package signature(s)]" \
-	--rmsource'[Remove the sources after the build]' \
-	--rmspec'[Remove the spec file after the build]' \
-	--short-circuit'[Skip straight to specified stage (-bc, -bi or -bb in PLD Linux]' \
-	--sign'[Embed a GPG signature]' \
-	--target='[Set target platform]:arch-vendor-os:' \
-	{'*-D','*--define='}'[Define MACRO with value EXPR]:MACRO EXPR' \
-	{'*-E','*--eval='}'[Print macro expansion of EXPR]:EXPR' \
-	'*--with[Enable configure option for build]:option' \
-	'*--without[Disable configure option for build]:option' \
-	"($cmds $b_cmds $t_cmds * $b_options)"--bcond'[Find all --with/--without values]' \
-	--debug'[Build packages with debug information]' \
-	"($cmds $b_cmds $t_cmds * $b_options)"--install-build-tree'[Make all needed dirs for building binary rpms]' \
-	"(--clean $b_cmds $t_cmds --rebuild)"--recompile'[Recompile source package]' \
-	"(--clean $b_cmds $t_cmds --recompile)"--rebuild'[Rebuild source package]' \
+	--macros'[macros files]:macros files:_files -S\:' \
+	--pipe'[command to pipe the output of rpm to]:command' \
+	--dbpath'[set database directory]:database directory:_files -/' \
+	"(-r --root)"{-r,--root}'[root file system tree]:chroot directory:_files -/' \
+	--buildroot'[override the BuildRoot]:BuildRoot directory:_files -/' \
+	--clean'[remove the build tree after the packages are made]' \
+	--nobuild'[do not execute any build stages (for spec testing purposes]' \
+	--nodeps'[do not verify build dependencies]' \
+	--nodigest"[don't verify package digest(s)]" \
+	--nosignature"[don't verify package signature(s)]" \
+	--rmsource'[remove the sources after the build]' \
+	--rmspec'[remove the spec file after the build]' \
+	--short-circuit'[skip straight to specified stage (-bc, -bi or -bb in PLD Linux]' \
+	--sign'[embed a GPG signature]' \
+	--target='[set target platform]:arch-vendor-os:' \
+	{'*-D','*--define='}'[define MACRO with value EXPR]:MACRO EXPR' \
+	{'*-E','*--eval='}'[print macro expansion of EXPR]:EXPR' \
+	'*--with[enable configure option for build]:option' \
+	'*--without[disable configure option for build]:option' \
+	"($cmds $b_cmds $t_cmds * $b_options)"--bcond'[find all --with/--without values]' \
+	--debug'[build packages with debug information]' \
+	"($cmds $b_cmds $t_cmds * $b_options)"--install-build-tree'[make all needed dirs for building binary rpms]' \
+	"(--clean $b_cmds $t_cmds --rebuild)"--recompile'[recompile source package]' \
+	"(--clean $b_cmds $t_cmds --recompile)"--rebuild'[rebuild source package]' \
 	"*:file:_files -g '(#i)*.(spec|srpm|tgz|tar|tar.gz|tar.bz2)(-.)'" && ret=0
diff --git a/Completion/Linux/Command/_strace b/Completion/Linux/Command/_strace
index ba777d68a..695e800c7 100644
--- a/Completion/Linux/Command/_strace
+++ b/Completion/Linux/Command/_strace
@@ -47,18 +47,18 @@ _sys_calls () {
 
 _sets () {
 	_alternative \
-		'special:Special values:(all none)' \
+		'special:special values:(all none)' \
 		'calls::_sys_calls'
 }
 
 _traces () {
 	local expl
-	traces=('file:Trace all system calls which take a file name as an argument'
-		'process:Trace all system calls which involve process management'
-		'network:Trace all the network related system calls'
-		'signal:Trace all signal related system calls'
-		'ipc:Trace all IPC related system calls'
-		'desc:Trace all file descriptor related system calls')
+	traces=('file:trace all system calls which take a file name as an argument'
+		'process:trace all system calls which involve process management'
+		'network:trace all the network related system calls'
+		'signal:trace all signal related system calls'
+		'ipc:trace all IPC related system calls'
+		'desc:trace all file descriptor related system calls')
 	compset -P '*,'
 	_describe -t traces 'Related system calls' traces -qS ,
 }
@@ -71,43 +71,43 @@ _traces_sets () {
 
 _expression () {
 	_values -S = "Qualifying expression" \
-		'trace[Trace specified set of system calls only]:system calls:_traces_sets' \
-		'abbrev[Abbreviate the output from printing each member of large structures]:system calls:_sets' \
-		'verbose[Dereference structures for the specified set of system calls]:system calls:_sets' \
-		'raw[Print raw, undecoded arguments for the specified set of system calls]:system calls:_sets' \
-		'signal[Trace only the specified subset of signals]:signal:{compset -P "*,"; _signals -s -qS ,}' \
-		'read[Perform a full hex and ASCII dump of all the data read from listed file descriptors]:file descriptors:{compset -P "*,"; _file_descriptors -qS ,}' \
-		'write[Perform a full hex and ASCII dump of all the data written to listed file descriptors]:file descriptors:{compset -P "*,"; _file_descriptors -qS ,}'
+		'trace[trace specified set of system calls only]:system calls:_traces_sets' \
+		'abbrev[abbreviate the output from printing each member of large structures]:system calls:_sets' \
+		'verbose[dereference structures for the specified set of system calls]:system calls:_sets' \
+		'raw[print raw, undecoded arguments for the specified set of system calls]:system calls:_sets' \
+		'signal[trace only the specified subset of signals]:signal:{compset -P "*,"; _signals -s -qS ,}' \
+		'read[perform a full hex and ASCII dump of all the data read from listed file descriptors]:file descriptors:{compset -P "*,"; _file_descriptors -qS ,}' \
+		'write[perform a full hex and ASCII dump of all the data written to listed file descriptors]:file descriptors:{compset -P "*,"; _file_descriptors -qS ,}'
 	if [[ -z "$words[CURRENT]" || -n "${words[CURRENT]:#*=*}" ]]; then
 		_traces_sets
 	fi
 }
 
 _arguments \
-	'()-c[Count time, calls, and errors for each system call and report a summary]' \
-	-d'[Show some debugging output of strace itself on the standard error]' \
-	-f'[Trace child processes as they are created by currently traced processes]' \
-	-ff'[Write each process trace to <filename>.<pid> (when using -o <filename>]' \
-	'(-c -d -f -ff -i -q -r -t -tt -ttt -T -v -V -x -xx -a -e -o -O -p -s -S -u -E)-h[Print help]' \
-	-i'[Print the instruction pointer at the time of the system call]' \
-	-q'[Suppress messages about attaching, detaching etc.]' \
-	-r'[Print a relative timestamp upon entry to each system call]' \
-	'(-ttt)-t[Prefix each line of the trace with the time of day]' \
-	'(-ttt -tt)-tt[Prefix each line of the trace with the time of day including the microseconds]' \
-	'(-tt -t)-ttt[Prefix each line of the trace with the number of seconds and microseconds since the epoch]' \
-	-T'[Show the time spent in system calls]' \
-	-v'[Print unabbreviated versions of environment, stat, termios, etc. calls]' \
-	'(-c -d -f -ff -h -i -q -r -t -tt -ttt -T -v -x -xx -a -e -o -O -p -s -S -u -E)-V[Print the version number of strace]' \
-	'(-xx)-x[Print all non-ASCII strings in hexadecimal string format]' \
-	'(-x)-xx[Print all strings in hexadecimal string format]' \
-	-a'[Align return values in a specific column (default 40)]:column number' \
-	'*-e[Select events to trace or how to trace]:system call:_expression' \
-	'-o[Write the trace output to the file]:output file:_files' \
-	'-O[Overhead for tracing system calls]:overhead microseconds' \
-	'(:)-p[Attach to the process with specified process ID and begin tracing]:Process ID:_pids' \
-	'-s[Specify the maximum string size to print (default 32)]:maximum string size' \
-	'-S[Sort the output of the histogram (-c option) by the specified criterion]:sort by:(time calls name nothing)' \
-	'-u[Run as specified user]:user:_users' \
-	'*-E[Remove variable from the inherited list of environment or define a value]:variable:_printenv' \
+	'()-c[count time, calls, and errors for each system call and report a summary]' \
+	-d'[show some debugging output of strace itself on the standard error]' \
+	-f'[trace child processes as they are created by currently traced processes]' \
+	-ff'[write each process trace to <filename>.<pid> (when using -o <filename>]' \
+	'(-c -d -f -ff -i -q -r -t -tt -ttt -T -v -V -x -xx -a -e -o -O -p -s -S -u -E)-h[print help]' \
+	-i'[print the instruction pointer at the time of the system call]' \
+	-q'[suppress messages about attaching, detaching etc.]' \
+	-r'[print a relative timestamp upon entry to each system call]' \
+	'(-ttt)-t[prefix each line of the trace with the time of day]' \
+	'(-ttt -tt)-tt[prefix each line of the trace with the time of day including the microseconds]' \
+	'(-tt -t)-ttt[prefix each line of the trace with the number of seconds and microseconds since the epoch]' \
+	-T'[show the time spent in system calls]' \
+	-v'[print unabbreviated versions of environment, stat, termios, etc. calls]' \
+	'(-c -d -f -ff -h -i -q -r -t -tt -ttt -T -v -x -xx -a -e -o -O -p -s -S -u -E)-V[print the version number of strace]' \
+	'(-xx)-x[print all non-ASCII strings in hexadecimal string format]' \
+	'(-x)-xx[print all strings in hexadecimal string format]' \
+	-a'[align return values in a specific column (default 40)]:column number' \
+	'*-e[select events to trace or how to trace]:system call:_expression' \
+	'-o[write the trace output to the file]:output file:_files' \
+	'-O[overhead for tracing system calls]:overhead microseconds' \
+	'(:)-p[attach to the process with specified process ID and begin tracing]:process ID:_pids' \
+	'-s[specify the maximum string size to print (default 32)]:maximum string size' \
+	'-S[sort the output of the histogram (-c option) by the specified criterion]:sort by:(time calls name nothing)' \
+	'-u[run as specified user]:user:_users' \
+	'*-E[remove variable from the inherited list of environment or define a value]:variable:_printenv' \
 	'(-):command name: _command_names -e' \
 	'*::arguments:_normal'
diff --git a/Completion/Mandriva/Command/_rebootin b/Completion/Mandriva/Command/_rebootin
index 5a27bf800..1b69609f3 100644
--- a/Completion/Mandriva/Command/_rebootin
+++ b/Completion/Mandriva/Command/_rebootin
@@ -3,8 +3,8 @@
 local loader=$(sudo detectloader -q)
 
 _arguments -C -s \
-    '-n[No immediate reboot just  set the flags for next reboot.]' \
-    '-f[Create a /fastboot file to reboot in fastboot mode]' \
+    '-n[no immediate reboot just set the flags for next reboot]' \
+    '-f[create a /fastboot file to reboot in fastboot mode]' \
     '*::arguments:->loader_entry'
 
 local expl
diff --git a/Completion/Redhat/Command/_yum b/Completion/Redhat/Command/_yum
index 455812b1b..d0ea0911a 100644
--- a/Completion/Redhat/Command/_yum
+++ b/Completion/Redhat/Command/_yum
@@ -8,19 +8,19 @@ _yum()
 	_arguments -s \
 	   {-h,--help}'[show the help message]' \
 	   {-t,--tolerant}'[be tolerant of errors]' \
-	   '-C[Run entirely from cache]' \
-	   '-c[Config file location]:Yum conf file:_files' \
-	   '-R[Maximum command wait time (in minutes)]:Max wait time' \
-	   '-d[Debug level (0-10)]:Debug level' \
-	   '-e[Error level (0-10)]:Error level' \
-	   '-y[Answer yes for all questions]' \
-	   '--installroot=[Set install root]:Install Root:_files -/' \
-	   '*--enablerepo=[Enable or or more repositories]:Repos to enable:_yum_disabled_repos_list' \
-	   '*--disablerepo=[Disable one or more repositories]:Disable Repos:_yum_enabled_repos_list' \
-	   '--exclude=[Exclude package(s) by name or glob]:Exclude Packages' \
-	   '--version[Show yum version]' \
-	   '--obseletes[Enable obsoletes processing during updates]' \
-	   '--noplugins[Disable yum plugins]' \
+	   '-C[run entirely from cache]' \
+	   '-c[config file location]:Yum conf file:_files' \
+	   '-R[maximum command wait time (in minutes)]:max wait time' \
+	   '-d[debug level (0-10)]:debug level' \
+	   '-e[error level (0-10)]:error level' \
+	   '-y[answer yes for all questions]' \
+	   '--installroot=[set install root]:install root:_files -/' \
+	   '*--enablerepo=[enable or or more repositories]:repos to enable:_yum_disabled_repos_list' \
+	   '*--disablerepo=[disable one or more repositories]:disable repos:_yum_enabled_repos_list' \
+	   '--exclude=[exclude package(s) by name or glob]:exclude packages' \
+	   '--version[show yum version]' \
+	   '--obseletes[enable obsoletes processing during updates]' \
+	   '--noplugins[disable yum plugins]' \
 	   '*::yum command:_yum_command'
 }
 
@@ -28,29 +28,29 @@ _yum()
 {
   	local -a _yum_cmds
   	_yum_cmds=(
-		"install:Install the latest version of a package or group of packages"
-		"erase:Remove an installed package (with its dependencies)"
-		"remove:Remove an installed package (with its dependencies)"
-		"clean:Clean local yum cache"
-		"deplist:Gives a list of all dependencies for a package"
-		"check-update:Check if any updates are available"
-		"info:Get description of available packages"
-		"list:Is used to list various information about packages"
-		"groupinfo:Get info on package groups"
-		"groupinstall:Install a package group or groups"
-		"groupremove:Remove a package group or groups"
-		"grouplist:List package groups"
-		"groupupdate:Update a package group or groups"
-		"localinstall:Install packages with local rpm files"
-		"localupdate:Update packages with local rpm files"
-		"makecache:Makes a local yum cache"
-		"provides:Find out which package provides some feature or file"
-		"whatprovides:Find out which package provides some feature or file"
-		"resolvedep:List packages providing the specified dependencies"
-		"search:Find any packages matching pattern"
-		"shell:Enter the 'yum shell'"
-		"update:Update one or more packages"
-		"upgrade:Upgrade one or more packages"
+		"install:install the latest version of a package or group of packages"
+		"erase:remove an installed package (with its dependencies)"
+		"remove:remove an installed package (with its dependencies)"
+		"clean:clean local yum cache"
+		"deplist:gives a list of all dependencies for a package"
+		"check-update:check if any updates are available"
+		"info:get description of available packages"
+		"list:is used to list various information about packages"
+		"groupinfo:get info on package groups"
+		"groupinstall:install a package group or groups"
+		"groupremove:remove a package group or groups"
+		"grouplist:list package groups"
+		"groupupdate:update a package group or groups"
+		"localinstall:install packages with local rpm files"
+		"localupdate:update packages with local rpm files"
+		"makecache:makes a local yum cache"
+		"provides:find out which package provides some feature or file"
+		"whatprovides:find out which package provides some feature or file"
+		"resolvedep:list packages providing the specified dependencies"
+		"search:find any packages matching pattern"
+		"shell:enter the 'yum shell'"
+		"update:update one or more packages"
+		"upgrade:upgrade one or more packages"
   	)
 
   	if (( CURRENT == 1 )); then
diff --git a/Completion/Solaris/Command/_coreadm b/Completion/Solaris/Command/_coreadm
index 7cf529a4f..c37e2b077 100644
--- a/Completion/Solaris/Command/_coreadm
+++ b/Completion/Solaris/Command/_coreadm
@@ -4,19 +4,19 @@ _coreadm() {
 	local -a content option
 
 	content=(
-		"anon[Anonymous private mappings]"
+		"anon[anonymous private mappings]"
 		"ctf[CTF type information]"
-		"data[Writable private file mappings]"
+		"data[writable private file mappings]"
 		"dism[DISM mappings]"
-		"heap[Process heap]"
+		"heap[process heap]"
 		"ism[ISM mappings]"
-		"rodata[Read-only private file mappings]"
-		"shanon[Anonymous shared mappings]"
-		"shfile[File-backed shared mappings]"
+		"rodata[read-only private file mappings]"
+		"shanon[anonymous shared mappings]"
+		"shfile[file-backed shared mappings]"
 		"shm[System V shared memory]"
-		"stack[Process stack]"
-		"symtab[Symbol table sections for loaded files]"
-		"text[Readable and executable private file mappings]"
+		"stack[process stack]"
+		"symtab[symbol table sections for loaded files]"
+		"text[readable and executable private file mappings]"
 	)
 
 	option=(
@@ -31,18 +31,18 @@ _coreadm() {
 	# "+" or "-"
 	_arguments -s \
 		- set1 \
-		'-g[Global core file name pattern]:' \
-		'-G[Global core file content]:content:_values -s + "content" $content' \
-		'-i[Per-process core file name pattern]:' \
-		'-I[Per-process core file content]:content:_values -s + "content" $content' \
-		'*-d[Disable core option]:option:(($option))' \
-		'*-e[Enable core option]:option:(($option))' \
+		'-g[global core file name pattern]:' \
+		'-G[global core file content]:content:_values -s + "content" $content' \
+		'-i[per-process core file name pattern]:' \
+		'-I[per-process core file content]:content:_values -s + "content" $content' \
+		'*-d[disable core option]:option:(($option))' \
+		'*-e[enable core option]:option:(($option))' \
 		- set2 \
 		'-p[PID-specific per-process core file name pattern]:' \
 		'-P[PID-specific per-process core file content]:content:_values -s + "content" $content' \
 		'*:pids:_pids' \
 		- set3 \
-		'-u[Update options from coreadm.conf]'
+		'-u[update options from coreadm.conf]'
 }
 
 _coreadm "$@"
diff --git a/Completion/Solaris/Command/_dhcpinfo b/Completion/Solaris/Command/_dhcpinfo
index 076b015b7..079b6e6f6 100644
--- a/Completion/Solaris/Command/_dhcpinfo
+++ b/Completion/Solaris/Command/_dhcpinfo
@@ -28,8 +28,8 @@ _dhcpinfo() {
 
 	_arguments -A \
 		'-c[]' \
-		'-i[Interface]:interface:' \
-		'-n[Maximum number of lines]:limit:' \
+		'-i[interface]:interface:' \
+		'-n[maximum number of lines]:limit:' \
 		':DHCP Parameter:_values "DHCP Parameter" $mnemonics_v4' \
 }
 
diff --git a/Completion/Solaris/Command/_dladm b/Completion/Solaris/Command/_dladm
index d99fdc0e4..3c1595b52 100644
--- a/Completion/Solaris/Command/_dladm
+++ b/Completion/Solaris/Command/_dladm
@@ -77,7 +77,7 @@ _dladm() {
 
 	if [[ $service == "dladm" ]]; then
 		_arguments -C -A "-*" \
-			'-\?[Help]' \
+			'-\?[help]' \
 			'*::command:->subcmd' && return 0
 
 		if (( CURRENT == 1 )); then
@@ -111,31 +111,31 @@ _dladm() {
 	case $service in
 	("show-link")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent link configuration]' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
 			- set1 \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $link_properties' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $link_properties' \
 			- set2 \
-			'(-s --statistics)'{-s,--statistics}'[Display link statistics]' \
-			'(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $link_stats_properties' \
+			'(-s --statistics)'{-s,--statistics}'[display link statistics]' \
+			'(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $link_stats_properties' \
 			':link name:_dladm_links' \
 		;;
 
 	("rename-link")
 		_arguments -A "-*" \
-			'-R[Root directory]:directory:_path_files -/' \
+			'-R[root directory]:directory:_path_files -/' \
 			':old link name:_dladm_links' \
 			':new link name:' \
 		;;
 
 	("show-phys")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-s --statistics)'{-s,--statistics}'[Display link statistics]' \
-			'(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" link media state speed duplex device' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent link configuration]' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-s --statistics)'{-s,--statistics}'[display link statistics]' \
+			'(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" link media state speed duplex device' \
 			':physical link name:_dladm_devs'
 		;;
 
@@ -146,97 +146,97 @@ _dladm() {
 
 	("create-aggr")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \
-			'(-P --policy)'{-P,--policy}'[Port selection policy]:policy:_values -s , "policy" L2 L3 L4' \
+			'(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \
+			'(-P --policy)'{-P,--policy}'[port selection policy]:policy:_values -s , "policy" L2 L3 L4' \
 			'(-L --lacp-mode)'{-L,--lacp-mode}'[LACP mode]:lacp mode:(off active passive)' \
 			'(-T --lacp-timer)'{-T,--lacp-timer}'[LACP timer]:lacp timer:(short long)' \
-			'(-u --unicast)'{-u,--unicast}'[Unicast address]:unicast address:' \
+			'(-u --unicast)'{-u,--unicast}'[unicast address]:unicast address:' \
 			':aggregate link name:'
 		;;
 
 	("modify-aggr")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \
-			'(-P --policy)'{-P,--policy}'[Port selection policy]:policy:_values -s , "policy" L2 L3 L4' \
+			'(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \
+			'(-P --policy)'{-P,--policy}'[port selection policy]:policy:_values -s , "policy" L2 L3 L4' \
 			'(-L --lacp-mode)'{-L,--lacp-mode}'[LACP mode]:lacp mode:(off active passive)' \
 			'(-T --lacp-timer)'{-T,--lacp-timer}'[LACP timer]:lacp timer:(short long)' \
-			'(-u --unicast)'{-u,--unicast}'[Unicast address]:unicast address:' \
+			'(-u --unicast)'{-u,--unicast}'[unicast address]:unicast address:' \
 			':aggregate link name:_dladm_aggrs'
 		;;
 
 	("delete-aggr")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
+			'(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
 			':aggregate link name:_dladm_aggrs'
 		;;
 
 	("add-aggr")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \
+			'(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \
 			':aggregate link name:_dladm_aggrs'
 		;;
 
 	("remove-aggr")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-l --link)'{-l,--link}'[Component link]:link:_dladm_aggr_ports' \
+			'(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-l --link)'{-l,--link}'[component link]:link:_dladm_aggr_ports' \
 			':aggregate link name:_dladm_aggrs'
 		;;
 
 	("show-aggr")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-s --statistics)'{-s,--statistics}'[Display link statistics]' \
-			'(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent link configuration]' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-s --statistics)'{-s,--statistics}'[display link statistics]' \
+			'(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \
 			':aggregate link name:_dladm_links' \
 			- set1 \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_properties' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $aggr_properties' \
 			- lacp \
 			'(-L --lacp)'{-L,--lacp}'[LACP information]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_lacp_properties' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $aggr_lacp_properties' \
 			- extended \
-			'(-x --extended)'{-x,--extended}'[Extended information]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_ext_properties' \
+			'(-x --extended)'{-x,--extended}'[extended information]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $aggr_ext_properties' \
 		;;
 
 	("create-vlan")
 		_arguments -A "-*" \
 			'(-t --temporary)'{-t,--temporary}'[VLAN should be temporary]' \
-			'(-f --force)'{-f,--force}'[Force VLAN creation]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \
+			'(-f --force)'{-f,--force}'[force VLAN creation]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \
 			'-v[VLAN ID]:id:' \
 			':VLAN link name:'
 		;;
 
 	("delete-vlan")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
+			'(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
 			':VLAN link name:_dladm_vlans'
 		;;
 
 	("show-vlan")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $vlan_properties' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent link configuration]' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $vlan_properties' \
 			':VLAN link name:_dladm_vlans'
 		;;
 
 	("scan-wifi")
 		_arguments -A "-*" \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $wifi_connect_properties' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $wifi_connect_properties' \
 			':wireless link name:_dladm_wifi_links'
 		;;
 
@@ -245,127 +245,127 @@ _dladm() {
 			'(-e --essid)'{-e,--essid}'[ESSID name]:network:_dladm_wifi_nets' \
 			'(-b --bsstype)'{-b,--bsstype}'[BSS type]:' \
 			'(-m --mode)'{-m,--mode}'[802.11 mode]:mode:(a b g)' \
-			'(-k --key)'{-k,--key}'[Key name]:key:_dladm_secobjs' \
-			'(-s --sec)'{-s,--sec}'[Security mode]:(none wep wpa)' \
-			'(-a --auth)'{-a,--auth}'[Authentication mode]:mode:(open shared)' \
-			'(-c --create-ibss)'{-c,--create-ibss}'[Create an ad-hoc network]' \
-			'(-T --timeout)'{-T,--timeout}'[Association timeout]:(forever)' \
+			'(-k --key)'{-k,--key}'[key name]:key:_dladm_secobjs' \
+			'(-s --sec)'{-s,--sec}'[security mode]:(none wep wpa)' \
+			'(-a --auth)'{-a,--auth}'[authentication mode]:mode:(open shared)' \
+			'(-c --create-ibss)'{-c,--create-ibss}'[create an ad-hoc network]' \
+			'(-T --timeout)'{-T,--timeout}'[association timeout]:(forever)' \
 			':wireless link name:_dladm_wifi_links'
 		;;
 
 	("disconnect-wifi")
 		_arguments -A "-*" \
 			- set1 \
-			'(-a --all-links)'{-a,--all-links}'[All links]' \
+			'(-a --all-links)'{-a,--all-links}'[all links]' \
 			- set2 \
 			':wireless link name:_dladm_wifi_links'
 		;;
 
 	("show-wifi")
 		_arguments -A "-*" \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $wifi_properties' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $wifi_properties' \
 			':wireless link name:_dladm_wifi_links'
 		;;
 
 	("show-ether")
 		_arguments -A "-*" \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-x --extended)'{-x,--extended}'[Extended output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $ether_properties' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-x --extended)'{-x,--extended}'[extended output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $ether_properties' \
 			':ethernet link name:_dladm_ethers'
 		;;
 
 	("set-linkprop")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Change should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-p --prop)'{-p,--prop}'[Properties]:property:_dladm_linkprops' \
+			'(-t --temporary)'{-t,--temporary}'[change should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-p --prop)'{-p,--prop}'[properties]:property:_dladm_linkprops' \
 			':link name:_dladm_links'
 		;;
 
 	("reset-linkprop")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Change should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-p --prop)'{-p,--prop}'[Properties]:property:_dladm_linkprops' \
+			'(-t --temporary)'{-t,--temporary}'[change should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-p --prop)'{-p,--prop}'[properties]:property:_dladm_linkprops' \
 			':link name:_dladm_links'
 		;;
 
 	("show-linkprop")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent link properties]' \
-			'(-c --parseable)'{-c,--parseable}'[Parseable output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $linkprop_properties' \
-			'(-p --prop)'{-p,--prop}'[Properties]:property:_dladm_linkprops' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent link properties]' \
+			'(-c --parseable)'{-c,--parseable}'[parseable output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $linkprop_properties' \
+			'(-p --prop)'{-p,--prop}'[properties]:property:_dladm_linkprops' \
 			':link name:_dladm_links'
 		;;
 
 	("create-secobj")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-c --class)'{-c,--class}'[Class]:class:(wep wpa)' \
-			'(-f --file)'{-f,--file}'[File containing object value]:file:_path_files' \
+			'(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-c --class)'{-c,--class}'[class]:class:(wep wpa)' \
+			'(-f --file)'{-f,--file}'[file containing object value]:file:_path_files' \
 			':object name:'
 		;;
 
 	("delete-secobj")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
+			'(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
 			':object name:_dladm_secobjs'
 		;;
 
 	("show-secobj")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent object information]' \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $secobj_properties' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent object information]' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $secobj_properties' \
 			':object name:_dladm_secobjs'
 		;;
 
 	("create-vnic")
 		# TODO: MAC address completion could be richer
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
-			'(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \
+			'(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
+			'(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \
 			'(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto)' \
 			'-v[VLAN ID]:id:' \
-			'(-p --prop)'{-p,--prop}'[Property values]:value:' \
+			'(-p --prop)'{-p,--prop}'[property values]:value:' \
 			':VNIC name:'
 		;;
 
 	("delete-vnic")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
+			'(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
 			':VNIC name:_dladm_vnics'
 		;;
 
 	("show-vnic")
 		_arguments -A "-*" \
-			'(-P --persistent)'{-P,--persistent}'[Display persistent object information]' \
-			'(-p --parseable)'{-p,--parseable}'[Parseable output]' \
-			'(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $vnic_properties' \
-			'(-l --link)'{-l,--link}'[Limit to VNICs on link]:link:_dladm_links' \
-			'(-s --statistics)'{-s,--statistics}'[Display VNIC statistics]' \
-			'(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \
+			'(-P --persistent)'{-P,--persistent}'[display persistent object information]' \
+			'(-p --parseable)'{-p,--parseable}'[parseable output]' \
+			'(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $vnic_properties' \
+			'(-l --link)'{-l,--link}'[limit to VNICs on link]:link:_dladm_links' \
+			'(-s --statistics)'{-s,--statistics}'[display VNIC statistics]' \
+			'(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \
 			':VNIC name:_dladm_vnics'
 		;;
 
 	("create-etherstub")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
+			'(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
 			':etherstub name:'
 		;;
 
 	("delete-etherstub")
 		_arguments -A "-*" \
-			'(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \
-			'(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \
+			'(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \
+			'(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \
 			':etherstub name:_dladm_etherstubs'
 		;;
 
@@ -376,11 +376,11 @@ _dladm() {
 
 	("show-usage")
 		_arguments -A "-*" \
-			'(-f --file)'{-f,--file}'[Read records from file]:_path_files' \
-			'(-F --format)'{-f,--format}'[Plotfile format]:(gnuplot)' \
-			'(-p --plot)'{-p,--plot}'[Write plot to file]:' \
-			'(-e --start)'{-e,--start}'[Start time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \
-			'(-s --stop)'{-s,--stop}'[Stop time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \
+			'(-f --file)'{-f,--file}'[read records from file]:_path_files' \
+			'(-F --format)'{-f,--format}'[plotfile format]:(gnuplot)' \
+			'(-p --plot)'{-p,--plot}'[write plot to file]:' \
+			'(-e --start)'{-e,--start}'[start time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \
+			'(-s --stop)'{-s,--stop}'[stop time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \
 			':link name:_dladm_links'
 		;;
 
diff --git a/Completion/Solaris/Command/_dumpadm b/Completion/Solaris/Command/_dumpadm
index 37491946c..02c63f6a7 100644
--- a/Completion/Solaris/Command/_dumpadm
+++ b/Completion/Solaris/Command/_dumpadm
@@ -10,14 +10,14 @@ _dumpadm() {
 	)
 
 	_arguments -s \
-		'-n[Dont run savecore on reboot]' \
-		'-u[Update dump configuration from dumpadm.conf]' \
-		'-y[Run savecore on reboot]' \
-		'-c[Set dump content]:dump content:(($content))' \
-		'-d[Set dump device]:block devices:_files -g "*(-%b)"' \
-		'-m[Set minfree size ]:' \
-		'-s[Set the savecore directory]:directory:_files -/' \
-		'-r[Alternate root directory]:directory:_files -/'
+		'-n[dont run savecore on reboot]' \
+		'-u[update dump configuration from dumpadm.conf]' \
+		'-y[run savecore on reboot]' \
+		'-c[set dump content]:dump content:(($content))' \
+		'-d[set dump device]:block devices:_files -g "*(-%b)"' \
+		'-m[set minfree size ]:' \
+		'-s[set the savecore directory]:directory:_files -/' \
+		'-r[alternate root directory]:directory:_files -/'
 }
 
 _dumpadm "$@"
diff --git a/Completion/Solaris/Command/_gcore b/Completion/Solaris/Command/_gcore
index c7b8d9466..d4ac9a03a 100644
--- a/Completion/Solaris/Command/_gcore
+++ b/Completion/Solaris/Command/_gcore
@@ -4,27 +4,27 @@ _gcore() {
 	local -a content
 
 	content=(
-		"anon[Anonymous private mappings]"
+		"anon[anonymous private mappings]"
 		"ctf[CTF type information]"
-		"data[Writable private file mappings]"
+		"data[writable private file mappings]"
 		"dism[DISM mappings]"
-		"heap[Process heap]"
+		"heap[process heap]"
 		"ism[ISM mappings]"
-		"rodata[Read-only private file mappings]"
-		"shanon[Anonymous shared mappings]"
-		"shfile[File-backed shared mappings]"
+		"rodata[read-only private file mappings]"
+		"shanon[anonymous shared mappings]"
+		"shfile[file-backed shared mappings]"
 		"shm[System V shared memory]"
-		"stack[Process stack]"
-		"symtab[Symbol table sections for loaded files]"
-		"text[Readable and executable private file mappings]"
+		"stack[process stack]"
+		"symtab[symbol table sections for loaded files]"
+		"text[readable and executable private file mappings]"
 	)
 
 	_arguments -s \
-		'-p[Use per-process core file repository]' \
-		'-g[Use global core file repository]' \
-		'-F[Force grabbing the target process]' \
-		'-c[Set core file content]:_values -s + "content" $content' \
-		'-o[Set core file base name]:' \
+		'-p[use per-process core file repository]' \
+		'-g[use global core file repository]' \
+		'-F[force grabbing the target process]' \
+		'-c[set core file content]:_values -s + "content" $content' \
+		'-o[set core file base name]:' \
 		'*:pids:_pids'
 }
 
diff --git a/Completion/Solaris/Command/_inetadm b/Completion/Solaris/Command/_inetadm
index 2588672ef..0c8b14a4e 100644
--- a/Completion/Solaris/Command/_inetadm
+++ b/Completion/Solaris/Command/_inetadm
@@ -2,13 +2,13 @@
 
 _inetadm() {
 	_arguments -s \
-		'-?[Help]' \
-		'-l[List service instance properties]:FMRI:_svcs_fmri -i' \
-		'-e[Enable specified instance]:FMRI:_svcs_fmri -i' \
-		'-d[Disable specified instance]:FMRI:_svcs_fmri -i' \
-		'-p[List inet service properties]' \
-		'-m[Modify service instance properties]:FMRI:_svcs_fmri -i' \
-		'-M[Modify inet service properties]'
+		'-?[help]' \
+		'-l[list service instance properties]:FMRI:_svcs_fmri -i' \
+		'-e[enable specified instance]:FMRI:_svcs_fmri -i' \
+		'-d[disable specified instance]:FMRI:_svcs_fmri -i' \
+		'-p[list inet service properties]' \
+		'-m[modify service instance properties]:FMRI:_svcs_fmri -i' \
+		'-M[modify inet service properties]'
 }
 
 _inetadm "$@"
diff --git a/Completion/Solaris/Command/_ptree b/Completion/Solaris/Command/_ptree
index 031007ba8..035614b59 100644
--- a/Completion/Solaris/Command/_ptree
+++ b/Completion/Solaris/Command/_ptree
@@ -5,9 +5,9 @@ _ptree() {
 	typeset -A opt_args
 
 	_arguments -s \
-		'-a[All processes]' \
-		'-c[Show contract memberships]' \
-		'-z[Show processes in zone]:zone:($(zoneadm list))' \
+		'-a[all processes]' \
+		'-c[show contract memberships]' \
+		'-z[show processes in zone]:zone:($(zoneadm list))' \
 		'*:pid or user:->pidoruser' && ret=0
 
 	if [[ $ret -ne 0 ]]; then
diff --git a/Completion/Solaris/Command/_savecore b/Completion/Solaris/Command/_savecore
index 63bb81fb7..e112944ed 100644
--- a/Completion/Solaris/Command/_savecore
+++ b/Completion/Solaris/Command/_savecore
@@ -2,10 +2,10 @@
 
 _savecore() {
 	_arguments -s \
-		'-L[Take live dump]' \
-		'-v[Verbose]' \
-		'-d[Disregard dump header valid flag]' \
-		'-f[Save crash dump from file]:file:_files' \
+		'-L[take live dump]' \
+		'-v[verbose]' \
+		'-d[disregard dump header valid flag]' \
+		'-f[save crash dump from file]:file:_files' \
 		'::directory:_files -/'
 }
 
diff --git a/Completion/Solaris/Command/_svcadm b/Completion/Solaris/Command/_svcadm
index c2e91a6fe..8cd001f29 100644
--- a/Completion/Solaris/Command/_svcadm
+++ b/Completion/Solaris/Command/_svcadm
@@ -8,7 +8,7 @@ _svcadm() {
 
 	if [[ $service == "svcadm" ]]; then
 		_arguments -C -A "-*" \
-			'-v[Print actions verbosely]' \
+			'-v[print actions verbosely]' \
 			'*::command:->subcmd' && return 0
 
 		if (( CURRENT == 1 )); then
@@ -22,23 +22,23 @@ _svcadm() {
 	case $service in
 	(enable)
 		_arguments \
-			'-r[Recursively enable dependencies]' \
-			'-s[Wait for service to come online]' \
-			'-t[State change is temporary]' \
+			'-r[recursively enable dependencies]' \
+			'-s[wait for service to come online]' \
+			'-t[state change is temporary]' \
 			'*:instance FMRI:_svcs_fmri -i'
 		;;
 
 	(disable)
 		_arguments \
-			'-s[Wait for service to become disabled]' \
-			'-t[State change is temporary]' \
+			'-s[wait for service to become disabled]' \
+			'-t[state change is temporary]' \
 			'*:instance FMRI:_svcs_fmri -i'
 		;;
 
 	(mark)
 		_arguments \
-			'-I[Change state immediately]' \
-			'-t[State change is temporary]' \
+			'-I[change state immediately]' \
+			'-t[state change is temporary]' \
 			':state:(degraded maintenance)' \
 			':instance FMRI:_svcs_fmri -i'
 		;;
@@ -50,7 +50,7 @@ _svcadm() {
 
 	(milestone)
 		_arguments \
-			'-d[Make milestone the default]' \
+			'-d[make milestone the default]' \
 			'*:milestone FMRI:_svcs_fmri -m'
 		;;
 
diff --git a/Completion/Solaris/Command/_svccfg b/Completion/Solaris/Command/_svccfg
index 5d1bf358a..10b84bda3 100644
--- a/Completion/Solaris/Command/_svccfg
+++ b/Completion/Solaris/Command/_svccfg
@@ -25,11 +25,11 @@ _svccfg() {
 
 	if [[ $service == "svccfg" ]]; then
 		_arguments -s \
-			'-?[Help]' \
-			'-v[Verbose]' \
+			'-?[help]' \
+			'-v[verbose]' \
 			'-s[FMRI on which to operate]:fmri:_svcs_fmri -c' \
 			- set1 \
-			'-f[Read commands from file]:command file:_files' \
+			'-f[read commands from file]:command file:_files' \
 			- set2 \
 			'*::command:->subcmd' && return 0
 
@@ -44,7 +44,7 @@ _svccfg() {
 	case $service in
 	(import)
 		_arguments \
-			'-V[Verify property updates]' \
+			'-V[verify property updates]' \
 			':file:_files'
 		;;
 
@@ -62,15 +62,15 @@ _svccfg() {
 
 	(delete)
 		_arguments \
-			'-f[Force deletion if online or degraded]' \
+			'-f[force deletion if online or degraded]' \
 			'*:FMRI:_svcs_fmri -c'
 		;;
 
 	(describe)
 		local fmri=$opt_args[-s]
 		_arguments -A "-*" \
-			'-v[Give all information]' \
-			'-t[Show only template data]' \
+			'-v[give all information]' \
+			'-t[show only template data]' \
 			":property group or property:_svccfg_properties $fmri"
 		;;
 
diff --git a/Completion/Solaris/Command/_svcprop b/Completion/Solaris/Command/_svcprop
index aa166808a..60d74a1ad 100644
--- a/Completion/Solaris/Command/_svcprop
+++ b/Completion/Solaris/Command/_svcprop
@@ -2,19 +2,19 @@
 
 _svcprop() {
 	_arguments -s \
-		'-f[Designate properties by their FMRI]' \
-		'-q[Quiet]' \
-		'-t[Use multi-property output format]' \
-		'-v[Verbose]' \
+		'-f[designate properties by their FMRI]' \
+		'-q[quiet]' \
+		'-t[use multi-property output format]' \
+		'-v[verbose]' \
 		- set1 \
-		'-w[Waits for the selected property or property group to change]' \
-		'-p[Prints values of named property or property group]' \
+		'-w[waits for the selected property or property group to change]' \
+		'-p[prints values of named property or property group]' \
 		':FMRI:_svcs_fmri -i' \
 		- set2 \
-		'(-c -s)-C[Retrieve properties without composition]' \
-		'(-C -s)-c[Retrieve properties with composition]' \
-		'(-c -C)-s[Retrieve properties from snapshot]:snapshot:' \
-		'*-p[Prints values of named property or property group]' \
+		'(-c -s)-C[retrieve properties without composition]' \
+		'(-C -s)-c[retrieve properties with composition]' \
+		'(-c -C)-s[retrieve properties from snapshot]:snapshot:' \
+		'*-p[prints values of named property or property group]' \
 		'*:FMRI:_svcs_fmri -i'
 }
 
diff --git a/Completion/Solaris/Command/_svcs b/Completion/Solaris/Command/_svcs
index 0588afcae..7c148fad4 100644
--- a/Completion/Solaris/Command/_svcs
+++ b/Completion/Solaris/Command/_svcs
@@ -11,19 +11,19 @@ _svcs() {
 	)
 
 	_arguments -s \
-		'(-l -x -d -D)-a[List all instances]' \
-		'(-l -x -D -a -R)-d[List dependencies]' \
-		'(-l -x -d -a -R)-D[List dependents]' \
-		'(-l -x)-H[Suppress header line]' \
-		'(-x -d -D -a -R -s)-l[Print detailed status about services and instances]' \
-		'(-l -x)-o[Display specific columns]:column:_values -s , "column" ${^cols/\:/[}\]' \
-		'(-l -x)-p[List processes]' \
-		'(-l -x -d -D)-R[List services with the given restarter]:instance FMRI:_svcs_fmri -i' \
-		'(-l -x)-s[Sort by a column]:column:(($cols))' \
-		'(-l -x)-S[Reverse sort by a column]:column:(($cols))' \
+		'(-l -x -d -D)-a[list all instances]' \
+		'(-l -x -D -a -R)-d[list dependencies]' \
+		'(-l -x -d -a -R)-D[list dependents]' \
+		'(-l -x)-H[suppress header line]' \
+		'(-x -d -D -a -R -s)-l[print detailed status about services and instances]' \
+		'(-l -x)-o[display specific columns]:column:_values -s , "column" ${^cols/\:/[}\]' \
+		'(-l -x)-p[list processes]' \
+		'(-l -x -d -D)-R[list services with the given restarter]:instance FMRI:_svcs_fmri -i' \
+		'(-l -x)-s[sort by a column]:column:(($cols))' \
+		'(-l -x)-S[reverse sort by a column]:column:(($cols))' \
 		'-v[verbose columns]' \
-		'(-l)-x[Display explanation for service states]' \
-		'(-l -x)-\?[Print help]' \
+		'(-l)-x[display explanation for service states]' \
+		'(-l -x)-\?[print help]' \
 		'*:FMRI or pattern:_svcs_fmri -i'
 }
 
diff --git a/Completion/Solaris/Command/_zlogin b/Completion/Solaris/Command/_zlogin
index 9e93684b8..8c55d8671 100644
--- a/Completion/Solaris/Command/_zlogin
+++ b/Completion/Solaris/Command/_zlogin
@@ -2,14 +2,14 @@
 
 _zlogin() {
 	_arguments -s \
-		'-E[Disable escape character]' \
-		'-e[Specify escape character]:character:' \
-		'-l[Specify username]:username:_users' \
+		'-E[disable escape character]' \
+		'-e[specify escape character]:character:' \
+		'-l[specify username]:username:_users' \
 		':zonename:' \
 		- set1 \
-		'-C[Connect to zone console]' \
+		'-C[connect to zone console]' \
 		- set2 \
-		'-S["Safe" login mode]' \
+		'-S["safe" login mode]' \
 		':utility'
 }
 
diff --git a/Completion/Unix/Command/_arp b/Completion/Unix/Command/_arp
index d9b033e90..64a8b8069 100644
--- a/Completion/Unix/Command/_arp
+++ b/Completion/Unix/Command/_arp
@@ -10,8 +10,8 @@ _arguments -C \
   "($cmds 1 -n --numeric -D --use-device -H --hw-type)"{-d,--delete}'[delete entry from table]:host:->hostintable' \
   "($cmds 1 -n --numeric)"{-s,--set}'[create an ARP entry]:host:_hosts:ethernet address::*:option:(temp trail pub)' \
   "($cmds 1 -n --numeric)"{-f,--file}'[read multiple entries from file]:file:_files' \
-  '(-i --device)'{-i,--device}'[Select an interface]:::_net_interfaces:' \
-  '(-D --use-device -a --display -d --delete)'{-D,--use-device}"[Use the interface ifa's hardware address]" \
+  '(-i --device)'{-i,--device}'[select an interface]:::_net_interfaces:' \
+  '(-D --use-device -a --display -d --delete)'{-D,--use-device}"[use the interface ifa's hardware address]" \
   '(-H --hw-type -d --delete)'{-H,--hw-type}'[class of entries to check for]:class:(ether arcnet pronet ax25 netrom)' \
   '(-n --numeric -d --delete -s --set -f --file)'{-n,--numeric}'[shows numerical addresses]' \
   '(-v --verbose)'{-v,--verbose}'[be verbose]' \
diff --git a/Completion/Unix/Command/_arping b/Completion/Unix/Command/_arping
index 5fc65a27a..fea110934 100644
--- a/Completion/Unix/Command/_arping
+++ b/Completion/Unix/Command/_arping
@@ -7,7 +7,7 @@ _arguments -s \
   '-q[be quiet]' \
   '-b[keep broadcasting, do not go unicast]' \
   '-D[duplicate address detection mode]'\
-  '-U[Unsolicited ARP mode, update your neighbours]' \
+  '-U[unsolicited ARP mode, update your neighbours]' \
   '-A[ARP answer mode, update your neighbours]' \
   '-V[print version and exit]' \
   '-c[how many packets to send]:count' \
diff --git a/Completion/Unix/Command/_bzr b/Completion/Unix/Command/_bzr
index a757a1059..47083ca49 100644
--- a/Completion/Unix/Command/_bzr
+++ b/Completion/Unix/Command/_bzr
@@ -116,10 +116,10 @@ case $cmd in
 (log)
     args+=(
 	'--forward[reverse direction of revisions]'
-	'(-l --long --short --log_format)--line[Use log format with one line per revision. Same as "--log-format line"]'
-	'(-l --long --short --line)--log-format=[Use the specified log format]:log format:(line short long)'
-	'(-l --long --short --line --log-format)'{--long,-l}'[Use detailed log format. Same as "--log-format long"]'
-	'(-l --long --log_format)--short[Use moderately short log format. Same as "--log-format short"]'
+	'(-l --long --short --log_format)--line[use log format with one line per revision. Same as "--log-format line"]'
+	'(-l --long --short --line)--log-format=[use the specified log format]:log format:(line short long)'
+	'(-l --long --short --line --log-format)'{--long,-l}'[use detailed log format. Same as "--log-format long"]'
+	'(-l --long --log_format)--short[use moderately short log format. Same as "--log-format short"]'
 	'(-m --message)'{--message=,-m}'[specify regexp]:regexp:'
 	'(-r --revision)'{--revision=,-r}'[revision or range]:rev or rev range:'
 	'--show-ids[show file IDs]'
@@ -180,8 +180,8 @@ case $cmd in
 
 (pull)
     args+=(
-	'--overwrite[Ignore differences, overwrite unconditionally]'
-	'--remember[Remember the specified location as a default]'
+	'--overwrite[ignore differences, overwrite unconditionally]'
+	'--remember[remember the specified location as a default]'
 	'(-r --revision)'{--revision=,-r}'[get a particular revision]:revision:'
 	'(-v --verbose)'{--verbose,-v}'[display more information]'
 	'*:local repository:_files -/'
@@ -191,14 +191,14 @@ case $cmd in
 
 (missing)
     args+=(
-	'(-l --long --short --log_format)--line[Use log format with one line per revision. Same as "--log-format line"]'
-	'(-l --long --short --line)--log-format=[Use the specified log format]:log format:(line short long)'
-	'(-l --long --short --line --log-format)'{--long,-l}'[Use detailed log format. Same as "--log-format long"]'
-	'(-l --long --log_format)--short[Use moderately short log format. Same as "--log-format short"]'
-	'--mine-only[Display changes in the local branch only]'
-	'--reverse[Reverse the order of revisions]'
+	'(-l --long --short --log_format)--line[use log format with one line per revision. Same as "--log-format line"]'
+	'(-l --long --short --line)--log-format=[use the specified log format]:log format:(line short long)'
+	'(-l --long --short --line --log-format)'{--long,-l}'[use detailed log format. Same as "--log-format long"]'
+	'(-l --long --log_format)--short[use moderately short log format. Same as "--log-format short"]'
+	'--mine-only[display changes in the local branch only]'
+	'--reverse[reverse the order of revisions]'
 	'--show-ids[show internal object ids]'
-	'--theirs-only[Display changes in the remote branch only]'
+	'--theirs-only[display changes in the remote branch only]'
 	'(-v --verbose)'{--verbose,-v}'[display more information]'
 	'*:local repository:_files -/'
 	)
@@ -238,8 +238,8 @@ case $cmd in
 (remerge)
     args+=(
 	'--merge-type=[the type of the merge]:type:'
-	'--reprocess[Reprocess to reduce spurious conflicts]'
-	'--show-base[Show base revision text in conflicts]'
+	'--reprocess[reprocess to reduce spurious conflicts]'
+	'--show-base[show base revision text in conflicts]'
 	)
     _bzr_completeParents
     ;;
@@ -308,10 +308,10 @@ case $cmd in
     args+=(
 	'--force[ignore uncommitted changes]'
 	'--merge-type:merge type:(diff3 merge3 weave)'
-	'--remember[Remember the specified location as a default]'
-	'--reprocess[Reprocess to reduce spurious conflicts]'
+	'--remember[remember the specified location as a default]'
+	'--reprocess[reprocess to reduce spurious conflicts]'
 	'(-r --revision)'{--revision=,-r}'[revision]:revision:'
-	'--show-base[Show base revision text in conflicts]'
+	'--show-base[show base revision text in conflicts]'
 	'*:local repository:_files -/'
 	)
     _bzr_completeParents
@@ -322,18 +322,18 @@ case $cmd in
 	'(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]'
 	'(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]'
 	'(-r --revision)'{--revision=,-r}'[revision]:revision:'
-	'--from-root[Print all paths from the root of the branch]'
-	'--non-recursive[Do not recurse into subdirectories]'
-	'--null[Null separate the files]'
-	'--ignored[Print ignored files]'
-	'--unknown[Print unknown files]'
-	'--versioned[Print versioned files]'
+	'--from-root[print all paths from the root of the branch]'
+	'--non-recursive[do not recurse into subdirectories]'
+	'--null[null separate the files]'
+	'--ignored[print ignored files]'
+	'--unknown[print unknown files]'
+	'--versioned[print versioned files]'
 	)
     ;;
 
 (switch)
     args+=(
-	'--force[Switch even if local commits will be lost]'
+	'--force[switch even if local commits will be lost]'
 	'(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]'
 	'(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]'
 	'*:local repository:_files -/'
@@ -367,9 +367,9 @@ case $cmd in
 
 (push)
     args+=(
-	'--create-prefix[Create the path leading up to the branch when missing]'
-	'--overwrite[Ignore differences, overwrite unconditionally]'
-	'--remember[Remember the specified location as a default]'
+	'--create-prefix[create the path leading up to the branch when missing]'
+	'--overwrite[ignore differences, overwrite unconditionally]'
+	'--remember[remember the specified location as a default]'
 	'*:local repository:_files -/'
 	)
     _bzr_completeParents
diff --git a/Completion/Unix/Command/_cdcd b/Completion/Unix/Command/_cdcd
index 9e832eea5..3fa83f61f 100644
--- a/Completion/Unix/Command/_cdcd
+++ b/Completion/Unix/Command/_cdcd
@@ -32,7 +32,7 @@ _cdcd_commands ()
     'list:list all CDs in a CD-ROM changer'
     'slot:changes the current CD in the CD-ROM changer'
     'edit:edit information about the disc'
-    'ext:Extended information about the disc'
+    'ext:extended information about the disc'
     'refresh:refresh the information about the CD from a CDDB server'
     'device:change the CD-ROM device cdcd will use'
     'verbose:toggle verbosity'
diff --git a/Completion/Unix/Command/_ecasound b/Completion/Unix/Command/_ecasound
index 204ce869a..e31b072f9 100644
--- a/Completion/Unix/Command/_ecasound
+++ b/Completion/Unix/Command/_ecasound
@@ -15,7 +15,7 @@ _arguments \
   '-sr\:-[set internal sampling rate]:internal sampling rate:(8000 11025 22050 44100 48000)' \
   '*-a\:-[select active signal chains]:chain name' \
   '-b\:-[set the size of buffer in samples]:buffer size:->b' \
-  '-m\:-[force use of specified mix mode]:mix mode:((auto\:Automatic simple\:Only\ one\ input/cain/output normal\:Normal\ single-threaded\ mode))' \
+  '-m\:-[force use of specified mix mode]:mix mode:((auto\:automatic simple\:only\ one\ input/cain/output normal\:normal\ single-threaded\ mode))' \
   '-r[use realtime scheduling policy (SCHED_FIFO)]' \
   '-r\:-[use realtime scheduling policy (SCHED_FIFO)]:sched_priority' \
   '-x[truncate outputs]' \
diff --git a/Completion/Unix/Command/_feh b/Completion/Unix/Command/_feh
index f29bf6ee9..82b2b4086 100644
--- a/Completion/Unix/Command/_feh
+++ b/Completion/Unix/Command/_feh
@@ -69,44 +69,44 @@ argument_pairs=(
 )
 
 argument_postfix=(
-	'help'        '[Show help]'
-	'version'     '[Show version information]'
-	'verbose'     '[Be verbose]'
-	'quiet'       '[Suppress non-fatal errors]'
-	'theme'       '[Load named options from config]:theme:_feh_theme'
-	'recursive'   '[Recurse into subdirectories]'
-	'randomize'   '[Randomize file list before displaying]'
-	'filelist'    '[Read file list from this file]:file:_files'
-	'preload'     '[Eliminate unlaodable images before displaying]'
-	'full-screen' '[Make the window fullscreen]'
-	'geometry'    '[Limit window size]:geometry: '
-	'auto-zoom'   '[Zoom picture to screen size]'
-	'multiwindow' '[Multiple windows, one image per window]'
-	'borderless'  '[Borderless windows]'
-	'draw-filename' '[Show filename in images]'
-	'reload'      '[Time delay for reloading]:time: '
-	'keep-http'   "[Don't delete cached files]"
-	'builtin'     '[Use builtin http client]'
-	'list'        '[List images, their size, etc.]'
-	'customlist'  '[Format list output]:format: '
-	'loadable'    '[Print loadable images]'
-	'unloadable'  '[Print unloadable images]'
-	'sort'        '[Sort images]:sort type:(name filename width height pixels size format)'
-	'reverse'     '[Reverse sort order]'
-	'action'      '[Action to perform on each image]:shell: '
-	'montage'     '[Enable montage mode]'
-	'collage'     '[Enable collage mode]'
-	'index'       '[Enable index mode]'
-	'fullindex'   '[Enable verbose index mode]'
-	'thumbnails'  '[Enable interactive index mode]'
-	'menu-font'   '[Set font in menus]:font: '
-	'no-menus'    "[Don't load or show any menus]"
-	'reload-button' '[Button to reload image]:button:_feh_button'
-	'pan-button'  '[Button to pan image]:button:_feh_button'
-	'zoom-button' '[Button to zoom image]:button:_feh_button'
-	'menu-button' '[Button to activate menu]:button:_feh_button'
-	'prev-button' '[Button to go to previous image]:button:_feh_button'
-	'next-button' '[Button to go to next image]:button:_feh_button'
+	'help'        '[show help]'
+	'version'     '[show version information]'
+	'verbose'     '[be verbose]'
+	'quiet'       '[suppress non-fatal errors]'
+	'theme'       '[load named options from config]:theme:_feh_theme'
+	'recursive'   '[recurse into subdirectories]'
+	'randomize'   '[randomize file list before displaying]'
+	'filelist'    '[read file list from this file]:file:_files'
+	'preload'     '[eliminate unlaodable images before displaying]'
+	'full-screen' '[make the window fullscreen]'
+	'geometry'    '[limit window size]:geometry: '
+	'auto-zoom'   '[zoom picture to screen size]'
+	'multiwindow' '[multiple windows, one image per window]'
+	'borderless'  '[borderless windows]'
+	'draw-filename' '[show filename in images]'
+	'reload'      '[time delay for reloading]:time: '
+	'keep-http'   "[don't delete cached files]"
+	'builtin'     '[use builtin http client]'
+	'list'        '[list images, their size, etc.]'
+	'customlist'  '[format list output]:format: '
+	'loadable'    '[print loadable images]'
+	'unloadable'  '[print unloadable images]'
+	'sort'        '[sort images]:sort type:(name filename width height pixels size format)'
+	'reverse'     '[reverse sort order]'
+	'action'      '[action to perform on each image]:shell: '
+	'montage'     '[enable montage mode]'
+	'collage'     '[enable collage mode]'
+	'index'       '[enable index mode]'
+	'fullindex'   '[enable verbose index mode]'
+	'thumbnails'  '[enable interactive index mode]'
+	'menu-font'   '[set font in menus]:font: '
+	'no-menus'    "[don't load or show any menus]"
+	'reload-button' '[button to reload image]:button:_feh_button'
+	'pan-button'  '[button to pan image]:button:_feh_button'
+	'zoom-button' '[button to zoom image]:button:_feh_button'
+	'menu-button' '[button to activate menu]:button:_feh_button'
+	'prev-button' '[button to go to previous image]:button:_feh_button'
+	'next-button' '[button to go to next image]:button:_feh_button'
 	'rotate-button' '[Ctrl+Button to rotate image]:button:_feh_button'
 	'blur-button' '[Ctrl+Button tu blur image]:button:_feh_button'
 	'ignore-aspect' "[montage mode: Don't preserve aspect ratio]"
@@ -119,47 +119,47 @@ argument_postfix=(
 	'alpha'       '[montage mode: Thumbnail transparency level]:integer: '
 	'font'        '[index mode: Thumbnail info font]:font: '
 	'slideshow-delay' '[slide change delay]:seconds'
-	'scale-down'  '[Scale down images which are too big]'
-	'output-dir'  '[Save files to DIR (with -k)]:directory:_files -/'
-	'wget-timestamp' '[Add no timestamp ("?123") to URLs]'
-	'fontpath'    '[Add paths to font path]:font path:_files -/'
-	'image-bg'    '[Set transparent image background]:background:(white black default)'
+	'scale-down'  '[scale down images which are too big]'
+	'output-dir'  '[save files to DIR (with -k)]:directory:_files -/'
+	'wget-timestamp' '[add no timestamp ("?123") to URLs]'
+	'fontpath'    '[add paths to font path]:font path:_files -/'
+	'image-bg'    '[set transparent image background]:background:(white black default)'
 	'output'      '[montage mode: Output file]:file:_files'
 	'output-only' "[montage mode: Output file, don't display montage]:file: files"
-	'rcfile'      '[Specify config file]:file:_files'
-	'thumb-title' '[Window title in thumbnail mode]:format string'
-	'title'       '[Window title in slideshow mode]:format string'
-	'start-at'    '[Start slideshow at]:file:_files'
-	'title-font'  '[Title font for index mode]:font'
+	'rcfile'      '[specify config file]:file:_files'
+	'thumb-title' '[window title in thumbnail mode]:format string'
+	'title'       '[window title in slideshow mode]:format string'
+	'start-at'    '[start slideshow at]:file:_files'
+	'title-font'  '[title font for index mode]:font'
 )
 
 arguments=(
-	'--zoom[Zoom images]:percent: '
-	'--caption-path[Where to look for image captions]:relative directory: '
+	'--zoom[zoom images]:percent: '
+	'--caption-path[where to look for image captions]:relative directory: '
 	--action{1..9}':shell: '
-	'--bg-tile[Set tiled desktop background]:file:_files'
-	'--bg-center[Set centered desktop background]:file:_files'
-	'--bg-scale[Set scaled desktop background]:file:_files'
-	'--bg-seamless[Set desktop background with seamless borders]:file:_files'
-	'--bg-fill[Set scaled desktop background, preserving aspect ratio]:file:_files'
-	'--menu-style[Style descriptor for menu text]:file:_files'
-	'--menu-border[Set menu background border]:integer: '
-	'--menu-ctrl-mask[Use Ctrl+Button to display menu]'
-	'--no-rotate-ctrl-mask[Don'\''t require Ctrl for the rotate button]'
-	'--no-blur-ctrl-mask[Don'\''t require Ctrl for the blur button]'
-	'--no-xinerama[Disable xinerama support]'
-	'--screen-clip[Toggle window clipping]'
-	'--hide-pointer[Hide mouse pointer in fullscreen mode]'
+	'--bg-tile[set tiled desktop background]:file:_files'
+	'--bg-center[set centered desktop background]:file:_files'
+	'--bg-scale[set scaled desktop background]:file:_files'
+	'--bg-seamless[set desktop background with seamless borders]:file:_files'
+	'--bg-fill[set scaled desktop background, preserving aspect ratio]:file:_files'
+	'--menu-style[style descriptor for menu text]:file:_files'
+	'--menu-border[set menu background border]:integer: '
+	'--menu-ctrl-mask[use Ctrl+Button to display menu]'
+	'--no-rotate-ctrl-mask[don'\''t require Ctrl for the rotate button]'
+	'--no-blur-ctrl-mask[don'\''t require Ctrl for the blur button]'
+	'--no-xinerama[disable xinerama support]'
+	'--screen-clip[toggle window clipping]'
+	'--hide-pointer[hide mouse pointer in fullscreen mode]'
 	'*--fontpath[index mode: directory to search for fonts]:directory:_path_files -/'
-	'--index-name[Show image name in index/thumbnail mode]:bool:(0 1)'
-	'--index-size[Show image size in index/thumbnail mode]:bool:(0 1)'
-	'--index-dim[Show image dimensions in index/thumbnail mode]:bool:(0 1)'
-	'--no-jump-on-resort[Stay at current image after resorting the filelist]'
-	'--cycle-once[Quit after one loop through the slideshow]'
-	'--draw-actions[Draw defined actions]'
-	'--cache-thumbnails[Enable thumbnail caching]'
-	'--menu-bg[Background image in menus]: :_feh_background'
-	'--thumb-redraw[Set thumbnail image redraw frequency]:digit'
+	'--index-name[show image name in index/thumbnail mode]:bool:(0 1)'
+	'--index-size[show image size in index/thumbnail mode]:bool:(0 1)'
+	'--index-dim[show image dimensions in index/thumbnail mode]:bool:(0 1)'
+	'--no-jump-on-resort[stay at current image after resorting the filelist]'
+	'--cycle-once[quit after one loop through the slideshow]'
+	'--draw-actions[draw defined actions]'
+	'--cache-thumbnails[enable thumbnail caching]'
+	'--menu-bg[background image in menus]: :_feh_background'
+	'--thumb-redraw[set thumbnail image redraw frequency]:digit'
 	'*:file:_files'
 )
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index cb06d5703..e8ef1131a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -760,7 +760,7 @@ _git-update-index () {
     '--unmerged[if unmerged changes exists, ignore them instead of exiting]' \
     '--ignore-missing[ignore missing files when refreshing the index]' \
     '*--cacheinfo[insert information directly into the cache]: :_guard "[0-7]#" "octal file mode": :_guard "[[\:xdigit\:]]#" "object id":file:_files' \
-    '(: -)--index-info[read index information from stdin.]' \
+    '(: -)--index-info[read index information from stdin]' \
     '--chmod=-[set the execute permissions on the updated files]:permission:((-x\:executable +x\:"not executable"))' \
     '(                   --no-assume-unchanged)--assume-unchanged[set the "assume unchanged" bit for the given paths]' \
     '(--assume-unchanged                      )--no-assume-unchanged[unset the "assume unchanged" bit for the given paths]' \
@@ -1865,7 +1865,7 @@ _git-log () {
   _arguments -S \
     $revision_arguments \
     '--source[show which ref each commit is reached from]' \
-    '--decorate[print out ref names of any commits that are shown.]' \
+    '--decorate[print out ref names of any commits that are shown]' \
     '*:file-or-branch:->files' && ret=0
 
   case $state in
diff --git a/Completion/Unix/Command/_gnupod b/Completion/Unix/Command/_gnupod
index cbcfc664d..f53ae6c59 100644
--- a/Completion/Unix/Command/_gnupod
+++ b/Completion/Unix/Command/_gnupod
@@ -8,31 +8,31 @@ case "$service" in
     '(-h --help)'{-h,--help}'[display help and exit]'
     --version'[output version information and exit]'
     '(-m --mount)'{-m,--mount=}'[iPod mountpoint, default is $IPOD_MOUNTPOINT]:mount point:_files'
-    '(-r --restore)'{-r,--restore}'[Restore the iPod (create a new GNUtunesDB from scratch)]'
-    '(-d --duplicate)'{-d,--duplicate}'[Allow duplicate files]'
-    '(-p --playlist)'{-p,--playlist=}'[Add songs to this playlist]:playlist:'
-    --playlist-is-podcast'[Set podcast flag for playlist(s) created using --playlist]'
-    --podcast-artwork'[Download and install artwork for podcasts from their channel.]'
-    --podcast-cache-dir='[Set a directory in which podcast media files will be cached.]:podcast cache dir:'
-    --podcast-files-limit='[Limit files to download (0 = all (default), -X = X oldest, X = X newest)]:podcast files limit:'.
-    --disable-v1'[Do not read ID3v1 Tags (MP3 Only)]'
-    --disable-v2'[Do not read ID3v2 Tags (MP3 Only)]'
-    '(-x --decode)'{-x,--decode=}'[Convert FLAC Files to WAVE/MP3 or AAC on-the-fly]:encoding:(pcm mp3 aac aacbm)'
-    --decode=video'[Convert .avi Files into iPod video on-the-fly]'
-    '(-e --reencode)'{-e,--reencode=}'[Reencode MP3/AAC files with new quality on-the-fly]:quality number (0 = Good 9 = Bad):(1 2 3 4 5 6 7 8 9)'
-    '(-t --set-title)'{-t,--set-title=}'[Set Title (Override ID3 Tag)]:title:'
-    '(-a --set-artist)'{-a,--set-artist=}'[Set Artist (Override ID3 Tag)]:artist:'
-    '(-l --set-album)'{-l,--set-album=}'[Set Album (Override ID3 Tag)]:album:'
-    '(-g --set-genre)'{-g,--set-genre=}'[Set Genre (Override ID3 Tag)]:genre:'
-    --set-rating='[Set Rating (0=-/20=*/40=**/60=***/80=****/100=*****)]:rating:(0 20 40 60 80 100)'
-    --set-playcount='[Set Playcount]:play count:'
-    --set-songnum='[Override Songnum/Tracknum field]:song number:'
-    '(-b --set-bookmarkable)'{-b,--set-bookmarkable}'[Set this song as bookmarkable (= Remember position)]'
-    --set-shuffleskip'[Exclude this file in shuffle-mode]'
-    --set-compilation'[Mark songs as being part of a compilation]'
-    --min-vol-adj='[Minimum volume adjustment allowed by ID3v2.4 RVA2 tag (range -100 to 100, default 0)]'
-    --max-vol-adj='[Maximum volume adjustment allowed by ID3v2.4 RVA2 tag (range -100 to 100, default 0)]'
-    --artwork='[Use FILE as album cover]:artwork:_files'
+    '(-r --restore)'{-r,--restore}'[restore the iPod (create a new GNUtunesDB from scratch)]'
+    '(-d --duplicate)'{-d,--duplicate}'[allow duplicate files]'
+    '(-p --playlist)'{-p,--playlist=}'[add songs to this playlist]:playlist:'
+    --playlist-is-podcast'[set podcast flag for playlist(s) created using --playlist]'
+    --podcast-artwork'[download and install artwork for podcasts from their channel]'
+    --podcast-cache-dir='[set a directory in which podcast media files will be cached]:podcast cache dir:'
+    --podcast-files-limit='[limit files to download (0 = all (default), -X = X oldest, X = X newest)]:podcast files limit:'.
+    --disable-v1'[do not read ID3v1 Tags (MP3 Only)]'
+    --disable-v2'[do not read ID3v2 Tags (MP3 Only)]'
+    '(-x --decode)'{-x,--decode=}'[convert FLAC Files to WAVE/MP3 or AAC on-the-fly]:encoding:(pcm mp3 aac aacbm)'
+    --decode=video'[convert .avi Files into iPod video on-the-fly]'
+    '(-e --reencode)'{-e,--reencode=}'[reencode MP3/AAC files with new quality on-the-fly]:quality number (0 = Good 9 = Bad):(1 2 3 4 5 6 7 8 9)'
+    '(-t --set-title)'{-t,--set-title=}'[set Title (Override ID3 Tag)]:title:'
+    '(-a --set-artist)'{-a,--set-artist=}'[set Artist (Override ID3 Tag)]:artist:'
+    '(-l --set-album)'{-l,--set-album=}'[set Album (Override ID3 Tag)]:album:'
+    '(-g --set-genre)'{-g,--set-genre=}'[set Genre (Override ID3 Tag)]:genre:'
+    --set-rating='[set Rating (0=-/20=*/40=**/60=***/80=****/100=*****)]:rating:(0 20 40 60 80 100)'
+    --set-playcount='[set Playcount]:play count:'
+    --set-songnum='[override Songnum/Tracknum field]:song number:'
+    '(-b --set-bookmarkable)'{-b,--set-bookmarkable}'[set this song as bookmarkable (= Remember position)]'
+    --set-shuffleskip'[exclude this file in shuffle-mode]'
+    --set-compilation'[mark songs as being part of a compilation]'
+    --min-vol-adj='[minimum volume adjustment allowed by ID3v2.4 RVA2 tag (range -100 to 100, default 0)]'
+    --max-vol-adj='[maximum volume adjustment allowed by ID3v2.4 RVA2 tag (range -100 to 100, default 0)]'
+    --artwork='[use FILE as album cover]:artwork:_files'
     '*:file to add:_files'
 )
   ;;
@@ -53,7 +53,7 @@ case "$service" in
     '(-m --mount)'{-m,--mount=}'[iPod mountpoint (default is $IPOD_MOUNTPOINT)]:mount point:_files'
     '(-d --disable-convert)'{-d,--disable-convert}'[do not try to convert an existing iTunesDB]'
     '(-f --france)'{-f,--france}'[limit volume to 100dB, works only on very old iPods]'
-    --noask'[Do not wait for any user input]'
+    --noask'[do not wait for any user input]'
 )
   ;;
 
@@ -76,7 +76,7 @@ case "$service" in
     --delete'[remove matched songs from the iPod]'
     --view='[modify output (default is ialt, see --help)]:output string:'
     --rename='[rename key into value for matched songs]:KEY=VALUE:'
-    --artwork='[Use FILE as Cover for found files]:artwork:_files'
+    --artwork='[use FILE as Cover for found files]:artwork:_files'
 )
   ;;
 
diff --git a/Completion/Unix/Command/_gnutls b/Completion/Unix/Command/_gnutls
index b30408199..64f8e3cf5 100644
--- a/Completion/Unix/Command/_gnutls
+++ b/Completion/Unix/Command/_gnutls
@@ -26,8 +26,8 @@ _arguments \
      "$_gnutls_cli_common_args[@]" \
      '(-r --resume)'{-r,--resume}'[resume session]' \
      '(-s --starttls)'{-s,--starttls}'[start TLS on EOF or SIGALRM]' \
-     '--crlf[Send CR LF instead of LF]' \
-     '--x509fmtder[Use DER format for certificates to read from]' \
+     '--crlf[send CR LF instead of LF]' \
+     '--x509fmtder[use DER format for certificates to read from]' \
      '(-f --fingerprint)'{-f,--fingerprint}'[send the openpgp fingerprint instead of the key]' \
      '--disable-extensions[disable all the TLS extensions]' \
      '--xml[print the certificate information in XML format]' \
diff --git a/Completion/Unix/Command/_locate b/Completion/Unix/Command/_locate
index 35dbf062a..0b35b7cdd 100644
--- a/Completion/Unix/Command/_locate
+++ b/Completion/Unix/Command/_locate
@@ -52,22 +52,22 @@ case $ltype in
   # -m and --mmap are ignored, so don't bother
   # -s and --stdio likewise
   _arguments -s -S : \
-    {-b,--basename}'[Match only the basename of files in the database]' \
-    {-c,--count}'[Output the number of matching entries]' \
-    {-d,--database=}'[Use alternative database]:database:_files' \
-    {-e,--existing}'[Restrict display to existing files]' \
-    {-L,--follow}'[Follow symbolic links to find existing files (default)]' \
-    {-h,--help}'[Show help]' \
-    {-i,--ignore-case}'[Ignore case distinctions in patterns]' \
-    {-l,-n,--limit=}'[Limit search results]:file limit: ' \
-    {-P,-H,--nofollow}'[Don'\''t follow symbolic links]' \
-    {-0,--null}'[Output separated by NUL characters]' \
-    {-S,--statistics}'[Show database statistics]' \
-    {-q,--quiet}'[Don'\''t report errors]' \
-    {-r,--regexp=}'[Search for given basic regexp]:basic regexp: ' \
-    --regex'[Patterns are extended regexps]' \
-    {-V,--version}'[Show version]' \
-    {-w,--wholename}'[Match entire file path (default)]' \
+    {-b,--basename}'[match only the basename of files in the database]' \
+    {-c,--count}'[output the number of matching entries]' \
+    {-d,--database=}'[use alternative database]:database:_files' \
+    {-e,--existing}'[restrict display to existing files]' \
+    {-L,--follow}'[follow symbolic links to find existing files (default)]' \
+    {-h,--help}'[show help]' \
+    {-i,--ignore-case}'[ignore case distinctions in patterns]' \
+    {-l,-n,--limit=}'[limit search results]:file limit: ' \
+    {-P,-H,--nofollow}'[don'\''t follow symbolic links]' \
+    {-0,--null}'[output separated by NUL characters]' \
+    {-S,--statistics}'[show database statistics]' \
+    {-q,--quiet}'[don'\''t report errors]' \
+    {-r,--regexp=}'[search for given basic regexp]:basic regexp: ' \
+    --regex'[patterns are extended regexps]' \
+    {-V,--version}'[show version]' \
+    {-w,--wholename}'[match entire file path (default)]' \
     '*:pattern: '
   ;;
 
@@ -76,57 +76,57 @@ case $ltype in
   # -e can take a comma-separated list of directories.
   # -f should complete list of file system types like mount
   _arguments -s -S : \
-    -u'[Create slocate database starting at path /]' \
-    -U'[Create slocate database starting at given path]:directory:_files -/' \
-    -c'[Parse GNU locate updatedb with -u, -U]' \
-    -e'[Exclude directories with -u, -U]:directories:_files -/' \
-    -f'[Exclude file system types from db with -u, -U]:file system:_file_systems' \
-    -l'[Security level]:level:(0 1)' \
-    -q'[Quiet mode]' \
-    -n'[Limit search results]:file limit: ' \
-    -i'[Case insensitive search]' \
-    {-r,--regexp=}'[Use basic regular expression]:regexp: ' \
-    {-o,--output=}'[Specify database to create]:database:_files' \
-    {-d,--database=}'[Specify database to search]:database:_files' \
-    {-h,--help}'[Display help]' \
-    {-v,--verbose}'[Display files when creating database]' \
-    {-V,--version}'[Display version]' \
+    -u'[create slocate database starting at path /]' \
+    -U'[create slocate database starting at given path]:directory:_files -/' \
+    -c'[parse GNU locate updatedb with -u, -U]' \
+    -e'[exclude directories with -u, -U]:directories:_files -/' \
+    -f'[exclude file system types from db with -u, -U]:file system:_file_systems' \
+    -l'[security level]:level:(0 1)' \
+    -q'[quiet mode]' \
+    -n'[limit search results]:file limit: ' \
+    -i'[case insensitive search]' \
+    {-r,--regexp=}'[use basic regular expression]:regexp: ' \
+    {-o,--output=}'[specify database to create]:database:_files' \
+    {-d,--database=}'[specify database to search]:database:_files' \
+    {-h,--help}'[display help]' \
+    {-v,--verbose}'[display files when creating database]' \
+    {-V,--version}'[display version]' \
     '*:pattern: '
   ;;
 
   (gnu)
   _arguments -s : \
-    {-d,--database=}'[Use alternative database]:database:_files' \
-    {-e,--existing}'[Restrict display to existing files]' \
-    {-E,--non-existing}'[Allow display of nonexistent files (default)]' \
-    {-i,--ignore-case}'[Ignore case distinctions in patterns]' \
-    {-w,--wholename}'[Match entire file path (default)]' \
-    {-b,--basename}'[Match only the basename of files in the database]' \
-    {-l,-n,--limit=}'[Limit search results]:file limit: ' \
-    {-S,--statistics}'[Show database statistics]' \
-    {-0,--null}'[Output separated by NUL characters]' \
-    {-c,--count}'[Output the number of matching entries]' \
-    {-P,-H,--nofollow}'[Don'\''t follow symbolic links]' \
-    {-L,--follow}'[Follow symbolic links to find existing files (default)]' \
-    {-A,-all}'[Match all arguments instead of at least one]' \
-    {-p,--print}'[Include search results with statistics or count]' \
-    {-r,--regex=}'[Patterns are regular expressions]:basic regexp: ' \
-    --regextype='[Select type of regular expression]' \
-    {-V,--version}'[Show version]' \
-    --help'[Show help]' \
+    {-d,--database=}'[use alternative database]:database:_files' \
+    {-e,--existing}'[restrict display to existing files]' \
+    {-E,--non-existing}'[allow display of nonexistent files (default)]' \
+    {-i,--ignore-case}'[ignore case distinctions in patterns]' \
+    {-w,--wholename}'[match entire file path (default)]' \
+    {-b,--basename}'[match only the basename of files in the database]' \
+    {-l,-n,--limit=}'[limit search results]:file limit: ' \
+    {-S,--statistics}'[show database statistics]' \
+    {-0,--null}'[output separated by NUL characters]' \
+    {-c,--count}'[output the number of matching entries]' \
+    {-P,-H,--nofollow}'[don'\''t follow symbolic links]' \
+    {-L,--follow}'[follow symbolic links to find existing files (default)]' \
+    {-A,-all}'[match all arguments instead of at least one]' \
+    {-p,--print}'[include search results with statistics or count]' \
+    {-r,--regex=}'[patterns are regular expressions]:basic regexp: ' \
+    --regextype='[select type of regular expression]' \
+    {-V,--version}'[show version]' \
+    --help'[show help]' \
     '*:pattern: '
   ;;
 
   (bsd)
   _arguments -s -S -A '-*' \
-    '(-S)-0[Separate file names by NUL characters]' \
-    '(- *)-S[Show database statistics and exit]' \
-    '(-S)-c[Output the number of matching file names]' \
-    '(-S)*-d[Specify database to search]:database:_files' \
-    '(-S)-i[Ignore case distinctions in pattern and database]' \
-    '(-S)-l[Limit output to specified number of file names]:file limit: ' \
-    '(-S)-m[Use mmap(2) instead of stdio(3) (default)]' \
-    '(-S)-s[Use stdio(3) instead of mmap(2)]' \
+    '(-S)-0[separate file names by NUL characters]' \
+    '(- *)-S[show database statistics and exit]' \
+    '(-S)-c[output the number of matching file names]' \
+    '(-S)*-d[specify database to search]:database:_files' \
+    '(-S)-i[ignore case distinctions in pattern and database]' \
+    '(-S)-l[limit output to specified number of file names]:file limit: ' \
+    '(-S)-m[use mmap(2) instead of stdio(3) (default)]' \
+    '(-S)-s[use stdio(3) instead of mmap(2)]' \
     '*:pattern: '
   ;;
 esac
diff --git a/Completion/Unix/Command/_module b/Completion/Unix/Command/_module
index 65e29430a..c1c9f5c08 100644
--- a/Completion/Unix/Command/_module
+++ b/Completion/Unix/Command/_module
@@ -23,32 +23,32 @@ _module()
   local -a _module_cmds
 
   _module_cmds=(
-    "help:Print the usage of each sub-command"
-    "load:Load a module into the shell environment"
-    "add:Load a module into the shell environment"
-    "unload:Remove a module from the shell environment"
-    "rm:Remove a module from the shell environment"
-    "switch:Switch loaded a loaded module with another module"
-    "swap:Switch loaded a loaded module with another module"
-    "display:Display information about a module"
-    "show:Display information about a module"
-    "list:List loaded modules"
-    "avail:List all available modules"
-    "use:Add a directory to MODULEPATH"
-    "unuse:Remove a directory from MODULEPATH"
-    "update:Reload all loaded modules"
-    "clear:Clear loaded modules information"
-    "purge:Unload all loaded modules"
-    "refresh:Refresh all non-persistent components of loaded modules"
-    "whatis:Display module information"
-    "appropos:Search for a given keyword in modules"
-    "keyword:Search for a given keyword in modules"
-    "initadd:Add or append a module to the user's shell init file"
-    "initprepend:Add or prepend a module to the user's shell init files"
-    "initrm:Remove a module from the user's shell init file"
-    "initswitch:Switch modules in the user's shell init file"
-    "initlist:List all loaded modules in the user's shell init files"
-    "initclear:Clear all modules from the user's shell init files"
+    "help:print the usage of each sub-command"
+    "load:load a module into the shell environment"
+    "add:load a module into the shell environment"
+    "unload:remove a module from the shell environment"
+    "rm:remove a module from the shell environment"
+    "switch:switch loaded a loaded module with another module"
+    "swap:switch loaded a loaded module with another module"
+    "display:display information about a module"
+    "show:display information about a module"
+    "list:list loaded modules"
+    "avail:list all available modules"
+    "use:add a directory to MODULEPATH"
+    "unuse:remove a directory from MODULEPATH"
+    "update:reload all loaded modules"
+    "clear:clear loaded modules information"
+    "purge:unload all loaded modules"
+    "refresh:refresh all non-persistent components of loaded modules"
+    "whatis:display module information"
+    "appropos:search for a given keyword in modules"
+    "keyword:search for a given keyword in modules"
+    "initadd:add or append a module to the user's shell init file"
+    "initprepend:add or prepend a module to the user's shell init files"
+    "initrm:remove a module from the user's shell init file"
+    "initswitch:switch modules in the user's shell init file"
+    "initlist:list all loaded modules in the user's shell init files"
+    "initclear:clear all modules from the user's shell init files"
   )
 
   if (( CURRENT == 1 )); then
@@ -131,7 +131,7 @@ _module_available_modules()
 (( $+functions[_module_use] )) || _module_use()
 {
   _arguments -s \
-    '(-a --append)'{--append,-a}'[Append the directories instead of prepending]' \
+    '(-a --append)'{--append,-a}'[append the directories instead of prepending]' \
     '*:directory:_files -/'    
 }
 
diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce
index 04482be6f..1f68a80ca 100644
--- a/Completion/Unix/Command/_perforce
+++ b/Completion/Unix/Command/_perforce
@@ -488,12 +488,12 @@ _perforce_gen_cmd_list() {
   # but let's at least check they're not already there.
   local -a unsup
   unsup=(
-    "attribute:Set attributes for open file (EXPERIMENTAL)"
-    "dbschema:Report meta database information"
-    "export:Rxtract journal or checkpoint records"
-    "interchanges:Report changes not yet integrated between branches"
-    "replicate:Poll for journal changes and apply to another server"
-    "spec:Allows limited changes to form specifications (admin)"
+    "attribute:set attributes for open file (EXPERIMENTAL)"
+    "dbschema:report meta database information"
+    "export:extract journal or checkpoint records"
+    "interchanges:report changes not yet integrated between branches"
+    "replicate:poll for journal changes and apply to another server"
+    "spec:allows limited changes to form specifications (admin)"
   )
   for line in $unsup; do
     if [[ ${_perforce_cmd_list[(r)${line%%:*}:*]} = '' ]]; then
@@ -2029,7 +2029,7 @@ _perforce_cmd_help() {
       fi
     done
     if [[ -z ${_perforce_help_list[(r)undoc:*]} ]]; then
-      _perforce_help_list+=("undoc:Help for otherwise undocumented features")
+      _perforce_help_list+=("undoc:help for otherwise undocumented features")
     fi
   fi
   _describe -t help-options 'Perforce help option' _perforce_help_list
diff --git a/Completion/Unix/Command/_pkgadd b/Completion/Unix/Command/_pkgadd
index 042cc79a1..7adc18a2a 100644
--- a/Completion/Unix/Command/_pkgadd
+++ b/Completion/Unix/Command/_pkgadd
@@ -2,30 +2,30 @@
 
 _pkgadd_pass() {
 	_values -S : 'password descriptor' \
-	'(file env console)pass[Literal password]:password:' \
-	'(pass file console)env[Environment variable]:environment:_parameters -g "*export*"' \
-	'(pass env console)file[File]:file:_files' \
-	'(pass env file)console[From /dev/tty]'
+	'(file env console)pass[literal password]:password:' \
+	'(pass file console)env[environment variable]:environment:_parameters -g "*export*"' \
+	'(pass env console)file[file]:file:_files' \
+	'(pass env file)console[from /dev/tty]'
 }
 
 _pkgadd() {
 	_arguments -s \
-	'-d[Device]:device file:_files' \
+	'-d[device]:device file:_files' \
 	'-x[HTTP(S) proxy]:HTTP proxy: ' \
-	'-k[Keystore]:keystore:_files' \
-	'-P[Password to decrypt keystore]:password:_pkgadd_pass' \
-	'-Y[Select packages by category]:category: ' \
+	'-k[keystore]:keystore:_files' \
+	'-P[password to decrypt keystore]:password:_pkgadd_pass' \
+	'-Y[select packages by category]:category: ' \
 	- set1 \
-	'-n[Non-interactive mode]' \
-	'-v[Trace all scripts]' \
-	'-a[Admin file]:admin file:_files' \
-	"-M[Don't use vfstab file]" \
-	'-R[Root path]:root path:_files -/' \
-	'-r[Response file]:response file:_files' \
-	'-V[Alternate vfstab file]:vfstab file:_files' \
+	'-n[non-interactive mode]' \
+	'-v[trace all scripts]' \
+	'-a[admin file]:admin file:_files' \
+	"-M[don't use vfstab file]" \
+	'-R[root path]:root path:_files -/' \
+	'-r[response file]:response file:_files' \
+	'-V[alternate vfstab file]:vfstab file:_files' \
 	'*:package instance:_pkg_instance --_opts uninstalled:-d' \
 	- set2 \
-	'-s[Spool package]:spool directory:_files -/' \
+	'-s[spool package]:spool directory:_files -/' \
 	'*:package instance:_pkg_instance --_opts uninstalled:-d'
 }
 
diff --git a/Completion/Unix/Command/_pkginfo b/Completion/Unix/Command/_pkginfo
index 0253ab3e3..6c71082ef 100644
--- a/Completion/Unix/Command/_pkginfo
+++ b/Completion/Unix/Command/_pkginfo
@@ -2,20 +2,20 @@
 
 _pkginfo() {
 	_arguments -s \
-	'(-q -r -x)-l[Long listing]' \
-	'(-l -r -x)-q[Quiet mode]' \
-	'(-l -q -x)-r[Relocation base]' \
-	'(-l -q -r)-x[Extracted listing]' \
-	'-c[Category]:category: ' \
-	'-a[Architecture]:architecture: ' \
-	'-v[Version]:version: ' \
+	'(-q -r -x)-l[long listing]' \
+	'(-l -r -x)-q[quiet mode]' \
+	'(-l -q -x)-r[relocation base]' \
+	'(-l -q -r)-x[extracted listing]' \
+	'-c[category]:category: ' \
+	'-a[architecture]:architecture: ' \
+	'-v[version]:version: ' \
 	- set1 \
-	'(-p)-i[Select completely installed packages]' \
-	'(-i)-p[Select partially installed packages]' \
-	'-R[Root path]:root path:_files -/' \
+	'(-p)-i[select completely installed packages]' \
+	'(-i)-p[select partially installed packages]' \
+	'-R[root path]:root path:_files -/' \
 	'*:package instance:_pkg_instance --_opts installed:set1--R' \
 	- set2 \
-	'-d[Device]:device file:_files' \
+	'-d[device]:device file:_files' \
 	'*:package instance:_pkg_instance --_opts uninstalled:set2--d'
 }
 
diff --git a/Completion/Unix/Command/_pkgrm b/Completion/Unix/Command/_pkgrm
index 4edccbfda..25a950221 100644
--- a/Completion/Unix/Command/_pkgrm
+++ b/Completion/Unix/Command/_pkgrm
@@ -2,18 +2,18 @@
 
 _pkgrm() {
 	_arguments -s \
-	'-Y[Select packages by category]:category: ' \
+	'-Y[select packages by category]:category: ' \
 	- set1 \
-	'-n[Non-interactive mode]' \
-	'-v[Trace all scripts]' \
-	'-a[Admin file]:admin file:_files' \
-	"-A[Force removal of all files]" \
-	"-M[Don't use vfstab file]" \
-	'-R[Root path]:root path:_files -/' \
-	'-V[Alternate vfstab file]:vfstab file:_files' \
+	'-n[non-interactive mode]' \
+	'-v[trace all scripts]' \
+	'-a[admin file]:admin file:_files' \
+	"-A[force removal of all files]" \
+	"-M[don't use vfstab file]" \
+	'-R[root path]:root path:_files -/' \
+	'-V[alternate vfstab file]:vfstab file:_files' \
 	'*:package instance:_pkg_instance --_opts installed:set1--R' \
 	- set2 \
-	'-s[Spool package]:spool directory:_files -/' \
+	'-s[spool package]:spool directory:_files -/' \
 	'*:package instance:_pkg_instance --_opts spooled:set2--s'
 }
 
diff --git a/Completion/Unix/Command/_sisu b/Completion/Unix/Command/_sisu
index 36bba65d9..d3d53275b 100644
--- a/Completion/Unix/Command/_sisu
+++ b/Completion/Unix/Command/_sisu
@@ -39,7 +39,7 @@ _arguments -s -C -M 'r:|[_-]=* r:|=*' \
   '(--convert --to -C)-X[XML dom style]' \
   '(--convert --to -C)-x[XML sax style]' \
   '(--convert --to -C)-y[output summary page, manifest of existing generated output]' \
-  '(--convert --to -C)-Z[Zap delete/destroy output]' \
+  '(--convert --to -C)-Z[zap delete/destroy output]' \
   '--import[-\[Dd\] imports document to database]' \
   '--update[-\[Dd\] updates document in database]' \
   '--remove[-\[Dd\] removes document from database]' \
diff --git a/Completion/Unix/Command/_sqsh b/Completion/Unix/Command/_sqsh
index e43782839..f41ab5bf8 100644
--- a/Completion/Unix/Command/_sqsh
+++ b/Completion/Unix/Command/_sqsh
@@ -15,37 +15,37 @@ _sybase_server() {
 }
 
 _arguments : \
-    '-A[Adjust TDS packet size (512)]:packet size (bytes):(512 1024 1536 2048)' \
-    '-B[Turn off file buffering on startup]' \
-    '-C[Send sql statment to server]:sql' \
-    '-D[Change database context on startup]:database' \
-    '-E[Replace default editor (vi)]:editor' \
-    '-H[Set the client hostname]:reported hostname' \
-    '-I[Alternate interfaces file]:interface file:_files' \
-    '-J[Client character set]:charset' \
-    '*-L[Set the value of a given variable]:variable=value' \
+    '-A[adjust TDS packet size (512)]:packet size (bytes):(512 1024 1536 2048)' \
+    '-B[turn off file buffering on startup]' \
+    '-C[send sql statment to server]:sql' \
+    '-D[change database context on startup]:database' \
+    '-E[replace default editor (vi)]:editor' \
+    '-H[set the client hostname]:reported hostname' \
+    '-I[alternate interfaces file]:interface file:_files' \
+    '-J[client character set]:charset' \
+    '*-L[set the value of a given variable]:variable=value' \
     '-P[Sybase password (NULL)]:password' \
-    '-S[Name of Sybase server (\$DSQUERY)]:_sybase_server' \
-    '-U[Name of Sybase user]:username' \
-    '-X[Enable client password encryption]' \
-    '-a[Max. # of errors before abort]:number' \
-    '-b[Suppress banner message on startup]' \
-    '*-c[Alias for the ''go'' command]:go alias' \
-    '-d[Min. severity level to display]:severity level (0-22)' \
-    '-e[Echo batch prior to executing]' \
-    '-f[Min. severity level for failure]:failure severity' \
-    '-h[Disable headers and footers]' \
-    '-i[Read input from file]:_files' \
-    '-k[Specify alternate keywords file]:_files' \
-    '-l[Set debugging level]' \
-    '-m[Set display mode (normal)]:display style:(horiz vert bcp html meta pretty none)' \
-    '-n[Set chained transaction mode]:chained transaction mode:(on off)' \
-    '-o[Direct all output to file]:_files' \
-    '-p[Display performance stats]' \
-    '-r[Specify name of .sqshrc]:_files' \
-    '-s[Alternate column separator (\t)]:column separator' \
-    '-t[Filter batches through program]:filter program:_files -g "*(*)"' \
-    '-v[Display current version and exit]' \
-    '-w[Adjust result display width]:number' \
-    '-y[Override value of $SYBASE]:_directories' \
-    '-z[Alternate display language]:language'
+    '-S[name of Sybase server (\$DSQUERY)]:_sybase_server' \
+    '-U[name of Sybase user]:username' \
+    '-X[enable client password encryption]' \
+    '-a[max. # of errors before abort]:number' \
+    '-b[suppress banner message on startup]' \
+    '*-c[alias for the ''go'' command]:go alias' \
+    '-d[min. severity level to display]:severity level (0-22)' \
+    '-e[echo batch prior to executing]' \
+    '-f[min. severity level for failure]:failure severity' \
+    '-h[disable headers and footers]' \
+    '-i[read input from file]:_files' \
+    '-k[specify alternate keywords file]:_files' \
+    '-l[set debugging level]' \
+    '-m[set display mode (normal)]:display style:(horiz vert bcp html meta pretty none)' \
+    '-n[set chained transaction mode]:chained transaction mode:(on off)' \
+    '-o[direct all output to file]:_files' \
+    '-p[display performance stats]' \
+    '-r[specify name of .sqshrc]:_files' \
+    '-s[alternate column separator (\t)]:column separator' \
+    '-t[filter batches through program]:filter program:_files -g "*(*)"' \
+    '-v[display current version and exit]' \
+    '-w[adjust result display width]:number' \
+    '-y[override value of $SYBASE]:_directories' \
+    '-z[alternate display language]:language'
diff --git a/Completion/Unix/Command/_surfraw b/Completion/Unix/Command/_surfraw
index 89da0b8e5..0307555a9 100644
--- a/Completion/Unix/Command/_surfraw
+++ b/Completion/Unix/Command/_surfraw
@@ -65,13 +65,13 @@ case $state in
       ;;
       ctan)
 	_arguments $args \
-	'-name[Search by filename]' \
-	'-desc[Search descriptions (default)]'\
-	'-doc[Search documentation]'
+	'-name[search by filename]' \
+	'-desc[search descriptions (default)]'\
+	'-doc[search documentation]'
       ;;
       currency)
         _arguments \
-          '-l[List all known currency symbols]' \
+          '-l[list all known currency symbols]' \
           '-from=-:currency symbol:(EUR USD GBP CAD AUD JPY INR NZD CHF ZAR)' \
           '-to=-:currency symbol:(EUR USD GBP CAD AUD JPY INR NZD CHF ZAR)' \
           '*:currency amount' && ret=0
@@ -155,8 +155,8 @@ case $state in
       ;;
       debpackages)
         _arguments \
-          '-release=-:Search release:(all main non-US contrib non-free)' \
-          '-distro=-:Search distribution:(all stable testing unstable)' \
+          '-release=-:search release:(all main non-US contrib non-free)' \
+          '-distro=-:search distribution:(all stable testing unstable)' \
           '*:package:_deb_packages avail' && ret=0
       ;;
       debpts)
@@ -230,9 +230,9 @@ case $state in
       ;;
       gutenberg)
 	_arguments $args \
-	  '-title[Search titles (default)]'
-	  '-author[Search authors]'
-	  '-num[Search etext numbers]'
+	  '-title[search titles (default)]'
+	  '-author[search authors]'
+	  '-num[search etext numbers]'
       ;;       
       imdb)
         _arguments $args \
@@ -256,11 +256,11 @@ case $state in
         _arguments \
           '-tol=:special character tolerance:(off standard high)' \
           '-to=:language:(de en either)' \
-          '-lang=:Webpage is in this language:(en de)' \
-          '-link=:Link results:(on off)' \
-          '-head=:Display headlines:(on off)' \
-          '-grid=:Show results in grid:(on off)' \
-          '-spell=:Spelling tolerance:(off standard force)' \
+          '-lang=:webpage is in this language:(en de)' \
+          '-link=:link results:(on off)' \
+          '-head=:display headlines:(on off)' \
+          '-grid=:show results in grid:(on off)' \
+          '-spell=:spelling tolerance:(off standard force)' \
           '*:dictionary word:->dictword' && ret=0
 
         [[ "$state" = dictword ]] && _wanted words expl 'dictionary word' \
@@ -274,7 +274,7 @@ case $state in
       pgpkeys)
         _arguments \
           '-s[display key signatures]' \
-          '*:KeyID or email' && ret=0
+          '*:key ID or email' && ret=0
       ;;
       pubmed)
         _arguments $args \
@@ -387,19 +387,19 @@ case $state in
       ;;
       wayback)
 	_arguments $args \
-	  '-syear=-[Start search from this year]:year' \
-	  '-smonth=-:[Start search from this month]:month:(jan feb mar apr may jun jul aug sep oct nov dec)' \
-	  '-sday=-[Start search from this day]:number' \
-	  '-eyear=-[End search in this year]:year' \
-	  '-emonth=-[End search in this month]:month:(jan feb mar apr may jun jul aug sep oct nov dec)' \
-	  '-eday=-[End search in this day]:number' \
-	  '-list[List all pages that match search criteria]' \
-	  '-dups[Show dups]' \
-	  '-compare[Compare pages]' \
-	  '-pdf[Show as PDF]' \
-	  '-alias=-[How to handle site aliases]:alias:(merge show hide)' \
-	  '-redir=-[How to handle redirections]:redir:(hide flag show)' \
-	  '-type=-[File type to search for]:type:(image audio video binary text pdf)'
+	  '-syear=-[start search from this year]:year' \
+	  '-smonth=-:[start search from this month]:month:(jan feb mar apr may jun jul aug sep oct nov dec)' \
+	  '-sday=-[start search from this day]:number' \
+	  '-eyear=-[end search in this year]:year' \
+	  '-emonth=-[end search in this month]:month:(jan feb mar apr may jun jul aug sep oct nov dec)' \
+	  '-eday=-[end search in this day]:number' \
+	  '-list[list all pages that match search criteria]' \
+	  '-dups[show dups]' \
+	  '-compare[compare pages]' \
+	  '-pdf[show as PDF]' \
+	  '-alias=-[how to handle site aliases]:alias:(merge show hide)' \
+	  '-redir=-[how to handle redirections]:redir:(hide flag show)' \
+	  '-type=-[file type to search for]:type:(image audio video binary text pdf)'
       ;;
       wetandwild)
         _arguments \
diff --git a/Completion/Unix/Command/_tcpdump b/Completion/Unix/Command/_tcpdump
index 015cd8651..edc6c7306 100644
--- a/Completion/Unix/Command/_tcpdump
+++ b/Completion/Unix/Command/_tcpdump
@@ -46,47 +46,47 @@ _bpf_filter () {
 }
 
 _arguments \
-  '()-A[Print each packet in ASCII]' \
-  -c'[Exit after receiving specified number of packets]:number of packets' \
-  -C'[Specify output file size in MB (10e6 bytes)]:output file size' \
-  '(-ddd)-d[Dump the compiled packet-matching code in a human readable form]' \
-  '(-ddd)-dd[Dump packet-matching code as a C program fragment]' \
-  '(-d -dd)-ddd[Dump packet-matching code as decimal numbers (preceded with a count)]' \
-  '(-A -c -C -d -dd -ddd -e -E -f -F -i -l -L -m -M -n -N -O -p -q -R -r -S -s -T -t -tt -ttt -tttt -u -U -v -vv -vvv -w -W -x -xx -X -XX -y -Z *)'-D'[Print the list of the network interfaces available on the system]' \
-  -e'[Print the link-level header on each dump line]' \
-  -E"[Decrypting IPsec ESP packets]:spi@ipaddr::algo\:secret:_esp_secrets" \
-  -f"[Print 'foreign' IPv4 addresses numerically]" \
+  '()-A[print each packet in ASCII]' \
+  -c'[exit after receiving specified number of packets]:number of packets' \
+  -C'[specify output file size in MB (10e6 bytes)]:output file size' \
+  '(-ddd)-d[dump the compiled packet-matching code in a human readable form]' \
+  '(-ddd)-dd[dump packet-matching code as a C program fragment]' \
+  '(-d -dd)-ddd[dump packet-matching code as decimal numbers (preceded with a count)]' \
+  '(-A -c -C -d -dd -ddd -e -E -f -F -i -l -L -m -M -n -N -O -p -q -R -r -S -s -T -t -tt -ttt -tttt -u -U -v -vv -vvv -w -W -x -xx -X -XX -y -Z *)'-D'[print the list of the network interfaces available on the system]' \
+  -e'[print the link-level header on each dump line]' \
+  -E"[decrypting IPsec ESP packets]:spi@ipaddr::algo\:secret:_esp_secrets" \
+  -f"[print 'foreign' IPv4 addresses numerically]" \
   -F'[input file for the filter expression]:filter expression file:_files' \
-  -i'[Interface]:interface:_interfaces' \
-  -l'[Make stdout line buffered]' \
-  '(-A -c -C -d -dd -ddd -e -E -f -F -l -D -m -M -n -N -O -p -q -R -r -S -s -T -t -tt -ttt -tttt -u -U -v -vv -vvv -w -W -x -xx -X -XX -y -Z *)'-L'[List the known data link types for the interface]' \
-  '*-m[Load SMI MIB module definitions]:SMI MIB module definitions:_files' \
+  -i'[interface]:interface:_interfaces' \
+  -l'[make stdout line buffered]' \
+  '(-A -c -C -d -dd -ddd -e -E -f -F -l -D -m -M -n -N -O -p -q -R -r -S -s -T -t -tt -ttt -tttt -u -U -v -vv -vvv -w -W -x -xx -X -XX -y -Z *)'-L'[list the known data link types for the interface]' \
+  '*-m[load SMI MIB module definitions]:SMI MIB module definitions:_files' \
   -M'[shared secret for validating the digests in TCP segments with the TCP-MD5 option]:secret' \
-  -n"[Don't convert addresses to names]" \
-  -N"[Don't print domain name qualification of host names]" \
-  -O"[Don't run the packet-matching code optimizer]" \
-  -p"[Don't put the interface into promiscuous mode]" \
-  -q'[Quick (quiet?) output]' \
-  -R'[Assume ESP/AH packets to be based on old specification (RFC1825 to RFC1829)]' \
-  -r'[Read packets from file]:input file:_files' \
-  -S'[Print absolute TCP sequence numbers]' \
-  -s'[Specify number of bytes of data to snarf from each packet]:number of bytes to snap' \
-  -T'[Interpret captured packets as specified type]:packet type:_packet_types' \
-  "(-tttt)-t[Don't print a timestamp on each dump line]" \
-  '(-ttt -tttt)-tt[Print an unformatted timestamp on each dump line]' \
-  '(-tt -tttt)-ttt[Print a delta (in micro-seconds) between current and previous line on each dump line]' \
-  '(-t -tt -ttt)-tttt[Print a timestamp in default format proceeded by date on each dump line]' \
-  -u'[Print undecoded NFS handles]' \
-  -U'[Make output packet-buffered when saving to file (-w)]' \
+  -n"[don't convert addresses to names]" \
+  -N"[don't print domain name qualification of host names]" \
+  -O"[don't run the packet-matching code optimizer]" \
+  -p"[don't put the interface into promiscuous mode]" \
+  -q'[quick (quiet?) output]' \
+  -R'[assume ESP/AH packets to be based on old specification (RFC1825 to RFC1829)]' \
+  -r'[read packets from file]:input file:_files' \
+  -S'[print absolute TCP sequence numbers]' \
+  -s'[specify number of bytes of data to snarf from each packet]:number of bytes to snap' \
+  -T'[interpret captured packets as specified type]:packet type:_packet_types' \
+  "(-tttt)-t[don't print a timestamp on each dump line]" \
+  '(-ttt -tttt)-tt[print an unformatted timestamp on each dump line]' \
+  '(-tt -tttt)-ttt[print a delta (in micro-seconds) between current and previous line on each dump line]' \
+  '(-t -tt -ttt)-tttt[print a timestamp in default format proceeded by date on each dump line]' \
+  -u'[print undecoded NFS handles]' \
+  -U'[make output packet-buffered when saving to file (-w)]' \
   '(-vvv)-v[slightly more verbose output]' \
   '(-vvv)-vv[more verbose output]' \
   '(-v -vv)-vvv[most verbose output]' \
-  -w'[Write the raw packets to file]:output file:_files' \
-  -W'[Limit the number of created files (-C)]:number of files' \
-  -x'[Print each packet (minus its link level header) in hex]' \
-  '(-x)-xx[Print each packet, including its link level header, in hex]' \
-  -X'[Print each packet (minus its link level header) in hex and ASCII]' \
-  '(-X)-XX[Print each packet, including its link level header, in hex and ASCII]' \
-  -y'[Set the data link type to use while capturing packets]:data link type:_data_link_types' \
-  -Z'[Drops privileges (if root) and changes user ID (along with primary group)]:user:_users' \
+  -w'[write the raw packets to file]:output file:_files' \
+  -W'[limit the number of created files (-C)]:number of files' \
+  -x'[print each packet (minus its link level header) in hex]' \
+  '(-x)-xx[print each packet, including its link level header, in hex]' \
+  -X'[print each packet (minus its link level header) in hex and ASCII]' \
+  '(-X)-XX[print each packet, including its link level header, in hex and ASCII]' \
+  -y'[set the data link type to use while capturing packets]:data link type:_data_link_types' \
+  -Z'[drops privileges (if root) and changes user ID (along with primary group)]:user:_users' \
   '*:BPF filter:_bpf_filter'
diff --git a/Completion/Unix/Command/_tmux b/Completion/Unix/Command/_tmux
index 30e395e62..f2507491f 100644
--- a/Completion/Unix/Command/_tmux
+++ b/Completion/Unix/Command/_tmux
@@ -154,9 +154,9 @@ function _tmux-attach-session() {
     local -a args
 
     args=(
-        '-d[Detach other clients attached to target session]'
-        '-r[Put the client into read-only mode]'
-        '-t[Choose a target session]:target session:__tmux-sessions'
+        '-d[detach other clients attached to target session]'
+        '-r[put the client into read-only mode]'
+        '-t[choose a target session]:target session:__tmux-sessions'
     )
     _arguments ${args}
 }
@@ -167,10 +167,10 @@ function _tmux-bind-key() {
     local -a args
 
     args=(
-        '-c[Bind to command mode instead of normal mode]'
-        '-n[Make the binding work without the need for the prefix key]'
-        '-r[The key may repeat]'
-        '-t[Choose a key table for the binding]:key tables:__tmux-key-tables'
+        '-c[bind to command mode instead of normal mode]'
+        '-n[make the binding work without the need for the prefix key]'
+        '-r[the key may repeat]'
+        '-t[choose a key table for the binding]:key tables:__tmux-key-tables'
         '1: :->key'
         '*:: :->command_and_args'
     )
@@ -188,8 +188,8 @@ function _tmux-break-pane() {
     [[ -n ${tmux_describe} ]] && print "Break a pane from an existing into a new window" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-t[Choose a target pane]:panes:__tmux-panes'
+        '-d[do not make the new window become the active one]'
+        '-t[choose a target pane]:panes:__tmux-panes'
     )
     _arguments ${args}
 }
@@ -198,8 +198,8 @@ function _tmux-capture-pane() {
     [[ -n ${tmux_describe} ]] && print "Capture the contents of a pane to a buffer" && return
     local -a args
     args=(
-        '-b[Choose target buffer]:target buffer:__tmux-buffers'
-        '-t[Choose source pane]:source pane:__tmux-panes'
+        '-b[choose target buffer]:target buffer:__tmux-buffers'
+        '-t[choose source pane]:source pane:__tmux-panes'
     )
     _arguments ${args}
 }
@@ -222,14 +222,14 @@ function _tmux-choose-window() {
 function _tmux-clear-history() {
     [[ -n ${tmux_describe} ]] && print "Remove and clear history for a pane" && return
     local -a args
-    args=('-t[Choose a target pane]:panes:__tmux-panes')
+    args=('-t[choose a target pane]:panes:__tmux-panes')
     _arguments ${args}
 }
 
 function _tmux-clock-mode() {
     [[ -n ${tmux_describe} ]] && print "Enter clock mode" && return
     local -a args
-    args=('-t[Choose a target pane]:panes:__tmux-panes')
+    args=('-t[choose a target pane]:panes:__tmux-panes')
     _arguments ${args}
 }
 
@@ -238,8 +238,8 @@ function _tmux-command-prompt() {
     local state
     local -a args
     args=(
-        '-p[List of prompts]:prompts:->plist'
-        '-t[Choose a target client]:clients:__tmux-clients'
+        '-p[list of prompts]:prompts:->plist'
+        '-t[choose a target client]:clients:__tmux-clients'
         '*:: :->tmpl'
     )
     _arguments -C ${args} && return
@@ -255,7 +255,7 @@ function _tmux-confirm-before() {
     local state
     local -a args
     args=(
-        '-t[Choose a target client]:clients:__tmux-clients'
+        '-t[choose a target client]:clients:__tmux-clients'
         '*:: :->command_and_args'
     )
     _arguments -C ${args} && return
@@ -269,10 +269,10 @@ function _tmux-copy-buffer() {
     local -ax bopts
 
     args=(
-        '-a[Choose a source buffer index]:buffer:->srcbuf'
-        '-b[Choose a destination buffer index]:buffer:->dstbuf'
-        '-s[Choose a source session]:session:->srcsession'
-        '-t[Choose a destination session]:session:->dstsession'
+        '-a[choose a source buffer index]:buffer:->srcbuf'
+        '-b[choose a destination buffer index]:buffer:->dstbuf'
+        '-s[choose a source session]:session:->srcsession'
+        '-t[choose a destination session]:session:->dstsession'
     )
     _arguments ${args}
 
@@ -301,8 +301,8 @@ function _tmux-copy-mode() {
     [[ -n ${tmux_describe} ]] && print "Enter copy mode" && return
     local -a args
     args=(
-        '-t[Choose a target pane]:panes:__tmux-panes'
-        '-u[Scroll up one page]'
+        '-t[choose a target pane]:panes:__tmux-panes'
+        '-u[scroll up one page]'
     )
     _arguments ${args}
 }
@@ -314,8 +314,8 @@ function _tmux-delete-buffer() {
     local -ax bopts
 
     args=(
-        '-b[Choose a target buffer index]:panes:->buffer'
-        '-t[Choose a target session]:panes:->session'
+        '-b[choose a target buffer index]:panes:->buffer'
+        '-t[choose a target session]:panes:->session'
     )
     _arguments ${args}
 
@@ -341,7 +341,7 @@ function _tmux-delete-buffer() {
 function _tmux-detach-client() {
     [[ -n ${tmux_describe} ]] && print "Detach a client from the server" && return
     local -a args
-    args=('-t[Choose a target client]:clients:__tmux-clients')
+    args=('-t[choose a target client]:clients:__tmux-clients')
     _arguments ${args}
 }
 
@@ -349,8 +349,8 @@ function _tmux-display-message() {
     [[ -n ${tmux_describe} ]] && print "Display a message in the status line" && return
     local -a args
     args=(
-        '-p[Print message to stdout]'
-        '-t[Choose a target client]:clients:__tmux-clients'
+        '-p[print message to stdout]'
+        '-t[choose a target client]:clients:__tmux-clients'
         '*:: :->msg'
     )
     _arguments ${args} && return
@@ -360,14 +360,14 @@ function _tmux-display-message() {
 function _tmux-display-panes() {
     [[ -n ${tmux_describe} ]] && print "Display an indicator for each visible pane" && return
     local -a args
-    args=('-t[Choose a target client]:clients:__tmux-clients')
+    args=('-t[choose a target client]:clients:__tmux-clients')
     _arguments ${args}
 }
 
 function _tmux-down-pane() {
     [[ -n ${tmux_describe} ]] && print "Move down a pane" && return
     local -a args
-    args=('-t[Choose a target pane]:panes:__tmux-panes')
+    args=('-t[choose a target pane]:panes:__tmux-panes')
     _arguments ${args}
 }
 
@@ -376,7 +376,7 @@ function _tmux-find-window() {
     local curcontext="${curcontext}" state
     local -a args
     args=(
-        '-t[Choose a target window]:windows:__tmux-windows'
+        '-t[choose a target window]:windows:__tmux-windows'
         '*:: :->pattern'
     )
     _arguments ${args} && return
@@ -386,7 +386,7 @@ function _tmux-find-window() {
 function _tmux-has-session() {
     [[ -n ${tmux_describe} ]] && print "Check and report if a session exists on the server" && return
     local -a args
-    args=('-t[Choose a target session]:sessions:__tmux-sessions')
+    args=('-t[choose a target session]:sessions:__tmux-sessions')
     _arguments ${args}
 }
 
@@ -404,13 +404,13 @@ function _tmux-join-pane() {
     [[ -n ${tmux_describe} ]] && print "Split a pane and move an existing one into the new space" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-h[Split horizontally]'
-        '-v[Split vertically]'
-        '-l[Define new pane'\''s size]: :_guard "[0-9]#" "numeric value"'
-        '-p[Define new pane'\''s size in percent]: :_guard "[0-9]#" "numeric value"'
-        '-s[Choose source pane]:window:__tmux-panes'
-        '-t[Choose target pane]:window:__tmux-panes'
+        '-d[do not make the new window become the active one]'
+        '-h[split horizontally]'
+        '-v[split vertically]'
+        '-l[define new pane'\''s size]: :_guard "[0-9]#" "numeric value"'
+        '-p[define new pane'\''s size in percent]: :_guard "[0-9]#" "numeric value"'
+        '-s[choose source pane]:window:__tmux-panes'
+        '-t[choose target pane]:window:__tmux-panes'
     )
     _arguments ${args} && return
 }
@@ -419,8 +419,8 @@ function _tmux-kill-pane() {
     [[ -n ${tmux_describe} ]] && print "Destroy a given pane" && return
     local -a args
     args=(
-        '-a[Kill all panes, except current]'
-        '-t[Choose a target pane]:panes:__tmux-panes'
+        '-a[kill all panes, except current]'
+        '-t[choose a target pane]:panes:__tmux-panes'
     )
     _arguments ${args}
 }
@@ -433,21 +433,21 @@ function _tmux-kill-server() {
 function _tmux-kill-session() {
     [[ -n ${tmux_describe} ]] && print "Destroy a given session" && return
     local -a args
-    args=('-t[Choose a target session]:sessions:__tmux-sessions')
+    args=('-t[choose a target session]:sessions:__tmux-sessions')
     _arguments ${args}
 }
 
 function _tmux-kill-window() {
     [[ -n ${tmux_describe} ]] && print "Destroy a given window" && return
     local -a args
-    args=('-t[Choose a target window]:windows:__tmux-windows')
+    args=('-t[choose a target window]:windows:__tmux-windows')
     _arguments ${args}
 }
 
 function _tmux-last-window() {
     [[ -n ${tmux_describe} ]] && print "Select the previously selected window" && return
     local -a args
-    args=('-t[Choose a session]:sessions:__tmux-sessions')
+    args=('-t[choose a session]:sessions:__tmux-sessions')
     _arguments ${args} && return
 }
 
@@ -455,10 +455,10 @@ function _tmux-link-window() {
     [[ -n ${tmux_describe} ]] && print "Link a window to another" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-k[Kill the target window if it exists]'
-        '-s[Choose source window]:window:__tmux-windows'
-        '-t[Choose destination window]:window:__tmux-windows'
+        '-d[do not make the new window become the active one]'
+        '-k[kill the target window if it exists]'
+        '-s[choose source window]:window:__tmux-windows'
+        '-t[choose destination window]:window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -466,7 +466,7 @@ function _tmux-link-window() {
 function _tmux-list-buffers() {
     [[ -n ${tmux_describe} ]] && print "List paste buffers of a session" && return
     local -a args
-    args=('-t[Choose a session]:sessions:__tmux-sessions')
+    args=('-t[choose a session]:sessions:__tmux-sessions')
     _arguments ${args} && return
 }
 
@@ -483,14 +483,14 @@ function _tmux-list-commands() {
 function _tmux-list-keys() {
     [[ -n ${tmux_describe} ]] && print "List all key-bindings" && return
     local -a args
-    args=('-t[Choose a key table]:key table:__tmux-key-tables')
+    args=('-t[choose a key table]:key table:__tmux-key-tables')
     _arguments ${args} && return
 }
 
 function _tmux-list-panes() {
     [[ -n ${tmux_describe} ]] && print "List panes of a window" && return
     local -a args
-    args=('-t[Choose a window]:windows:__tmux-windows')
+    args=('-t[choose a window]:windows:__tmux-windows')
     _arguments ${args} && return
 }
 
@@ -502,7 +502,7 @@ function _tmux-list-sessions() {
 function _tmux-list-windows() {
     [[ -n ${tmux_describe} ]] && print "List windows of a session" && return
     local -a args
-    args=('-t[Choose a session]:sessions:__tmux-sessions')
+    args=('-t[choose a session]:sessions:__tmux-sessions')
     _arguments ${args} && return
 }
 
@@ -513,8 +513,8 @@ function _tmux-load-buffer() {
     local -ax bopts
 
     args=(
-        '-b[Choose a target buffer index]:panes:->buffer'
-        '-t[Choose a target session]:panes:->session'
+        '-b[choose a target buffer index]:panes:->buffer'
+        '-t[choose a target session]:panes:->session'
         '1:file name:_files -g "*(-.)"'
     )
     _arguments ${args}
@@ -541,7 +541,7 @@ function _tmux-load-buffer() {
 function _tmux-lock-client() {
     [[ -n ${tmux_describe} ]] && print "Lock a client" && return
     local -a args
-    args=('-t[Choose a client]:clients:__tmux-clients')
+    args=('-t[choose a client]:clients:__tmux-clients')
     _arguments ${args} && return
 }
 
@@ -553,7 +553,7 @@ function _tmux-lock-server() {
 function _tmux-lock-session() {
     [[ -n ${tmux_describe} ]] && print "Lock all clients attached to a session" && return
     local -a args
-    args=('-t[Choose a session]:sessions:__tmux-sessions')
+    args=('-t[choose a session]:sessions:__tmux-sessions')
     _arguments ${args} && return
 }
 
@@ -561,9 +561,9 @@ function _tmux-move-window() {
     [[ -n ${tmux_describe} ]] && print "Move a window to another" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-s[Choose source window]:window:__tmux-windows'
-        '-t[Choose destination window]:window:__tmux-windows'
+        '-d[do not make the new window become the active one]'
+        '-s[choose source window]:window:__tmux-windows'
+        '-t[choose destination window]:window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -572,10 +572,10 @@ function _tmux-new-session() {
     [[ -n ${tmux_describe} ]] && print "Create a new session" && return
     local -a args
     args=(
-        '-d[Attach the new session the current terminal]'
-        '-n[Name the initial window]:window name'
-        '-s[Name the session]:session name'
-        '-t[Specify target session]:sessions:__tmux-sessions'
+        '-d[attach the new session the current terminal]'
+        '-n[name the initial window]:window name'
+        '-s[name the session]:session name'
+        '-t[specify target session]:sessions:__tmux-sessions'
         '*:: :_command'
     )
     _arguments ${args}
@@ -585,10 +585,10 @@ function _tmux-new-window() {
     [[ -n ${tmux_describe} ]] && print "Create a new window" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-k[Destroy it if the specified window exists]'
-        '-n[Specify a window name]:window name:'
-        '-t[Specify target window]:windows:__tmux-windows'
+        '-d[do not make the new window become the active one]'
+        '-k[destroy it if the specified window exists]'
+        '-n[specify a window name]:window name:'
+        '-t[specify target window]:windows:__tmux-windows'
         '*:: :_command'
     )
     _arguments ${args}
@@ -597,7 +597,7 @@ function _tmux-new-window() {
 function _tmux-next-layout() {
     [[ -n ${tmux_describe} ]] && print "Move a window to the next layout" && return
     local -a args
-    args=('-t[Choose target window]:window:__tmux-windows')
+    args=('-t[choose target window]:window:__tmux-windows')
     _arguments ${args}
 }
 
@@ -605,8 +605,8 @@ function _tmux-next-window() {
     [[ -n ${tmux_describe} ]] && print "Move to the next window in a session" && return
     local -a args
     args=(
-        '-a[Move to the next window with activity]'
-        '-t[Choose target session]:session:__tmux-sessions'
+        '-a[move to the next window with activity]'
+        '-t[choose target session]:session:__tmux-sessions'
     )
     _arguments ${args}
 }
@@ -615,10 +615,10 @@ function _tmux-paste-buffer() {
     [[ -n ${tmux_describe} ]] && print "Insert a paste buffer into the window" && return
     local -a args
     args=(
-        '-d[Remove buffer from stack after pasting]'
-        '-r[Do not replace LF with CR when pasting]'
-        '-b[Choose buffer]:source buffer:__tmux-buffers'
-        '-t[Choose target window]:window:__tmux-windows'
+        '-d[remove buffer from stack after pasting]'
+        '-r[do not replace LF with CR when pasting]'
+        '-b[choose buffer]:source buffer:__tmux-buffers'
+        '-t[choose target window]:window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -627,8 +627,8 @@ function _tmux-pipe-pane() {
     [[ -n ${tmux_describe} ]] && print "Pipe output from a pane to a shell command" && return
     local state
     args=(
-        '-o[Only open a pipe if none is currently opened]'
-        '-t[Choose target pane]:pane:__tmux-panes'
+        '-o[only open a pipe if none is currently opened]'
+        '-t[choose target pane]:pane:__tmux-panes'
         '*:: :->cmd'
     )
     _arguments ${args} && return
@@ -638,7 +638,7 @@ function _tmux-pipe-pane() {
 function _tmux-previous-layout() {
     [[ -n ${tmux_describe} ]] && print "Move a window to the previous layout" && return
     local -a args
-    args=('-t[Choose target window]:window:__tmux-windows')
+    args=('-t[choose target window]:window:__tmux-windows')
     _arguments ${args}
 }
 
@@ -646,8 +646,8 @@ function _tmux-previous-window() {
     [[ -n ${tmux_describe} ]] && print "Move to the previous window in a session" && return
     local -a args
     args=(
-        '-a[Move to the previous window with activity]'
-        '-t[Choose target session]:session:__tmux-sessions'
+        '-a[move to the previous window with activity]'
+        '-t[choose target session]:session:__tmux-sessions'
     )
     _arguments ${args}
 }
@@ -655,7 +655,7 @@ function _tmux-previous-window() {
 function _tmux-refresh-client() {
     [[ -n ${tmux_describe} ]] && print "Refresh a client" && return
     local -a args
-    args=('-t[Choose target client]:client:__tmux-clients')
+    args=('-t[choose target client]:client:__tmux-clients')
     _arguments ${args}
 }
 
@@ -663,7 +663,7 @@ function _tmux-rename-session() {
     [[ -n ${tmux_describe} ]] && print "Rename a session" && return
     local state
     args=(
-        '-t[Choose target session]:session:__tmux-sessions'
+        '-t[choose target session]:session:__tmux-sessions'
         '*:: :->name'
     )
     _arguments ${args} && return
@@ -674,7 +674,7 @@ function _tmux-rename-window() {
     [[ -n ${tmux_describe} ]] && print "Rename a window" && return
     local state
     args=(
-        '-t[Choose target window]:window:__tmux-windows'
+        '-t[choose target window]:window:__tmux-windows'
         '*:: :->name'
     )
     _arguments ${args} && return
@@ -684,11 +684,11 @@ function _tmux-rename-window() {
 function _tmux-resize-pane() {
     [[ -n ${tmux_describe} ]] && print "Resize a pane" && return
     args=(
-        '-D[Resize downward]'
-        '-L[Resize to the left]'
-        '-R[Resize to the right]'
-        '-U[Resize upward]'
-        '-t[Choose target pane]:pane:__tmux-panes'
+        '-D[resize downward]'
+        '-L[resize to the left]'
+        '-R[resize to the right]'
+        '-U[resize upward]'
+        '-t[choose target pane]:pane:__tmux-panes'
         '1::adjustment (defaults to one):_guard "[0-9]#" "numeric value"'
     )
     _arguments ${args}
@@ -698,8 +698,8 @@ function _tmux-respawn-window() {
     [[ -n ${tmux_describe} ]] && print "Reuse a window in which a command has exited" && return
     local -a args
     args=(
-        '-k[Kill window if it is in use]'
-        '-t[Choose target window]:window:__tmux-windows'
+        '-k[kill window if it is in use]'
+        '-t[choose target window]:window:__tmux-windows'
         '*::command:_command'
     )
     _arguments ${args}
@@ -709,9 +709,9 @@ function _tmux-rotate-window() {
     [[ -n ${tmux_describe} ]] && print "Rotate positions of panes in a window" && return
     local -a args
     args=(
-        '-D[Rotate downward]'
-        '-U[Rotate upward]'
-        '-t[Choose target window]:window:__tmux-windows'
+        '-D[rotate downward]'
+        '-U[rotate upward]'
+        '-t[choose target window]:window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -728,8 +728,8 @@ function _tmux-save-buffer() {
     local -ax bopts
 
     args=(
-        '-b[Choose a target buffer index]:buffer:->buffer'
-        '-t[Choose a target session]:buffer:->session'
+        '-b[choose a target buffer index]:buffer:->buffer'
+        '-t[choose a target session]:buffer:->session'
     )
     _arguments ${args}
 
@@ -755,7 +755,7 @@ function _tmux-save-buffer() {
 function _tmux-select-layout() {
     [[ -n ${tmux_describe} ]] && print "Choose a layout for a window" && return
     args=(
-        '-t[Choose a target window]:target window:__tmux-windows'
+        '-t[choose a target window]:target window:__tmux-windows'
         '*::layout name:__tmux-layouts'
     )
     _arguments ${args}
@@ -764,21 +764,21 @@ function _tmux-select-layout() {
 function _tmux-select-pane() {
     [[ -n ${tmux_describe} ]] && print "Make a pane the active one in the window" && return
     local -a args
-    args=('-t[Choose a target pane]:panes:__tmux-panes')
+    args=('-t[choose a target pane]:panes:__tmux-panes')
     _arguments ${args} && return
 }
 
 function _tmux-select-prompt() {
     [[ -n ${tmux_describe} ]] && print "Open a prompt to enter a window index" && return
     local -a args
-    args=('-t[Choose a target client]:clients:__tmux-clients')
+    args=('-t[choose a target client]:clients:__tmux-clients')
     _arguments ${args} && return
 }
 
 function _tmux-select-window() {
     [[ -n ${tmux_describe} ]] && print "Select a window" && return
     local -a args
-    args=('-t[Choose a target window]:windows:__tmux-windows')
+    args=('-t[choose a target window]:windows:__tmux-windows')
     _arguments ${args} && return
 }
 
@@ -787,7 +787,7 @@ function _tmux-send-keys() {
     local curcontext="${curcontext}" state
     local -a args
     args=(
-        '-t[Choose a target pane]:panes:__tmux-panes'
+        '-t[choose a target pane]:panes:__tmux-panes'
         '*:: :->key'
     )
     _arguments ${args} && return
@@ -797,7 +797,7 @@ function _tmux-send-keys() {
 function _tmux-send-prefix() {
     [[ -n ${tmux_describe} ]] && print "Send the prefix key to a window" && return
     local -a args
-    args=('-t[Choose a target pane]:panes:__tmux-panes')
+    args=('-t[choose a target pane]:panes:__tmux-panes')
     _arguments ${args}
 }
 
@@ -813,8 +813,8 @@ function _tmux-set-buffer() {
     local -ax bopts
 
     args=(
-        '-b[Choose a target buffer index]:panes:->buffer'
-        '-t[Choose a target session]:panes:->session'
+        '-b[choose a target buffer index]:panes:->buffer'
+        '-t[choose a target session]:panes:->session'
     )
     _arguments ${args}
 
@@ -842,10 +842,10 @@ function _tmux-set-environment() {
     local state
     local -a args
     args=(
-        '-g[Modify global environment]'
-        '-r[Remove variable before starting new processes]'
-        '-u[Unset a variable]'
-        '-t[Choose a target session]:target session:__tmux-sessions'
+        '-g[modify global environment]'
+        '-r[remove variable before starting new processes]'
+        '-u[unset a variable]'
+        '-t[choose a target session]:target session:__tmux-sessions'
         '*:: :->name_or_value'
     )
     _arguments -C ${args}
@@ -868,12 +868,12 @@ function _tmux-set-option() {
     local mode
     local -a args
     args=(
-        '-a[Append to string options]'
-        '-g[Set a global session option]'
-        '-u[Unset a non-global option]'
-        '-w[Change window (not session) options]'
-        '-s[Change server (not session) options]'
-        '-t[Choose a target session]:target session:__tmux-sessions'
+        '-a[append to string options]'
+        '-g[set a global session option]'
+        '-u[unset a non-global option]'
+        '-w[change window (not session) options]'
+        '-s[change server (not session) options]'
+        '-t[choose a target session]:target session:__tmux-sessions'
         '*:: :->name_or_value'
     )
     if __tmux-got-option-already -w; then
@@ -891,10 +891,10 @@ function _tmux-set-window-option() {
     [[ -n ${tmux_describe} ]] && print "Set a window option" && return
     local -a args
     args=(
-        '-a[Append to string options]'
-        '-g[Set a global window option]'
-        '-u[Unset a non-global option]'
-        '-t[Choose a target window]:target window:__tmux-windows'
+        '-a[append to string options]'
+        '-g[set a global window option]'
+        '-u[unset a non-global option]'
+        '-t[choose a target window]:target window:__tmux-windows'
         '*:: :->name_or_value'
     )
     _arguments -C ${args}
@@ -908,8 +908,8 @@ function _tmux-show-buffer() {
     local -ax bopts
 
     args=(
-        '-b[Choose a target buffer index]:panes:->buffer'
-        '-t[Choose a target session]:panes:->session'
+        '-b[choose a target buffer index]:panes:->buffer'
+        '-t[choose a target session]:panes:->session'
     )
     _arguments ${args}
 
@@ -936,15 +936,15 @@ function _tmux-show-environment() {
     [[ -n ${tmux_describe} ]] && print "Display the environment" && return
     local -a args
     args=(
-        '-g[Show global environment]'
-        '-t[Choose a target session]:target session:__tmux-sessions'
+        '-g[show global environment]'
+        '-t[choose a target session]:target session:__tmux-sessions'
     )
     _arguments ${args}
 }
 
 function _tmux-show-messages() {
     [[ -n ${tmux_describe} ]] && print "Show client"\'"s message log" && return
-    args=('-t[Choose target client]:client:__tmux-clients')
+    args=('-t[choose target client]:client:__tmux-clients')
     _arguments ${args}
 }
 
@@ -952,8 +952,8 @@ function _tmux-show-options() {
     [[ -n ${tmux_describe} ]] && print "Show session options" && return
     local -a args
     args=(
-        '-g[Show global options]'
-        '-t[Choose a target session]:target session:__tmux-sessions'
+        '-g[show global options]'
+        '-t[choose a target session]:target session:__tmux-sessions'
     )
     _arguments ${args}
 }
@@ -962,8 +962,8 @@ function _tmux-show-window-options() {
     [[ -n ${tmux_describe} ]] && print "Show window options" && return
     local -a args
     args=(
-        '-g[Show global options]'
-        '-t[Choose a target window]:target window:__tmux-windows'
+        '-g[show global options]'
+        '-t[choose a target window]:target window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -977,16 +977,16 @@ function _tmux-split-window() {
     [[ -n ${tmux_describe} ]] && print "Splits a pane into two" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-h[Split horizontally]'
-        '-v[Split vertically]'
-        '-l[Define new pane'\''s size]: :_guard "[0-9]#" "numeric value"'
-        '-p[Define new pane'\''s size in percent]: :_guard "[0-9]#" "numeric value"'
+        '-d[do not make the new window become the active one]'
+        '-h[split horizontally]'
+        '-v[split vertically]'
+        '-l[define new pane'\''s size]: :_guard "[0-9]#" "numeric value"'
+        '-p[define new pane'\''s size in percent]: :_guard "[0-9]#" "numeric value"'
         # Yes, __tmux_pane is correct here. The behaviour was changed
         # in recent tmux versions and makes more sense. Except that
         # changing the command's name might annoy users. So it stays like
         # this.
-        '-t[Choose target pane]:window:__tmux-panes'
+        '-t[choose target pane]:window:__tmux-panes'
         '*:: :_command'
     )
     _arguments ${args} && return
@@ -1000,7 +1000,7 @@ function _tmux-start-server() {
 function _tmux-suspend-client() {
     [[ -n ${tmux_describe} ]] && print "Suspend a client" && return
     local -a args
-    args=('-t[Choose destination client]:client:__tmux-clients')
+    args=('-t[choose destination client]:client:__tmux-clients')
     _arguments ${args}
 }
 
@@ -1008,11 +1008,11 @@ function _tmux-swap-pane() {
     [[ -n ${tmux_describe} ]] && print "Swap two panes" && return
     local -a args
     args=(
-        '-D[Move pane down]'
-        '-U[Move pane up]'
-        '-d[Do not change the active pane]'
-        '-s[Choose source pane]:pane:__tmux-panes'
-        '-t[Choose destination pane]:pane:__tmux-panes'
+        '-D[move pane down]'
+        '-U[move pane up]'
+        '-d[do not change the active pane]'
+        '-s[choose source pane]:pane:__tmux-panes'
+        '-t[choose destination pane]:pane:__tmux-panes'
     )
     _arguments ${args}
 }
@@ -1021,9 +1021,9 @@ function _tmux-swap-window() {
     [[ -n ${tmux_describe} ]] && print "Swap two windows" && return
     local -a args
     args=(
-        '-d[Do not make the new window become the active one]'
-        '-s[Choose source window]:window:__tmux-windows'
-        '-t[Choose destination window]:window:__tmux-windows'
+        '-d[do not make the new window become the active one]'
+        '-s[choose source window]:window:__tmux-windows'
+        '-t[choose destination window]:window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -1032,8 +1032,8 @@ function _tmux-switch-client() {
     [[ -n ${tmux_describe} ]] && print "Switch the client to another session" && return
     local -a args
     args=(
-        '-c[Choose a target client]:client:__tmux-clients'
-        '-t[Choose a target window]:window:__tmux-windows'
+        '-c[choose a target client]:client:__tmux-clients'
+        '-t[choose a target window]:window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -1045,9 +1045,9 @@ function _tmux-unbind-key() {
 
     ow=( "${words[@]}" )
     args=(
-        '-c[Kill the window if it is only in one session]'
-        '-n[Remove a non-prefix binding]'
-        '-t[Choose a key table]:key table:__tmux-key-tables'
+        '-c[kill the window if it is only in one session]'
+        '-n[remove a non-prefix binding]'
+        '-t[choose a key table]:key table:__tmux-key-tables'
         '*:: :->boundkeys'
     )
     _arguments ${args} && return
@@ -1064,8 +1064,8 @@ function _tmux-unlink-window() {
     [[ -n ${tmux_describe} ]] && print "Unlink a window" && return
     local -a args
     args=(
-        '-k[Kill the window if it is only in one session]'
-        '-t[Choose a target window]:target window:__tmux-windows'
+        '-k[kill the window if it is only in one session]'
+        '-t[choose a target window]:target window:__tmux-windows'
     )
     _arguments ${args}
 }
@@ -1073,7 +1073,7 @@ function _tmux-unlink-window() {
 function _tmux-up-pane() {
     [[ -n ${tmux_describe} ]] && print "Move up a pane" && return
     local -a args
-    args=('-t[Choose a target pane]:panes:__tmux-panes')
+    args=('-t[choose a target pane]:panes:__tmux-panes')
     _arguments ${args}
 }
 
@@ -1114,7 +1114,7 @@ function __tmux-choose-stuff() {
     local curcontext="${curcontext}" state
     local -a args
     args=(
-        '-t[Choose a target pane]:panes:__tmux-panes'
+        '-t[choose a target pane]:panes:__tmux-panes'
         '*:: :->tmpl'
     )
     _arguments ${args} && return
@@ -1312,58 +1312,58 @@ function __tmux-option-guard() {
 function __tmux-options() {
     local -a tmux_options
     tmux_options=(
-        'base-index:Define where to start numbering'
-        'bell-action:Set action on window bell'
-        'buffer-limit:Number of buffers kept per session'
-        'default-command:Default command for new windows'
-        'default-path:Default working directory'
-        'default-shell:Default shell executable'
-        'default-terminal:Default terminal definition string'
-        'display-panes-colour:Colour used for display-panes'
-        'display-panes-active-colour:Colour for active pane in display-panes'
-        'display-panes-time:Time (in msecs) of display-panes output'
-        'display-time:Time (in msecs) messages are displayed'
-        'history-limit:Number of copy-mode lines per window'
-        'lock-after-time:Lock sessions after N seconds'
-        'lock-command:Command to run for locking a client'
-        'lock-server:Make lock-after-time lock the server instead of sessions'
-        'message-attr:Set status line message attributes'
-        'message-bg:Set status line message background colour'
-        'message-fg:Set status line message foreground colour'
-        'message-limit:Set size of message log per client'
-        'mouse-select-pane:Make mouse clicks select window panes'
-        'pane-border-bg:Set pane border foreground colour'
-        'pane-border-fg:Set pane border background colour'
-        'pane-active-border-bg:Set active pane border foreground colour'
-        'pane-active-border-fg:Set active pane border background colour'
-        'prefix:Comma seperated line of keys accepted as prefix key'
-        'repeat-time:Time for multiple commands without prefix-key presses'
-        'set-remain-on-exit:Set remain-on-exit window option'
-        'set-titles:Try to set xterm window titles'
-        'set-titles-string:Format used by set-titles'
-        'status:Show or hide the status bar'
-        'status-attr:Status bar attributes'
-        'status-bg:Status bar background colour'
-        'status-fg:Status bar foreground colour'
-        'status-interval:Interval (in seconds) for status bar updates'
-        'status-justify:Position of the window list in status bar'
-        'status-keys:Mode to use in status bar modes (vi/emacs)'
-        'status-left:Format to use left in status bar'
-        'status-left-attr:Attribute for the left part of the status bar'
-        'status-left-bg:Background colour of the left part of the status bar'
-        'status-left-fg:Foreground colour of the left part of the status bar'
-        'status-left-length:Maximum length of the left part of the status bar'
-        'status-right:Format to use right in status bar'
-        'status-right-attr:Attribute for the right part of the status bar'
-        'status-right-bg:Background colour of the right part of the status bar'
-        'status-right-fg:Foreground colour of the right part of the status bar'
-        'status-right-length:Maximum length of the right part of the status bar'
-        'status-utf8:Assume UTF-8 sequences to appear in status bar'
-        'terminal-overrides:Override terminal descriptions'
-        'update-environment:List of variables to be copied to a session'\''s environment'
-        'visual-activity:Display status line messages upon activity'
-        'visual-bell:Use visual bell instead of audible'
-        'visual-content:Display status line messages upon content changes'
+        'base-index:define where to start numbering'
+        'bell-action:set action on window bell'
+        'buffer-limit:number of buffers kept per session'
+        'default-command:default command for new windows'
+        'default-path:default working directory'
+        'default-shell:default shell executable'
+        'default-terminal:default terminal definition string'
+        'display-panes-colour:colour used for display-panes'
+        'display-panes-active-colour:colour for active pane in display-panes'
+        'display-panes-time:time (in msecs) of display-panes output'
+        'display-time:time (in msecs) messages are displayed'
+        'history-limit:number of copy-mode lines per window'
+        'lock-after-time:lock sessions after N seconds'
+        'lock-command:command to run for locking a client'
+        'lock-server:make lock-after-time lock the server instead of sessions'
+        'message-attr:set status line message attributes'
+        'message-bg:set status line message background colour'
+        'message-fg:set status line message foreground colour'
+        'message-limit:set size of message log per client'
+        'mouse-select-pane:make mouse clicks select window panes'
+        'pane-border-bg:set pane border foreground colour'
+        'pane-border-fg:set pane border background colour'
+        'pane-active-border-bg:set active pane border foreground colour'
+        'pane-active-border-fg:set active pane border background colour'
+        'prefix:comma seperated line of keys accepted as prefix key'
+        'repeat-time:time for multiple commands without prefix-key presses'
+        'set-remain-on-exit:set remain-on-exit window option'
+        'set-titles:try to set xterm window titles'
+        'set-titles-string:format used by set-titles'
+        'status:show or hide the status bar'
+        'status-attr:status bar attributes'
+        'status-bg:status bar background colour'
+        'status-fg:status bar foreground colour'
+        'status-interval:interval (in seconds) for status bar updates'
+        'status-justify:position of the window list in status bar'
+        'status-keys:mode to use in status bar modes (vi/emacs)'
+        'status-left:format to use left in status bar'
+        'status-left-attr:attribute for the left part of the status bar'
+        'status-left-bg:background colour of the left part of the status bar'
+        'status-left-fg:foreground colour of the left part of the status bar'
+        'status-left-length:maximum length of the left part of the status bar'
+        'status-right:format to use right in status bar'
+        'status-right-attr:attribute for the right part of the status bar'
+        'status-right-bg:background colour of the right part of the status bar'
+        'status-right-fg:foreground colour of the right part of the status bar'
+        'status-right-length:maximum length of the right part of the status bar'
+        'status-utf8:assume UTF-8 sequences to appear in status bar'
+        'terminal-overrides:override terminal descriptions'
+        'update-environment:list of variables to be copied to a session'\''s environment'
+        'visual-activity:display status line messages upon activity'
+        'visual-bell:use visual bell instead of audible'
+        'visual-content:display status line messages upon content changes'
     )
     _describe -t tmux-options 'tmux option' tmux_options
 }
@@ -1412,8 +1412,8 @@ function __tmux-panes() {
 function __tmux-server-options() {
     local -a tmux_server_options
     tmux_server_options=(
-        'escape-time:Set timeout to detect single escape characters (in msecs)'
-        'quiet:Enable/disable the display of various informational messages'
+        'escape-time:set timeout to detect single escape characters (in msecs)'
+        'quiet:enable/disable the display of various informational messages'
     )
     _describe -t tmux-server-options 'tmux server option' tmux_server_options
 }
@@ -1437,34 +1437,34 @@ function __tmux-socket-name() {
 function __tmux-window-options() {
     local -a tmux_window_options
     tmux_window_options=(
-        'aggressive-resize:Aggressively resize windows'
-        'alternate-screen:Allow alternate screen feature to be used'
-        'automatic-rename:Attempt to automatically rename windows'
-        'clock-mode-colour:Set clock colour'
-        'clock-mode-style:Set clock hour format (12/24)'
-        'force-height:Force a windows to a certain height'
-        'force-width:Force a windows to a certain width'
-        'main-pane-height:Set height for main-* layouts'
-        'main-pane-width:Set width for main-* layouts'
-        'mode-attr:Set window modes attributes'
-        'mode-bg:Set window modes background colour'
-        'mode-fg:Set window modes foreground colour'
-        'mode-keys:Mode to use in copy and choice modes (vi/emacs)'
-        'mode-mouse:Use mouse in modes'
-        'monitor-activity:Monitor window activity'
-        'monitor-content:Monitor window contents for a fnmatch(3) pattern'
-        'remain-on-exit:Do not destroy windows after the program exits'
-        'synchronize-panes:Send input to all panes of a window'
-        'utf8:Assume UTF-8 sequences to appear in a window'
-        'window-status-attr:Set status line attributes for a window'
-        'window-status-bg:Set status line background for a window'
-        'window-status-current-attr:Set status line attributes for active window'
-        'window-status-current-bg:Set status line background for active window'
-        'window-status-current-fg:Set status line foreground for active window'
-        'window-status-current-format:Set status line format for active window'
-        'window-status-fg:Set status line foreground for a window'
-        'window-status-format:Set status line format for all but the active window'
-        'xterm-keys:Generate xterm-style function key sequences'
+        'aggressive-resize:aggressively resize windows'
+        'alternate-screen:allow alternate screen feature to be used'
+        'automatic-rename:attempt to automatically rename windows'
+        'clock-mode-colour:set clock colour'
+        'clock-mode-style:set clock hour format (12/24)'
+        'force-height:force a windows to a certain height'
+        'force-width:force a windows to a certain width'
+        'main-pane-height:set height for main-* layouts'
+        'main-pane-width:set width for main-* layouts'
+        'mode-attr:set window modes attributes'
+        'mode-bg:set window modes background colour'
+        'mode-fg:set window modes foreground colour'
+        'mode-keys:mode to use in copy and choice modes (vi/emacs)'
+        'mode-mouse:use mouse in modes'
+        'monitor-activity:monitor window activity'
+        'monitor-content:monitor window contents for a fnmatch(3) pattern'
+        'remain-on-exit:do not destroy windows after the program exits'
+        'synchronize-panes:send input to all panes of a window'
+        'utf8:assume UTF-8 sequences to appear in a window'
+        'window-status-attr:set status line attributes for a window'
+        'window-status-bg:set status line background for a window'
+        'window-status-current-attr:set status line attributes for active window'
+        'window-status-current-bg:set status line background for active window'
+        'window-status-current-fg:set status line foreground for active window'
+        'window-status-current-format:set status line format for active window'
+        'window-status-fg:set status line foreground for a window'
+        'window-status-format:set status line format for all but the active window'
+        'xterm-keys:generate xterm-style function key sequences'
     )
     _describe -t tmux-window-options 'tmux window option' tmux_window_options
 }
diff --git a/Completion/Unix/Command/_todo.sh b/Completion/Unix/Command/_todo.sh
index 3bae98b1a..799be5427 100644
--- a/Completion/Unix/Command/_todo.sh
+++ b/Completion/Unix/Command/_todo.sh
@@ -32,19 +32,19 @@ local txtmsg="text with contexts or projects"
 case $state in
   (commands)
   cmdlist=(
-    "add:Add TODO ITEM to todo.txt."
-    "append:Adds to item on line NUMBER the text TEXT."
-    "archive:Moves done items from todo.txt to done.txt."
-    "del:Deletes the item on line NUMBER in todo.txt."
-    "do:Marks item on line NUMBER as done in todo.txt."
-    "list:Displays all todo items containing TERM(s), sorted by priority."
-    "listall:Displays items including done ones containing TERM(s)"
-    "listpri:Displays all items prioritized at PRIORITY."
-    "prepend:Adds to the beginning of the item on line NUMBER text TEXT."
-    "pri:Adds or replace in NUMBER the priority PRIORITY (upper case letter)."
-    "replace:Replace in NUMBER the TEXT."
-    "remdup:Remove exact duplicates from todo.txt."
-    "report:Adds the number of open and done items to report.txt."
+    "add:add TODO ITEM to todo.txt."
+    "append:adds to item on line NUMBER the text TEXT."
+    "archive:moves done items from todo.txt to done.txt."
+    "del:deletes the item on line NUMBER in todo.txt."
+    "do:marks item on line NUMBER as done in todo.txt."
+    "list:displays all todo items containing TERM(s), sorted by priority."
+    "listall:displays items including done ones containing TERM(s)"
+    "listpri:displays all items prioritized at PRIORITY."
+    "prepend:adds to the beginning of the item on line NUMBER text TEXT."
+    "pri:adds or replace in NUMBER the priority PRIORITY (upper case letter)."
+    "replace:replace in NUMBER the TEXT."
+    "remdup:remove exact duplicates from todo.txt."
+    "report:adds the number of open and done items to report.txt."
   )
   _describe -t todo-commands 'todo.sh command' cmdlist
   ;;
diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget
index 67c2326e2..54c09a377 100644
--- a/Completion/Unix/Command/_wget
+++ b/Completion/Unix/Command/_wget
@@ -79,7 +79,7 @@ _arguments -C -s \
   '(--user)--ftp-user=:user' \
   '(--password)--ftp-password=:password' \
   "--no-remove-listing[don't remove \`.listing' files]" \
-  '--no-glob[turn off FTP file name globbing.]' \
+  '--no-glob[turn off FTP file name globbing]' \
   '--no-passive-ftp' \
   '--retr-symlinks' \
   '--preserve-permissions[preserve remote file permissions with ftp]' \
diff --git a/Completion/Unix/Command/_yafc b/Completion/Unix/Command/_yafc
index 9c5388ba6..df9623beb 100644
--- a/Completion/Unix/Command/_yafc
+++ b/Completion/Unix/Command/_yafc
@@ -3,22 +3,22 @@
 _yafc() {
     local arguments
     arguments=(
-    '(--anon -a)'{--anon,-a}'[Try an anonymous login]'
-    '(--debug -d)'{--debug,-d}'[Print all messages to/from server]'
-    '(--dump-rc -D)'{--dump-rc,-D}'[Print the default configuration file]'
+    '(--anon -a)'{--anon,-a}'[try an anonymous login]'
+    '(--debug -d)'{--debug,-d}'[print all messages to/from server]'
+    '(--dump-rc -D)'{--dump-rc,-D}'[print the default configuration file]'
     '(--mechanism -m)'{--mechanism=-,-m}'[specify a security mechanism]:security mechanism:(krb4, krb5, none)'
-    '(--norc -n)'{--norc,-n}'[Do not read the users configuration file]'
-    '(--noproxy -p)'{--noproxy,-p}'[Do not connect via the proxy]'
-    '(--quiet -q)'{--quiet,-q}'[Do not print the welcome message]'
-    '(--rcfile -r)'{--rcfile=-,-r}'[Specify a configuration file]:configuration file:_files'
-    '(--trace -t)'{--trace=-,-t-}'[Specify a trace file]:trace file:_files'
-    '(--noauto -u)'{--noauto,-u}'[Do not login automagically]'
-    '(--noalias -U)'{--noalias,-U}'[As --noauto, but bookmark aliases is disabled]'
+    '(--norc -n)'{--norc,-n}'[do not read the users configuration file]'
+    '(--noproxy -p)'{--noproxy,-p}'[do not connect via the proxy]'
+    '(--quiet -q)'{--quiet,-q}'[do not print the welcome message]'
+    '(--rcfile -r)'{--rcfile=-,-r}'[specify a configuration file]:configuration file:_files'
+    '(--trace -t)'{--trace=-,-t-}'[specify a trace file]:trace file:_files'
+    '(--noauto -u)'{--noauto,-u}'[do not login automagically]'
+    '(--noalias -U)'{--noalias,-U}'[as --noauto, but bookmark aliases is disabled]'
     '(--verbose -v)'{--verbose,-v}'[print all responses received]'
-    '(--wait -w)'{--wait,-w=}'[Specify a waiting time between connection attempts]:wait time: '
-    '(--workdir -W)'{--workdir=,-W+}'[Use a different working directory]:working directory:_directories'
-    '(--version -V)'{--version,-V}'[Print version information]'
-    '(--help -h)'{--help,-h}'[Print a short help description]'
+    '(--wait -w)'{--wait,-w=}'[specify a waiting time between connection attempts]:wait time: '
+    '(--workdir -W)'{--workdir=,-W+}'[use a different working directory]:working directory:_directories'
+    '(--version -V)'{--version,-V}'[print version information]'
+    '(--help -h)'{--help,-h}'[print a short help description]'
     '*:address:_yafc_address'
     )
 
diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs
index c15bc81d5..ff404278a 100644
--- a/Completion/Unix/Command/_zfs
+++ b/Completion/Unix/Command/_zfs
@@ -49,7 +49,7 @@ _zfs() {
 
 	if [[ $service == "zfs" ]]; then
 		_arguments -C -A "-*" \
-			'-\?[Help]' \
+			'-\?[help]' \
 			'*::command:->subcmd' && return 0
 
 		if (( CURRENT == 1 )); then
@@ -63,43 +63,43 @@ _zfs() {
 	case $service in
 	("create")
 		_arguments -A "-*" \
-			'-p[Create parent datasets]' \
-			'-o[Set initial properties]:property:_values -s , "property" $rw_properties' \
+			'-p[create parent datasets]' \
+			'-o[set initial properties]:property:_values -s , "property" $rw_properties' \
 			- set1 \
 			':filesystem:' \
 			- set2 \
-			'-s[Create sparse volume]' \
-			'-b[Set volblocksize]:blocksize:' \
-			'-V[Set size]:size:' \
+			'-s[create sparse volume]' \
+			'-b[set volblocksize]:blocksize:' \
+			'-V[set size]:size:' \
 			':volume:'
 		;;
 
 	("destroy")
 		_arguments -A "-*" \
-			'-r[Recursively destroy all children]' \
-			'-R[Recursively destroy all dependents]' \
-			'-f[Force unmounts]' \
+			'-r[recursively destroy all children]' \
+			'-R[recursively destroy all dependents]' \
+			'-f[force unmounts]' \
 			':filesystem/volume/snapshot:_zfs_dataset'
 		;;
 
 	("snapshot")
 		_arguments -A "-*" \
-			'-r[Recursively snapshot all descendant datasets]' \
+			'-r[recursively snapshot all descendant datasets]' \
 			':filesystem/volume:_zfs_dataset -t fs -t vol -S@'
 		;;
 
 	("rollback")
 		_arguments -A "-*" \
-			'-r[Recursively destroy more recent snapshots]' \
-			'-R[Recursively destroy more recent snapshots and clones]' \
-			'-f[Force unmounts]' \
+			'-r[recursively destroy more recent snapshots]' \
+			'-R[recursively destroy more recent snapshots and clones]' \
+			'-f[force unmounts]' \
 			':snapshot:_zfs_dataset -t snap'
 		;;
 
 	("clone")
 		# XXX needs to bail if there are no snapshots
 		_arguments -A "-*" \
-			'-p[Create parent datasets]' \
+			'-p[create parent datasets]' \
 			':snapshot:_zfs_dataset -t snap' \
 			':filesystem/volume:'
 		;;
@@ -113,23 +113,23 @@ _zfs() {
 	("rename")
 		_arguments -A "-*" \
 			- set1 \
-			'-p[Create parent datasets]' \
+			'-p[create parent datasets]' \
 			':filesystem/volume/snapshot:_zfs_dataset' \
 			':filesystem/volume/snapshot:' \
 			- set2 \
-			'-r[Recursively rename snapshots of all descendent datasets]' \
+			'-r[recursively rename snapshots of all descendent datasets]' \
 			':snapshot:_zfs_dataset -t snap' \
 			':snapshot:'
 		;;
 
 	("list")
 		_arguments -A "-*" \
-			'-r[Recursively display children]' \
-			'-H[Scripting mode]' \
-			'-o[Properties to list]:property:_values -s , "property" $ro_properties $rw_propnames' \
-			'*-s[Sort key (ascending)]:property:_values "property" $ro_properties $rw_propnames' \
-			'*-S[Sort key (descending)]:property:_values "property" $ro_properties $rw_propnames' \
-			'-t[Dataset types to list]:dataset type:_values -s , "dataset type" filesystem snapshot volume' \
+			'-r[recursively display children]' \
+			'-H[scripting mode]' \
+			'-o[properties to list]:property:_values -s , "property" $ro_properties $rw_propnames' \
+			'*-s[sort key (ascending)]:property:_values "property" $ro_properties $rw_propnames' \
+			'*-S[sort key (descending)]:property:_values "property" $ro_properties $rw_propnames' \
+			'-t[dataset types to list]:dataset type:_values -s , "dataset type" filesystem snapshot volume' \
 			'*:filesystem/volume/snapshot:_zfs_dataset'
 		;;
 
@@ -141,46 +141,46 @@ _zfs() {
 
 	("get")
 		_arguments -A "-*" \
-			"-r[Recursively display children's properties]" \
-			'-H[Scripting mode]' \
-			'-p[Display numbers exactly]' \
-			'-s[Specify sources]:source:_values -s , "source" local default inherited temporary none' \
-			'-o[Specify fields]:field:_values -s , "field" name property value source' \
+			"-r[recursively display children's properties]" \
+			'-H[scripting mode]' \
+			'-p[display numbers exactly]' \
+			'-s[specify sources]:source:_values -s , "source" local default inherited temporary none' \
+			'-o[specify fields]:field:_values -s , "field" name property value source' \
 			':property:_values -s , "property" $ro_properties $rw_propnames all' \
 			'*:filesystem/volume/snapshot:_zfs_dataset'
 		;;
 
 	("inherit")
 		_arguments -A "-*" \
-			'-r[Recursively inherit property for all children]' \
+			'-r[recursively inherit property for all children]' \
 			':property:_values -s , "property" $ro_properties $rw_properties' \
 			'*:filesystem/volume:_zfs_dataset -t fs -t vol'
 		;;
 
 	("mount")
 		_arguments -A "-*" \
-			'-o[Mount options]:mount options:_values -s , "option" {,no}{devices,exec,setuid} ro rw' \
-			'-O[Overlay mount]' \
-			'-v[Report mount progress]' \
+			'-o[mount options]:mount options:_values -s , "option" {,no}{devices,exec,setuid} ro rw' \
+			'-O[overlay mount]' \
+			'-v[report mount progress]' \
 			- set1 \
 			':filesystem:_zfs_dataset -t fs' \
 			- set2 \
-			'-a[Mount all available ZFS filesystems]'
+			'-a[mount all available ZFS filesystems]'
 		;;
 
 	("unmount")
 		_arguments -A "-*" \
 			- set1 \
-			'-f[Force unmount]' \
+			'-f[force unmount]' \
 			':filesystem:_zfs_dataset -t fs -t mtpt' \
 			- set2 \
-			'-a[Unmount all ZFS filesystems]'
+			'-a[unmount all ZFS filesystems]'
 		;;
 
 	("share")
 		_arguments -A "-*" \
 			- set1 \
-			'-a[Share all available ZFS filesystems]' \
+			'-a[share all available ZFS filesystems]' \
 			- set2 \
 			':filesystem:_zfs_dataset -t fs'
 		;;
@@ -188,27 +188,27 @@ _zfs() {
 	("unshare")
 		_arguments -A "-*" \
 			- set1 \
-			'-a[Unshare all shared ZFS filesystems]' \
+			'-a[unshare all shared ZFS filesystems]' \
 			- set2 \
-			'-F[Force unshare]' \
+			'-F[force unshare]' \
 			':filesystem:_zfs_dataset -t fs -t mtpt'
 		;;
 
 	("send")
 		_arguments -A "-*" \
-			'-i[Generate an incremental stream]:snapshot:_zfs_dataset -t snap' \
+			'-i[generate an incremental stream]:snapshot:_zfs_dataset -t snap' \
 			':snapshot:_zfs_dataset -t snap'
 		;;
 
 	("receive")
 		_arguments -A "-*" \
-			'-v[Verbose]' \
-			'-n[Do not receive the stream]' \
-			'-F[Force a rollback if necessary]' \
+			'-v[verbose]' \
+			'-n[do not receive the stream]' \
+			'-F[force a rollback if necessary]' \
 			- set1 \
 			':filesystem/volume/snapshot:_zfs_dataset' \
 			- set2 \
-			'-d[Set path prefix]:filesystem:_zfs_dataset -t fs'
+			'-d[set path prefix]:filesystem:_zfs_dataset -t fs'
 		;;
 
 	("allow"|"unallow")
@@ -218,14 +218,14 @@ _zfs() {
 	("upgrade")
 		_arguments -A "-*" \
 			- set1 \
-			'-v[Verbose]' \
+			'-v[verbose]' \
 			- set2 \
-			'-a[Upgrade all filesystems on all pools]' \
-			'-r[Upgrade descendent filesystems, too]' \
-			'-V[Upgrade to specified version]:version:(1 2)' \
+			'-a[upgrade all filesystems on all pools]' \
+			'-r[upgrade descendent filesystems, too]' \
+			'-V[upgrade to specified version]:version:(1 2)' \
 			- set3 \
-			'-r[Upgrade descendent filesystems, too]' \
-			'-V[Upgrade to specified version]:version:(1 2)' \
+			'-r[upgrade descendent filesystems, too]' \
+			'-V[upgrade to specified version]:version:(1 2)' \
 			':filesystem:_zfs_dataset -t fs' \
 		;;
 
diff --git a/Completion/Unix/Command/_zpool b/Completion/Unix/Command/_zpool
index ae98c2b7f..9692121ae 100644
--- a/Completion/Unix/Command/_zpool
+++ b/Completion/Unix/Command/_zpool
@@ -35,7 +35,7 @@ _zpool() {
 
 	if [[ $service == "zpool" ]]; then
 		_arguments -C -A "-*" \
-			'-\?[Help]' \
+			'-\?[help]' \
 			'*::command:->subcmd' && return 0
 
 		if (( CURRENT == 1 )); then
@@ -56,38 +56,38 @@ _zpool() {
 	(create)
 		# TODO: investigate better vdev handling
 		_arguments -A "-*" \
-			'-f[Force use of in-use devices]' \
-			'-n[Display configuration without creating pool]' \
-			'-R[Use alternate root]:alternate root:_files -/' \
-			'-m[Set mountpoint for root dataset]:mountpoint:' \
+			'-f[force use of in-use devices]' \
+			'-n[display configuration without creating pool]' \
+			'-R[use alternate root]:alternate root:_files -/' \
+			'-m[set mountpoint for root dataset]:mountpoint:' \
 			':pool name:' \
 			'*:virtual device:_files'
 		;;
 
 	(destroy)
 		_arguments -A "-*" \
-			'-f[Force active datasets to be unmounted]' \
+			'-f[force active datasets to be unmounted]' \
 			':pool name:_zfs_pool'
 		;;
 
 	(add)
 		_arguments -A "-*" \
-			'-f[Force use of in-use devices]' \
-			'-n[Display configuration without modifying pool]' \
+			'-f[force use of in-use devices]' \
+			'-n[display configuration without modifying pool]' \
 			':pool name:_zfs_pool' \
 			'*:virtual device:_files'
 		;;
 
 	(list)
 		_arguments \
-			'-H[Scripted mode]' \
-			'-o[Fields to list]:field:_values -s , "field" ${^fields/\:/[}\]' \
+			'-H[scripted mode]' \
+			'-o[fields to list]:field:_values -s , "field" ${^fields/\:/[}\]' \
 			'::pool name:_zfs_pool'
 		;;
 
 	(iostat)
 		_arguments -A "-*" \
-			'-v[Verbose statistics]' \
+			'-v[verbose statistics]' \
 			'*::pool name:_zfs_pool' \
 			'::interval:' \
 			'::count:'
@@ -95,14 +95,14 @@ _zpool() {
 
 	(status)
 		_arguments -A "-*" \
-			'-v[Verbose information]' \
-			'-x[Show only unhealthy pools]' \
+			'-v[verbose information]' \
+			'-x[show only unhealthy pools]' \
 			'*::pool name:_zfs_pool'
 		;;
 
 	(offline)
 		_arguments -A "-*" \
-			'-t[Offline until next reboot]' \
+			'-t[offline until next reboot]' \
 			':pool name:_zfs_pool' \
 			'*:virtual device:_files'
 		;;
@@ -116,7 +116,7 @@ _zpool() {
 	(attach)
 		# TODO: first device should choose first from existing.
 		_arguments \
-			'-f[Force attach, even if in use]' \
+			'-f[force attach, even if in use]' \
 			':pool name:_zfs_pool' \
 			':virtual device:_files' \
 			':virtual device:_files'
@@ -130,7 +130,7 @@ _zpool() {
 
 	(replace)
 		_arguments -A "-*" \
-			'-f[Force attach, even if in use]' \
+			'-f[force attach, even if in use]' \
 			':pool name:_zfs_pool' \
 			':virtual device:_files' \
 			'::virtual device:_files'
@@ -138,30 +138,30 @@ _zpool() {
 
 	(scrub)
 		_arguments -A "-*" \
-			'-s[Stop scrubbing]' \
+			'-s[stop scrubbing]' \
 			'*:pool name:_zfs_pool'
 		;;
 
 	(export)
 		_arguments -A "-*" \
-			'-f[Forcefully unmount all datasets]' \
+			'-f[forcefully unmount all datasets]' \
 			'*:pool name:_zfs_pool'
 		;;
 
 	(import)
 		# TODO: -o should complete options
 		_arguments -A "-*" \
-			'*-d[Search for devices or files in directory]:_files -/' \
-			'-D[Destroyed pools]' \
-			'-f[Force import]' \
+			'*-d[search for devices or files in directory]:_files -/' \
+			'-D[destroyed pools]' \
+			'-f[force import]' \
 			- set1 \
-			'-o[Mount options]' \
-			'-p[Set property]:property:_values -s , "property" $import_properties' \
-			'-R[Alternate root]:_files -/' \
+			'-o[mount options]' \
+			'-p[set property]:property:_values -s , "property" $import_properties' \
+			'-R[alternate root]:_files -/' \
 			'*:pool name or id:_zfs_pool' \
 			'::new pool name:' \
 			- set2 \
-			'-a[All pools]'
+			'-a[all pools]'
 		;;
 
 	(get)
@@ -179,16 +179,16 @@ _zpool() {
 	(upgrade)
 		_arguments -A "-*" \
 			- set1 \
-			'-v[Display ZFS versions and descriptions]' \
+			'-v[display ZFS versions and descriptions]' \
 			- set2 \
-			'-a[Upgrade all pools]' \
+			'-a[upgrade all pools]' \
 			'*:pool name:_zfs_pool'
 		;;
 
 	(history)
 		_arguments -A "-*" \
-			'-i[Display internal events]' \
-			'-l[Long format]' \
+			'-i[display internal events]' \
+			'-l[long format]' \
 			'*:pool name:_zfs_pool'
 		;;
 
diff --git a/Completion/Unix/Type/_printers b/Completion/Unix/Type/_printers
index 70f10f65e..d7039dbbe 100644
--- a/Completion/Unix/Type/_printers
+++ b/Completion/Unix/Type/_printers
@@ -83,7 +83,7 @@ if (( ! $+_lp_cache )); then
     _lp_cache+=( ${${${(S)${(f)tmp}/(#b):*((#e)|description=([^:]#):)*/:${match[2]}|}%%|*}:#_default*} ) # If you use YP
   fi
 
-  (( $#_lp_cache )) || _lp_cache=( 'lp0:Guessed default printer' )
+  (( $#_lp_cache )) || _lp_cache=( 'lp0:guessed default printer' )
   (( $#_lp_alias_cache )) || unset _lp_alias_cache
 fi
 
diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer
index ec65937ba..d3d1e6046 100644
--- a/Completion/X/Command/_mplayer
+++ b/Completion/X/Command/_mplayer
@@ -45,7 +45,7 @@ _x_arguments -C -s \
   {-h,-help,--help}'[display help info]' \
   -hardframedrop \-hr-mp3-seek \
   '-hue:video signal hue adjustment' \
-  '(-rootwin)-icelayer:icewm layer:((0\:Desktop 2\:Below 4\:Normal 6\:OnTop 8\:Dock 10\:AboveDock 12\:Menu))' \
+  '(-rootwin)-icelayer:icewm layer:((0\:desktop 2\:below 4\:normal 6\:ontop 8\:dock 10\:abovedock 12\:menu))' \
   '(-use-stdin)-idx[rebuild index of the avi]' \
   '-ifo:ifo file:_files' '-include:config-file:_files' \
   '-input:command:(conf ar-delay ar-rate keylist cmdlist js-dev file)' \
diff --git a/Completion/X/Command/_setxkbmap b/Completion/X/Command/_setxkbmap
index 85609b554..c490a9d8c 100644
--- a/Completion/X/Command/_setxkbmap
+++ b/Completion/X/Command/_setxkbmap
@@ -30,10 +30,10 @@ _setxkbmap() {
         '(-)'-print'[print component names]'
         '-rules[rules file]:rules:_files'
         '-symbols[symbols components]:symbols:'
-        '(-)'{-help,-h}'[Display help message]'
+        '(-)'{-help,-h}'[display help message]'
         '-synch[force synchronization]'
         '-types[types components]:types:'
-        '(-verbose -v)'{-verbose,-v}'[Set verbosity level]:verbosity:(0 1 2 3 4 5 6 7 8 9)'
+        '(-verbose -v)'{-verbose,-v}'[set verbosity level]:verbosity:(0 1 2 3 4 5 6 7 8 9)'
         '*::keyboard:_setxkbmap_dispatcher'
     )
     _arguments $arguments
diff --git a/Completion/Zsh/Command/_cd b/Completion/Zsh/Command/_cd
index d2632b215..476947f60 100644
--- a/Completion/Zsh/Command/_cd
+++ b/Completion/Zsh/Command/_cd
@@ -13,10 +13,10 @@
 
 _cd_options() {
   _arguments -s \
-  '-q[Quiet, no output or use of hooks]' \
-  '-s[Refuse to use paths with symlinks]' \
-  '(-P)-L[Retain symbolic links ignoring CHASE_LINKS]' \
-  '(-L)-P[Resolve symbolic links as CHASE_LINKS]'
+  '-q[quiet, no output or use of hooks]' \
+  '-s[refuse to use paths with symlinks]' \
+  '(-P)-L[retain symbolic links ignoring CHASE_LINKS]' \
+  '(-L)-P[resolve symbolic links as CHASE_LINKS]'
 }
 
 setopt localoptions nonomatch