completions: More shortening

Also removes a few deprecated options - there's really no need to
offer these.

share/completions/btrfs.fish

@@ -320,7 +320,7 @@ complete -f -c btrfs -n '__btrfs_command_groups scrub status' -s R -d 'Print raw
 complete -f -c btrfs -n $rescue -a chunk-recover -d 'Recover the chunk tree by scanning the devices one by one.'
 complete -f -c btrfs -n $rescue -a super-recover -d 'Recover bad superblocks from good copies'
 complete -f -c btrfs -n $rescue -a zero-log -d 'Clear the tree log. Usable if it\'s corrupted and prevents mount.'
-complete -f -c btrfs -n $rescue -a fix-device-size -d 'Re-align device and super block sizes. Usable if newer kernel refuse to mount it due to mismatch super size'
+complete -f -c btrfs -n $rescue -a fix-device-size -d 'Re-align device and super block sizes'
 # btrfs rescue chunk-recover
 complete -f -c btrfs -n '__btrfs_command_groups rescue chunk-recover' -s y -d 'Assume an answer of YES to all questions'
 complete -f -c btrfs -n '__btrfs_command_groups rescue chunk-recover' -s v -d 'Verbose mode'

share/completions/bzr.fish

@@ -57,7 +57,7 @@ complete -f -c bzr -n __fish_use_subcommand -a diff -d 'Show detailed diffs'
 
 # merge command
 complete -f -c bzr -n __fish_use_subcommand -a merge -d 'Pull in changes from another branch'
-complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l pull -d 'If the destination is already completely merged into the source, pull from the source rather than merging'
+complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l pull -d 'If destination is already merged, pull rather than merging'
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l remember -d 'Remember the specified location as a default'
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l force -d 'Merge even if the destination tree has uncommitted changes'
 complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l reprocess -d 'Reprocess to reduce spurious conflicts'
@@ -71,7 +71,7 @@ complete -f -c bzr -n '__fish_seen_subcommand_from merge' -l revision -s r -d 'S
 
 # commit command
 complete -f -c bzr -n __fish_use_subcommand -a commit -d 'Save some or all changes'
-complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l show-diff -s p -d 'When no message is supplied, show the diff along with the status summary in the message editor'
+complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l show-diff -s p -d 'When no message is supplied, show diff along with status summary in message editor'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l file -s F -d 'Take commit message from this file'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l exclude -s x -d 'Do not consider changes made to a given path'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l message -s m -d 'Description of the new revision'
@@ -80,8 +80,8 @@ complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l commit-time -d 'Ma
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l unchanged -d 'Commit even if nothing has changed'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l fixes -d 'Mark a bug as being fixed by this revision'
 complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l strict -d 'Refuse to commit if there are unknown files in the working tree'
-complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l lossy -d 'When committing to a foreign version control system do not push data that can not be natively represented'
-complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l local -d 'Perform a local commit in a bound branch.  Local commits are not pushed to the master branch until a normal commit is performed'
+complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l lossy -d 'When committing to a foreign vcs do not push data that can not be natively represented'
+complete -f -c bzr -n '__fish_seen_subcommand_from commit' -l local -d 'Perform a local commit in a bound branch (pushed to master on normal commit)'
 
 # send command
 complete -f -c bzr -n __fish_use_subcommand -a send -d 'Send changes via email'

share/completions/cf.fish

@@ -14,20 +14,20 @@ complete -f -n __fish_use_subcommand -c cf -a delete -d "Delete an app"
 complete -f -n __fish_use_subcommand -c cf -a rename -d "Rename an app"
 complete -f -n __fish_use_subcommand -c cf -a start -d "Start an app"
 complete -f -n __fish_use_subcommand -c cf -a stop -d "Stop an app"
-complete -f -n __fish_use_subcommand -c cf -a restart -d "Stop all instances of the app, then start them again. This causes downtime."
-complete -f -n __fish_use_subcommand -c cf -a restage -d "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
+complete -f -n __fish_use_subcommand -c cf -a restart -d "Stop all instances of the app, then start them again"
+complete -f -n __fish_use_subcommand -c cf -a restage -d "Recreate the app's executable artifact using the latest pushed app files and environment"
 complete -f -n __fish_use_subcommand -c cf -a restart-app-instance -d "Terminate, then restart an app instance"
 complete -f -n __fish_use_subcommand -c cf -a run-task -d "Run a one-off task on an app"
 complete -f -n __fish_use_subcommand -c cf -a tasks -d "List tasks of an app"
 complete -f -n __fish_use_subcommand -c cf -a terminate-task -d "Terminate a running task of an app"
 complete -f -n __fish_use_subcommand -c cf -a events -d "Show recent app events"
