unposted: fix incorrectly capitalized completion descriptions

13 files changed, 197 insertions, 197 deletions

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'
 }