Concise option/value descriptions

share/completions/attrib.fish

@@ -1,6 +1,6 @@
 function __attrib_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
-  
+
   switch $current_token
     case '+*'
       echo -e 'r\tSet the Read-only file attribute
@@ -17,7 +17,7 @@ i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$curr
     case '*'
       if __fish_seen_argument --windows 's'
         echo -e '/d\tApply attrib and any command-line options to directories
-/l\tApply attrib and any command-line options to the Symbolic Link, rather than the target of it'
+/l\tApply attrib and any command-line options to the Symbolic Link'
       end
 
       echo -e '+\tSet the file attribute
@@ -27,4 +27,4 @@ i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$curr
   end
 end
 
-complete --command attrib --no-files --arguments '(__attrib_generate_args)'
+complete --command attrib --no-files --arguments '(__attrib_generate_args)'

share/completions/attributes.fish

@@ -37,4 +37,4 @@ volume\tDisplay, set, or clear the attributes of a volume'
   end
 end
 
-complete --command attributes --no-files --arguments '(__attributes_generate_args)'
+complete --command attributes --no-files --arguments '(__attributes_generate_args)'

share/completions/choice.fish

@@ -1,7 +1,7 @@
 complete --command choice --no-files --arguments '/c\t"Specify the list of choices to be created"
 /n\t"Hide the list of choices"
 /cs\t"Specify that the choices are case-sensitive"
-/t\t"Specify the number of seconds to pause before using the default choice specified by /d"
-/d\t"Specify the default choice to use after waiting the number of seconds specified by /t"
-/m\t"Specify a message to display before the list of choices"
-/?\t"Show help"'
+/t\t"Specify the number of seconds"
+/d\t"Specify the default choice"
+/m\t"Specify a message"
+/?\t"Show help"'

share/completions/cleanmgr.fish

@@ -6,13 +6,13 @@ function __cleanmgr_generate_args --description 'Function to generate args'
     return
   end
 
-  echo -e '/d\tSpecify the drive that you want Disk Cleanup to clean
+  echo -e '/d\tSpecify the drive
 /sageset\tDisplay the Disk Cleanup Settings dialog box and also create a registry keyt
-/sagerun\tRun the specified tasks that are assigned to the n value if you use the /sageset option
+/sagerun\tRun the specified tasks that are assigned to the n value
 /tuneup\tRun /sageset and /sagerun for the same n
 /lowdisk\tRun with the default settings
 /verylowdisk\tRun with the default settings, no user prompts
 /?\tShow help'
 end
 
-complete --command cleanmgr --no-files --arguments '(__cleanmgr_generate_args)'
+complete --command cleanmgr --no-files --arguments '(__cleanmgr_generate_args)'

share/completions/cmd.fish

@@ -1,6 +1,6 @@
 function __cmd_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
-  
+
   switch $current_token
     case '/t:*'
       echo -e '0\tBlack
@@ -37,8 +37,8 @@ off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$
       echo -e '/s\tModify the treatment of string after /c or /k
 /q\tTurn the echo off
 /d\tDisable execution of AutoRun commands
-/a\tFormat internal command output to a pipe or a file as ANSI
-/u\tFormat internal command output to a pipe or a file as Unicode
+/a\tFormat internal command output as ANSI
+/u\tFormat internal command output as Unicode
 /t\tSet the background and foreground color
 /e\tManage command extensions
 /f\tManage file and directory name completion

share/completions/cmdkey.fish

@@ -12,20 +12,20 @@ function __cmdkey_generate_args --description 'Function to generate args'
       end
 
       if not __fish_seen_argument --windows 'add:' --windows 'generic:'
-        echo -e '/add:\tAdd a user name and password to the list
-/generic:\tAdd generic credentials to the list'
+        echo -e '/add:\tAdd a user name and password
+/generic:\tAdd generic credentials'
       end
-    
+
       if not __fish_seen_argument --windows 'smartcard' --windows 'user:'
