Yet more shortening

2024-12-27 13:23:09 +00:00 · 2024-05-16 18:49:52 +02:00 · 2024-05-16 18:49:52 +02:00 · 00e0d6ad9d
commit 00e0d6ad9d
parent 2f84f76cc2
20 changed files with 158 additions and 227 deletions
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@ -206,7 +206,7 @@ complete -n '__fish_seen_subcommand_from logcat' -c adb -s B -l binary -d 'Outpu
 complete -n '__fish_seen_subcommand_from logcat' -c adb -s f -l file -d 'Log to file instead of stdout'
 complete -n '__fish_seen_subcommand_from logcat' -c adb -s r -l rotate-kbytes -d 'Rotate log every kbytes, requires -f'
 complete -n '__fish_seen_subcommand_from logcat' -c adb -s n -l rotate-count -d 'Sets number of rotated logs to keep, default 4'
-complete -n '__fish_seen_subcommand_from logcat' -c adb -l id -d ' If the signature <id> for logging to file changes, then clear the associated files and continue'
+complete -n '__fish_seen_subcommand_from logcat' -c adb -l id -d 'If the given signature for logging changes, clear the associated files'
 # logd control
 complete -n '__fish_seen_subcommand_from logcat' -c adb -s g -l buffer-size -d 'Get the size of the ring buffers within logd'
 complete -n '__fish_seen_subcommand_from logcat' -c adb -s G -l buffer-size -d 'Set size of a ring buffer in logd'
--- a/share/completions/bzr.fish
+++ b/share/completions/bzr.fish
@ -90,7 +90,7 @@ complete -f -c bzr -n '__fish_seen_subcommand_from send' -l remember -d 'Remembe
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l mail-to -d 'Mail the request to this address'
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l format -d 'Use the specified output format'
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l no-bundle -d 'Do not include a bundle in the merge directive'
-complete -f -c bzr -n '__fish_seen_subcommand_from send' -l strict -d 'Refuse to send if there are uncommitted changes in the working tree, --no-strict disables the check'
+complete -f -c bzr -n '__fish_seen_subcommand_from send' -l strict -d 'Refuse to send if there are uncommitted changes in the working tree'
 complete -f -c bzr -n '__fish_seen_subcommand_from send' -l no-patch -d 'Do not include a preview patch in the merge directive'
 # log command
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@ -109,9 +109,6 @@ complete -c cargo -n __fish_use_subcommand -f -a owner -d 'Manage the owners of
 complete -c cargo -n __fish_use_subcommand -f -a package -d 'Assemble the local package into a distributable tarball'
 complete -c cargo -n __fish_use_subcommand -f -a pkgid -d 'Print a fully qualified package specification'
 complete -c cargo -n __fish_use_subcommand -f -a publish -d 'Upload a package to the registry'
 complete -c cargo -n __fish_use_subcommand -f -a read-manifest -d 'Print a JSON representation of a Cargo.toml manifest.
 Deprecated, use `cargo metadata --no-deps` instead.'
 complete -c cargo -n __fish_use_subcommand -f -a run -d 'Run a binary or example of the local package'
 complete -c cargo -n __fish_use_subcommand -f -a rustc -d 'Compile a package, and pass extra options to the compiler'
 complete -c cargo -n __fish_use_subcommand -f -a rustdoc -d 'Build a package\'s documentation, using specified custom flags.'
@ -148,7 +145,6 @@ complete -c cargo -n "__fish_seen_subcommand_from bench" -l tests -d 'Benchmark
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l benches -d 'Benchmark all benches'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l all-targets -d 'Benchmark all targets'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l no-run -d 'Compile, but don\'t run benchmarks'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l all -d 'Alias for --workspace (deprecated)'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l workspace -d 'Benchmark all packages in the workspace'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l all-features -d 'Activate all available features'
 complete -c cargo -n "__fish_seen_subcommand_from bench" -l no-default-features -d 'Do not activate the `default` feature'
@ -179,7 +175,6 @@ complete -c cargo -n "__fish_seen_subcommand_from build" -l color -d 'Coloring:
 complete -c cargo -n "__fish_seen_subcommand_from build" -l config -d 'Override a configuration value (unstable)'
 complete -c cargo -n "__fish_seen_subcommand_from build" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
 complete -c cargo -n "__fish_seen_subcommand_from build" -s q -l quiet -d 'No output printed to stdout'
 complete -c cargo -n "__fish_seen_subcommand_from build" -l all -d 'Alias for --workspace (deprecated)'
 complete -c cargo -n "__fish_seen_subcommand_from build" -l workspace -d 'Build all packages in the workspace'
 complete -c cargo -n "__fish_seen_subcommand_from build" -l lib -d 'Build only this package\'s library'
 complete -c cargo -n "__fish_seen_subcommand_from build" -l bins -d 'Build all binaries'
@ -217,7 +212,6 @@ complete -c cargo -n "__fish_seen_subcommand_from check" -l color -d 'Coloring:
 complete -c cargo -n "__fish_seen_subcommand_from check" -l config -d 'Override a configuration value (unstable)'
 complete -c cargo -n "__fish_seen_subcommand_from check" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
 complete -c cargo -n "__fish_seen_subcommand_from check" -s q -l quiet -d 'No output printed to stdout'
 complete -c cargo -n "__fish_seen_subcommand_from check" -l all -d 'Alias for --workspace (deprecated)'
 complete -c cargo -n "__fish_seen_subcommand_from check" -l workspace -d 'Check all packages in the workspace'
 complete -c cargo -n "__fish_seen_subcommand_from check" -l lib -d 'Check only this package\'s library'
 complete -c cargo -n "__fish_seen_subcommand_from check" -l bins -d 'Check all binaries'
@ -278,7 +272,6 @@ complete -c cargo -n "__fish_seen_subcommand_from doc" -l config -d 'Override a
 complete -c cargo -n "__fish_seen_subcommand_from doc" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
 complete -c cargo -n "__fish_seen_subcommand_from doc" -s q -l quiet -d 'No output printed to stdout'
 complete -c cargo -n "__fish_seen_subcommand_from doc" -l open -d 'Opens the docs in a browser after the operation'
 complete -c cargo -n "__fish_seen_subcommand_from doc" -l all -d 'Alias for --workspace (deprecated)'
 complete -c cargo -n "__fish_seen_subcommand_from doc" -l workspace -d 'Document all packages in the workspace'
 complete -c cargo -n "__fish_seen_subcommand_from doc" -l no-deps -d 'Don\'t build documentation for dependencies'
 complete -c cargo -n "__fish_seen_subcommand_from doc" -l document-private-items -d 'Document private items'
@ -324,7 +317,6 @@ complete -c cargo -n "__fish_seen_subcommand_from fix" -l color -d 'Coloring: au
 complete -c cargo -n "__fish_seen_subcommand_from fix" -l config -d 'Override a configuration value (unstable)'
 complete -c cargo -n "__fish_seen_subcommand_from fix" -s Z -d 'Unstable (nightly-only) flags to Cargo, see \'cargo -Z help\' for details'
 complete -c cargo -n "__fish_seen_subcommand_from fix" -s q -l quiet -d 'No output printed to stdout'
 complete -c cargo -n "__fish_seen_subcommand_from fix" -l all -d 'Alias for --workspace (deprecated)'
 complete -c cargo -n "__fish_seen_subcommand_from fix" -l workspace -d 'Fix all packages in the workspace'
 complete -c cargo -n "__fish_seen_subcommand_from fix" -l lib -d 'Fix only this package\'s library'
 complete -c cargo -n "__fish_seen_subcommand_from fix" -l bins -d 'Fix all binaries'
@ -536,7 +528,6 @@ complete -c cargo -n "__fish_seen_subcommand_from pkgid" -l frozen -d 'Require C
 complete -c cargo -n "__fish_seen_subcommand_from pkgid" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from pkgid" -l offline -d 'Run without accessing the network'
 complete -c cargo -n "__fish_seen_subcommand_from publish" -l index -d 'Registry index URL to upload the package to'
 complete -c cargo -n "__fish_seen_subcommand_from publish" -l host -d 'DEPRECATED, renamed to \'--index\''
 complete -c cargo -n "__fish_seen_subcommand_from publish" -l token -d 'Token to use when uploading'
 complete -c cargo -n "__fish_seen_subcommand_from publish" -l target -d 'Build for the target triple' -xa "(__fish_cargo_targets)"
 complete -c cargo -n "__fish_seen_subcommand_from publish" -l target-dir -d 'Directory for all generated artifacts'
@ -665,7 +656,6 @@ complete -c cargo -n "__fish_seen_subcommand_from rustdoc" -l frozen -d 'Require
 complete -c cargo -n "__fish_seen_subcommand_from rustdoc" -l locked -d 'Require Cargo.lock is up to date'
 complete -c cargo -n "__fish_seen_subcommand_from rustdoc" -l offline -d 'Run without accessing the network'
 complete -c cargo -n "__fish_seen_subcommand_from search" -l index -d 'Registry index URL to upload the package to'
 complete -c cargo -n "__fish_seen_subcommand_from search" -l host -d 'DEPRECATED, renamed to \'--index\''
 complete -c cargo -n "__fish_seen_subcommand_from search" -l limit -d 'Limit the number of results (default: 10, max: 100)'
 complete -c cargo -n "__fish_seen_subcommand_from search" -l registry -d 'Registry to use'
 complete -c cargo -n "__fish_seen_subcommand_from search" -l color -d 'Coloring: auto, always, never'
@ -704,7 +694,6 @@ complete -c cargo -n "__fish_seen_subcommand_from test" -l all-targets -d 'Test
 complete -c cargo -n "__fish_seen_subcommand_from test" -l doc -d 'Test only this library\'s documentation'
 complete -c cargo -n "__fish_seen_subcommand_from test" -l no-run -d 'Compile, but don\'t run tests'
 complete -c cargo -n "__fish_seen_subcommand_from test" -l no-fail-fast -d 'Run all tests regardless of failure'
 complete -c cargo -n "__fish_seen_subcommand_from test" -l all -d 'Alias for --workspace (deprecated)'
 complete -c cargo -n "__fish_seen_subcommand_from test" -l workspace -d 'Test all packages in the workspace'
 complete -c cargo -n "__fish_seen_subcommand_from test" -l release -d 'Build artifacts in release mode, with optimizations'
 complete -c cargo -n "__fish_seen_subcommand_from test" -l all-features -d 'Activate all available features'
--- a/share/completions/cf.fish
+++ b/share/completions/cf.fish
@ -28,7 +28,7 @@ complete -f -n __fish_use_subcommand -c cf -a set-env -d "Set an env variable fo
 complete -f -n __fish_use_subcommand -c cf -a unset-env -d "Remove an env variable"
 complete -f -n __fish_use_subcommand -c cf -a stacks -d "List all stacks (stack is a pre-built file system, including an OS, to run apps)"
 complete -f -n __fish_use_subcommand -c cf -a stack -d "Show stack info (stack is a pre-built file system, including an OS, to run apps)"
-complete -f -n __fish_use_subcommand -c cf -a copy-source -d "Copies the source code of an application to another existing application (and restarts that application)"
+complete -f -n __fish_use_subcommand -c cf -a copy-source -d "Copy the source to another existing app (and restart that)"
 complete -f -n __fish_use_subcommand -c cf -a create-app-manifest -d "Create an app manifest for an app that has been pushed successfully"
 complete -f -n __fish_use_subcommand -c cf -a get-health-check -d "Show the type of health check performed on an app"
 complete -f -n __fish_use_subcommand -c cf -a set-health-check -d "Change type of health check performed on an app"
@ -120,8 +120,8 @@ complete -f -n __fish_use_subcommand -c cf -a update-service-broker -d "Update a
 complete -f -n __fish_use_subcommand -c cf -a delete-service-broker -d "Delete a service broker"
 complete -f -n __fish_use_subcommand -c cf -a rename-service-broker -d "Rename a service broker"
 complete -f -n __fish_use_subcommand -c cf -a migrate-service-instances -d "Migrate service instances from one service plan to another"
-complete -f -n __fish_use_subcommand -c cf -a purge-service-offering -d "Recursively remove a service from Cloud Foundry database without requests to service broker"
+complete -f -n __fish_use_subcommand -c cf -a purge-service-offering -d "Recursively remove service from CF database without requests to service broker"
-complete -f -n __fish_use_subcommand -c cf -a purge-service-instance -d "Recursively remove a service instance from Cloud Foundry database without requests to service broker"
+complete -f -n __fish_use_subcommand -c cf -a purge-service-instance -d "Recursively remove service instance from CF database without requests to service broker"
 complete -f -n __fish_use_subcommand -c cf -a service-access -d "List service access settings"
 complete -f -n __fish_use_subcommand -c cf -a enable-service-access -d "Enable access to a service or service plan"
 complete -f -n __fish_use_subcommand -c cf -a disable-service-access -d "Disable access to a service or service plan"
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@ -94,7 +94,7 @@ complete -f -c composer -n __fish_composer_needs_command -a init -d 'Creates a b
 complete -f -c composer -n __fish_composer_needs_command -a install -d 'Install dependencies from composer.lock or composer.json'
 complete -f -c composer -n __fish_composer_needs_command -a licenses -d 'Show information about licenses of dependencies'
 complete -f -c composer -n __fish_composer_needs_command -a list -d 'Lists commands'
-complete -f -c composer -n __fish_composer_needs_command -a outdated -d 'Shows a list of installed packages that have updates available, including their latest version'
+complete -f -c composer -n __fish_composer_needs_command -a outdated -d 'Shows a list of installed packages with available updates'
 complete -f -c composer -n __fish_composer_needs_command -a prohibits -d 'Shows which packages prevent the given package from being installed'
 complete -f -c composer -n __fish_composer_needs_command -a remove -d 'Removes a package from the require or require-dev'
 complete -f -c composer -n __fish_composer_needs_command -a require -d 'Adds required packages to your composer.json and installs them'
@ -207,7 +207,7 @@ complete -f -c composer -n '__fish_composer_using_command list' -l raw -d 'To ou
 complete -f -c composer -n '__fish_composer_using_command list' -l format -d 'The output format (txt, xml, json, or md)'
 # outdated
-complete -f -c composer -n '__fish_composer_using_command outdated' -l outdated -d 'Show only packages that are outdated (this is the default, but present here for compat with `show`'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l outdated -d 'Show only packages that are outdated'
 complete -f -c composer -n '__fish_composer_using_command outdated' -l all -d 'Show all installed packages with their latest versions'
 complete -f -c composer -n '__fish_composer_using_command outdated' -l direct -d 'Shows only packages that are directly required by the root package'
 complete -f -c composer -n '__fish_composer_using_command outdated' -l strict -d 'Return a non-zero exit code when there are outdated packages'
--- a/share/completions/csc.fish
+++ b/share/completions/csc.fish
@ -10,7 +10,7 @@ complete -c csc -s o -o "o+" -o optimize -o "optimize+" -d "Enable optimizations
 complete -c csc -o o- -o optimize- -d "Disable optimizations"
 # Output Files
-complete -c csc -o deterministic -d "Output an assembly whose binary content is identical across compilations if inputs are identical"
+complete -c csc -o deterministic -d "Make output identical across compilations if inputs are identical"
 complete -c csc -o "doc:" -d "Specifies an XML file where processed documentation comments are to be written"
 complete -c csc -o "out:" -d "Specifies the output file"
 complete -c csc -o "pathmap:" -d "Specify a mapping for source path names output by the compiler"
--- a/share/completions/dart.fish
+++ b/share/completions/dart.fish
@ -79,8 +79,8 @@ complete -c dart -n '__fish_seen_subcommand_from run' -l pause-isolates-on-exit
 complete -c dart -n '__fish_seen_subcommand_from run' -l no-pause-isolates-on-exit -d 'Pause isolates on exit when running with --enable-vm-service'
 complete -c dart -n '__fish_seen_subcommand_from run' -l pause-isolates-on-unhandled-exceptions -d 'Pause isolates after unhandled exception when running with --enable-vm-service'
 complete -c dart -n '__fish_seen_subcommand_from run' -l no-pause-isolates-on-unhandled-exceptions -d 'Don\'t pause isolates after unhandled exception when running with --enable-vm-service'
