Clean-up all completions

share/completions/attrib.fish

@@ -8,15 +8,15 @@ s\tSet the System file attribute
 h\tSet the Hidden file attribute
 i\tSet the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
     case '-*'
-      echo -e 'r\tUnset the Read-only file attribute
-a\tUnset the Archive file attribute
-s\tUnset the System file attribute
-h\tUnset the Hidden file attribute
-i\tUnset the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
+      echo -e 'r\tClear the Read-only file attribute
+a\tClear the Archive file attribute
+s\tClear the System file attribute
+h\tClear the Hidden file attribute
+i\tClear the Not Content Indexed file attribute' | awk -F '\t' "{ printf \"$current_token%s\t%s\n\", \$1, \$2 }"
     case '*'
-      echo -e '/s\tApply changes recursively
-/d\tApply changes only to directories
-/l\tApply changes to symbolic links and not their targets
+      echo -e '/s\tApply to matching files in the current directory and all of its subdirectories
+/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
 /?\tShow help'
   end
 end

share/completions/attributes.fish

@@ -1,34 +1,34 @@
 function __attributes_generate_args --description 'Function to generate args'
   if ! __fish_seen_subcommand_from disk volume
-    echo -e 'disk\tManipulate disk attributes
-volume\tManipulate volume attributes'
+    echo -e 'disk\tDisplay, set, or clear the attributes of a disk
+volume\tDisplay, set, or clear the attributes of a volume'
     return
   end
 
   if __fish_seen_subcommand_from disk
     if ! __fish_seen_subcommand_from set clear
-      echo -e 'set\tSet an attribute of the disk with focus
-clear\tUnset an attribute of the disk with focus'
+      echo -e 'set\tSet the specified attribute of the disk with focus
+clear\tClear the specified attribute of the disk with focus'
       return
     end
 
-    echo -e 'readonly\tUse readonly attribute
-noerr\tSuppress errors for DiskPart'
+    echo -e 'readonly\tSpecify that the disk is read-only
+noerr\tWhen an error is encountered, DiskPart continues to process commands'
     return
   end
 
   if __fish_seen_subcommand_from volume
     if ! __fish_seen_subcommand_from set clear
-      echo -e 'set\tSet an attribute of the volume with focus
-clear\tUnset an attribute of the disk volume focus'
+      echo -e 'set\tSet the specified attribute of the volume with focus
+clear\tClear the specified attribute of the volume with focus'
       return
     end
 
-    echo -e 'readonly\tUse readonly attribute
-readonly\tUse hidden attribute
-nodefaultdriveletter\tDon\'t use a drive letter by default
-shadowcopy\tSet volume type to shadow copy volume
-noerr\tSuppress errors for DiskPart'
+    echo -e 'readonly\tSpecify that the volume is read-only
+readonly\tSpecify that the volume is hidden
+nodefaultdriveletter\tSpecify that the volume does not receive a drive letter by default
+shadowcopy\tSpecify that the volume is a shadow copy volume
+noerr\tWhen an error is encountered, DiskPart continues to process commands'
     return
   end
 end

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"Respect case"
-/t\t"Specify the number of seconds to pause before using the default choice"
-/d\t"Use as the default choice"
+/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"'

share/completions/clean.fish

@@ -1 +1 @@
-complete --command clean --no-files --arguments 'all\t"Set every sector on the disk to zero"'
+complete --command clean --no-files --arguments 'all\t"Specify that each and every sector on the disk is set to zero"'

share/completions/cleanmgr.fish

@@ -1,7 +1,7 @@
-complete --command cleanmgr --no-files --arguments '/d\t"Use drive to clean-up"
-/sageset\t"Show the Disk Cleanup Settings dialog box and also create a registry key to store the settings that you select"
+complete --command cleanmgr --no-files --arguments '/d\t"Specify the drive that you want Disk Cleanup to clean"
+/sageset\t"Display the Disk Cleanup Settings dialog box and also create a registry keyt"
 /sagerun\t"Run the specified tasks that are assigned to the n value if you use the /sageset option"
 /tuneup\t"Run /sageset and /sagerun for the same n"
-/lowdisk\t"Use default settings"
-/verylowdisk\t"Use default settings and hide all prompts"
+/lowdisk\t"Run with the default settings"
+/verylowdisk\t"Run with the default settings, no user prompts"
 /?\t"Show help"'

share/completions/cmd.fish

@@ -31,8 +31,8 @@ off\tDisable delayed environment variable expansion' | awk -F '\t' "{ printf \"$
       echo -e '/c\tCarry out the command specified by string and then stop
 /k\tCarry out the command specified by string and continue
 /s\tModify the treatment of string after /c or /k
-/q\tDisable echo
-/d\tDisables execution of AutoRun commands
+/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
 /t\tSet the background and foreground color

share/completions/comp.fish

@@ -1,13 +1,8 @@
-function __comp_generate_args --description 'Function to generate args'
-  echo -e '/d\tShow differences in decimal format
-/a\tShow differences as characters
-/l\tShow the numbe
-r of the line where a difference occurs, instead of displaying the byte offset
-/n=\tCompare only the number of lines that are specified for each file, even if the files are different sizes
-/c\tPerform a comparison that is not case-sensitive
-/off\tProcess files with the offline attribute set
-/offline\tProcess files with the offline attribute set
-/?\tShow help'
-end
-
-complete --command comp --no-files --arguments '(__comp_generate_args)'
+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"
+/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"
+/?\t"Show help"'

share/completions/copy.fish

@@ -6,7 +6,7 @@ function __copy_generate_args --description 'Function to generate args'
 
   echo -e '/d\tAllow the encrypted files being copied to be saved as decrypted files at the destination
 /v\tVerify that new files are written correctly
-/n\tUses a short file name, if available
+/n\tUse a short file name, if available
 /y=\tHide prompts to confirm that you want to overwrite an existing destination file
 /-y\tShow prompts to confirm that you want to overwrite an existing destination file
 /z\tCopy networked files in restartable mode

share/completions/forfiles.fish

@@ -1,10 +1,6 @@
-function __forfiles_generate_args --description 'Function to generate args'
-  echo -e '/P\tSpecify the path from which to start the search
-/M\tSearch files according to the specified search mask
-/S\tInstruct the forfiles command to search in subdirectories recursively
-/C\tRun the specified command on each file
-/D\tSelect files with a last modified date within the specified time frame
-/?\tShow help'
-end
-
-complete --command forfiles --no-files --arguments '(__forfiles_generate_args)'
+complete --command forfiles --no-files --arguments '/P\t"Specify the path from which to start the search"
+/M\t"Search files according to the specified search mask"
+/S\t"Instruct the forfiles command to search in subdirectories recursively"
+/C\t"Run the specified command on each file"
+/D\t"Select files with a last modified date within the specified time frame"
+/?\t"Show help"'

share/completions/vol.fish

@@ -3,7 +3,7 @@ function __vol_generate_args --description 'Function to generate args'
   switch $current_token
     case '/*'
       echo -e '/?\tShow help'
-    case "*"
+    case '*'
       wmic logicaldisk get name | tail --lines +2
   end
 end