-complete -f -n __fish_use_subcommand -c cf -a files -d "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
+complete -f -n __fish_use_subcommand -c cf -a files -d "Print out a list of files or contents of a specific file of an app running on the DEA backend"
 complete -f -n __fish_use_subcommand -c cf -a logs -d "Tail or show recent logs for an app"
 complete -f -n __fish_use_subcommand -c cf -a env -d "Show all env variables for an app"
 complete -f -n __fish_use_subcommand -c cf -a set-env -d "Set an env variable for an app"
 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 (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n __fish_use_subcommand -c cf -a stack -d "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
+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 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"
@@ -120,11 +120,11 @@ 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 and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n __fish_use_subcommand -c cf -a purge-service-instance -d "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
+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-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 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 for one or all orgs"
-complete -f -n __fish_use_subcommand -c cf -a disable-service-access -d "Disable access to a service or service plan for one or all orgs"
+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"
 complete -f -n __fish_use_subcommand -c cf -a security-group -d "Show a single security group"
 complete -f -n __fish_use_subcommand -c cf -a security-groups -d "List all security groups"
 complete -f -n __fish_use_subcommand -c cf -a create-security-group -d "Create a security group"

share/completions/clasp.fish

@@ -1,9 +1,9 @@
 # options
 complete -c clasp -s v -l version -d "output the current version"
-complete -c clasp -s A -l auth -d "path to an auth file or a folder with a '.clasprc.json' file."
-complete -c clasp -s I -l ignore -d "path to an ignore file or a folder with a '.claspignore' file."
-complete -c clasp -s P -l project -d "path to a project file or to a folder with a '.clasp.json' file."
-complete -c clasp -s W -l why -d "Display some debugging info upon exit."
+complete -c clasp -s A -l auth -d "path to an auth file or a folder with a '.clasprc.json' file"
+complete -c clasp -s I -l ignore -d "path to an ignore file or a folder with a '.claspignore' file"
+complete -c clasp -s P -l project -d "path to a project file or to a folder with a '.clasp.json' file"
+complete -c clasp -s W -l why -d "Display some debugging info upon exit"
 complete -c clasp -s h -l help -d "display help for command"
 
 # subcommands
@@ -28,23 +28,23 @@ complete -f -c clasp -n __fish_use_subcommand -xa help -d "display help for comm
 
 # login options
 complete -c clasp -n '__fish_seen_subcommand_from login' -l no-localhost -d 'Do not run a local server, manually enter code instead'
-complete -c clasp -n '__fish_seen_subcommand_from login' -l creds -d 'Relative path to credentials (from GCP).'
+complete -c clasp -n '__fish_seen_subcommand_from login' -l creds -d 'Relative path to credentials (from GCP)'
 complete -c clasp -n '__fish_seen_subcommand_from login' -l status -d 'Print who is logged in'
 
 # create option
-complete -c clasp -n '__fish_seen_subcommand_from create' -l type -d "Creates a new Apps Script project attached to a new Document, Spreadsheet, Presentation, Form, or as a standalone script, web app, or API."
-complete -c clasp -n '__fish_seen_subcommand_from create' -l parentId -d "A project parent Id."
-complete -c clasp -n '__fish_seen_subcommand_from create' -l rootDir -d "Local root directory in which clasp will store your project files."
+complete -c clasp -n '__fish_seen_subcommand_from create' -l type -d "Creates a new Apps Script project"
+complete -c clasp -n '__fish_seen_subcommand_from create' -l parentId -d "A project parent Id"
+complete -c clasp -n '__fish_seen_subcommand_from create' -l rootDir -d "Local root directory in which clasp will store your project files"
 
 # clone options
-complete -c clasp -n '__fish_seen_subcommand_from clone' -l rootDir -d "Local root directory in which clasp will store your project files."
+complete -c clasp -n '__fish_seen_subcommand_from clone' -l rootDir -d "Local root directory in which clasp will store your project files"
 
 # pull options
-complete -c clasp -n '__fish_seen_subcommand_from pull' -l versionNumber -d "The version number of the project to retrieve."
+complete -c clasp -n '__fish_seen_subcommand_from pull' -l versionNumber -d "The version number of the project to retrieve"
 
 # push options
-complete -c clasp -n '__fish_seen_subcommand_from push' -s f -l force -d "Forcibly overwrites the remote manifest."
-complete -c clasp -n '__fish_seen_subcommand_from push' -s w -l watch -d "Watches for local file changes. Pushes when a non-ignored file changes."
+complete -c clasp -n '__fish_seen_subcommand_from push' -s f -l force -d "Forcibly overwrites the remote manifest"
+complete -c clasp -n '__fish_seen_subcommand_from push' -s w -l watch -d "Watches for local file changes. Pushes when a non-ignored file changes"
 
 # status options
 complete -c clasp -n '__fish_seen_subcommand_from status' -l json -d "Show status in JSON form"
@@ -65,7 +65,7 @@ complete -c clasp -n '__fish_seen_subcommand_from undeploy' -l all -d "Undeploy
 complete -c clasp -n '__fish_seen_subcommand_from undeploy' -l help -d "display help for command"
 
 # list options
-complete -c clasp -n '__fish_seen_subcommand_from list' -l noShorten -d "Do not shorten long names (default: false)"
+complete -c clasp -n '__fish_seen_subcommand_from list' -l noShorten -d "Do not shorten long names"
 
 # logs options
 complete -c clasp -n '__fish_seen_subcommand_from logs' -l json -d "Show logs in JSON form"