-complete -c dart -n '__fish_seen_subcommand_from run' -l warn-on-pause-with-no-debugger -d 'Print warning when isolate pauses with no attached debugger when running with --enable-vm-service'
+complete -c dart -n '__fish_seen_subcommand_from run' -l warn-on-pause-with-no-debugger -d 'Warn when isolate pauses with no attached debugger when running with --enable-vm-service'
-complete -c dart -n '__fish_seen_subcommand_from run' -l no-warn-on-pause-with-no-debugger -d 'No warning when isolate pauses with no attached debugger when running with --enable-vm-service'
+complete -c dart -n '__fish_seen_subcommand_from run' -l no-warn-on-pause-with-no-debugger -d 'Don\'t warn when isolate pauses with no attached debugger when running with --enable-vm-service'
 complete -c dart -n '__fish_seen_subcommand_from run' -l pause-isolates-on-start -d 'Pause isolates on start when running with --enable-vm-service'
 complete -c dart -n '__fish_seen_subcommand_from run' -l no-pause-isolates-on-start -d 'Don\'t pause isolates on start when running with --enable-vm-service'
 complete -c dart -n '__fish_seen_subcommand_from run' -l enable-asserts -d 'Enable assert statements'
--- a/share/completions/exercism.fish
+++ b/share/completions/exercism.fish
@ -11,17 +11,16 @@ complete -c exercism -s c -l config -d 'path to config file [$EXERCISM_CONFIG_FI
 complete -c exercism -s v -l verbose -d "turn on verbose logging"
 complete -c exercism -s h -l help -d "show help"
 complete -c exercism -s v -l version -d "print the version"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a configure -d "Writes config values to a JSON file."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a configure -d "Writes config values to a JSON file"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a debug -d "Outputs useful debug information."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a debug -d "Outputs useful debug information"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a download -d "Downloads a solution given the ID of the latest iteration."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a download -d "Downloads a solution given the ID of the latest iteration"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a fetch -d "Fetches the next unsubmitted problem in each track."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a fetch -d "Fetches the next unsubmitted problem in each track"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a list -d "Lists the available problems for a language track, given its ID."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a list -d "Lists the available problems for a language track, given its ID"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a open -d "Opens exercism.io to your most recent iteration of a problem given the track ID and problem slug."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a open -d "Opens exercism.io on given problem"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a restore -d "Downloads the most recent iteration for each of your solutions on exercism.io."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a restore -d "Downloads the most recent iteration for each of your solutions on exercism.io"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a skip -d "Skips a problem given a track ID and problem slug."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a skip -d "Skips a problem given a track ID and problem slug"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a status -d "Fetches information about your progress with a given language track."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a status -d "Fetches information about your progress with a given language track"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a submit -d "Submits a new iteration to a problem on exercism.io."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a submit -d "Submits a new iteration to a problem on exercism.io"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a tracks -d "Lists the available language tracks."
+complete -f -n __fish_exercism_no_subcommand -c exercism -a tracks -d "Lists the available language tracks"
-complete -f -n __fish_exercism_no_subcommand -c exercism -a unsubmit -d REMOVED
+complete -f -n __fish_exercism_no_subcommand -c exercism -a upgrade -d "Upgrades the CLI to the latest released version"
 complete -f -n __fish_exercism_no_subcommand -c exercism -a upgrade -d "Upgrades the CLI to the latest released version."
 complete -f -n __fish_exercism_no_subcommand -c exercism -a help -d "show help"
--- a/share/completions/gacutil.fish
+++ b/share/completions/gacutil.fish
@ -20,6 +20,6 @@ complete -c gacutil -o package -c '__fish_seen_argument $COMMANDS' \
 complete -c gacutil -o gacdir -c "__fish_seen_argument $COMMANDS" \
    -d 'Use the GACs base directory'
 complete -c gacutil -o root -c "__fish_seen_argument $COMMANDS" \
-    -d 'Integrate with automake tools or packaging tools that require a prefix directory to be specified'
+    -d 'Integrate with packaging tools that require a prefix directory to be specified'
 complete -c gacutil -o check_refs -c '__fish_seen_argument -s i -o il' \
-    -d 'Check the assembly being installed into the GAC does not reference any non strong named assemblies'
+    -d 'Check the assembly being installed does not reference any non strong named assemblies'
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@ -61,7 +61,6 @@ complete -c gcc -o fno-gnu-keywords -d 'Do not recognize "typeof" as a keyword,
 complete -c gcc -o fno-implicit-templates -d 'Never emit code for non-inline templates which are instantiated implicitly'
 complete -c gcc -o fno-implicit-inline-templates -d 'Don’t emit code for implicit instantiations of inline templates, either'
 complete -c gcc -o fno-implement-inlines -d 'Do not emit out-of-line copies of inline functions controlled by #pragma implementation'
 complete -c gcc -o fms-extensions -d 'Disable pedantic warnings about constructs used in MFC'
 complete -c gcc -o fno-nonansi-builtins -d 'Disable built-ins that are not mandated by ANSI/ISO C'
 complete -c gcc -o fno-operator-names -d 'Do not treat and/bitand/bitor/compl/not/or/xor as keywords'
 complete -c gcc -o fno-optional-diags -d 'Disable diagnostics that the standard says a compiler does not need to issue'
@ -73,20 +72,19 @@ complete -c gcc -o fno-threadsafe-statics -d 'Do not emit code to use C++ ABI ro
 complete -c gcc -o fuse-cxa-atexit -d 'Use "__cxa_atexit" function for static object destructors'
 complete -c gcc -o fvisibility-inlines-hidden -d 'Mark inlined methods with "__attribute__ ((visibility ("hidden")))"'
 complete -c gcc -o fno-weak -d 'Do not use weak symbol support'
 complete -c gcc -o nostdinc++ -d 'Do not search for header files in the standard directories specific to C++'
 complete -c gcc -o fno-default-inline -d 'Do not assume inline for functions defined inside a class scope'
 complete -c gcc -o Wabi -d 'Warn when code is probably incompatible with the vendor-neutral C++ ABI'
 complete -c gcc -o Wctor-dtor-privacy -d 'Warn when a class has no usable con/destructors'
 complete -c gcc -o Wnon-virtual-dtor -d 'Warn when a class requires a virtual destructor but declares a non-virtual one'
-complete -c gcc -o Wreorder -d 'Warn when the order of member initializers does not match the order in which they must be executed'
+complete -c gcc -o Wreorder -d 'Warn when the order of initializers is not the order in which they must be executed'
 complete -c gcc -o Weffc++ -d 'Warn about violations of style guidelines from Scott Meyers’ Effective C++ book'
-complete -c gcc -o Wno-deprecated -d '(C++ only) Do not warn about usage of deprecated features'
+complete -c gcc -o Wno-deprecated -d '(C++) Do not warn about usage of deprecated features'
-complete -c gcc -o Wstrict-null-sentinel -d '(C++ only) Warn also about the use of an uncasted "NULL" as sentinel'
+complete -c gcc -o Wstrict-null-sentinel -d '(C++) Warn also about the use of an uncasted "NULL" as sentinel'
-complete -c gcc -o Wno-non-template-friend -d '(C++ only) Disable warnings when non-templatized friend functions are declared within a template'
+complete -c gcc -o Wno-non-template-friend -d '(C++) Disable warnings for non-templatized friend functions declared in a template'
 complete -c gcc -o Wold-style-cast -d 'Warn if an C-style cast to a non-void type is used in a C++ program'
-complete -c gcc -o Woverloaded-virtual -d '(C++ only) Warn when a function hides virtual functions from a base class'
+complete -c gcc -o Woverloaded-virtual -d '(C++) Warn when a function hides virtual functions from a base class'
-complete -c gcc -o Wno-pmf-conversions -d '(C++ only) Disable the diagnostic for converting a bound pointer to member function to a plain pointer'
+complete -c gcc -o Wno-pmf-conversions -d '(C++) Don\'t warn when converting bound pointer to member function to a plain pointer'
-complete -c gcc -o Wsign-promo -d '(C++ only) Warn when overload resolution promotes from unsigned or enumerated type to a signed type'
+complete -c gcc -o Wsign-promo -d '(C++) Warn when overload resolution promotes from unsigned or enumerated to signed'
 complete -c gcc -o fconstant-string-class -d 'Use class-name as the name of the class to instantiate for each literal string specified with the syntax "@"'
 complete -c gcc -o name -d 'Use class-name as the name of the class to instantiate for each literal string specified with the syntax "@"'
 complete -c gcc -o fgnu-runtime -d 'Generate object code compatible with the standard GNU Objective-C runtime'
@ -96,7 +94,7 @@ complete -c gcc -o fobjc-call-cxx-cdtors -d '(Obj-C), check if instance variable
 complete -c gcc -o fobjc-direct-dispatch -d 'Allow fast jumps to the message dispatcher'
 complete -c gcc -o fobjc-exceptions -d '(Obj-C) Enable syntactic support for structured exception handling'
 complete -c gcc -o fobjc-gc -d 'Enable garbage collection (GC) in Objective-C and Objective-C++ programs'
-complete -c gcc -o freplace-objc-classes -d 'Tell ld(1) not to statically link the object file, and allow dyld(1) to load it at run time instead'
+complete -c gcc -o freplace-objc-classes -d 'Tell ld(1) not to statically link the object file'
 complete -c gcc -o fzero-link
 complete -c gcc -o gen-decls -d 'Dump interface declarations for all classes seen in the source file to a file named sourcename'
 complete -c gcc -o Wassign-intercept -d 'Warn whenever an Objective-C assignment is being intercepted by the garbage collector'
@ -110,12 +108,9 @@ complete -c gcc -o fdiagnostics-show-location -d 'Only meaningful in line-wrappi
 complete -c gcc -o line -d 'Only meaningful in line-wrapping mode'
 complete -c gcc -o fdiagnostics-show-options -d 'Show which option controls a diagnostic'
 complete -c gcc -o fsyntax-only -d 'Check the code for syntax errors, but don’t do anything beyond that'
 complete -c gcc -o pedantic -d 'Issue all warnings demanded by strict ISO C/C++; reject programs with forbidden extensions'
 complete -c gcc -o pedantic-errors -d 'Like -pedantic, except that errors are produced rather than warnings'
 complete -c gcc -s w -d 'Inhibit all warning messages'
 complete -c gcc -o Wno-import -d 'Inhibit warning messages about the use of #import'
 complete -c gcc -o Wchar-subscripts -d 'Warn if an array subscript has type "char"'
 complete -c gcc -o Wcomment -d 'Warn whenever a comment-start sequence appears in a comment'
 complete -c gcc -o Wfatal-errors -d 'Abort compilation on the first error'
 complete -c gcc -o Wformat -d 'Check calls to "printf" and "scanf", etc'
 complete -c gcc -o Wformat-y2k -d 'Warn about "strftime" formats which may yield only a two-digit year'
@ -148,20 +143,17 @@ complete -c gcc -o Wuninitialized -d 'Warn if an automatic variable is used with
 complete -c gcc -o Wunknown-pragmas -d 'Warn when an unknown #pragma directive is encountered'
 complete -c gcc -o Wno-pragmas -d 'Do not warn about misuses of pragmas'
 complete -c gcc -o Wstrict-aliasing -d 'Warn about strict aliasing rules' -a 2
 complete -c gcc -o Wall -d 'All of the above -W options combined'
 complete -c gcc -o Wextra -d 'Enable warnings not enabled by -Wall'
 complete -c gcc -o Wno-div-by-zero -d 'Do not warn about compile-time integer division by zero'
 complete -c gcc -o Wsystem-headers -d 'Print warning messages for constructs found in system header files'
 complete -c gcc -o Wfloat-equal -d 'Warn if floating point values are used in equality comparisons'
-complete -c gcc -o Wtraditional -d '(C only) Warn about certain constructs that behave differently in traditional and ISO C'
+complete -c gcc -o Wdeclaration-after-statement -d '(C) Warn when a declaration is found after a statement in a block'
 complete -c gcc -o Wdeclaration-after-statement -d '(C only) Warn when a declaration is found after a statement in a block'
 complete -c gcc -o Wundef -d 'Warn if an undefined identifier is evaluated in an #if directive'
 complete -c gcc -o Wno-endif-labels -d 'Do not warn whenever an #else or an #endif are followed by text'
 complete -c gcc -o Wshadow -d 'Warn if a local variable shadows another variable or if a built-in function is shadowed'
 complete -c gcc -o Wlarger-than-len -d 'Warn whenever an object of larger than len bytes is defined'
 complete -c gcc -o Wunsafe-loop-optimizations -d 'Warn if a loop cannot be safely optimized'
 complete -c gcc -o Wpointer-arith -d 'Warn about anything that depends on the "size of" a function type or of "void"'
-complete -c gcc -o Wbad-function-cast -d '(C only) Warn whenever a function call is cast to a non-matching type'
+complete -c gcc -o Wbad-function-cast -d '(C) Warn whenever a function call is cast to a non-matching type'
 complete -c gcc -o Wc++-compat -d 'Warn about ISO C constructs that are outside of the common subset of ISO C and ISO C++, e'
 complete -c gcc -o Wcast-qual -d 'Warn whenever a pointer is cast so as to remove a type qualifier from the target type'
 complete -c gcc -o Wcast-align -d 'Warn whenever a pointer is cast such that the required alignment of the target is increased'
@ -170,25 +162,25 @@ complete -c gcc -o Wconversion -d 'Warn if presence of a prototype changes type
 complete -c gcc -o Wsign-compare -d 'Warn when a comparison between signed and unsigned values could produce an incorrect result'
 complete -c gcc -o Waggregate-return -d 'Warn if any functions that return structures or unions are defined or called'
 complete -c gcc -o Wno-attributes -d 'Do not warn if an unexpected "__attribute__" is used'
-complete -c gcc -o Wstrict-prototypes -d '(C only) Warn if a function is declared or defined without specifying the argument types'
+complete -c gcc -o Wstrict-prototypes -d '(C) Warn if a function is declared or defined without specifying the argument types'
-complete -c gcc -o Wold-style-definition -d '(C only) Warn if an old-style function definition is used'
+complete -c gcc -o Wold-style-definition -d '(C) Warn if an old-style function definition is used'
-complete -c gcc -o Wmissing-prototypes -d '(C only) Warn if a global function is defined without a previous prototype declaration'
+complete -c gcc -o Wmissing-prototypes -d '(C) Warn if a global function is defined without a previous prototype declaration'
-complete -c gcc -o Wmissing-declarations -d '(C only) Warn if a global function is defined without a previous declaration'
+complete -c gcc -o Wmissing-declarations -d '(C) Warn if a global function is defined without a previous declaration'
 complete -c gcc -o Wmissing-field-initializers -d 'Warn if a structure’s initializer has some fields missing'
 complete -c gcc -o Wmissing-noreturn -d 'Warn about functions which might be candidates for attribute "noreturn"'
 complete -c gcc -o Wmissing-format-attribute -d 'Warn about function pointers which might be candidates for "format" attributes'
 complete -c gcc -o Wno-multichar -d 'Do not warn if a multicharacter constant (’FOOF’) is used'
-complete -c gcc -o Wnormalized -d 'In ISO C and ISO C++, two identifiers are different if they are different sequences of characters' -x -a "none id nfc nfkc"
+complete -c gcc -o Wnormalized -d 'Warn about identifiers that are not normalized' -x -a "none id nfc nfkc"
 complete -c gcc -o Wno-deprecated-declarations -d 'Do not warn about uses of functions, variables, and types marked as deprecated'
 complete -c gcc -o Wpacked -d 'Warn if a structure is given the packed attribute without effect'
 complete -c gcc -o Wpadded -d 'Warn if padding is included in a structure'
 complete -c gcc -o Wredundant-decls -d 'Warn if anything is declared more than once in the same scope'
