Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author
PATCH: make wider use of the convention of square brackets for defaults

X-seq: zsh-workers 49156
From: Oliver Kiddle <opk@xxxxxxx>
To: Zsh workers <zsh-workers@xxxxxxx>
Subject: PATCH: make wider use of the convention of square brackets for defaults
Date: Fri, 09 Jul 2021 01:06:43 +0200
Archived-at: <https://zsh.org/workers/49156>
List-id: <zsh-workers.zsh.org>
It is often useful to make default values explicit from completions. At
some point I adopted the approach of putting them in square brackets in
the match group description and this was subsequently documented in
Etc/completion-style-guide. With this patch, I've changed instances of
other styles such as "(default 2)" to conform.

If anyone feels strongly that some other style would be preferable, 
it may be better to investigate whether it can be made configurable
via zformat strings and zstyle. Though that could be tricky to do in a
backward compatible way.

There are also plenty of cases where we've indicated a default in
per-match descriptions rather than the group headings which I've mostly
not touched. I've also left things alone where the default is not a
valid literal value (e.g the default is something like all where you can
only specify a number for a specific one).

Oliver

diff --git a/Completion/Cygwin/Command/_cygserver b/Completion/Cygwin/Command/_cygserver
index 1c2744c8f..392bf5cbd 100644
--- a/Completion/Cygwin/Command/_cygserver
+++ b/Completion/Cygwin/Command/_cygserver
@@ -3,14 +3,14 @@
 # cygwin 1.5.25
 
 _arguments -s -S \
-  '(--config-file -f)'{-f,--config-file}'[use specified file as config file (default /etc/cygserver.conf)]:config file:_files -g "*.conf(-.)"' \
-  '(--cleanup-threads -c)'{-c,--cleanup-threads}'[number of cleanup threads to use (default 2)]:number of threads:' \
+  '(--config-file -f)'{-f,--config-file}'[use specified config file]:config file [/etc/cygserver.conf]:_files -g "*.conf(-.)"' \
+  '(--cleanup-threads -c)'{-c,--cleanup-threads}'[number of cleanup threads to use]:number of threads [2]' \
   '(--process-cache -p)'{-p,--process-cache}'[size of process cache]:cache size:' \
-  '(--request-threads -r)'{-r,--request-threads}'[number of request threads to use (default 10)]:number of threads:' \
+  '(--request-threads -r)'{-r,--request-threads}'[number of request threads to use]:number of threads [10]' \
   '(--debug -d)'{-d,--debug}'[log debug messages to stderr]' \
   '(--stderr -e --no-stderr -E)'{-e,--stderr}'[log to stderr (default if stderr is a tty)]' \
   '(--stderr -e --no-stderr -E)'{-E,--no-stderr}"[don't log to stderr (see -y, -Y options)]" \
-  '(--log-level -l)'{-l,--log-level}'[verbosity of logging (1..7) (default 6)]:verbosity level:({1..7})' \
+  '(--log-level -l)'{-l,--log-level}'[specify log verbosity]:verbosity level [6]:({1..7})' \
   '(--syslog -y --no-syslog -Y)'{-y,--syslog}'[log to syslog (default if stderr is no tty)]' \
   '(--syslog -y --no-syslog -Y)'{-Y,--no-syslog}"[don't log to syslog (see -e, -E options)]" \
   '(--no-sharedmem -m)'{-m,--no-sharedmem}"[don't start XSI Shared Memory support]" \
diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debian/Command/_git-buildpackage
index c38edc1cc..81bf7dac9 100644
--- a/Completion/Debian/Command/_git-buildpackage
+++ b/Completion/Debian/Command/_git-buildpackage
@@ -13,14 +13,14 @@ _arguments \
   '--git-sign-tags[sign tags]' \
   '--git-no-sign-tags[negates --git-sign-tags]' \
   '--git-keyid=-[GPG keyid to sign tags with]:GPG key:' \