-        echo -e '/smartcard\tRetrieve the credential from a smart card
-/user:\tSpecify the user or account name to store with this entry'
+        echo -e '/smartcard\tRetrieve the credential
+/user:\tSpecify the user or account name'
       end
-    
+
       if __fish_seen_argument --windows 'user:'
-        echo -e '/pass:\tSpecify the password to store with this entry'
+        echo -e '/pass:\tSpecify the password'
       end
-    
-      echo -e '/delete\tDelete a user name and password from the list
+
+      echo -e '/delete\tDelete a user name and password
 /list:\tDisplay the list of stored user names and credentials
 /?\tShow help'
   end

share/completions/comp.fish

@@ -1,7 +1,7 @@
 complete --command comp --no-files --arguments '/d\t"Display differences in decimal format"
 /a\t"Display differences as characters"
-/l\t"Displays the number of the line where a difference occurs, instead of displaying the byte offset"
-/n=\t"Compare only the number of lines that are specified for each file, even if the files are different sizes"
+/l\t"Displays the number of the line where a difference occurs"
+/n=\t"Compare only the number of lines that are specified for each file"
 /c\t"Perform a comparison that is not case-sensitive"
 /off\t"Process files with the offline attribute set"
 /offline\t"Process files with the offline attribute set"

share/completions/powershell.fish

@@ -17,7 +17,7 @@ complete --command powershell --old-option NonInteractive \
 complete --command powershell --old-option InputFormat --no-files --require-parameter \
   --arguments 'Text XML'  --description 'Describe the format of data sent to PowerShell'
 complete --command powershell --old-option OutputFormat --no-files --require-parameter \
-  --arguments 'Text XML'  --description 'Determine how output from PowerShell is formatted'
+  --arguments 'Text XML'  --description 'Determine how output is formatted'
 complete --command powershell --old-option WindowStyle --no-files --require-parameter \
   --arguments 'Normal Minimized Maximized Hidden' --description 'Set the window style for the session'
 complete --command powershell --old-option EncodedCommand --require-parameter \

share/completions/reg.fish

@@ -18,7 +18,7 @@ REG_EXPAND_SZ'
   end
 
   echo -e '/t\tSpecify the type for the registry entry
-/s\tSpecify the character to be used to separate multiple instances of data
+/s\tSpecify the character to be used
 /d\tSpecify the data for the new registry entry
 /f\tAdd the registry entry without prompting for confirmation
 /?\tShow help'
@@ -26,7 +26,7 @@ end
 
 function __reg_compare_generate_args --argument-names previous_token
   if not __fish_seen_argument --windows 'v' --windows 've'
-    echo -e '/v\tSpecify the value name to compare under the subkey
+    echo -e '/v\tSpecify the value name
 /ve\tSpecify that only entries that have a value name of null should be compared'
   end
 
@@ -44,7 +44,7 @@ end
 function __reg_copy_generate_args --argument-names previous_token
   echo -e '/s\tCopy all subkeys and entries under the specified subkey
 /f\tCopy the subkey without prompting for confirmation
-/?\tShow help'  
+/?\tShow help'
 end
 
 function __reg_delete_generate_args --argument-names previous_token
@@ -60,7 +60,7 @@ end
 
 function __reg_export_generate_args --argument-names previous_token
   echo -e '/y\tOverwrite any existing file with the name filename without prompting for confirmation
-/?\tShow help'  
+/?\tShow help'
 end
 
 function __reg_query_generate_args --argument-names previous_token
@@ -75,7 +75,7 @@ REG_NONE'
   end
 
   if not __fish_seen_argument --windows 'v' --windows 've'
-    echo -e '/v\tSpecify the registry value name that is to be queried
+    echo -e '/v\tSpecify the registry value name
 /ve\tRun a query for value names that are empty'
   end
 
@@ -84,7 +84,7 @@ REG_NONE'
 /d\tSpecify to search in data only'
   end
 
-  echo -e '/se\tSpecify the single value separator to search for in the value name type REG_MULTI_SZ
+  echo -e '/se\tSpecify the single value separator
 /f\tSpecify the data or pattern to search for
 /c\tSpecify that the query is case sensitive
 /e\tSpecify to return only exact matches