-complete -c gcc -o Wnested-externs -d '(C only) Warn if an "extern" declaration is encountered within a function'
+complete -c gcc -o Wnested-externs -d '(C) Warn if an "extern" declaration is encountered within a function'
 complete -c gcc -o Wunreachable-code -d 'Warn if the compiler detects that code will never be executed'
 complete -c gcc -o Winline -d 'Warn if a function can not be inlined and it was declared as inline'
-complete -c gcc -o Wno-invalid-offsetof -d '(C++ only) Suppress warnings from applying the offsetof macro to a non-POD type'
+complete -c gcc -o Wno-invalid-offsetof -d '(C++) Suppress warnings from applying the offsetof macro to a non-POD type'
-complete -c gcc -o Wno-int-to-pointer-cast -d '(C only) Suppress warnings from casts to pointer type of an integer of a different size'
+complete -c gcc -o Wno-int-to-pointer-cast -d '(C) Suppress warnings from casts to pointer type of an integer of a different size'
-complete -c gcc -o Wno-pointer-to-int-cast -d '(C only) Suppress warnings from casts from a pointer to an integer type of a different size'
+complete -c gcc -o Wno-pointer-to-int-cast -d '(C) Suppress warnings from casts from a pointer to an integer type of a different size'
 complete -c gcc -o Winvalid-pch -d 'Warn if a precompiled header is found in the search path but can’t be used'
 complete -c gcc -o Wlong-long -d 'Warn if long long type is used'
 complete -c gcc -o Wvariadic-macros -d 'Warn if variadic macros are used in pedantic mode'
@ -197,7 +189,7 @@ complete -c gcc -o Wdisabled-optimization -d 'Warn if a requested optimization p
 complete -c gcc -o Wpointer-sign -d 'Warn for pointer argument passing or assignment with different signedness'
 complete -c gcc -o Werror -d 'Make all warnings into errors'
 complete -c gcc -o Wstack-protector -d 'Only active when -fstack-protector is active'
-complete -c gcc -s g -d 'Produce debugging information in the operating system’s native format (stabs, COFF, XCOFF, or DWARF 2)'
+complete -c gcc -s g -d 'Produce debugging information in OS’s native format (stabs, COFF, XCOFF, or DWARF 2)'
 complete -c gcc -o ggdb -d 'Produce debugging information for use by GDB'
 complete -c gcc -o gstabs -d 'Produce debugging information in stabs format (if that is supported), without GDB extensions'
 complete -c gcc -o feliminate-unused-debug-symbols -d 'Produce debugging information in stabs format, for only symbols that are actually used'
@ -226,10 +218,8 @@ complete -c gcc -o ftest-coverage -d 'Produce a notes file that the gcov code-co
 # complete -c gcc -o dletters -d 'Says to make debugging dumps during compilation at times specified by letters'
 complete -c gcc -o fdump-rtl-pass -d 'Says to make debugging dumps during compilation at times specified by letters'
 complete -c gcc -o fdump-unnumbered -d 'When doing debugging dumps (-d), suppress instruction numbers and line number note output'
-complete -c gcc -o fdump-translation-unit -d '(C++ only) Dump a representation of the tree structure for the entire translation unit to a file'
+complete -c gcc -o fdump-translation-unit -d '(C++) Dump representation of the tree structure for the entire translation unit'
-complete -c gcc -o fdump-translation-unit-options -d '(C++ only) Dump a representation of the tree structure for the entire translation unit to a file'
+complete -c gcc -o fdump-translation-unit-options -d '(C++) Dump representation of the tree structure for the translation unit'
 complete -c gcc -o fdump-class-hierarchy -d '(C++ only) Dump a representation of each class’s hierarchy and virtual function table layout to a file'
 complete -c gcc -o fdump-class-hierarchy-options -d '(C++ only) Dump a representation of each class’s hierarchy and virtual function table layout to a file'
 complete -c gcc -o fdump-ipa-switch -d 'Control the dumping at various stages of inter-procedural analysis language tree to a file'
 complete -c gcc -o fdump-tree-switch -d 'Control the dumping at various stages of processing the intermediate language tree to a file'
 complete -c gcc -o fdump-tree-switch-options -d 'Control the dumping at various stages of processing the intermediate language tree to a file'
@ -239,7 +229,7 @@ complete -c gcc -o fsched-verbose -d 'Control the amount of debugging output the
 complete -c gcc -o save-temps -d 'Store the usual "temporary" intermediate files in the current directory'
 complete -c gcc -o time -d 'Report the CPU time taken by each subprocess in the compilation sequence'
 complete -c gcc -o fvar-tracking -d 'Run variable tracking pass'
-complete -c gcc -o print-file-name -r -d 'Print the full absolute name of the library file library that would be used when linking---and don\'t do anything else'
+complete -c gcc -o print-file-name -r -d 'Print the full absolute name of the library file library that would be used when linking'
 complete -c gcc -o print-multi-directory -d 'Print the multilib directory'
 complete -c gcc -o print-multi-lib -d 'Print the mapping from multilib directories to compiler switches that enable them'
 complete -c gcc -o print-prog-name -r -d 'Like -print-file-name, but searches for a program such as cpp'
@ -258,7 +248,6 @@ complete -c gcc -o Os -d 'Optimize for size'
 complete -c gcc -o Ofast -d 'Disregard strict standards compliance'
 complete -c gcc -o Og -d 'Optimize debugging experience'
 complete -c gcc -o Oz -d 'Optimize aggressively for size rather than speed'
 complete -c gcc -o fno-default-inline -d 'Do not make member functions inline just because they are defined inside the class (C++)'
 complete -c gcc -o fno-defer-pop -d 'Always pop the arguments to each function call as soon as that function returns'
 complete -c gcc -o fforce-mem -d 'Force memory operands to be copied into registers before doing arithmetic on them'
 complete -c gcc -o fforce-addr -d 'Force memory address constants to be copied into registers before doing arithmetic on them'
@ -270,7 +259,7 @@ complete -c gcc -o finline-functions-called-once -d 'Consider all "static" funct
 complete -c gcc -o fearly-inlining -d 'Inline functions marked by "always_inline" and small functions early'
 complete -c gcc -o finline-limit -d 'By default, GCC limits the size of functions that can be inlined' -x -a "1 2 3 4 5"
 complete -c gcc -o fkeep-inline-functions -d 'In C, keep inline "static" functions in the object file'
-complete -c gcc -o fkeep-static-consts -d 'Emit variables declared "static const" when optimization isn’t turned on, even if the variables aren’t referenced'
+complete -c gcc -o fkeep-static-consts -d 'Emit "static const" variables when optimization isn’t turned on, even when they aren’t referenced'
 complete -c gcc -o fmerge-constants -d 'Attempt to merge identical constants (string and float) across compilation units'
 complete -c gcc -o fmerge-all-constants -d 'Attempt to merge identical constants and identical variables'
 complete -c gcc -o fmodulo-sched -d 'Perform swing modulo scheduling immediately before the first scheduling pass'
@ -285,7 +274,7 @@ complete -c gcc -o fcse-skip-blocks -d 'Like -fcse-follow-jumps, but follow jump
 complete -c gcc -o frerun-cse-after-loop -d 'Re-run common subexpression elimination after loop optimizations has been performed'
 complete -c gcc -o frerun-loop-opt -d 'Run the loop optimizer twice'
 complete -c gcc -o fgcse -d 'Perform a global common subexpression elimination pass'
-complete -c gcc -o fgcse-lm -d 'Global common subexpression elimination: Move loads which are only killed by stores into themselves'
+complete -c gcc -o fgcse-lm -d 'Global common subexpression elimination: Move loads which are killed by stores into themselves'
 complete -c gcc -o fgcse-sm -d 'A store motion pass is run after global common subexpression elimination'
 complete -c gcc -o fgcse-las -d 'global common subexpression elimination pass (eliminates redundant loads)'
 complete -c gcc -o fgcse-after-reload -d 'With -fgcse-after-reload: perform redundant load elimination pass'
@ -298,9 +287,9 @@ complete -c gcc -o fif-conversion2 -d 'Use conditional execution to transform co
 complete -c gcc -o fdelete-null-pointer-checks -d 'Use global dataflow analysis to identify and eliminate useless checks for null pointers'
 complete -c gcc -o fexpensive-optimizations -d 'Perform a number of minor optimizations that are relatively expensive'
 complete -c gcc -o foptimize-register-move -o fregmove -d 'Attempt to reassign register numbers in move instructions to maximize register tying'
-complete -c gcc -o fdelayed-branch -d 'Try to reorder instructions to exploit instruction slots available after delayed branch instructions'
+complete -c gcc -o fdelayed-branch -d 'Try to reorder instructions to use instruction slots after delayed branch instructions'
-complete -c gcc -o fschedule-insns -d 'Try to reorder instructions to eliminate execution stalls due to required data being unavailable'
+complete -c gcc -o fschedule-insns -d 'Try to reorder instructions to eliminate execution stalls'
-complete -c gcc -o fschedule-insns2 -d '-fschedule-insns, but request an additional pass of instruction scheduling after register allocation'
+complete -c gcc -o fschedule-insns2 -d '-fschedule-insns, but more instruction scheduling after register allocation'
 complete -c gcc -o fno-sched-interblock -d 'Don’t schedule instructions across basic blocks'
 complete -c gcc -o fno-sched-spec -d 'Don’t allow speculative motion of non-load instructions'
 complete -c gcc -o fsched-spec-load -d 'Allow speculative motion of some load instructions'
@ -335,11 +324,11 @@ complete -c gcc -o ftree-vectorize -d 'Perform loop vectorization on trees'
 complete -c gcc -o ftree-vect-loop-version -d 'Perform loop versioning when doing loop vectorization on trees'
 complete -c gcc -o ftree-vrp -d 'Perform Value Range Propagation on trees'
 complete -c gcc -o ftracer -d 'Perform tail duplication to enlarge superblock size'
-complete -c gcc -o funroll-loops -d 'Unroll loops whose number of iterations can be determined at compile time or upon entry to the loop'
+complete -c gcc -o funroll-loops -d 'Unroll loops whose number of iterations is known at compile time'
-complete -c gcc -o funroll-all-loops -d 'Unroll all loops, even if their number of iterations is uncertain when the loop is entered'
+complete -c gcc -o funroll-all-loops -d 'Unroll all loops, even if their number of iterations is uncertain when entered'
 complete -c gcc -o fsplit-ivs-in-unroller
 complete -c gcc -o fvariable-expansion-in-unroller -d 'Create multiple copies of local variables when unrolling a loop if it helps'
-complete -c gcc -o fprefetch-loop-arrays -d 'Generate instructions to prefetch memory to improve the performance of loops that access large arrays'
+complete -c gcc -o fprefetch-loop-arrays -d 'Generate instructions to prefetch memory for loops that access large arrays'
 complete -c gcc -o fno-peephole -d 'Disable any machine-specific peephole optimizations'
 complete -c gcc -o fno-peephole2 -d 'Disable any machine-specific peephole optimizations'
 complete -c gcc -o fno-guess-branch-probability -d 'Do not guess branch probabilities using heuristics'
@ -348,7 +337,7 @@ complete -c gcc -o freorder-blocks-and-partition -d 'Reorder basic blocks and pa
 complete -c gcc -o freorder-functions -d 'Reorder functions in the object file in order to improve code locality'
 complete -c gcc -o fstrict-aliasing -d 'Assume strictest aliasing rules'
 complete -c gcc -o falign-functions -d 'Align the start of functions to the next power-of-two greater than n, skipping up to n bytes'
-complete -c gcc -o falign-labels -d 'Align all branch targets to a power-of-two boundary, skipping up to n bytes like -falign-functions'
+complete -c gcc -o falign-labels -d 'Align all branch targets to power-of-two boundary, skipping up to n bytes'
 complete -c gcc -o falign-loops -d 'Align loops to a power-of-two boundary, skipping up to n bytes like -falign-functions'
 complete -c gcc -o falign-jumps -d 'Align branch targets to a power-of-two, skipping bytes'
 complete -c gcc -o funit-at-a-time -d 'Parse the whole compilation unit before starting to produce code'
@ -372,13 +361,9 @@ complete -c gcc -o fbranch-probabilities -d 'Optimize based on the number of tim
 complete -c gcc -o fprofile-values -d 'With -fprofile-arcs: gather data about values of expressions'
 complete -c gcc -o fvpt -d 'With -fprofile-arcs: gather information about values of expressions'
 complete -c gcc -o frename-registers -d 'Make use of registers left over after register allocation'
 complete -c gcc -o ftracer -d 'Perform tail duplication to enlarge superblock size'
 complete -c gcc -o funroll-loops -d 'Unroll loops whose number of iterations can be determined at compile time or upon entry to the loop'
 complete -c gcc -o funroll-all-loops -d 'Unroll all loops, even if their number of iterations is uncertain when the loop is entered'
 complete -c gcc -o fpeel-loops -d 'Peel loops that do not roll much (from profile feedback)'
 complete -c gcc -o fmove-loop-invariants -d 'Enables the loop invariant motion pass in the new loop optimizer'
 complete -c gcc -o funswitch-loops -d 'Move branches with loop invariant conditions out of the loop'
 complete -c gcc -o fprefetch-loop-arrays -d 'Generate instructions to prefetch memory to improve the performance of loops that access large arrays'
 complete -c gcc -o ffunction-sections -d 'Place each function or data item into its own section in the output file if possible'
 complete -c gcc -o fdata-sections -d 'Place each function or data item into its own section in the output file if possible'
 complete -c gcc -o fbranch-target-load-optimize -d 'Perform branch target register load optimization before prologue / epilogue threading'
@ -393,15 +378,13 @@ complete -c gcc -o undef -d 'Do not predefine any system-specific or GCC-specifi
 complete -c gcc -s I -d 'Add the directory dir to the list of directories to be searched for header files'
 complete -c gcc -o Wall -d 'Turns on all optional warnings which are desirable for normal code'
 complete -c gcc -o Wcomment -o Wcomments -d 'Warn for "/*" in a /* comment and backslash-newline in a // comment'
 complete -c gcc -o Wtrigraphs -d 'Most trigraphs in comments cannot affect the meaning of the program'
 complete -c gcc -o Wtraditional -d 'Warn about certain constructs that behave differently in traditional and ISO C'
 complete -c gcc -o Wimport -d 'Warn the first time #import is used'
 complete -c gcc -o Wunused-macros -d 'Warn about macros defined in the main file that are unused'
 complete -c gcc -o Wendif-labels -d 'Warn whenever an #else or an #endif are followed by text'
 complete -c gcc -o Werror -d 'Make all warnings into hard errors'
 complete -c gcc -o Wsystem-headers -d 'Issue warnings for code in system headers'
 complete -c gcc -o pedantic -d 'Issue all the mandatory diagnostics listed in the C standard'
-complete -c gcc -o pedantic-errors -d 'Issue all the mandatory diagnostics, and make all mandatory diagnostics into errors'
+complete -c gcc -o pedantic-errors -d 'Issue all the mandatory diagnostics, and make them errors'
 complete -c gcc -s M -d 'Output make code for the main source file\'s dependencies'
 complete -c gcc -o MM -d 'Like -M but ignore headers in system header directories and what they include'
 complete -c gcc -o MF -d 'When used with -M or -MM, specifies a file to write the dependencies to' -x
@ -417,7 +400,6 @@ complete -c gcc -s x -d 'Specify the source language' -a 'c  c-header  cpp-outpu
 c++  c++-header  c++-cpp-output objective-c  objective-c-header  objective-c-cpp-output
 objective-c++ objective-c++-header objective-c++-cpp-output
 assembler  assembler-with-cpp ada f77  f77-cpp-input f95  f95-cpp-input go brig'
 complete -c gcc -o ansi -d 'Specify the standard to which the code should conform'
 complete -c gcc -o nostdinc -d 'Do not search the standard system directories for header files'
 complete -c gcc -o nostdinc++ -d 'Do not search for header files in the C++-specific standard directories'
 complete -c gcc -o include -d 'Process file as if "#include "file"" appeared as the first line of the primary source file'