-  '--git-debian-tag=-[format string for debian tags]:default is debian/%(version)s:' \
-  '--git-upstream-tag=-[format string for upstream tags]:default is upstream/%(version)s:' \
+  '--git-debian-tag=-[format string for debian tags]:format string [debian/%%(version)s]' \
+  '--git-upstream-tag=-[format string for upstream tags]:format string [upstream/%%(version)s]' \
   '--git-pristine-tar[use pristine-tar to create .orig.tar.gz]' \
   '--git-no-pristine-tar[negates --git-pristine-tar]' \
   '--git-force-create[force creation of orig.tar.gz]' \
   '--git-no-create-orig[do not create orig.tar.gz]' \
   '--git-tarball-dir=-[location to look for external tarballs]:tarball directory:_files -/' \
-  '--git-compression=-[compression type]:compression:(auto gzip bzip2 lzma xz)' \
+  '--git-compression=-[compression type]:compression type [auto]:(auto gzip bzip2 lzma xz)' \
   '--git-compression-level=-[set compression level]:level:(1 2 3 4 5 6 7 8 9)' \
   '--git-upstream-branch=-[upstream branch]::' \
   '--git-debian-branch=-[branch the Debian package is being developed on]::' \
diff --git a/Completion/Linux/Command/_alsa-utils b/Completion/Linux/Command/_alsa-utils
index 91bb0b86c..dd5c26866 100644
--- a/Completion/Linux/Command/_alsa-utils
+++ b/Completion/Linux/Command/_alsa-utils
@@ -38,7 +38,7 @@ opts=(
   --disable-format'[disable automatic format conversions]'
   --disable-softvol'[disable software volume control (softvol)]'
   --test-position'[test ring buffer position]'
-  --test-coef='[test coefficient for ring buffer position (default 8)]'
+  --test-coef='[test coefficient for ring buffer position]:coefficient [8]'
   --test-nowait'[do not wait for ring buffer - eats whole CPU]'
   --max-file-time='[start another output file when the old file has recorded]'
   --process-id-file='[write the process ID here]'
diff --git a/Completion/Linux/Command/_ipset b/Completion/Linux/Command/_ipset
index 061d16799..a40480904 100644
--- a/Completion/Linux/Command/_ipset
+++ b/Completion/Linux/Command/_ipset
@@ -4,7 +4,7 @@ local offset=0
 local -a args from_to hash cmds listopts addopts
 
 _set_types () {
-	_values -S \  "Set type" \
+	_values -S \  "set type" \
 		'bitmap\:ip[uses a memory range to store IPv4 host (default) or IPv4 subnet addresses up to 65536 elements]'\
 		'bitmap\:ip,mac[uses a memory range to store an IPv4 host/subnet and mac address pair up to 65536 elements]'\
 		'bitmap\:port[uses a memory range to store port numbers independent of L4 protocol at up to 65536 elements]'\
@@ -37,18 +37,11 @@ from_to=('(--network)--from[from IP or network (with --netmask)]:IP'
 	'(--from --to)--network[network]:IP/mask'
 )
 
-_addressfamily () {
-	vals=(  inet
-	 	inet6
-	     )
-	_describe -t addressfamily "Address Family" vals
-}
-
-hash=(	'--hashsize[the initial hash size aligned to a power of 2(default 1024)]:hashsize'
-	'--maxelem[the maximum number of elements in the set (default 65536)]:maxelements'
-	'--family[the protocol family of addresses to be stored in the set (default inet)]:addressfamily:_addressfamily'
+hash=(	'--hashsize[the initial hash size aligned to a power of 2]:hashsize [1024]'
+	'--maxelem[the maximum number of elements in the set]:max elements [65536]'
+        '--family[the protocol family of addresses to be stored in the set]:address family [inet]:(inet inet6)'
 	'--timeout[adds timeout support to the set with your specified value as default, (0 = forever)]:entrytimeout'
-	'--probes[max number of tries to resolve clashing, altering this is discouraged (default 8)]:probes'
+	'--probes[max number of tries to resolve clashing, altering this is discouraged]:tries [8]'
 	'--resize[ratio of increasing hash size after unsuccessful <probes> of double-hashing, altering discouraged]:percent'
 )
 
@@ -100,7 +93,7 @@ case $words[offset+2]; in
 	  	args=(	$hash  )
 	  ;;
 	  list\:set)
-	  	args=(	'--size[size of the new setlist (default 8)]:size'  )
+		args=( '--size[size of the new setlist]:size [8]' )
 	  ;;
 	esac
   ;;
diff --git a/Completion/Solaris/Command/_dtrace b/Completion/Solaris/Command/_dtrace
index 6a6636af3..06e0dc4f6 100644
--- a/Completion/Solaris/Command/_dtrace
+++ b/Completion/Solaris/Command/_dtrace
@@ -12,7 +12,7 @@ case $OSTYPE in
       '-X+[specify ISO C conformance settings for preprocessor]:ISO C conformance:((a\:"ISO plus K&R extensions (default)" c\:"Strictly conformant ISO C" s\:"K&R C only" t\:"ISO plus K&R extensions"))'
     )
     xopts=(
-      'errexit[exit on error with specified status code (default 1)]::status'
+      'errexit[exit on error with specified status code]::status [1]'
       'noresolve[do not perform user address symbol resolution]'
       'uresolve[specify resolution of user addresses]:how:(no symbol basename absolute)'
     )
diff --git a/Completion/Solaris/Command/_prstat b/Completion/Solaris/Command/_prstat
index 1eb38845c..12be9c5a4 100644
--- a/Completion/Solaris/Command/_prstat
+++ b/Completion/Solaris/Command/_prstat
@@ -9,7 +9,7 @@ _prstat()
 	)
 
 	sort_key=(
-		"cpu"\:"process CPU usage (default)"
+		"cpu"\:"process CPU usage"
 		"pri"\:"process priority"
 		"rss"\:"resident set size"
 		"size"\:"size of process image"
@@ -32,8 +32,8 @@ _prstat()
 		'-p[only processes whose process ID is in the list]:PID list' \
 		'-P[only processes or lwps which have most recently executed on a CPU in the list]:CPU list' \
 		'-R[Put prstat in the real time scheduling class]' \
-		'-s[Sort key (descending)]:key:(($sort_key))' \
-		'-S[Sort key (ascending)]:key:(($sort_key))' \
+		'-s[sort key (descending)]:sort key [cpu]:(($sort_key))' \
+		'-S[sort key (ascending)]:sort key [cpu]:(($sort_key))' \
 		'-t[total usage summary for each user]' \
 		'-T[information about processes and tasks]' \
 		'-u[only processes whose effective user ID is in the list]:UID:_users' \
diff --git a/Completion/Unix/Command/_adb b/Completion/Unix/Command/_adb
index 21cd68761..1375813bb 100644
--- a/Completion/Unix/Command/_adb
+++ b/Completion/Unix/Command/_adb
@@ -446,8 +446,8 @@ _adb_dispatch_logcat() {
    _arguments \
      '(-c -g)-s[set default filter to silent]' \
      '(-c -g)-f[log output to file (defaults to stdout)]:logfile:_files' \
-     '(-c -g -d)-r[rotate log every kbytes (default 16, requires -f)]:logsize:_guard "[0-9]#" "numeric value"' \
-     '(-c -g -d)-n[max number of rotated logs (default 4)]:number :_guard "[0-9]#" "numeric value"' \
+     '(-c -g -d)-r[rotate log at specified size, requires -f]:log size (kbytes) [16]' \
+     '(-c -g -d)-n[specify max number of rotated logs]:number [4]' \
      '(-c -g -d)-v[log format]:format: _values "format" brief process tag thread raw time threadtime long' \
      '(-d -t -g)-c[clear log]' \
      '(-c -g)-d[dump log]' \
diff --git a/Completion/Unix/Command/_ant b/Completion/Unix/Command/_ant
index 080ce6857..7401c7449 100644
--- a/Completion/Unix/Command/_ant
+++ b/Completion/Unix/Command/_ant
@@ -56,7 +56,7 @@ _arguments -C \
   '-propertyfile[load all properties from specified file with -D properties taking precedence]:property file:_files -g "*.properties(-.)"' \
   '-inputhandler[specify class which will handle input requests]:class:->class' \
   '(-s -find -f -file -buildfile)'{-s,-find}'[search for specified build file towards the root of filesystem]:build file:(build.xml)' \
-  '-nice[specify a niceness value for the main thread]:niceness value (default 5):({1..10})' \
+  '-nice[specify a niceness value for the main thread]:niceness value [5]:({1..10})' \
   '-nouserlib[run ant without using the jar files from ${user.home}/.ant/lib]' \
   '-noclasspath[run ant without using CLASSPATH]' \
   '-autoproxy[Java1.5+: use the OS proxy settings]' \
diff --git a/Completion/Unix/Command/_django b/Completion/Unix/Command/_django
index 9eaa2284a..1d5cf7311 100644
--- a/Completion/Unix/Command/_django
+++ b/Completion/Unix/Command/_django
@@ -146,9 +146,9 @@ case $state in
         args+=(
           $locale
           $verbosity
-          {-d,--domain=}'[domain of the message files (default: "django")]:domain'
+          {-d,--domain=}'[domain of the message files]:domain [django]:(django djangojs)'
           {-a,--all}'[re-examine all code and templates]'
-          {-e,--extensions=}'[file extension(s) to examine (default: ".html")]:extension'
+          {-e,--extensions=}'[file extension(s) to examine]:extension [html]'
         )
         ;;
 
diff --git a/Completion/Unix/Command/_dtruss b/Completion/Unix/Command/_dtruss
index bd1ae8bc5..b56e713d2 100644
--- a/Completion/Unix/Command/_dtruss
+++ b/Completion/Unix/Command/_dtruss
@@ -2,7 +2,7 @@
 
 _arguments -s : \
   '-a[print all details]' \
-  '-b+[specify dynamic variable buffer size]:buffer size (default 4m)' \
+  '-b+[specify dynamic variable buffer size]:buffer size [4m]' \
   '-c[print system call counts]' \
   '-d[print relative timestamps]' \
   '-e[print elapsed times]' \
diff --git a/Completion/Unix/Command/_gcc b/Completion/Unix/Command/_gcc
index 22d3083de..b6f1da2c6 100644
--- a/Completion/Unix/Command/_gcc
+++ b/Completion/Unix/Command/_gcc
@@ -1643,7 +1643,7 @@ args+=(
   '+e-[control how virtual function definitions are used]:virtual function definitions in classes:((0\:only\ interface 1\:generate\ code))'
   {-e,--entry}'[specify program entry point is entry]:entry'
   {-E,--preprocess}'[preprocess only; do not compile, assemble or link]'
-  '-fabi-version=-[use version <n> of the C++ ABI (default: 2)]:ABI version:(1 2 3 4 5 6)'
+  '-fabi-version=-[use specified C++ ABI version]:ABI version [0]:(0 1 2 3 4 5 6 7 8 9 10 11 12 13)'
   '-fada-spec-parent=[dump Ada specs as child units of given parent]'
   '-faggressive-loop-optimizations[aggressively optimize loops using language constraints]'
   '-falign-functions[align the start of functions]'
@@ -1737,11 +1737,11 @@ args+=(
   '-feliminate-unused-debug-types[perform unused type elimination in debug info]'
   '-femit-class-debug-always[do not suppress C++ class debug information]'
   '-femit-struct-debug-baseonly[aggressive reduced debug info for structs]'
-  '-femit-struct-debug-detailed=[detailed reduced debug info for structs]:spec list'
+  '-femit-struct-debug-detailed=-[detailed reduced debug info for structs]:spec list [all]'
   '-femit-struct-debug-reduced[conservative reduced debug info for structs]'
   '-fexceptions[enable exception handling]'
   '-fexcess-precision=-[specify handling of excess floating-point precision]:precision handling:(fast standard)'
-  '-fexec-charset=[convert all strings and character constants to character set]:character set'
+  '-fexec-charset=-[convert all strings and character constants to character set]:character set [UTF-8]'
   '-fexpensive-optimizations[perform a number of minor, expensive optimizations]'
   '-fextended-identifiers[permit universal character names in identifiers]'
   '-ffast-math[sets -fno-math-errno, -funsafe-math-optimizations, -ffinite-math-only, -fno-rounding-math, -fno-signaling-nans and -fcx-limited-range]'
@@ -1750,8 +1750,7 @@ args+=(
   '-ffixed--[mark <register> as being unavailable to the compiler]:register'
   '-ffloat-store[don'\''t allocate floats and doubles in extended- precision registers]'
   '-fforward-propagate[perform a forward propagation pass on RTL]'
-  '-ffp-contract=-[perform floating- point expression contraction (default: fast)]:style:(on off fast)'
-  '-ffp-contract=[perform floating-point expression contraction]:style:(off on fast)'
+  '-ffp-contract=-[perform floating-point expression contraction]:style [fast]:(on off fast)'
   '-ffp-int-builtin-inexact[allow built-in functions ceil, floor, round, trunc to raise "inexact" exceptions]'
   '-ffreestanding[do not assume that standard C libraries and main exist]'
   '-ffunction-cse[allow function addresses to be held in registers]'
diff --git a/Completion/Unix/Command/_gnupod b/Completion/Unix/Command/_gnupod
index f53ae6c59..22ccabb9d 100644
--- a/Completion/Unix/Command/_gnupod
+++ b/Completion/Unix/Command/_gnupod
@@ -30,8 +30,8 @@ case "$service" in
     '(-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)]'
+    --min-vol-adj='[minimum volume adjustment allowed by ID3v2.4 RVA2 tag]:adjustment (-100..100) [0]'
+    --max-vol-adj='[maximum volume adjustment allowed by ID3v2.4 RVA2 tag]:adjustment (-100..100) [0]'
     --artwork='[use FILE as album cover]:artwork:_files'
     '*:file to add:_files'
 )
diff --git a/Completion/Unix/Command/_initctl b/Completion/Unix/Command/_initctl
index b404c0c16..b60bdbc5b 100644
--- a/Completion/Unix/Command/_initctl
+++ b/Completion/Unix/Command/_initctl
@@ -157,7 +157,7 @@ _initctl()
     '--system[talk via DBUS system bus instead of socket]'
     '(-q --quiet)'{-q,--quiet}'[reduce output to errors only]'
     '(-v --verbose)'{-v,--verbose}'[increase output to include informational messages]'
-    '--dest=[D-Bus name for init, defaults to com.ubuntu.Upstart]'
+    '--dest=[specify D-Bus name for init]:D-Bus name [com.ubuntu.Upstart]'
     '--help[display help and exit]'
     '--version[output version information and exit]'
   )
diff --git a/Completion/Unix/Command/_mysqldiff b/Completion/Unix/Command/_mysqldiff
index 52b96ef21..2515834e0 100644
--- a/Completion/Unix/Command/_mysqldiff
+++ b/Completion/Unix/Command/_mysqldiff
@@ -6,7 +6,7 @@ _mysqldiff () {
     {-p{,1,2},--password{,1,2}=}':server password: ' \
     {-u{,1,2},--user{,1,2}=}':server username:_mysql_users' \
     {-s{,1,2},--socket{,1,2}=}':server socket:_directories' \
-    {-d,--debug=}':debugging level (default 1):(1 2 3 4 5 6 7 8)' \
+    {-d,--debug=}':debugging level [1]:(1 2 3 4 5 6 7 8)' \
     {-i,--tolerant}':ignore DEFAULT and formatting changes: ' \
     {-k,--keep-old-tables}":don\'t output DROP TABLE commands: " \
     {-n,--no-old-defs}"[don't output old defs as comments]" \
diff --git a/Completion/Unix/Command/_pandoc b/Completion/Unix/Command/_pandoc
index bdd261322..98e5abc70 100644
--- a/Completion/Unix/Command/_pandoc
+++ b/Completion/Unix/Command/_pandoc
@@ -134,11 +134,11 @@ _pandoc_top_level_division(){
 _pandoc_email_obfusication(){
   local -a policies
   policies=(
-    'none:(default) leaves mailto: links as they are'
+    'none:leave mailto: links as they are'
     'javascript:obfuscates them using JavaScript'
     'references:obfuscates them by printing their letters as decimal or hexadecimal character references'
   )
-  _describe 'obfusication' policies
+  _describe 'obfuscation policy [none]' policies
 }
 
 # choose wrapping policy
@@ -146,11 +146,11 @@ _pandoc_email_obfusication(){
 _pandoc_wrap() {
   local -a policies
   policies=(
-    'auto:(default) wrap lines to the column width specified by --columns (default 72)'
+    'auto:wrap lines to the column width specified by --columns (default 72)'
     "none:don't wrap lines at all"
     'preserve:attempt to preserve the wrapping from the source document'
   )
-  _describe 'policy' policies
+  _describe 'policy [auto]' policies
 }
 
 # choose eol policy
@@ -170,11 +170,11 @@ _pandoc_eol() {
 _pandoc_track_changes() {
   local -a policies
   policies=(
-    'accept:(default) inserts all insertions, and ignores all deletions'
+    'accept:insert all insertions, and ignore all deletions'
     'reject:inserts all deletions and ignores insertions'
     'all:puts in insertions, deletions, and comments, wrapped in spans with insertion, deletion, comment-start, and comment-end classes, respectively'
   )
-  _describe 'policy' policies
+  _describe 'policy [accept]' policies
 }
 
 # The real thing
@@ -185,7 +185,7 @@ _arguments -s \
   '--data-dir=[specify the user data directory to search for pandoc data files]:data directory:_files -/' \
   {-d+,--defauls=}'[read default from YAMAL file]: :_pandoc_defaults_file' \
   '--shift-heading-level-by=[shift heading levels by specified number]:positive or negative integer: ' \
-  '!--base-header-level=[(deprecated) specify the base level for headers]:number (default 1):(1 2 3 4 5)' \
+  '!--base-header-level=:number [1]:(1 2 3 4 5)' \
   '!--strip-empty-paragraphs[deprecated. Use the +empty_paragraphs extension instead]' \
   '--indented-code-classes=[classes to use for indented code blocks]:class:{_message "Classes separated with ,"}' \
   '--default-image-extension=[specify a default extension to use when image paths/URLs have no extension]:extension: ' \
@@ -195,7 +195,7 @@ _arguments -s \
   {\*-M+,\*--metadata=}'[set the metadata field KEY to the value VALUE]:key\:value: ' \
   '*--metadata_file=[read metadata from file]:YAML or JSON file:_files' \
   {-p,--preserve-tabs}'[preserve tabs instead of converting them to spaces]' \
-  '--tab-stop=[specify the number of spaces per tab (default is 4)]:number:{_message -r "choose a number equals to or greater then 1"}' \
+  '--tab-stop=[specify the number of spaces per tab]:spaces [4]' \
   '--track-changes=[specifies what to do with insertions, deletions, and comments produced by the MS Word "Track Changes" feature]: :_pandoc_track_changes' \
   '--extract-media=[extract media in source document to specified directory]:directory:_files -/' \
   '--abbreviations=[specifies a custom abbreviations file]:file:_files ' \
@@ -207,7 +207,7 @@ _arguments -s \
   '--eol=[manually specify line endings (crlf|lf|native)]: :_pandoc_eol' \
   '--dpi=[specify the dpi (dots per inch) value for conversion from pixels to inch/centimeters and vice versa]:number: ' \
   '--wrap=[determine how text is wrapped in the output (the source code, not the rendered version)]: :_pandoc_wrap ' \
-  '--columns=[specify length of lines in characters (default 72)]:number: ' \
+  '--columns=[specify length of lines in characters]:length [72]' \
   {--toc,--table-of-contents}'[include an automatically generated table of contents]' \
   '--toc-depth=[specify the number of section levels to include in the table of contents]:number:{_message -r "choose a number equals to or greater then 1"}' \
   '--strip-comments[strip out HTML comments in the Markdown or Textile source]' \
@@ -226,11 +226,11 @@ _arguments -s \
   '--ascii[use only ASCII characters in output, supported only for HTML and DocBook output]' \
   '--reference-links[use reference-style links, rather than inline links]' \
   '--reference-location=[specify where footnotes (and references, if reference-links is set) are placed (block|section|document)]: :_pandoc_reference_location' \
-  '--markdown-headings[specify style for level1 and 2 headings in markdown output]:style (default atx):(setext atx)' \
+  '--markdown-headings[specify style for level1 and 2 headings in markdown output]:style [atx]:(setext atx)' \
   '!--atx-headers[use ATX-style headers in Markdown and AsciiDoc output]' \
   '--top-level-division=[treat top-level headers as the given division type in LaTeX, ConTeXt, DocBook, and TEI output]: :_pandoc_top_level_division' \
   {-N,--number-sections}'[number section headings in LaTeX, ConTeXt, HTML, or EPUB output]' \
-  '--number-offset=[offset for section headings in HTML output (ignored in other output formats)]:number[number,...] (default 0): ' \
+  '--number-offset=[offset for section headings in HTML output (ignored in other output formats)]:number[number,...] [0]' \
   '--listings[use the listings package for LaTeX code blocks]' \
   {-i,--incremental}'[make list items in slide shows display incrementally (one by one)]' \
   '--slide-level=[specifies that headers with the specified level create slides (for beamer, s5, slidy, slideous, dzslides)]:slide level:(1 2 3 4 5 6)' \
diff --git a/Completion/Unix/Command/_pbm b/Completion/Unix/Command/_pbm
index 62004f79e..8b5576c5f 100644
--- a/Completion/Unix/Command/_pbm
+++ b/Completion/Unix/Command/_pbm
@@ -740,7 +740,7 @@ ppmtomitsu)
   _arguments \
     '-sharpness:sharpness:(1 2 3 4)' \
     '-enlarge:enlargement factor:(1 2 3)' \
-    '-media:output media (default\: 1184x1350):((A\:1216x1350 A4\:1184x1452 AS\:1216x1650 A4S\:1184x1754))' \
+    '-media:output media [1184x1350]:((A\:1216x1350 A4\:1184x1452 AS\:1216x1650 A4S\:1184x1754))' \
     '-copy:number of copies:(1 2 3 4 5 6 7 8 9)' \
     -{dpi300,tiny} ':file:_pbm'
   ;;
diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce
index 4e69dee78..cb6cdb79f 100644
--- a/Completion/Unix/Command/_perforce
+++ b/Completion/Unix/Command/_perforce
@@ -2551,7 +2551,7 @@ _perforce_cmd_logstat() {
 (( $+functions[_perforce_cmd_logtail] )) ||
 _perforce_cmd_logtail() {
   _arguments -s : \
-    '-b[specify block size, default 8192]:block size: ' \
+    '-b[specify block size]:block size [8192]' \
     '-s[specify start offset]:offset: ' \
     '-m[specify max blocks]:max blocks: '
 }
diff --git a/Completion/Unix/Command/_qemu b/Completion/Unix/Command/_qemu
index 30fcd6757..7bc02c30c 100644
--- a/Completion/Unix/Command/_qemu
+++ b/Completion/Unix/Command/_qemu
@@ -19,8 +19,8 @@ _arguments \
   '-boot[specify which image to boot from]:boot device:((a\:floppy\ image\ a c\:hard\ disk d\:cdrom))' \
   '-snapshot[write to temporary files instead of disk image files]' \
   '-no-fd-bootchk[disable boot sig checking for floppies in Bochs BIOS]' \
-  '-m[virtual RAM size (default=128)]:megs:' \
-  '-smp[set the number of CPUs (default=1)]:number of CPUs:' \
+  '-m[specify virtual RAM size]:size (MB) [128]' \
+  '-smp[set the number of CPUs]:number of CPUs [1]' \
   '-nographic[disable graphical output]' \
   '-vnc[listen on VNC display]:display:' \
   '-k[use keyboard layout]:keyboard layout language:(ar de-ch es fo fr-ca hu ja mk no pt-br sv da en-gb et fr fr-ch is lt nl pl ru th de en-us fi fr-be hr it lv nl-be pt sl tr)' \
diff --git a/Completion/Unix/Command/_ruby b/Completion/Unix/Command/_ruby
index 3ed25a3f0..a57bffcda 100644
--- a/Completion/Unix/Command/_ruby
+++ b/Completion/Unix/Command/_ruby
@@ -21,7 +21,7 @@ common=(
 )
 
 opts=(
-  '-0-[specify record separator]:input record separator in octal [default \0]'
+  '-0-[specify record separator]:input record separator in octal [\0]'
   '-a[autosplit mode with -n or -p (splits $_ into $F)]'
   '-c[check syntax only]'
   '-C+[cd to directory before executing your script]:directory:_files -/'
diff --git a/Completion/Unix/Command/_tidy b/Completion/Unix/Command/_tidy
index 3998ccdb3..35ceb7e51 100644
--- a/Completion/Unix/Command/_tidy
+++ b/Completion/Unix/Command/_tidy
@@ -12,7 +12,7 @@ opts=( ${(M)opts:#*:*} )
 
 _arguments -s -A "-*" --$^opts \
   '(-indent -i)'{-indent,-i}'[indent element content]' \
-  '-wrap[wrap text at the specified <column> (default is 68)]:column:' \
+  '-wrap[wrap text at the specified column]:column [68]' \
   '(-upper -u)'{-upper,-u}'[force tags to upper case (default is lower case)]' \
   '(-clean -c)'{-clean,-c}'[replace FONT, NOBR and CENTER tags by CSS]' \
   '(-bare -b)'{-bare,-b}'[strip out smart quotes and em dashes, etc.]' \
diff --git a/Completion/Unix/Command/_w3m b/Completion/Unix/Command/_w3m
index 8b45ad730..eff9901ca 100644
--- a/Completion/Unix/Command/_w3m
+++ b/Completion/Unix/Command/_w3m
@@ -8,7 +8,7 @@ typeset -A opt_args
 _arguments -C \
   '-t[set tab width]:tab width:' \
   '-r[ignore backspace effect]' \
-  '-l[specify number of preserved lines]:number of lines (default 10000):' \
+  '-l[specify number of preserved lines]:number of lines [10000]' \
   '-I[document charset]:charset:->charset' \
   '-O[display/output charset]:charset:->charset' \
   '(   -s -j)-e[EUC-JP]' \
diff --git a/Completion/X/Command/_vnc b/Completion/X/Command/_vnc
index 9263ab930..7d818cfe7 100644
--- a/Completion/X/Command/_vnc
+++ b/Completion/X/Command/_vnc
@@ -65,10 +65,10 @@ case $service in
 	'-rfbauth[use authentication on RFB protocol]:passwd-file:_files' \
 	'-httpd[serve files via HTTP from here]:dir:_files -/' \
 	'-httpport[port for HTTP]:port:' \
-	'-deferupdate[time in ms to defer updates (default 40)]:time (ms):' \
+	'-deferupdate[specify time to defer updates by]:time (ms) [40]' \
 	'-economictranslate[less memory-hungry translation]' \
 	'-lazytight[disable "gradient" filter in tight encoding]' \
-	'-desktop[VNC desktop name (default x11)]:name:' \
+	'-desktop[specify VNC desktop name]:name [x11]' \
 	'-alwaysshared[always treat new clients as shared]' \
 	'-nevershared[never treat new clients as shared]' \
 	"-dontdisconnect[don't disconnect existing clients for new non-shared connections]" \
diff --git a/Completion/X/Command/_xdvi b/Completion/X/Command/_xdvi
index d55c99485..c33e67bcc 100644
--- a/Completion/X/Command/_xdvi
+++ b/Completion/X/Command/_xdvi
@@ -9,7 +9,7 @@ _xt_arguments \
   '-cr:cursor color:_x_color' \
   '-debug:debugging bitmask:((1\:bitmaps 2\:dvi\ translation 4\:pk\ reading 8\:batch\ operation 16\:events 32\:file\ opening 64\:PostScript\ communication 128\:Kpathsea\ statistics 256\:Kpathsea\ hash\ table\ lookups 512\:Kpathsea\ path\ definitions 1024\:Kpathsea\ path\ expansion 2048\:Kpathsea\ searches))' \
   '-density:font shrink density' \
-  '-gamma:anti-aliasing factor (default 1.0)' \
+  '-gamma:anti-aliasing factor [1.0]' \
   -grid{1,2,3}':grid color:_x_color' \
   '-gspalette:Ghostscript palette:(Color Greyscale Monochrome)' \
   '-hl:page highlight color:_x_color' \
Messages sorted by: Reverse Date, Date, Thread, Author