unposted: fix incorrectly capitalized completion descriptions

6 files changed, 218 insertions, 218 deletions

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'