@ -427,8 +409,7 @@ complete -c gcc -o iprefix -d 'Specify prefix as the prefix for subsequent -iwit
 complete -c gcc -o iwithprefix -d 'Append dir to prefix defined with -iprefix, to same place as -I'
 complete -c gcc -o iwithprefixbefore -d 'Append dir to prefix defined with -iprefix, to same place as -idirafter'
 complete -c gcc -o isysroot -d 'Like the --sysroot option, but only to header files'
-complete -c gcc -o isystem -d 'Search dir for headers, after directories specified by -I but before standard system directories'
+complete -c gcc -o isystem -d 'Search dir for headers, after -I dirs but before standard system dirs'
 complete -c gcc -o iquote -d 'Search dir only for header files requested with "#include "file""'
 complete -c gcc -o fdollars-in-identifiers -d 'Accept $ in identifiers'
 complete -c gcc -o fextended-identifiers -d 'Accept universal character names in identifiers'
 complete -c gcc -o fpreprocessed -d 'Indicate to the preprocessor that the input file has already been preprocessed'
@ -441,12 +422,10 @@ complete -c gcc -o fno-show-column -d 'Do not print column numbers in diagnostic
 complete -c gcc -s A -d 'Make an assertion with the predicate predicate and answer answer'
 complete -c gcc -s A -d 'Cancel an assertion with the predicate predicate and answer answer' -x
 complete -c gcc -o predicate -d 'Cancel an assertion with the predicate predicate and answer answer' -x
-complete -c gcc -o d -d 'CHARS is a sequence of one or more of the following characters, and must not be preceded by a space' -x
+complete -c gcc -o d -d 'Make debug dumps according to these arguments' -x -a 'M D N I U'
 complete -c gcc -s P -d 'Inhibit generation of linemarkers in the output from the preprocessor'
 complete -c gcc -s C -d 'Do not discard comments'
 complete -c gcc -o CC -d 'Do not discard comments, including during macro expansion'
 complete -c gcc -o traditional-cpp -d 'Try to imitate the behavior of old-fashioned C preprocessors, as opposed to ISO C preprocessors'
 complete -c gcc -o trigraphs -d 'Process trigraph sequences'
 complete -c gcc -o remap -d 'Work around file systems with very short file names, such as MS-DOS'
 complete -c gcc -l help -d 'Print text describing all the command line options instead of preprocessing anything'
 complete -c gcc -l target-help -d 'Print text describing all the command line options instead of preprocessing anything'
@ -459,7 +438,7 @@ complete -c gcc -o ldl -d 'Search the dynamic loader library when linking'
 complete -c gcc -o lm -d 'Search the math library when linking'
 complete -c gcc -o lz -d 'Search the zlib library when linking'
 complete -c gcc -o lrt -d 'Search the realtime extensions library when linking'
-complete -c gcc -o lobjc -d 'You need this special case of the -l option in order to link an Objective-C or Objective-C++ program'
+complete -c gcc -o lobjc -d 'Link an Objective-C or Objective-C++ program'
 complete -c gcc -o nostartfiles -d 'Do not use the standard system startup files when linking'
 complete -c gcc -o nodefaultlibs -d 'Do not use the standard system libraries when linking'
 complete -c gcc -o nostdlib -d 'Do not use the standard system startup files or libraries when linking'
@ -501,14 +480,14 @@ complete -c gcc -o mpic-register -x -d 'Specify the register to be used for PIC
 complete -c gcc -o mcirrus-fix-invalid-insns -d 'Insert NOPs to work around invalid Maverick instruction combinations'
 complete -c gcc -o mpoke-function-name -d 'Write the name of each function into the text section, directly preceding the function prologue'
 complete -c gcc -o mthumb -d 'Generate code for the 16-bit Thumb instruction set'
-complete -c gcc -o mtpcs-frame -d 'Generate a stack frame compliant with the Thumb Procedure Call Standard for all non-leaf functions'
+complete -c gcc -o mtpcs-frame -d 'Generate a stack frame compliant with Thumb Procedure Call Standard for non-leaf functions'
-complete -c gcc -o mtpcs-leaf-frame -d 'Generate a stack frame compliant with the Thumb Procedure Call Standard for all leaf functions'
+complete -c gcc -o mtpcs-leaf-frame -d 'Generate a stack frame compliant with Thumb Procedure Call Standard for leaf functions'
 complete -c gcc -o mcallee-super-interworking
 complete -c gcc -o mcaller-super-interworking
 complete -c gcc -o mtp -x -d 'Specify the access model for the thread local storage pointer'
 complete -c gcc -o mmcu -x -d 'Specify ATMEL AVR instruction set or MCU type'
 complete -c gcc -o msize -d 'Output instruction sizes to the asm file'
-complete -c gcc -o minit-stack -x -d 'Specify the initial stack address, which may be a symbol or numeric value, __stack is the default'
+complete -c gcc -o minit-stack -x -d 'Specify the initial stack address (symbol or numeric value)'
 complete -c gcc -o mno-interrupts -d 'Generated code is not compatible with hardware interrupts'
 complete -c gcc -o mcall-prologues -d 'Functions prologues/epilogues expanded as call to appropriate subroutines'
 complete -c gcc -o mno-tablejump -d 'Do not generate tablejump insns which sometimes increase code size'
@ -553,7 +532,6 @@ complete -c gcc -o mgotplt
 complete -c gcc -o sim -d 'Arrange to link with a simulator library'
 complete -c gcc -o sim2 -d 'Like -sim, but put initialized data at 0x40000000 and zero-initialized data at 0x80000000'
 complete -c gcc -o mmac -d 'Enable the use of multiply-accumulate instructions'
 complete -c gcc -o mpush-args -d 'Push instructions will be used to pass outgoing arguments when functions are called'
 complete -c gcc -o Fdir -d 'Add the framework dir to the list of directories to be searched for headers'
 complete -c gcc -o gused -d 'Emit debugging information for symbols that are used'
 complete -c gcc -o gfull -d 'Emit debugging information for all symbols and types'
@ -564,17 +542,15 @@ complete -c gcc -o ffix-and-continue -d 'Generate code suitable for fast turn ar
 complete -c gcc -o findirect-data -d 'Generate code suitable for fast turn around development'
 complete -c gcc -o all_load -d 'Loads all members of static archive libraries'
 complete -c gcc -o arch_errors_fatal -d 'Cause the errors having to do with files that have the wrong architecture to be fatal'
-complete -c gcc -o bind_at_load -d 'Mark the output file so that the dynamic linker binds undefined references when the file is loaded'
+complete -c gcc -o bind_at_load -d 'Let dynamic linker bind undefined references when the file is loaded'
 complete -c gcc -o bundle -d 'Produce a Mach-o bundle format file'
 complete -c gcc -o bundle_loader -d 'Specifies the executable that will be loading the build output file being linked'
-complete -c gcc -o dynamiclib -d 'Produce a dynamic library instead of an executable when linking, using the Darwin libtool command'
+complete -c gcc -o dynamiclib -d 'Produce a dynamic library, using the Darwin libtool command'
 complete -c gcc -o force_cpusubtype_ALL -d 'Make output have the ALL subtype, instead of one controlled by -mcpu or -march'
 complete -c gcc -o mfp-reg -d 'Use the floating-point register set'
 complete -c gcc -o mno-fp-regs -d 'Do not use the floating-point register set'
 complete -c gcc -o mieee -d 'The Alpha architecture implements floating-point hardware optimized for maximum performance'
 complete -c gcc -o mieee-with-inexact -d 'This is like -mieee except the generated code also maintains the IEEE inexact-flag'
 complete -c gcc -o mfp-trap-mode -d 'This option controls what floating-point related traps are enabled'
 complete -c gcc -o mode -d 'This option controls what floating-point related traps are enabled'
 complete -c gcc -o mfp-rounding-mode -d 'Selects the IEEE rounding mode'
 complete -c gcc -o mode -d 'Selects the IEEE rounding mode'
 complete -c gcc -o mtrap-precision -d 'In the Alpha architecture, floating point traps are imprecise'
@ -592,10 +568,6 @@ complete -c gcc -o mmax -d 'Use MAX instruction set'
 complete -c gcc -o mno-max -d 'Do not use MAX instruction set'
 complete -c gcc -o mfloat-vax -d 'Use VAX F and G floating point arithmetic'
 complete -c gcc -o mfloat-ieee -d 'Do not use VAX F and G floating point arithmetic'
 # complete -c gcc -o mexplicit-relocs -d 'Older Alpha assemblers provided no way to generate symbol relocations except via assembler macros'
 # complete -c gcc -o mno-explicit-relocs -d 'Older Alpha assemblers provided no way to generate symbol relocations except via assembler macros'
 # complete -c gcc -o msmall-data -d 'When -mexplicit-relocs is in effect, static data is accessed via gp-relative relocations'
 # complete -c gcc -o mlarge-data -d 'When -mexplicit-relocs is in effect, static data is accessed via gp-relative relocations'
 complete -c gcc -o msmall-text -d 'Assume that the code is small enough to be reachable with a branch instruction'
 complete -c gcc -o mlarge-text -d 'Does not assume that the code is small enough to be reachable with a branch instruction'
 complete -c gcc -o mmemory-latency -d '=time Sets the latency the scheduler should assume for typical memory references'
@ -618,12 +590,12 @@ complete -c gcc -o mno-media -d 'Do not use media instructions'
 complete -c gcc -o mmuladd -d 'Use multiply and add/subtract instructions'
 complete -c gcc -o mno-muladd -d 'Do not use multiply and add/subtract instructions'
 complete -c gcc -o mfdpic -d 'Select the FDPIC ABI, that uses function descriptors to represent pointers to functions'
-complete -c gcc -o minline-plt -d 'Enable inlining of PLT entries in function calls to functions that are not known to bind locally'
+complete -c gcc -o minline-plt -d 'Enable inlining of PLT entries for functions that are not known to bind locally'
 complete -c gcc -o mTLS -d 'Assume a large TLS segment when generating thread-local code'
 complete -c gcc -o mtls -d 'Do not assume a large TLS segment when generating thread-local code'
 complete -c gcc -o mgprel-ro -d 'Enable the use of "GPREL" relocations in the FDPIC ABI for data that is known to be in read-only sections'
 complete -c gcc -o multilib-library-pic -d 'Link with the (library, not FD) pic libraries'
-complete -c gcc -o mlinked-fp -d 'Follow the EABI requirement of always creating a frame pointer whenever a stack frame is allocated'
+complete -c gcc -o mlinked-fp -d 'Always create a frame pointer when a stack frame is allocated (EABI requirement)'
 complete -c gcc -o malign-labels -d 'Try to align labels to an 8-byte boundary by inserting nops into the previous packet'
 complete -c gcc -o mlibrary-pic -d 'Generate position-independent EABI code'
 complete -c gcc -o macc-4 -d 'Use only the first four media accumulator registers'
@ -651,7 +623,6 @@ complete -c gcc -o mh -d 'Generate code for the H8/300H'
 complete -c gcc -o ms -d 'Generate code for the H8S'
 complete -c gcc -o mn -d 'Generate code for the H8S and H8/300H in the normal mode'
 complete -c gcc -o ms2600 -d 'Generate code for the H8S/2600'
 complete -c gcc -o mint32 -d 'Make "int" data 32 bits by default'
 complete -c gcc -o malign-300 -d 'On the H8/300H and H8S, use the same alignment rules as for the H8/300'
 complete -c gcc -o mbig-switch -d 'Generate code suitable for big switch tables'
 complete -c gcc -o mjump-in-delay -d 'Fill delay slots of function calls with unconditional jump instructions'
@ -663,7 +634,6 @@ complete -c gcc -o mfixed-range -d 'Generate code treating the given register ra
 complete -c gcc -o range -d 'Generate code treating the given register range as fixed registers'
 complete -c gcc -o mlong-load-store -d 'Generate 3-instruction load and store sequences as sometimes required by the HP-UX 10 linker'
 complete -c gcc -o mportable-runtime -d 'Use the portable calling conventions proposed by HP for ELF systems'
 complete -c gcc -o mgas -d 'Enable the use of assembler directives only GAS understands'
 complete -c gcc -o mschedule -d 'Schedule code according to the constraints for the machine type cpu-type'
 complete -c gcc -o mlinker-opt -d 'Enable the optimization pass in the HP-UX linker'
 complete -c gcc -o msio -d 'Generate the predefine, "_SIO", for server IO'
@ -671,8 +641,6 @@ complete -c gcc -o mgnu-ld -d 'Use GNU ld specific options'
 complete -c gcc -o mhp-ld -d 'Use HP ld specific options'
 complete -c gcc -o munix -d 'Generate compiler predefines and select a startfile for the specified UNIX standard'
 complete -c gcc -o nolibdld -d 'Suppress the generation of link options to search libdld'
 complete -c gcc -o static -d 'The HP-UX implementation of setlocale in libc has a dependency on libdld'
 complete -c gcc -o threads -d 'Add support for multithreading with the dce thread library under HP-UX'
 complete -c gcc -o mfpmath -d '=unit Generate floating point arithmetics for selected unit unit'
 complete -c gcc -o masm -d '=dialect Output asm instructions using selected dialect'
 complete -c gcc -o mieee-fp -d 'Control whether or not the compiler uses IEEE floating point comparisons'
@ -686,8 +654,6 @@ complete -c gcc -o m128bit-long-double -d 'These switches control the size of "l
 complete -c gcc -o mmlarge-data-threshold -d '=number With -mcmodel=medium: place data greater than threshold in large data section'
 complete -c gcc -o msvr3-shlib -d 'Control whether GCC places uninitialized local variables into the "bss" or "data" segments'
 complete -c gcc -o mno-svr3-shlib -d 'Control whether GCC places uninitialized local variables into the "bss" or "data" segments'
 complete -c gcc -o mrtd -d 'Let functions that take a fixed number of arguments return with the "ret" num instruction'
 complete -c gcc -o mregparm -d '=num Control how many registers are used to pass integer arguments'
 complete -c gcc -o msseregparm -d 'Use SSE register passing conventions for float and double arguments and return values'
 complete -c gcc -o mpreferred-stack-boundary -d '=num Attempt to keep the stack boundary aligned to a 2 raised to num byte boundary'
 complete -c gcc -o mmmx
@ -704,11 +670,10 @@ complete -c gcc -o m3dnow
 complete -c gcc -o mno-3dnow
 complete -c gcc -o mpush-args -d 'Use PUSH operations to store outgoing parameters'
 complete -c gcc -o mno-push-args -d 'Don\'t use PUSH operations to store outgoing parameters'
-complete -c gcc -o maccumulate-outgoing-args -d 'The maximum amount of space required for outgoing arguments will be computed in the function prologue'
+complete -c gcc -o maccumulate-outgoing-args -d 'Reserve space for outgoing args in the function prologue'
 complete -c gcc -o mthreads -d 'Support thread-safe exception handling on Mingw32'
 complete -c gcc -o mno-align-stringops -d 'Do not align destination of inlined string operations'
 complete -c gcc -o minline-all-stringops -d 'Enable string operation inlining even without alignment'
 complete -c gcc -o momit-leaf-frame-pointer -d 'Don’t keep the frame pointer in a register for leaf functions'
 complete -c gcc -o mtls-direct-seg-refs -d 'TLS variables may be accessed with offsets from the TLS segment register'
 complete -c gcc -o mno-tls-direct-seg-refs -d 'TLS variables may not accessed with offsets from the TLS segment register'
 complete -c gcc -o m32 -d 'Generate code for a 32-bit environment'