@@ -100,15 +100,15 @@ end
 
 function __reg_generate_args --description 'Function to generate args'
   if not __fish_seen_subcommand_from add compare copy delete export import load query restore save unload
-    echo -e 'add\tAdd a new subkey or entry to the registry
+    echo -e 'add\tAdd a new subkey or entry
 compare\tCompare specified registry subkeys or entries
-copy\tCopy a registry entry to a specified location on the local or remote computer
-delete\tDelete a subkey or entries from the registry
+copy\tCopy a registry entry
+delete\tDelete a subkey or entries
 export\tCopy the specified subkeys, entries, and values of the local computer into a file
 import\tCopy the contents of a file that contains registry data into the registry of the local computer
 load\tWrite saved subkeys and entries into a different subkey in the registry
 query\tReturn a list of the next tier of subkeys and entries
-restore\tWrite saved subkeys and entries back to the registry
+restore\tWrite saved subkeys and entries back
 save\tSave a copy of specified subkeys, entries, and values of the registry in a specified file
 unload\tRemove a section of the registry that was loaded using the reg load operation'
     return
@@ -133,4 +133,4 @@ unload\tRemove a section of the registry that was loaded using the reg load oper
   end
 end
 
-complete --command reg --no-files --arguments '(__reg_generate_args)'
+complete --command reg --no-files --arguments '(__reg_generate_args)'

share/completions/schtasks.fish

@@ -28,7 +28,7 @@ function __schtasks_change_generate_args --argument-names previous_token
 
   if not __fish_seen_argument --windows 'et' --windows 'du'
     echo -e '/et\tSpecify the end time for the task
-/du\tA value that specifies the duration to run the task'
+/du\tA value that specifies the duration'
   end
 
   if not __fish_seen_argument --windows 'ENABLE' --windows 'DISABLE'
@@ -193,8 +193,8 @@ CSV'
   end
 
   echo -e '/fo\tSpecify the output format
-/nh\tRemove column headings from the table display
-/v\tAdd the advanced properties of the task to the display
+/nh\tRemove column headings
+/v\tAdd the advanced properties of the task
 /s\tSpecify the name or IP address of a remote computer
 /?\tShow help'
 end
@@ -236,7 +236,7 @@ function __schtasks_generate_args --description 'Function to generate args'
   end
 
   set --local previous_token (commandline --tokenize --cut-at-cursor)[-1]
-  
+
   if __fish_seen_argument --windows change
     __schtasks_change_generate_args "$previous_token"
   else if __fish_seen_argument --windows create
@@ -252,4 +252,4 @@ function __schtasks_generate_args --description 'Function to generate args'
   end
 end
 
-complete --command schtasks --no-files --arguments '(__schtasks_generate_args)'
+complete --command schtasks --no-files --arguments '(__schtasks_generate_args)'

share/completions/setx.fish

@@ -16,9 +16,9 @@ function __setx_generate_args --description 'Function to generate args'
 
   if not __fish_seen_argument --windows 'a' --windows 'r' --windows 'x'
     echo -e '/a\tSpecify absolute coordinates and offset as search parameters
-/r\tSpecify relative coordinates and offset from String as search parameters
+/r\tSpecify relative coordinates and offset
 /x\tDisplay file coordinates, ignoring the /a, /r, and /d command-line options'
-  end 
+  end
 
   if __fish_seen_argument --windows 'a' --windows 'r'
     echo -e '/m\tSpecify to set the variable in the system environment'
@@ -27,8 +27,8 @@ function __setx_generate_args --description 'Function to generate args'
   echo -e '/s\tSpecify the name or IP address of a remote computer
 /k\tSpecify that the variable is set based on information from a registry key
 /f\tSpecify the file that you want to use
-/d\tSpecify delimiters to be used in addition to the four built-in delimiters
+/d\tSpecify delimiters to be used
 /?\tShow help'
 end
 
-complete --command setx --no-files --arguments '(__setx_generate_args)'
+complete --command setx --no-files --arguments '(__setx_generate_args)'