@ -716,14 +681,12 @@ complete -c gcc -o m64 -d 'Generate code for a 64-bit environment'
 complete -c gcc -o mno-red-zone -d 'Do not use a so called red zone for x86-64 code'
 complete -c gcc -o mgnu-as -d 'Generate code for the GNU assembler'
 complete -c gcc -o mno-gnu-as -d 'Don\'t generate code for the GNU assembler'
 complete -c gcc -o mgnu-ld -d 'Generate code for the GNU linker'
 complete -c gcc -o mno-gnu-ld -d 'Don\'t generate code for the GNU linker'
 complete -c gcc -o mno-pic -d 'Do not use a global pointer register'
 complete -c gcc -o mvolatile-asm-stop -d 'Generate (or don’t) a stop bit immediately before and after volatile asm statements'
 complete -c gcc -o mno-volatile-asm-stop -d 'Generate (or don’t) a stop bit immediately before and after volatile asm statements'
 complete -c gcc -o mregister-names -d 'Generate (or don’t) in, loc, and out register names for the stacked registers'
 complete -c gcc -o mno-register-names -d 'Generate (or don’t) in, loc, and out register names for the stacked registers'
 complete -c gcc -o mno-sdata -d 'Disable (or enable) optimizations that use the small data section'
 complete -c gcc -o mconstant-gp -d 'Use a single constant global pointer value'
 complete -c gcc -o mauto-pic -d 'Generate code that is self-relocatable'
 complete -c gcc -o minline-float-divide-min-latency -d 'Inline divides of floating point values using the minimum latency algorithm'
@ -732,12 +695,10 @@ complete -c gcc -o minline-int-divide-min-latency -d 'Inline divides of integer
 complete -c gcc -o minline-int-divide-max-throughput -d 'Inline divides of integer values using the maximum throughput algorithm'
 complete -c gcc -o minline-sqrt-min-latency -d 'Inline square roots using the minimum latency algorithm'
 complete -c gcc -o minline-sqrt-max-throughput -d 'Inline square roots using the maximum throughput algorithm'
-complete -c gcc -o mno-dwarf2-asm -d 'Don’t (or do) generate assembler code for the DWARF2 line number debugging info'
+complete -c gcc -o mno-dwarf2-asm -d 'Don’t generate assembler code for the DWARF2 line number debugging info'
-complete -c gcc -o mdwarf2-asm -d 'Don’t (or do) generate assembler code for the DWARF2 line number debugging info'
+complete -c gcc -o mdwarf2-asm -d 'Generate assembler code for the DWARF2 line number debugging info'
-complete -c gcc -o mearly-stop-bits -d 'Allow stop bits to be placed earlier than immediately preceding the instruction that triggered them'
+complete -c gcc -o mearly-stop-bits -d 'Allow stop bits to be placed earlier than immediately before the triggering instruction'
-complete -c gcc -o mno-early-stop-bits -d 'Allow stop bits to be placed earlier than immediately preceding the instruction that triggered them'
+complete -c gcc -o mno-early-stop-bits -d 'Disallow stop bits to be placed earlier than immediately before the triggering instruction'
 complete -c gcc -o mfixed-range -d 'Generate code treating the given register range as fixed registers'
 complete -c gcc -o range -d 'Generate code treating the given register range as fixed registers'
 complete -c gcc -o mtls-size -d 'Specify bit size of immediate TLS offsets'
 complete -c gcc -o size -d 'Specify bit size of immediate TLS offsets'
 complete -c gcc -o mt -d 'Add support for multithreading using the POSIX threads library'
@ -745,7 +706,7 @@ complete -c gcc -o pthread -d 'Add support for multithreading using the POSIX th
 complete -c gcc -o milp32 -d 'Generate code for a 32-bit environment'
 complete -c gcc -o mlp64 -d 'Generate code for a 64-bit environment'
 complete -c gcc -o msim -d 'Specifies that the program will be run on the simulator'
-complete -c gcc -o memregs -d '=number Specifies the number of memory-based pseudo-registers GCC will use during code generation'
+complete -c gcc -o memregs -d '=number The number of available memory-based pseudo-registers'
 complete -c gcc -o m32r2 -d 'Generate code for the M32R/2'
 complete -c gcc -o m32rx -d 'Generate code for the M32R/X'
 complete -c gcc -o m32r -d 'Generate code for the M32R'
@ -753,8 +714,9 @@ complete -c gcc -o mmodel -xa "small\t'Assume all objects live in the lower 16MB
 complete -c gcc -o msdata -xa 'none\t"Disable use of the small data area"
 sdata\t"Put small global and static data in the small data area, but do not generate special code to reference them"
 use\t"Put small global and static data in the small data area, and generate special instructions to reference them"'
-complete -c gcc -s G -d 'Put global and static objects less than or equal to num bytes into the small data or bss sections' -xa '(seq 100)'
+complete -c gcc -s G -d 'Put global and static objects <= num bytes into the small data or bss sections' -xa '(seq 100)'
 complete -c gcc -o mdebug -d 'Print additional debug info'
 complete -c gcc -o mno-debug -d 'Do not print additional debug info'
 complete -c gcc -o malign-loops -d 'Align all loops to a 32-byte boundary'
 complete -c gcc -o mno-align-loops -d 'Do not enforce a 32-byte alignment for loops'
 complete -c gcc -o missue-rate -d '=number Issue number instructions per cycle'
@ -781,14 +743,11 @@ complete -c gcc -o mbitfield -d 'Do use the bit-field instructions'
 complete -c gcc -o mrtd -d 'Let functions that take a fixed number of arguments return with the "rtd" instruction'
 complete -c gcc -o malign-int -d 'Make GCC align "int", "long", "long long", "float", "double", and "long double" variables on a 32-bit boundary'
 complete -c gcc -o mno-align-int -d 'Make GCC aligns "int", "long", "long long", "float", "double", and "long double" variables on 16-bit boundary'
-complete -c gcc -o mpcrel -d 'Use the pc-relative addressing mode of the 68000 directly, instead of using a global offset table'
+complete -c gcc -o mpcrel -d 'Use the pc-relative addressing mode of the 68000 directly'
 complete -c gcc -o mno-strict-align -d 'Do not (do) assume that unaligned memory references will be handled by the system'
 complete -c gcc -o mstrict-align -d 'Do not (do) assume that unaligned memory references will be handled by the system'
 complete -c gcc -o msep-data -d 'Allow the data segment to be located in a different area of memory from the text segment'
 complete -c gcc -o mno-sep-data -d 'Assume that the data segment follows the text segment'
 complete -c gcc -o mid-shared-library -d 'Support shared libraries via the library ID method'
 complete -c gcc -o mno-id-shared-library -d 'Don’t assume ID based shared libraries are being used'
 complete -c gcc -o mshared-library-id -d '=n Specified the identification number of the ID based shared library being compiled'
 complete -c gcc -o m6811 -d 'Generate output for a 68HC11'
 complete -c gcc -o m68hc11 -d 'Generate output for a 68HC11'
 complete -c gcc -o m6812 -d 'Generate output for a 68HC12'
@ -798,7 +757,6 @@ complete -c gcc -o m68hcs12 -d 'Generate output for a 68HCS12'
 complete -c gcc -o mauto-incdec -d 'Enable the use of 68HC12 pre and post auto-increment and autodecrement addressing modes'
 complete -c gcc -o minmax -d 'Enable the use of 68HC12 min and max instructions'
 complete -c gcc -o nominmax -d 'Enable the use of 68HC12 min and max instructions'
 complete -c gcc -o mshort -d 'Consider type "int" to be 16 bits wide, like "short int"'
 complete -c gcc -o msoft-reg-count -d '=count Specify the number of pseudo-soft registers which are used for the code generation'
 complete -c gcc -o mhardlit -d 'Inline constants into the code stream if it can be done in two instructions or less'
 complete -c gcc -o mno-hardlit -d 'Inline constants into the code stream if it can be done in two instructions or less'
@ -827,10 +785,10 @@ complete -c gcc -o mips32r2 -d 'Equivalent to -march=mips32r2'
 complete -c gcc -o mips64 -d 'Equivalent to -march=mips64'
 complete -c gcc -o mips16 -d 'Generate MIPS16 code'
 complete -c gcc -o mno-mips16 -d 'Do not generate MIPS16 code'
-complete -c gcc -o mabicalls -d 'Generate (do not generate) SVR4-style position-independent code'
+complete -c gcc -o mabicalls -d 'Generate SVR4-style position-independent code'
-complete -c gcc -o mno-abicalls -d 'Generate (do not generate) SVR4-style position-independent code'
+complete -c gcc -o mno-abicalls -d 'Do not generate SVR4-style position-independent code'
-complete -c gcc -o mxgot -d 'Lift (do not lift) the usual restrictions on the size of the global offset table'
+complete -c gcc -o mxgot -d 'Lift the usual restrictions on the size of the global offset table'
-complete -c gcc -o mno-xgot -d 'Lift (do not lift) the usual restrictions on the size of the global offset table'
+complete -c gcc -o mno-xgot -d 'Do not lift the usual restrictions on the size of the global offset table'
 complete -c gcc -o mgp32 -d 'Assume that general-purpose registers are 32 bits wide'
 complete -c gcc -o mgp64 -d 'Assume that general-purpose registers are 64 bits wide'
 complete -c gcc -o mfp32 -d 'Assume that floating-point registers are 32 bits wide'
@ -857,8 +815,8 @@ complete -c gcc -o mexplicit-relocs -d 'Use assembler relocation operators when
 complete -c gcc -o mno-explicit-relocs -d 'Do not use assembler relocation operators when dealing with symbolic addresses'
 complete -c gcc -o mcheck-zero-division -d 'Trap on integer division by zero'
 complete -c gcc -o mno-check-zero-division -d 'Do not trap on integer division by zero'
-# complete -c gcc -o mdivide-traps -d 'MIPS systems check for division by zero by generating either a conditional trap or a break instruction'
+complete -c gcc -o mdivide-traps -d 'Check for division by zero with a trap'
-# complete -c gcc -o mdivide-breaks -d 'MIPS systems check for division by zero by generating either a conditional trap or a break instruction'
+complete -c gcc -o mdivide-breaks -d 'Check for division by zero with a break'
 complete -c gcc -o mmemcpy -d 'Force the use of "memcpy()" for non-trivial block moves'
 complete -c gcc -o mno-memcpy -d 'Do not force the use of "memcpy()" for non-trivial block moves'
 complete -c gcc -o mmad -d 'Enable use of the "mad", "madu" and "mul" instructions, as provided by the R4650 ISA'
@ -875,10 +833,8 @@ complete -c gcc -o mno-fix-vr4120 -d 'Does not work around certain VR4120 errata
 complete -c gcc -o mfix-vr4130 -d 'Work around the VR4130 "mflo"/"mfhi" errata'
 complete -c gcc -o mfix-sb1 -d 'Work around certain SB-1 CPU core errata'
 complete -c gcc -o mno-fix-sb1 -d 'Does not work around certain SB-1 CPU core errata'
-complete -c gcc -o mflush-func -d 'Specifies the function to call to flush the I and D caches'
+complete -c gcc -o mbranch-likely -d 'Enable use of Branch Likely instructions'
-complete -c gcc -o mno-flush-func -d 'Specifies to not call the function to flush the I and D caches'
+complete -c gcc -o mno-branch-likely -d 'Disable use of Branch Likely instructions'
 complete -c gcc -o mbranch-likely -d 'Enable use of Branch Likely instructions, regardless of the default for the selected architecture'
 complete -c gcc -o mno-branch-likely -d 'Disable use of Branch Likely instructions, regardless of the default for the selected architecture'
 complete -c gcc -o mfp-exceptions -d 'Specifies whether FP exceptions are enabled'
 complete -c gcc -o mno-fp-exceptions -d 'Specifies whether FP exceptions are enabled'
 complete -c gcc -o mvr4130-align
@ -894,12 +850,12 @@ complete -c gcc -o mno-knuthdiv -d 'Make the result of a division yielding a rem
 complete -c gcc -o mtoplevel-symbols -d 'Prepend a : to all global symbols, so the assembly code can be used with the "PREFIX" assembly directive'
 complete -c gcc -o mno-toplevel-symbols -d 'Do not prepend a : to all global symbols, so the assembly code can be used with the "PREFIX" assembly directive'
 complete -c gcc -o melf -d 'Generate an executable in the ELF format'
-complete -c gcc -o mbranch-predict -d 'Use the probable-branch instructions, when static branch prediction indicates a probable branch'
+complete -c gcc -o mbranch-predict -d 'Use probable-branch instructions'
-complete -c gcc -o mno-branch-predict -d 'Do not use the probable-branch instructions, when static branch prediction indicates a probable branch'
+complete -c gcc -o mno-branch-predict -d 'Do not use probable-branch instructions'
 complete -c gcc -o mbase-addresses -d 'Generate code that uses base addresses'
 complete -c gcc -o mno-base-addresses -d 'Do not generate code that uses base addresses'
-complete -c gcc -o msingle-exit -d 'Force (do not force) generated code to have a single exit point in each function'
+complete -c gcc -o msingle-exit -d 'Force generated code to have a single exit point in each function'
-complete -c gcc -o mno-single-exit -d 'Force (do not force) generated code to have a single exit point in each function'
+complete -c gcc -o mno-single-exit -d 'Do not force generated code to have a single exit point in each function'
 complete -c gcc -o mmult-bug -d 'Generate code to avoid bugs in the multiply instructions for the MN10300 processors'
 complete -c gcc -o mno-mult-bug -d 'Do not generate code to avoid bugs in the multiply instructions for the MN10300 processors'
 complete -c gcc -o mam33 -d 'Generate code which uses features specific to the AM33 processor'
@ -908,7 +864,6 @@ complete -c gcc -o mreturn-pointer-on-d0 -d 'When generating a function which re
 complete -c gcc -o mno-crt0 -d 'Do not link in the C run-time initialization object file'
 complete -c gcc -o mbacc -d 'Use byte loads and stores when generating code'
 complete -c gcc -o mno-bacc -d 'Do not use byte loads and stores when generating code'
 complete -c gcc -o mno-crt0 -d 'Do not link in the C run-time initialization object file crti'
 complete -c gcc -o mfpu -d 'Use hardware FPP floating point'
 complete -c gcc -o mac0 -d 'Return floating-point results in ac0 (fr0 in Unix assembler syntax)'
 complete -c gcc -o mno-ac0 -d 'Return floating-point results in memory'
@ -946,7 +901,6 @@ complete -c gcc -o mbss-plt -d 'Use a BSS '
 complete -c gcc -o misel -d 'Enable the generation of ISEL instructions'
 complete -c gcc -o mno-isel -d 'Disable the generation of ISEL instructions'
 complete -c gcc -o mspe -d 'Enable the generation of SPE simd instructions'
 complete -c gcc -o mno-isel -d 'Disable the generation of SPE simd instructions'
 complete -c gcc -o mfloat-gprs -d 'Enable the generation of floating point operations on the general purpose registers'
 complete -c gcc -o mfull-toc -d 'Allocate full Table Of Contents'
 complete -c gcc -o mno-fp-in-toc -d 'No floats in Table Of Contents'
@ -954,8 +908,8 @@ complete -c gcc -o mno-sum-in-toc -d 'No sums in Table Of Contents'
 complete -c gcc -o mminimal-toc -d 'Only one Table Of Contents entry per file'
 complete -c gcc -o maix64 -d 'Enable 64-bit AIX ABI and calling convention'
 complete -c gcc -o maix32 -d 'Enable 32-bit AIX ABI and calling convention'
-complete -c gcc -o mxl-compat -d 'Produce code that conforms more closely to IBM XL compiler semantics when using AIX-compatible ABI'
+complete -c gcc -o mxl-compat -d 'Conform more closely to IBM XL compiler semantics when using AIX-compatible ABI'
-complete -c gcc -o mno-xl-compat -d 'Produce code that conforms more closely to IBM XL compiler semantics when using AIX-compatible ABI'
+complete -c gcc -o mno-xl-compat -d 'Don\'t conform more closely to IBM XL compiler semantics when using AIX-compatible ABI'
 complete -c gcc -o mpe -d 'Support IBM RS/6000 SP Parallel Environment (PE)'
 complete -c gcc -o malign-natural -d 'Override ABI-defined alignment of larger types on their natural size-based boundary'
 complete -c gcc -o malign-power -d 'Follow ABI-specified alignment rules'
@ -987,8 +941,8 @@ complete -c gcc -o mno-regnames -d 'PowerPC: do not emit register names in the a
 complete -c gcc -o mlongcall -d 'Default to making all function calls indirectly'
 complete -c gcc -o mlong-double-64 -d 'These switches control the size of "long double" type'
 complete -c gcc -o mlong-double-128 -d 'These switches control the size of "long double" type'
-complete -c gcc -o mbackchain -d 'Store the address of the caller’s frame as backchain pointer into the callee’s stack frame'
+complete -c gcc -o mbackchain -d 'Store the address of the caller’s frame as backchain pointer into callee’s stack frame'
-complete -c gcc -o mno-backchain -d 'Do not store the address of the caller’s frame as backchain pointer into the callee’s stack frame'
+complete -c gcc -o mno-backchain -d 'Do not store the address of the caller’s frame as backchain pointer into callee’s stack frame'
 complete -c gcc -o mpacked-stack -d 'Use the packed stack layout'
 complete -c gcc -o mno-packed-stack -d 'Do not use the packed stack layout'
 complete -c gcc -o msmall-exec -d 'Generate code using the "bras" instruction to do subroutine calls'
@ -998,15 +952,10 @@ complete -c gcc -o mzarch -d 'When -mzarch is specified, generate code using the
 complete -c gcc -o mesa -d 'When -mzarch is specified, generate code using the instructions available on z/Architecture'
 complete -c gcc -o mmvcle -d 'Generate (or do not generate) code using the "mvcle" instruction to perform block moves'
 complete -c gcc -o mno-mvcle -d 'Generate (or do not generate) code using the "mvcle" instruction to perform block moves'
 complete -c gcc -o mdebug -d 'Print (or do not print) additional debug information when compiling'
 complete -c gcc -o mno-debug -d 'Print (or do not print) additional debug information when compiling'
 complete -c gcc -o mtpf-trace -d 'Add in TPF OS specific branches to trace routines in the operating system'
 complete -c gcc -o mno-tpf-trace -d 'Do not add in TPF OS specific branches to trace routines in the operating system'
 complete -c gcc -o mwarn-framesize -d '=framesize Emit a warning if the current function exceeds the given frame size'
 complete -c gcc -o mwarn-dynamicstack -d 'Emit a warning if the function calls alloca or uses dynamically sized arrays'
 complete -c gcc -o mstack-guard -d 'These arguments always have to be used in conjunction'
 complete -c gcc -o mstack-size -d 'These arguments always have to be used in conjunction'
 complete -c gcc -o size -d 'These arguments always have to be used in conjunction'
 complete -c gcc -o m1 -d 'Generate code for the SH1'
 complete -c gcc -o m2 -d 'Generate code for the SH2'
 complete -c gcc -o m2e -d 'Generate code for the SH2e'
@ -1034,9 +983,8 @@ complete -c gcc -o mieee -d 'Increase IEEE-compliance of floating-point code'
 complete -c gcc -o misize -d 'Dump instruction size and location in the assembly code'
 complete -c gcc -o mspace -d 'Optimize for space instead of speed'
 complete -c gcc -o mprefergot -d 'For PIC: function calls using the Global Offset Table, not Procedure Linkage Table'
-complete -c gcc -o musermode -d 'Generate a library function call to invalidate instruction cache entries, after fixing up a trampoline'
+complete -c gcc -o musermode -d 'Don\'t allow generating privileged mode code'
 complete -c gcc -o multcost -d '=number Set the cost to assume for a multiply insn'
 complete -c gcc -o mdiv -d '=strategy Set the division strategy to use for SHmedia code'
 complete -c gcc -o mdivsi3_libfunc -d '=name Set the name of the library function used for 32 bit signed division to name'
 complete -c gcc -o madjust-unroll -d 'Throttle unrolling to avoid thrashing target registers'
 complete -c gcc -o mindexed-addressing -d 'Enable the use of the indexed addressing mode for SHmedia32/SHcompact'
@ -1046,13 +994,13 @@ complete -c gcc -o minvalid-symbols -d 'Assume symbols might be invalid'
 complete -c gcc -o mapp-regs -d 'Use global registers 2 through 4, SPARC SVR4 ABI-reserved for applications'
 complete -c gcc -o mno-app-regs -d 'Don\'t use global registers 2 through 4, SPARC SVR4 ABI-reserved for applications'
 complete -c gcc -o mno-fpu -d 'Generate output containing library calls for floating point'
-complete -c gcc -o mhard-quad-float -d 'Generate output containing quad-word (long double) floating point instructions'
+complete -c gcc -o mhard-quad-float -d 'Generate quad-word (long double) floating point instructions'
-complete -c gcc -o msoft-quad-float -d 'Generate output containing library calls for quad-word (long double) floating point instructions'
+complete -c gcc -o msoft-quad-float -d 'Generate library calls for quad-word (long double) floating point instructions'
 complete -c gcc -o mno-unaligned-doubles -d 'Assume that doubles have 8 byte alignment'
 complete -c gcc -o munaligned-doubles -d 'Assume that doubles have 8 byte alignment'
 complete -c gcc -o mfaster-structs -d 'Assumes that structures should have 8 byte alignment'
 complete -c gcc -o mno-faster-structs -d 'Does not assume that structures should have 8 byte alignment'
-complete -c gcc -o mimpure-text -d 'Used in addition to -shared, tells to not pass -z text to the linker when linking a shared object'
+complete -c gcc -o mimpure-text -d 'With -shared: do not pass -z text to the linker'
 complete -c gcc -o mv8plus -d 'With -mv8plus, GCC generates code for the SPARC-V8+ ABI'
 complete -c gcc -o mno-v8plus -d 'With -mv8plus, GCC generates code for the SPARC-V8+ ABI'
 complete -c gcc -o mvis -d 'Take advantage of the UltraSPARC Visual Instruction Set extensions'
@ -1063,7 +1011,7 @@ medany\t"Medium/Anywhere code model: 64-bit addresses, programs may be linked an
 embmedany\t"Medium/Anywhere code model for embedded systems: 64-bit addresses, the text and data segments must be less than 2GB in size, both starting anywhere in memory (determined at link time)"'
 complete -c gcc -o mstack-bias -d 'Assume that the stack pointer, and frame pointer if present, are offset by -2047'
 complete -c gcc -o mno-stack-bias -d 'Don\'t assume that the stack pointer, and frame pointer if present, are offset by -2047'
-complete -c gcc -o threads -d 'Add support for multithreading using the Solaris threads library'
+complete -c gcc -o threads -d 'Add support for multithreading'
 complete -c gcc -o Qy -d 'Identify the versions of each tool used by the compiler, in a "'
 complete -c gcc -o Qn -d 'Refrain from adding "'
 complete -c gcc -o mbig-memory -d 'Generates code for the big or small memory model'
@ -1080,8 +1028,8 @@ complete -c gcc -o mmpyi
 complete -c gcc -o mno-mpyi
 complete -c gcc -o mfast-fix
 complete -c gcc -o mno-fast-fix
-complete -c gcc -o mrptb -d 'Enable generation of repeat block sequences using the RPTB instruction for zero overhead looping'
+complete -c gcc -o mrptb -d 'Enable repeat block sequences using the RPTB instruction for zero overhead looping'
-complete -c gcc -o mno-rptb -d 'Disable generation of repeat block sequences using the RPTB instruction for zero overhead looping'
+complete -c gcc -o mno-rptb -d 'Disable repeat block sequences using the RPTB instruction for zero overhead looping'
 complete -c gcc -o mrpts -d 'Enable the use of the single instruction repeat instruction RPTS'
 complete -c gcc -o mno-rpts -d 'Disable the use of the single instruction repeat instruction RPTS'
 complete -c gcc -o mloop-unsigned
@ -1095,20 +1043,16 @@ complete -c gcc -o mparallel-mpy -d 'Allow the generation of MPY││ADD/MPY│
 complete -c gcc -o mno-parallel-mpy -d 'Disallow the generation of MPY││ADD/MPY││SUB parallel instructions, with -mparallel-insns'
 complete -c gcc -o mep
 complete -c gcc -o mno-ep
-complete -c gcc -o mno-prolog-function -d 'Do not use external functions to save/restore registers at the prologue and epilogue of a function'
+complete -c gcc -o mno-prolog-function -d 'Do not use external functions to save/restore registers at function prologue/epilogue'
-complete -c gcc -o mprolog-function -d 'Do use external functions to save/restore registers at the prologue and epilogue of a function'
+complete -c gcc -o mprolog-function -d 'Do use external functions to save/restore registers at function prologue/epilogue'
 complete -c gcc -o mspace -d 'Try to make the code as small as possible'
 complete -c gcc -o mtda -d '=n Put static/global variables under n bytes into tiny data area register "ep" points to'
 complete -c gcc -o msda -d '=n Put static/global variables under n bytes into small data area register "gp" points to'
 complete -c gcc -o mzda -d '=n Put static/global variables under n bytes into the first 32 kilobytes of memory'
 complete -c gcc -o mv850 -d 'Specify that the target processor is the V850'
 complete -c gcc -o mbig-switch -d 'Generate code suitable for big switch tables'
 complete -c gcc -o mapp-regs -d 'Will cause r2 and r5 to be used in the code generated by the compiler'
 complete -c gcc -o mno-app-regs -d 'Will cause r2 and r5 to be treated as fixed registers'
 complete -c gcc -o mv850e1 -d 'Specify that the target processor is the V850E1'
 complete -c gcc -o mv850e -d 'Specify that the target processor is the V850E'
 complete -c gcc -o mdisable-callt -d 'Suppress generation of CALLT instruction for the v850e/v850e1 flavors of v850 architecture'
-complete -c gcc -o mgnu -d 'Do output those jump instructions, on the assumption that you will assemble with the GNU assembler'
+complete -c gcc -o mgnu -d 'Ouput certain jump instructions, only compatible with GNU assembler'
 complete -c gcc -o mg -d 'Output code for g-format floating point numbers instead of d-format'
 complete -c gcc -o mconst16 -d 'Enable or disable use of "CONST16" instructions for loading constant values'
 complete -c gcc -o mno-const16 -d 'Enable or disable use of "CONST16" instructions for loading constant values'
@ -1117,7 +1061,6 @@ complete -c gcc -o mno-text-section-literals -d 'Control the treatment of litera
 complete -c gcc -o mtarget-align -d 'Tell assembler to automatically align instructions to reduce branch penalties'
 complete -c gcc -o mno-target-align -d 'Tell assembler to not automatically align instructions to reduce branch penalties'
 complete -c gcc -o mlongcalls -d 'Tell assembler to translate direct calls to indirect calls'
 complete -c gcc -o fbounds-check -d 'Generate additional code to check that indices used to access arrays are within the declared range'
 complete -c gcc -o ftrapv -d 'Generates traps for signed overflow on addition, subtraction, multiplication operations'
 complete -c gcc -o fwrapv -d 'Assume that signed arithmetic overflow wraps around using twos-complement representation'
 complete -c gcc -o fexceptions -d 'Enable exception handling'
@ -1135,7 +1078,7 @@ complete -c gcc -o fno-ident -d 'Ignore the #ident directive'
 complete -c gcc -o finhibit-size-directive -d 'Don’t output a "'
 complete -c gcc -o fverbose-asm -d 'Put extra commentary information in the generated assembly code to make it more readable'
 complete -c gcc -o fpic -d 'Emit position-independent code (PIC) usable in shared library'
-complete -c gcc -o fPIC -d 'Emit position-independent code, usable in shared library, avoiding global offset table size limits'
+complete -c gcc -o fPIC -d 'Emit position-independent code, usable in shared library, avoid global offset table size limits'
 complete -c gcc -o fpie -d 'Like -fpic, but position independent code can be only linked into executables'
 complete -c gcc -o fPIE -d 'fpie but harder'
 complete -c gcc -o fno-jump-tables -d 'Do not use jump tables for switch statements'
--- a/share/completions/mkbundle.fish
+++ b/share/completions/mkbundle.fish
@ -19,7 +19,7 @@ complete -c mkbundle -l lists-targets -d 'Show all of the available remote cross
 complete -c mkbundle -l local-targets -d 'Show all of the available local cross compilation targets'
 complete -c mkbundle -l cil-strip -r -d 'Use a CIL stripper that mkbundle will use if able to'
 complete -c mkbundle -l in-tree -r \
-    -d 'Use mkbundle with a mono source repository from which to pull the necessary headers for compilation'
+    -d 'Use a mono source repository to pull the necessary headers for compilation'
 complete -c mkbundle -l managed-linker -r \
    -d 'Use mkbundle access to a managed linker to preprocess the assemblies'
 complete -c mkbundle -l machine-config -r \
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@ -151,8 +151,8 @@ complete -c mvn -a "shade:help" -d "Display help information on maven-shade-plug
 complete -c mvn -a "shade:shade" -d "Mojo that performs shading delegating to the Shader component"
 complete -c mvn -a "source:aggregate" -d "Aggregate sources for all modules in an aggregator project"
 complete -c mvn -a "source:jar" -d "This plugin bundles all the sources into a jar archive"
-complete -c mvn -a "source:test-jar-no-fork" -d "This goal bundles all the test sources into a jar archive"
+complete -c mvn -a "source:test-jar-no-fork" -d "Bundle all the test sources into a jar archive (goal)"
-complete -c mvn -a "source:test-jar" -d "This plugin bundles all the test sources into a jar archive"
+complete -c mvn -a "source:test-jar" -d "Bundle all the test sources into a jar archive (plugin)"
 complete -c mvn -a "source:generated-test-jar" -d "This plugin bundles all the test sources into a jar archive"
 complete -c mvn -a "source:help" -d "Display help information on maven-source-plugin"
 complete -c mvn -a "source:jar-no-fork" -d "This goal bundles all the sources into a jar archive"
@ -177,9 +177,9 @@ complete -c mvn -a "doap:generate" -d "Generate a Description of a Project (DOAP
 complete -c mvn -a "doap:help" -d "Display help information on maven-doap-plugin"
 complete -c mvn -a "docck:check" -d "Checks a plugin's documentation for the standard minimums"
 complete -c mvn -a "docck:help" -d "Display help information on maven-docck-plugin"
-complete -c mvn -a "javadoc:aggregate" -d "Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool"
+complete -c mvn -a "javadoc:aggregate" -d "Generates documentation for the Java code in an aggregator project"
 complete -c mvn -a "javadoc:aggregate-jar" -d "Bundles Javadoc for main Java code into a jar"
-complete -c mvn -a "javadoc:fix" -d "Fix Javadoc documentation and tags for the Java code for the project. See Where Tags Can Be Used"
+complete -c mvn -a "javadoc:fix" -d "Fix Javadoc documentation and tags for the Java code for the project"
 complete -c mvn -a "javadoc:help" -d "Display help information on maven-javadoc-plugin"
 complete -c mvn -a "javadoc:jar" -d "Bundle the Javadoc into a jar"
 complete -c mvn -a "javadoc:javadoc" -d "Generate documentation"
@ -238,7 +238,7 @@ complete -c mvn -a "archetype:help" -d "Display help information on maven-archet
 complete -c mvn -a "archetype:integration-test" -d "Execute the archetype integration tests"
 complete -c mvn -a "archetype:jar" -d "Build a JAR from the current Archetype project"
 complete -c mvn -a "archetype:update-local-catalog" -d "Updates the local catalog"
-complete -c mvn -a "assembly:assembly" -d "Assemble an application bundle or distribution using an assembly descriptor from the command line"
+complete -c mvn -a "assembly:assembly" -d "Assemble an application bundle or distribution"
 complete -c mvn -a "assembly:attached" -d "Assemble an application bundle or distribution from an assembly descriptor"
 complete -c mvn -a "assembly:directory" -d "Assemble an application bundle or distribution"
 complete -c mvn -a "assembly:directory-inline" -d "Like assembly:attached, but ignore the <formats/> section"
@ -251,9 +251,9 @@ complete -c mvn -a "dependency:analyze-dep-mgt" -d "Look for dependency mismatch
 complete -c mvn -a "dependency:analyze-duplicate" -d "Determine duplicate dependencies"
 complete -c mvn -a "dependency:analyze-only" -d "Analyze the dependencies of this project"
 complete -c mvn -a "dependency:analyze-report" -d "Analyze the dependencies of this project and produce a report"
-complete -c mvn -a "dependency:build-classpath" -d "This goal will output a classpath string of dependencies from the local repository to a file or log"
+complete -c mvn -a "dependency:build-classpath" -d "Output a classpath string of dependencies from the local repository to a file or log"
-complete -c mvn -a "dependency:copy" -d "Goal that copies a list of artifacts from the repository to defined locations"
+complete -c mvn -a "dependency:copy" -d "Copy a list of artifacts from the repository to defined locations"
-complete -c mvn -a "dependency:copy-dependencies" -d "Goal that copies the project dependencies from the repository to a defined location"
+complete -c mvn -a "dependency:copy-dependencies" -d "Copy the project dependencies from the repository to a defined location"
 complete -c mvn -a "dependency:display-ancestors" -d "Displays all ancestor POMs of the project"
 complete -c mvn -a "dependency:get" -d "Resolves a single artifact, eventually transitively, from the specified remote repositories"
 complete -c mvn -a "dependency:go-offline" -d "Resolve all project dependencies"
@ -263,13 +263,13 @@ complete -c mvn -a "dependency:list-repositories" -d "Resolve all project depend
 complete -c mvn -a "dependency:properties" -d "Set a property pointing to the artifact file for each project dependency"
 complete -c mvn -a "dependency:purge-local-repository" -d "Remove the project dependencies from the local repository, and optionally re-resolve them"
 complete -c mvn -a "dependency:resolve" -d "Resolve project dependencies"
-complete -c mvn -a "dependency:resolve-plugins" -d "Goal that resolves all project plugins and reports and their dependencies"
+complete -c mvn -a "dependency:resolve-plugins" -d "Resolve all project plugins and reports and their dependencies"
-complete -c mvn -a "dependency:sources" -d "Goal that resolves the project source dependencies from the repository"
+complete -c mvn -a "dependency:sources" -d "Resolve the project source dependencies from the repository"
 complete -c mvn -a "dependency:tree" -d "Displays the dependency tree for this project"
-complete -c mvn -a "dependency:unpack" -d "Goal that retrieves a list of artifacts from the repository and unpacks them in a defined location"
+complete -c mvn -a "dependency:unpack" -d "Retrieve a list of artifacts from the repository and unpacks them in a defined location"
-complete -c mvn -a "dependency:unpack-dependencies" -d "Goal that unpacks the project dependencies from the repository to a defined location"
+complete -c mvn -a "dependency:unpack-dependencies" -d "Unpack the project dependencies from the repository to a defined location"
-complete -c mvn -a "enforcer:display-info" -d "This goal displays the current platform information"
+complete -c mvn -a "enforcer:display-info" -d "Display the current platform information"
-complete -c mvn -a "enforcer:enforce" -d "This goal executes the defined enforcer-rules once per module"
+complete -c mvn -a "enforcer:enforce" -d "Execute the defined enforcer-rules once per module"
 complete -c mvn -a "enforcer:help" -d "Display help information on maven-enforcer-plugin"
 complete -c mvn -a "gpg:help" -d "Display help information on maven-gpg-plugin"
 complete -c mvn -a "gpg:sign" -d "Sign project artifact, the POM, and attached artifacts with GnuPG for deployment"
@ -312,7 +312,7 @@ complete -c mvn -a "release:prepare" -d "Prepare for a release in SCM"
 complete -c mvn -a "release:clean" -d "Clean up after a release preparation"
 complete -c mvn -a "release:help" -d "Display help information on maven-release-plugin"
 complete -c mvn -a "release:branch" -d "Branch a project in SCM"
-complete -c mvn -a "remote-resources:process" -d "Pull down resourceBundles containing remote resources and process the resources contained inside"
+complete -c mvn -a "remote-resources:process" -d "Pull down resourceBundles and process them"
 complete -c mvn -a "remote-resources:help" -d "Display help information on maven-remote-resources-plugin"
 complete -c mvn -a "remote-resources:bundle" -d "Bundle up resources that should be considered as a remote-resource"
 complete -c mvn -a "repository:bundle-create" -d "Goal which creates an upload bundle for a project built with Maven"
@ -367,7 +367,7 @@ complete -c mvn -a "jboss-packaging:par" -d "Builds a deployable JBoss Process A
 complete -c mvn -a "jboss-packaging:sar" -d "Builds a deployable JBoss Service Archive"
 complete -c mvn -a "jboss-packaging:sar-inplace" -d "Builds a deployable JBoss Service in place exploded Archive"
 complete -c mvn -a "jboss-packaging:sar-exploded" -d "Builds a deployable JBoss Service exploded Archive"
-complete -c mvn -a "was6:wsAdmin" -d "The wsadmin goal executes the WebSphere command-line administration tool with the specified arguments"
+complete -c mvn -a "was6:wsAdmin" -d "Execute the WebSphere command-line administration tool with the specified arguments"
 complete -c mvn -a "was6:wsListApps" -d "Lists all the applications installed on a WebSphere Server or Cell"
 complete -c mvn -a "was6:wsStartServer" -d "Starts a standalone server instance"
 complete -c mvn -a "was6:wsStartApp" -d "Start an application on a WebSphere Server or in a WebSphere Cell"
@ -407,8 +407,8 @@ complete -c mvn -a "axistools:help" -d "Display help information on axistools-ma
 complete -c mvn -a "axistools:wsdl2java" -d "A Plugin for generating stubs for WSDL files using Axis WSDL2Java"
 complete -c mvn -a "axistools:admin" -d "Utility for turning xml into Axis deployment operations (wraps org.apache.axis.utils.Admin)"
 complete -c mvn -a "castor:help" -d "Display help information on castor-maven-plugin"
-complete -c mvn -a "castor:mappings" -d "A mojo that uses Castor MappingTool to generate mapping files from a set of Classes. MappingTool"
+complete -c mvn -a "castor:mappings" -d "Use Castor MappingTool to generate mapping files from a set of Classes"
-complete -c mvn -a "castor:mapping" -d "A mojo that uses Castor MappingTool to generate mapping files from a single Class. MappingTool"
+complete -c mvn -a "castor:mapping" -d "Use Castor MappingTool to generate mapping files from a single Class"
 complete -c mvn -a "castor:generate" -d "A mojo that uses Castor to generate a collection of javabeans from an XSD"
 complete -c mvn -a "commons-attributes:compile" -d "Commons-attributes compiler"
 complete -c mvn -a "commons-attributes:test-compile" -d "Commons-attributes compiler for tests"
@ -443,7 +443,7 @@ complete -c mvn -a "hibernate3:hbm2java" -d "'hbm2java' is a java code generator
 complete -c mvn -a "idlj:generate-test" -d "Process CORBA IDL test files in IDLJ"
 complete -c mvn -a "idlj:help" -d "Display help information on idlj-maven-plugin"
 complete -c mvn -a "idlj:generate" -d "Process CORBA IDL files in IDLJ"
-complete -c mvn -a "javacc:jjtree" -d "Parses a JJTree grammar file (*.jjt) and transforms it to Java source files and a JavaCC grammar file"
+complete -c mvn -a "javacc:jjtree" -d "Parse a JJTree grammar file (*.jjt) and transform it to source files and a JavaCC grammar file"
 complete -c mvn -a "javacc:jtb" -d "Parses a JTB file and transforms it into source for an AST and a JavaCC grammar"
 complete -c mvn -a "javacc:jjdoc" -d "JJDoc takes a JavaCC parser specification and produces documentation for the BNF grammar"
 complete -c mvn -a "javacc:jtb-javacc" -d "Preprocess *.jtb grammar files and generate a parser with parse tree actions"
@ -495,9 +495,9 @@ complete -c mvn -a "nbm:build-installers" -d "Build installers for Mavenized Net
 complete -c mvn -a "nbm:cluster" -d "Create the NetBeans module clusters from reactor"
 complete -c mvn -a "nbm:cluster-app" -d "Create the NetBeans module clusters/application for the 'nbm-application' packaging projects"
 complete -c mvn -a "nbm:help" -d "Display help information on nbm-maven-plugin"
-complete -c mvn -a "nbm:manifest" -d "Goal for generating NetBeans module system specific manifest entries, part of nbm lifecycle/packaging"
+complete -c mvn -a "nbm:manifest" -d "Generate NetBeans module system specific manifest entries"
 complete -c mvn -a "nbm:nbm" -d "Create the NetBeans module artifact (nbm file), part of 'nbm' lifecycle/packaging"
-complete -c mvn -a "nbm:run-ide" -d "Run NetBeans IDE with additional custom module clusters, to be used in conjunction with nbm:cluster"
+complete -c mvn -a "nbm:run-ide" -d "Run NetBeans with additional module clusters, to be used with nbm:cluster"
 complete -c mvn -a "nbm:run-platform" -d "Run a branded application on top of NetBeans Platform"
 complete -c mvn -a "nbm:standalone-zip" -d "Create a standalone application out of the composed clusters of nbm-application"
 complete -c mvn -a "nbm:webstart-app" -d "Create webstartable binaries for a 'nbm-application'"
@ -509,8 +509,8 @@ complete -c mvn -a "clirr:check-no-fork" -d "Check for compatibility with previo
 complete -c mvn -a "cobertura:check" -d "Check the coverage for unit tests from last instrumentation"
 complete -c mvn -a "cobertura:check-integration-test" -d "Check the coverage for unit and integration tests from last instrumentation"
 complete -c mvn -a "cobertura:clean" -d "Clean up the files that Cobertura Maven Plugin has created during instrumentation"
-complete -c mvn -a "cobertura:cobertura" -d "Instrument the compiled classes, run the unit tests and generate a Cobertura report"
+complete -c mvn -a "cobertura:cobertura" -d "Generate Cobertura report on unit tests"
-complete -c mvn -a "cobertura:cobertura-integration-test" -d "Instrument compiled classes, run the unit tests and integration tests and generate Cobertura report"
+complete -c mvn -a "cobertura:cobertura-integration-test" -d "Generate Cobertura report on unit and integration tests"
 complete -c mvn -a "cobertura:dump-datafile" -d "Output the contents of Cobertura's data file to the command line"
 complete -c mvn -a "cobertura:help" -d "Display help information on cobertura-maven-plugin"
 complete -c mvn -a "cobertura:instrument" -d "Instrument the compiled classes"
@ -532,9 +532,9 @@ complete -c mvn -a "findbugs:check"
 complete -c mvn -a "findbugs:findbugs"
 complete -c mvn -a "findbugs:gui" -d "Open the findbugs GUI to browse the report"
 complete -c mvn -a "findbugs:help" -d "Display help information on findbugs-maven-plugin"
-complete -c mvn -a "fitnesse:remotecall" -d "Use fitnesse.runner.TestRunner class to get result of a remote FitNesse web page execution"
+complete -c mvn -a "fitnesse:remotecall" -d "Use fitnesse.runner.TestRunner to get result of a remote FitNesse web page execution"
 complete -c mvn -a "fitnesse:help" -d "Display help information on fitnesse-maven-plugin"
-complete -c mvn -a "fitnesse:run" -d "Use fitnesse.runner.TestRunner class to call a remote FitNesse web page and execute the tests locally"
+complete -c mvn -a "fitnesse:run" -d "Use fitnesse.runner.TestRunner to call a remote FitNesse web page and run the tests locally"
 complete -c mvn -a "fitnesse:fitnesse" -d "Generates a FitNesse report from a FitNesse web server"
 complete -c mvn -a "selenium:start-server" -d "Start the Selenium server"
 complete -c mvn -a "selenium:xvfb" -d "Starts an Xvfb instance suitable for handling X11 displays for headless systems"
@ -548,7 +548,7 @@ complete -c mvn -a "webtest:test" -d "Runs a Canoo WebTest defined in an ANT scr
 complete -c mvn -a "webtest:loop" -d "Runs a Canoo WebTest in a loop until an error or failure occurs"
 complete -c mvn -a "webtest:info" -d "Prints the configuration settings"
 complete -c mvn -a "webtest:report" -d "Creates the HTML report for a test run based on XSLT"
-complete -c mvn -a "webtest:verify-result" -d "Checks the webtest result file for test failures and throws an exception if one or more tests failed"
+complete -c mvn -a "webtest:verify-result" -d "Check webtest result file for test failures"
 complete -c mvn -a "chronos-jmeter:jmeter" -d "Invokes JMeter"
 complete -c mvn -a "chronos-jmeter:check" -d "Checks the latest performancetests to verify that performance targets have been met"
 complete -c mvn -a "chronos-jmeter:jmetergui" -d "Invokes the JMeter gui"
@ -556,7 +556,7 @@ complete -c mvn -a "chronos-jmeter:jmeteroutput" -d "Analyzes output from JMeter
 complete -c mvn -a "chronos-jmeter:help" -d "Display help information on chronos-jmeter-maven-plugin"
 complete -c mvn -a "chronos-jmeter:savehistory" -d "Save a snapshot of the currently executed test to enable later historic reports"
 complete -c mvn -a "chronos-surefire:help" -d "Display help information on chronos-surefire-maven-plugin"
-complete -c mvn -a "chronos-surefire:collect" -d "Collect the execution of each performed unittest, and compare the time to previous measured times"
+complete -c mvn -a "chronos-surefire:collect" -d "Collect the execution of each performed unittest, and compare to previous times"
 complete -c mvn -a "chronos-report:historyreport" -d "Creates a historic report of performance test results"
 complete -c mvn -a "chronos-report:report" -d "Creates a report of the currently executed performancetest in html format"
 complete -c mvn -a "chronos-report:help" -d "Display help information on chronos-report-maven-plugin"
@ -579,13 +579,13 @@ complete -c mvn -a "build-helper:reserve-network-port" -d "Reserve a list of ran
 complete -c mvn -a "build-helper:remove-project-artifact" -d "Remove project's artifacts from local repository"
 complete -c mvn -a "build-helper:add-source" -d "Add more source directories to the POM"
 complete -c mvn -a "build-helper:add-test-resource" -d "Add more test resource directories to the POM"
-complete -c mvn -a "build-helper:cpu-count" -d "Retrieve number of CPUs with project factor, and place it under a configurable project property"
+complete -c mvn -a "build-helper:cpu-count" -d "Get number of CPUs, place it under a configurable project property"
 complete -c mvn -a "build-helper:timestamp-property" -d "Sets a property based on the current date and time"
 complete -c mvn -a "build-helper:regex-properties" -d "Sets a property by applying a regex replacement rule to a supplied value"
 complete -c mvn -a "build-helper:regex-property" -d "Sets a property by applying a regex replacement rule to a supplied value"
 complete -c mvn -a "build-helper:help" -d "Display help information on build-helper-maven-plugin"
-complete -c mvn -a "buildnumber:create-timestamp" -d "This mojo is designed to give you a timestamp available through one or more properties"
+complete -c mvn -a "buildnumber:create-timestamp" -d "Give a timestamp available through one or more properties"
-complete -c mvn -a "buildnumber:create" -d "This mojo is designed to give you a build number"
+complete -c mvn -a "buildnumber:create" -d "Create a build number"
 complete -c mvn -a "buildnumber:help" -d "Display help information on buildnumber-maven-plugin"
 complete -c mvn -a "buildnumber:hgchangeset" -d "Set project properties for changeSet/changeSetDate from the current hg repository"
 complete -c mvn -a "cassandra:help" -d "Display help information on cassandra-maven-plugin"
@ -641,8 +641,8 @@ complete -c mvn -a "license:comment-style-list" -d "Displays all the available c
 complete -c mvn -a "license:update-file-header" -d "The goal to update (or add) the header on project source files"
 complete -c mvn -a "license:download-licenses" -d "Download the license files of all the current project's dependencies, and generate a summary file containing a list of all dependencies and their licenses"
 complete -c mvn -a "ounce:report" -d "Generate the scan results as part of the site"
-complete -c mvn -a "ounce:application" -d "This mojo generates an Ounce application file"
+complete -c mvn -a "ounce:application" -d "Generate an Ounce application file"
-complete -c mvn -a "ounce:scan" -d "This mojo allows an on demand scan of an application and the optional publishing of the results"
+complete -c mvn -a "ounce:scan" -d "Allows an on demand scan of an application and the optional publishing of the results"
 complete -c mvn -a "ounce:project-only" -d "This mojo generates an Ounce project file"
 complete -c mvn -a "ounce:project" -d "This mojo generates an Ounce project file"
 complete -c mvn -a "ounce:help" -d "Display help information on ounce-maven-plugin"
@ -663,7 +663,7 @@ complete -c mvn -a "truezip:move" -d "Move a single file or multiple files (via
 complete -c mvn -a "truezip:help" -d "Display help information on truezip-maven-plugin"
 complete -c mvn -a "truezip:update" -d "Update open archives immediately, flush cached data to disk"
 complete -c mvn -a "versions:commit" -d "Removes the initial backup of the pom, thereby accepting the changes"
-complete -c mvn -a "versions:compare-dependencies" -d "Compare dependency versions of the current project to dependencies of a remote repository project"
+complete -c mvn -a "versions:compare-dependencies" -d "Compare dependency versions of current project to another"
 complete -c mvn -a "versions:dependency-updates-report" -d "Generates a report of available updates for the dependencies of a project"
 complete -c mvn -a "versions:display-dependency-updates" -d "Displays all dependencies that have newer versions available"
 complete -c mvn -a "versions:display-parent-updates" -d "Displays any updates of the project's parent project"
@ -671,13 +671,13 @@ complete -c mvn -a "versions:display-plugin-updates" -d "Displays all plugins th
 complete -c mvn -a "versions:display-property-updates" -d "Displays properties that are linked to artifact versions and have updates available"
 complete -c mvn -a "versions:force-releases" -d "Replace -SNAPSHOT versions with a release version, downgrading if necessary"
 complete -c mvn -a "versions:help" -d "Display help information on versions-maven-plugin"
-complete -c mvn -a "versions:lock-snapshots" -d "Resolve unlocked snapshot dependency versions to the locked timestamp versions used in the build"
+complete -c mvn -a "versions:lock-snapshots" -d "Resolve unlocked snapshot dependencies to the locked timestamp versions"
 complete -c mvn -a "versions:plugin-updates-report" -d "Generates a report of available updates for the plugins of a project"
 complete -c mvn -a "versions:property-updates-report" -d "Generates a report of available updates for properties of a project"
 complete -c mvn -a "versions:resolve-ranges" -d "Resolve dependency version ranges to the specific version being used in the build"
 complete -c mvn -a "versions:revert" -d "Restores the pom from the initial backup"
 complete -c mvn -a "versions:set" -d "Sets the current project's version and based on that change propagates that change onto any child modules as necessary"
-complete -c mvn -a "versions:unlock-snapshots" -d "Resolve unlocked snapshot dependency versions to the locked timestamp versions used in the build"
+complete -c mvn -a "versions:unlock-snapshots" -d "Resolve unlocked snapshot dependencies to the locked timestamp versions"
 complete -c mvn -a "versions:update-child-modules" -d "Scan the current projects child modules, and update versions"
 complete -c mvn -a "versions:update-parent" -d "Sets the parent version to the latest parent version"
 complete -c mvn -a "versions:update-properties" -d "Sets properties to the latest versions of specific artifacts"
@ -689,7 +689,7 @@ complete -c mvn -a "versions:use-next-releases" -d "Replaces any release version
 complete -c mvn -a "versions:use-next-snapshots" -d "Replaces any release versions with the next snapshot version (if it has been deployed)"
 complete -c mvn -a "versions:use-next-versions" -d "Replaces any version with the latest version"
 complete -c mvn -a "versions:use-reactor" -d "Replaces any versions with the corresponding version from the reactor"
-complete -c mvn -a "versions:use-releases" -d "Replaces any -SNAPSHOT versions with the corresponding release version (if it has been released)"
+complete -c mvn -a "versions:use-releases" -d "Replaces any -SNAPSHOT versions with the corresponding release version"
 complete -c mvn -a "vfs:copy" -d "Copy files from one VFS to another VFS"
 complete -c mvn -a "vfs:help" -d "Display help information on vfs-maven-plugin"
 complete -c mvn -a "vfs:list" -d "Display file list of a virtual file system"
@ -787,13 +787,13 @@ complete -c mvn -a "liquibase:migrate" -d "Liquibase Migration Maven plugin"
 complete -c mvn -a "liquibase:changelogSync" -d "Marks all unapplied changes to the database as applied in the change log"
 complete -c mvn -a "liquibase:clearCheckSums" -d "Clears all checksums in the current changelog, so they will be recalculated next update"
 complete -c mvn -a "liquibase:dbDoc" -d "Generates dbDocs against the database"
-complete -c mvn -a "liquibase:rollbackSQL" -d "Generates the SQL that is required to rollback the database to the specified pointing attributes 'rollbackCount', 'rollbackTag'"
+complete -c mvn -a "liquibase:rollbackSQL" -d "Generates SQL to rollback the database to the specified pointing attributes 'rollbackCount', 'rollbackTag'"
 complete -c mvn -a "liquibase:status" -d "Prints which changesets need to be applied to the database"
 complete -c mvn -a "liquibase:changelogSyncSQL" -d "Generates SQL that marks all unapplied changes as applied"
 complete -c mvn -a "liquibase:updateTestingRollback" -d "Applies the DatabaseChangeLogs to the database, testing rollback"
 complete -c mvn -a "liquibase:help" -d "Display help information on liquibase-maven-plugin"
 complete -c mvn -a "liquibase:rollback" -d "Invokes Liquibase rollbacks on a database"
-complete -c mvn -a "liquibase:futureRollbackSQL" -d "Generates the SQL that is required to rollback the database to current state after the next update"
+complete -c mvn -a "liquibase:futureRollbackSQL" -d "Generates SQL to rollback the database to current state after the next update"
 complete -c mvn -a "liquibase:diff" -d "Generates a diff between the specified database and the reference database"
 complete -c mvn -a "liquibase:update" -d "Applies the DatabaseChangeLogs to the database"
 complete -c mvn -a "liquibase:generateChangeLog" -d "Generates SQL that marks all unapplied changes as applied"
--- a/share/completions/reg.fish
+++ b/share/completions/reg.fish
@ -175,7 +175,7 @@ complete -c reg -f \
    -d 'Copy the specified subkeys, entries, and values of the local computer into a file'
 complete -c reg -f \
    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a import \
-    -d 'Copy the contents of a file that contains registry data into the registry of the local computer'
+    -d 'Copy contents of a file with registry data into the local registry'
 complete -c reg -f \
    -n 'not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload' -a load \
    -d 'Write saved subkeys and entries into a different subkey in the registry'
--- a/share/completions/scons.fish
+++ b/share/completions/scons.fish
@ -26,12 +26,12 @@ complete -c scons -l implicit-deps-changed -d 'Force SCons to ignore the cached
 complete -c scons -l implicit-deps-unchanged -d 'Force SCons to ignore changes in the implicit dependencies'
 complete -c scons -s j -l jobs -d 'Specifies the number of jobs (commands) to run simultaneously'
 complete -c scons -s k -l keep-going -d 'Continue as much as possible after an error'
-complete -c scons -l duplicate -d 'There are three ways to duplicate files in a build tree: hard links, soft (symbolic) links and copies'
+complete -c scons -l duplicate -d 'How to duplicate files' -a 'hard-soft-copy soft-hard-copy hard-copy soft-copy copy'
 complete -c scons -l max-drift -d 'Set the maximum expected drift in the modification time of files to SECONDS'
 complete -c scons -s n -l just-print -l dry-run -l recon -d 'No execute'
 complete -c scons -l profile -d 'Run SCons under the Python profiler and save the results in the specified file'
 complete -c scons -s q -l question -d 'Do not run any commands, or print anything'
-complete -c scons -s Q -d 'Quiets SCons status messages about reading SConscript files, building targets and entering directories'
+complete -c scons -s Q -d 'Quiet some status messages'
 complete -c scons -l random -d 'Build dependencies in a random order'
 complete -c scons -s s -l silent -l quiet -d Silent
 complete -c scons -l taskmastertrace -d 'Prints Taskmaster trace information to the specified file'
--- a/share/completions/sfdx.fish
+++ b/share/completions/sfdx.fish
@ -202,7 +202,7 @@ complete $sfdx_looking -xa force:data:bulk:delete -d 'bulk delete records from a
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s f -l csvfile -d '(required) the path to the CSV file containing the ids of the records to delete'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s s -l sobjecttype -d '(required) the sObject type of the records you’re deleting'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait -d 'number of minutes to wait for the command to complete'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l apiversion -d 'override the api version used for api requests made by this command'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
@ -220,7 +220,7 @@ complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s f -l c
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s i -l externalid -d '(required) the column name of the external ID'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s s -l sobjecttype -d '(required) the sObject type of the records you want to upsert'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait -d 'number of minutes to wait for the command to complete'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l apiversion -d 'override the api version used for api requests made by this command'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
@ -381,7 +381,7 @@ complete $sfdx_looking -xa force:lightning:test:install -d 'install Lightning Te
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s r -l releaseversion -d '[default: latest] release version of Lightning Testing Service'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s t -l packagetype -d '[default: full] type of unmanaged package. \'full\' option contains both jasmine and mocha, plus examples' -xa 'jasmine mocha full'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait -d '[default: 2 minutes] number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait -d 'number of minutes to wait for installation status (default 2)'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l apiversion -d 'override the api version used for api requests made by this command'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
@ -459,7 +459,7 @@ complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -l
 complete $sfdx_looking -xa force:mdapi:listmetadata -d 'display properties of metadata components of a specified type'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s a -l apiversion -d 'API version to use (the default is 46.0)'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s f -l resultfile -d 'path to the file where results are stored'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype -d '(required) metadata type to be retrieved, such as CustomObject; metadata type value is case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype -d '(required) metadata type to be retrieved'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l folder -d 'folder associated with the component'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l json -d 'format output as json'
@ -553,7 +553,7 @@ complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s a -l setalia
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s n -l sandboxname -d '(required) name of the sandbox org to check status for'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s s -l setdefaultusername -d 'set the created org as the default username'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s u -l targetusername -d 'username or alias for the target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait -d '[default: 6 minutes] number of minutes to wait while polling for status'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait -d 'number of minutes to wait while polling for status (default 6)'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l apiversion -d 'override the api version used for api requests made by this command'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
@ -620,7 +620,7 @@ complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l pac
 complete $sfdx_looking -xa force:package:install -d 'install packages'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s a -l apexcompile -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s p -l package -d 'ID (starts with 04t) or alias of the package version to install'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l noprompt -d 'do not prompt for confirmation'
@ -684,7 +684,7 @@ complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l
 complete $sfdx_looking -xa force:package:install -d 'install packages'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s a -l apexcompile -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s p -l package -d 'ID (starts with 04t) or alias of the package version to install'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s r -l noprompt -d 'do not prompt for confirmation'
--- a/share/completions/strace.fish
+++ b/share/completions/strace.fish
@ -1,5 +1,5 @@
 # Startup
-complete -c strace -s E -l env -d 'Remove var from the inherited list of environment variables before passing it on to the command'
+complete -c strace -s E -l env -d 'Remove var from the inherited environment before passing it on to the command'
 complete -c strace -s p -l attach -xa '(__fish_complete_pids)'
 complete -c strace -s u -l user -xa '(__fish_complete_users)'
 complete -c strace -l argv0 -d 'Set argv[0] of the command being executed to name'
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@ -83,7 +83,7 @@ complete -c svn -n __fish_use_subcommand -x -a $help -d 'Describe the usage of t
 complete -c svn -n __fish_use_subcommand -x -a $import -d 'Commit an unversioned file or tree into the repository'
 complete -c svn -n __fish_use_subcommand -x -a $info -d 'Display information about a local or remote item'
 complete -c svn -n __fish_use_subcommand -x -a $list -d 'List directory entries in the repository'
-complete -c svn -n __fish_use_subcommand -x -a $lock -d 'Lock working copy paths or URLs in the repository, so that no other user can commit changes to them'
+complete -c svn -n __fish_use_subcommand -x -a $lock -d 'Lock working copy paths/URLs in the repo, so that no other user can commit changes to them'
 complete -c svn -n __fish_use_subcommand -x -a $log -d 'Show the log messages for a set of revision(s) and/or file(s)'
 complete -c svn -n __fish_use_subcommand -x -a $merge -d 'Apply the differences between two sources to a working copy path'
 complete -c svn -n __fish_use_subcommand -x -a $mergeinfo -d 'Display information related to merges'
--- a/share/completions/systemd-analyze.fish
+++ b/share/completions/systemd-analyze.fish
@ -13,7 +13,7 @@ complete -c systemd-analyze -l order -d 'dot: show only After and Before depende
 complete -c systemd-analyze -l require -d 'dot: show only Requires, Requisite, Wants and Conflicts dependencies' -n "not __fish_contains_opt order require"
 complete -c systemd-analyze -l from-pattern -d 'dot: show relationships matching left-hand nodes pattern'
 complete -c systemd-analyze -l to-pattern -d 'dot: show relationships matching right-hand nodes pattern'
-complete -c systemd-analyze -l fuzz -x -d 'critical-chain: also show units, which finished timespan earlier, than latest unit in the same level'
+complete -c systemd-analyze -l fuzz -x -d 'critical-chain: also show units which finished timespan earlier than last unit in same level'
 complete -c systemd-analyze -l man -xa no -d 'Do not invoke man to verify the existence of man pages'
 complete -c systemd-analyze -l generators -d 'Invoke unit generators'
 complete -c systemd-analyze -l root -xa "(__fish_complete_directories)" -d 'With cat-files, show config files underneath the specified root path'
--- a/share/completions/tail.fish
+++ b/share/completions/tail.fish
@ -1,8 +1,8 @@
 if tail --version >/dev/null 2>/dev/null
-    complete -c tail -s c -l bytes -x -d 'output the last K bytes; alternatively, use -c +K to output bytes starting with the Kth of each file'
+    complete -c tail -s c -l bytes -x -d 'output the last K bytes; with +K output bytes starting with the Kth'
    complete -c tail -s f -l follow -a 'name descriptor' -d 'output appended data as the file grows'
    complete -c tail -s F -d 'same as --follow=name --retry'
-    complete -c tail -s n -l lines -x -d 'output the last K lines, instead of last 10; or use -n +K to output lines starting with the Kth'
+    complete -c tail -s n -l lines -x -d 'output the last K lines; with +K output lines starting with the Kth'
    complete -c tail -l max-unchanged-stats -x -d 'with --follow=name, reopen a FILE which has not changed size after N iterations'
    complete -c tail -l pid -d 'with -f, terminate after process ID, PID dies' -xa '(__fish_complete_pids)'
    complete -c tail -s q -l quiet -l silent -d 'never output headers giving file names'
--- a/share/completions/zef.fish
+++ b/share/completions/zef.fish
@ -67,7 +67,7 @@ complete -c zef -n '__fish_seen_subcommand_from install upgrade smoke' -l instal
 # Install
 complete -c zef -n '__fish_seen_subcommand_from install' -l upgrade
 complete -c zef -n '__fish_seen_subcommand_from install' -l deps-only -d 'Install only the dependency chains of the requested distributions'
-complete -c zef -n '__fish_seen_subcommand_from install' -l contained -d 'Install all transitive and direct dependencies regardless if they are already installed globally'
+complete -c zef -n '__fish_seen_subcommand_from install' -l contained -d 'Install dependencies regardless if they are already installed globally'
 # Uninstall
 complete -c zef -n '__fish_seen_subcommand_from uninstall' -l from