aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-04-01 10:49:02 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2013-04-01 10:49:02 -0700
commitb4447bfa4dbbba3e90525e0771c4564d96b9aca4 (patch)
treea0b488ee8c09705a0b85ba7ecc108650a3b26b21
parent72b5988e56df183a45e66bd34975d9b33dd99850 (diff)
Squashed commit of the following:
commit 1bbde16b17f04903340206bada9935ea64f785ba Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:12:22 2013 -0500 fix spelling in xterm.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 392dd59da76e6a1293db79733e1975dbb9ef4032 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:10:08 2013 -0500 fix spelling in type.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit f82026828e4c08bdf355176f86489783c57efc80 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:09:34 2013 -0500 fix spelling in top.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 196f2ec59c0904eb13159d1063e2e6c6edbd50a8 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:08:16 2013 -0500 fix spelling in scrot.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 8400d97dce93afe48612c66eb8ddc2bd06b40968 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:07:48 2013 -0500 fix spelling in scp.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit b68bb3f36915520d2c271e48e2d5356e087e9fcf Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:04:30 2013 -0500 fix spelling in mount.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 97000184afde10ca26b6dda8597baa0593bb4e09 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:01:46 2013 -0500 fix spelling in hg.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 87ca4e71ce57842ab98e4d6b6f9274aafd9713a5 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:00:37 2013 -0500 fix spelling in gzip.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 17246a21ad3df39660e6b4c86bf8c6a2239b416b Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 01:00:07 2013 -0500 fix spelling in gunzip.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 0f618600508695ed5a93110568343f8a783db8c5 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:59:37 2013 -0500 fix spelling in grep.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit bacf6a62041d13f1766e90748cfc2c76e1b04b98 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:58:16 2013 -0500 fix spelling in git.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit f8f6a1914a8f2f60a14dac532f1d63dd8269f676 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:56:45 2013 -0500 fix spelling in fuser.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit dcdfd1552dfd360d1ce808706bc401d52cce22ce Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:54:58 2013 -0500 fix spelling in effectv.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 7b4388364f546b81f0557c500bb6a5207931c3be Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:53:45 2013 -0500 fix spelling in du.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 0450070e98adae2ebe19806f4fb74386a50de003 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:52:55 2013 -0500 fix spelling in df.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 49ae24ae0dbd06c72e6c994f1ea4ca9b385fdda5 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:49:00 2013 -0500 fix spelling in cut.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 4eccc923f389e2fc0c498fc63e4bbeeccc177e9a Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:47:21 2013 -0500 fix spelling in compare.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 8c0cfb91c596ef7a1583877c8f38fab7e867cff2 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:46:46 2013 -0500 fix spelling in chown.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 4518b06c3fc8c565038ccbeeb0d2f8aea73e1ee0 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:46:08 2013 -0500 fix spelling in chgrp.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit a0a4fb3dc271c469482e87a0f9efab4016596f82 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:43:04 2013 -0500 fix spelling in apt-setup.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 740e75e5316e73fb03c00bd9b482786d1f387cc5 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:42:25 2013 -0500 fix spelling in apt-rdepends.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 7a2727bcb96e58a023d0f8ab807f839e76555375 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:27:27 2013 -0500 fix spelling in fish_complete_pacman.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 0e28ff4c1c90bdbf1e1b780d0ab3c2ba04b3a463 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:26:17 2013 -0500 fix spelling in fish_complete_pgrep.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 1ca9fad713c460debcd851dfcffa135f3b579561 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:24:13 2013 -0500 fix spelling in trap.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit deb0c2129d50d627d720cbd549cf8aadc3113243 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:19:00 2013 -0500 fix spelling in fish_not_contain_opt.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 8a40bd08b37d5c80041b7beb58fb82d9b0592b5d Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:18:16 2013 -0500 fix spelling in fish_make_completion.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit f1c48dc8236a8eb5ba0e45e985e8dd7eadfb88e5 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:17:09 2013 -0500 fix spelling in fish_gnu_complete.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit b6813883d9355f8e15917769d46b58cc8fab840d Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:16:33 2013 -0500 fix spelling in fish_git_prompt.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 97e3e74ddb743061a8e4349bf7895cf98cf9d9b2 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:13:11 2013 -0500 fix spelling in fish_complete_vi.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 7c31d5fec8f855fbc3496be7200915a1d2dc4d46 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:10:47 2013 -0500 fix spelling of in fish_complete_tex.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 3f06bdb91942c4d0e686d1bb8b5eff1983a91304 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:06:45 2013 -0500 fix spelling in fish_complete_list.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit 5bfd9ef40547b744c9bbfb4cc6f8a7d880d8f3d6 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Mon Apr 1 00:03:14 2013 -0500 fix spelling in fish_complete_atool.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> commit b84a43ff0bad5e206a591891b6c7ff9028e14eb5 Author: Greg Dietsche <Gregory.Dietsche@cuw.edu> Date: Sun Mar 31 23:40:28 2013 -0500 fix spelling of protocol in fish_complete_ssh.fish Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
-rw-r--r--share/completions/apt-rdepends.fish4
-rw-r--r--share/completions/apt-setup.fish2
-rw-r--r--share/completions/chgrp.fish4
-rw-r--r--share/completions/chown.fish4
-rw-r--r--share/completions/compare.fish2
-rw-r--r--share/completions/cut.fish2
-rw-r--r--share/completions/df.fish14
-rw-r--r--share/completions/du.fish4
-rw-r--r--share/completions/effectv.fish6
-rw-r--r--share/completions/fuser.fish2
-rw-r--r--share/completions/git.fish2
-rw-r--r--share/completions/grep.fish4
-rw-r--r--share/completions/gunzip.fish2
-rw-r--r--share/completions/gzip.fish2
-rw-r--r--share/completions/hg.fish2
-rw-r--r--share/completions/mount.fish6
-rw-r--r--share/completions/scp.fish2
-rw-r--r--share/completions/scrot.fish2
-rw-r--r--share/completions/top.fish2
-rw-r--r--share/completions/type.fish2
-rw-r--r--share/completions/xterm.fish4
-rw-r--r--share/functions/__fish_complete_atool.fish4
-rw-r--r--share/functions/__fish_complete_list.fish2
-rw-r--r--share/functions/__fish_complete_pacman.fish8
-rw-r--r--share/functions/__fish_complete_pgrep.fish8
-rw-r--r--share/functions/__fish_complete_ssh.fish4
-rw-r--r--share/functions/__fish_complete_tex.fish8
-rw-r--r--share/functions/__fish_complete_vi.fish8
-rw-r--r--share/functions/__fish_git_prompt.fish4
-rw-r--r--share/functions/__fish_gnu_complete.fish2
-rw-r--r--share/functions/__fish_make_completion_signals.fish2
-rw-r--r--share/functions/__fish_not_contain_opt.fish2
-rw-r--r--share/functions/trap.fish2
33 files changed, 64 insertions, 64 deletions
diff --git a/share/completions/apt-rdepends.fish b/share/completions/apt-rdepends.fish
index 4dfb72d0..7f791d72 100644
--- a/share/completions/apt-rdepends.fish
+++ b/share/completions/apt-rdepends.fish
@@ -4,8 +4,8 @@ complete -f -c apt-rdepends -s b -l build-depends --description "Show build depe
complete -f -c apt-rdepends -s d -l dotty --description "Generate a dotty graph"
complete -f -c apt-rdepends -s p -l print-state --description "Show state of dependencies"
complete -f -c apt-rdepends -s r -l reverse --description "List packages depending on"
-complete -r -f -c apt-rdepends -s f -l follow --description "Comma-separated list of dependancy types to follow recursively"
-complete -r -f -c apt-rdepends -s s -l show --description "Comma-separated list of dependancy types to show"
+complete -r -f -c apt-rdepends -s f -l follow --description "Comma-separated list of dependency types to follow recursively"
+complete -r -f -c apt-rdepends -s s -l show --description "Comma-separated list of dependency types to show"
complete -r -f -c apt-rdepends -l state-follow --description "Comma-separated list of package installation states to follow recursively"
complete -r -f -c apt-rdepends -l state-show --description "Comma-separated list of package installation states to show"
complete -f -c apt-rdepends -l man --description "Display man page"
diff --git a/share/completions/apt-setup.fish b/share/completions/apt-setup.fish
index 6b04a03a..fe229dc1 100644
--- a/share/completions/apt-setup.fish
+++ b/share/completions/apt-setup.fish
@@ -1,4 +1,4 @@
#apt-setup
complete -c apt-setup -a probe --description "Probe a CD"
-complete -c apt-setup -s N --description "Run in noninteractive mode"
+complete -c apt-setup -s N --description "Run in non-interactive mode"
diff --git a/share/completions/chgrp.fish b/share/completions/chgrp.fish
index 14e565b1..bbe4e103 100644
--- a/share/completions/chgrp.fish
+++ b/share/completions/chgrp.fish
@@ -1,9 +1,9 @@
complete -c chgrp -s c -l changes --description "Output diagnostic for changed files"
-complete -c chgrp -l dereference --description "Dereferense symbolic links"
+complete -c chgrp -l dereference --description "Dereference symbolic links"
complete -c chgrp -s h -l no-dereference --description "Do not dereference symbolic links"
complete -c chgrp -l from --description "Change from owner/group"
-complete -c chgrp -s f -l silent --description "Supress errors"
+complete -c chgrp -s f -l silent --description "Suppress errors"
complete -c chgrp -l reference --description "Use same owner/group as file" -r
complete -c chgrp -s R -l recursive --description "Operate recursively"
complete -c chgrp -s v -l verbose --description "Output diagnostic for every file"
diff --git a/share/completions/chown.fish b/share/completions/chown.fish
index cf59f155..6005391d 100644
--- a/share/completions/chown.fish
+++ b/share/completions/chown.fish
@@ -1,8 +1,8 @@
complete -c chown -s c -l changes --description "Output diagnostic for changed files"
-complete -c chown -l dereference --description "Dereferense symbolic links"
+complete -c chown -l dereference --description "Dereference symbolic links"
complete -c chown -s h -l no-dereference --description "Do not dereference symbolic links"
complete -c chown -l from --description "Change from owner/group"
-complete -c chown -s f -l silent --description "Supress errors"
+complete -c chown -s f -l silent --description "Suppress errors"
complete -c chown -l reference --description "Use same owner/group as file" -r
complete -c chown -s R -l recursive --description "Operate recursively"
complete -c chown -s v -l verbose --description "Output diagnostic for every file"
diff --git a/share/completions/compare.fish b/share/completions/compare.fish
index 6c89b457..11769114 100644
--- a/share/completions/compare.fish
+++ b/share/completions/compare.fish
@@ -13,7 +13,7 @@ complete -c compare -o encipher -d 'Convert plain pixels to c
complete -c compare -o extract -d 'Extract area from image [geometry]'
complete -c compare -o format -d 'Output formatted image characteristics ["string"]'
complete -c compare -o fuzz -d 'Colors within this distance are considered equal [distance]'
-complete -c compare -o highlight-color -d 'Empasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c compare -o highlight-color -d 'Emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
complete -c compare -o identify -d 'Identify the format and characteristics of the image'
complete -c compare -o interlace -d 'Type of image interlacing scheme [type]' -xa '(compare -list interlace)'
complete -c compare -o limit -d 'Pixel cache resource limit [type value]' -x
diff --git a/share/completions/cut.fish b/share/completions/cut.fish
index 3c09fad7..65d2f225 100644
--- a/share/completions/cut.fish
+++ b/share/completions/cut.fish
@@ -3,7 +3,7 @@ complete -c cut -s b -l bytes -x --description "Output byte range"
complete -c cut -s c -l characters -x --description "Output character range"
complete -c cut -s d -l delimiter -x --description "Select field delimiter"
complete -c cut -s d -l fields -x --description "Select fields"
-complete -c cut -s n --description "Dont split mutibyte characters"
+complete -c cut -s n --description "Don't split multi byte characters"
complete -c cut -s s -l only-delimited --description "Do not print lines without delimiter"
complete -c cut -l output-delimiter --description "Select output delimiter"
complete -c cut -l help --description "Display help and exit"
diff --git a/share/completions/df.fish b/share/completions/df.fish
index 6f3c98dd..a084b30d 100644
--- a/share/completions/df.fish
+++ b/share/completions/df.fish
@@ -12,25 +12,25 @@ df --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
__fish_gnu_complete -c df -s h -l human-readable --description "Human readable sizes" $is_gnu
__fish_gnu_complete -c df -s i -l inodes --description "List inode information" $is_gnu
__fish_gnu_complete -c df -s k --description "Use 1kB block size" $is_gnu
-__fish_gnu_complete -c df -s l -l local --description "List only local filesystems" $is_gnu
-__fish_gnu_complete -c df -s P -l portability --description "Use Posix format" $is_gnu
-__fish_gnu_complete -c df -s t -l type -r --description "Show filesystems of specified type" $is_gnu -x -a "(__fish_print_filesystems)"
+__fish_gnu_complete -c df -s l -l local --description "List only local file systems" $is_gnu
+__fish_gnu_complete -c df -s P -l portability --description "Use POSIX format" $is_gnu
+__fish_gnu_complete -c df -s t -l type -r --description "Show file systems of specified type" $is_gnu -x -a "(__fish_print_filesystems)"
if test -n "$is_gnu"
- complete -c df -s a -l all --description "Include empty filesystems"
+ complete -c df -s a -l all --description "Include empty file systems"
complete -c df -s B -l block-size -r --description "Block size"
complete -c df -s H -l si --description "Human readable sizes, powers of 1000"
complete -c df -l no-sync --description "Do not sync before getting usage info"
complete -c df -l sync --description "Sync before getting usage info"
- complete -c df -s T -l print-type --description "Print filesystem type"
- complete -c df -s x -l exclude-type --description "Excluded filesystem type" -r -x -a "(__fish_print_filesystems)"
+ complete -c df -s T -l print-type --description "Print file system type"
+ complete -c df -s x -l exclude-type --description "Excluded file system type" -r -x -a "(__fish_print_filesystems)"
complete -c df -l help --description "Display help and exit"
complete -c df -l version --description "Display version and exit"
else
- complete -c df -s a --description "Show all filesystems"
+ complete -c df -s a --description "Show all file systems"
complete -c df -s g --description "Show sizes in gigabytes"
complete -c df -s m --description "Show sizes in megabytes"
complete -c df -s n --description "Print out the previously obtained statistics from the file systems"
diff --git a/share/completions/du.fish b/share/completions/du.fish
index cfb60f79..69f8ea3d 100644
--- a/share/completions/du.fish
+++ b/share/completions/du.fish
@@ -11,8 +11,8 @@ complete -c du -s l -l count-links --description "Count hard links multiple time
complete -c du -s L -l dereference --description "Dereference all symlinks"
complete -c du -s S -l separate-dirs --description "Do not include subdirectory size"
complete -c du -s s -l summarize --description "Display only a total for each argument"
-complete -c du -s x -l one-file-system --description "Skip other filesystems"
-complete -c du -s X -l exclude-from -r --description "Exclude files thet match pattern in file"
+complete -c du -s x -l one-file-system --description "Skip other file systems"
+complete -c du -s X -l exclude-from -r --description "Exclude files that match pattern in file"
complete -c du -l exclude -r --description "Exclude files that match pattern"
complete -c du -l max-depth -r --description "Recursion limit"
complete -c du -l help --description "Display help and exit"
diff --git a/share/completions/effectv.fish b/share/completions/effectv.fish
index f7230d96..971894c3 100644
--- a/share/completions/effectv.fish
+++ b/share/completions/effectv.fish
@@ -27,14 +27,14 @@ complete -c effectv -f -a "RippleTV" -d "Ripple mark effect"
complete -c effectv -f -a "DiceTV" -d "A 'dicing' effect"
complete -c effectv -f -a "VertigoTV" -d "Alpha blending with zoomed and rotated images"
complete -c effectv -f -a "DeinterlaceTV" -d "Deinterlacing video images"
-complete -c effectv -f -a "nervousTV" -d "Realtime frame shuffling effect"
+complete -c effectv -f -a "nervousTV" -d "Real-time frame shuffling effect"
complete -c effectv -f -a "RndmTV" -d "Gives you a noisy picture in color or B/W"
complete -c effectv -f -a "RevTV" -d "Waveform monitor effect"
complete -c effectv -f -a "RandomDotStereoTV" -d "Makes random dot stereo stream from video input"
complete -c effectv -f -a "LensTV" -d "Old school demo lens effect"
-complete -c effectv -f -a "DiffTV" -d "Hilights interframe differences"
+complete -c effectv -f -a "DiffTV" -d "Highlights interframe differences"
complete -c effectv -f -a "BrokenTV" -d "Simulates broken TV"
-complete -c effectv -f -a "WarholTV" -d "Hommage to Andy Warhol"
+complete -c effectv -f -a "WarholTV" -d "Homage to Andy Warhol"
complete -c effectv -f -a "MatrixTV" -d "A Matrix like effect"
complete -c effectv -f -a "PUPTV" -d "Comes from \"Partial UPdate\", certain part of image is updated at a frame"
complete -c effectv -f -a "ChameleonTV" -d "Vanishing into the wall..."
diff --git a/share/completions/fuser.fish b/share/completions/fuser.fish
index d491d35d..2cbab2bd 100644
--- a/share/completions/fuser.fish
+++ b/share/completions/fuser.fish
@@ -11,7 +11,7 @@ complete -c fuser -s k -l kill -d 'Kill processes, accessing the file'
complete -c fuser -s i -d 'Ask the user for confirmation before killing a process'
complete -c fuser -s l -l list-signals -d 'List all known signal names'
complete -c fuser -s m -l mount -d 'All processes accessing files on that file system are listed' -xa '(__fish_print_mounted)'
-complete -c fuser -s M -l ismountpoint -d 'Request will be fullfilled if -m specifies a mountpoint'
+complete -c fuser -s M -l ismountpoint -d 'Request will be fulfilled if -m specifies a mountpoint'
complete -c fuser -s w -d 'Kill only processes which have write access'
complete -c fuser -s n -l namespace -d 'Slect a different namespace' -r
complete -c fuser -s s -l silent -d 'Silent operation'
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 43337273..0da5a18c 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -221,7 +221,7 @@ complete -f -c git -n '__fish_git_needs_command' -a status -d 'Show the working
complete -f -c git -n '__fish_git_using_command status' -s s -l short -d 'Give the output in the short-format'
complete -f -c git -n '__fish_git_using_command status' -s b -l branch -d 'Show the branch and tracking info even in short-format'
complete -f -c git -n '__fish_git_using_command status' -l porcelain -d 'Give the output in a stable, easy-to-parse format'
-complete -f -c git -n '__fish_git_using_command status' -s z -d 'Terminate entries with NUL character'
+complete -f -c git -n '__fish_git_using_command status' -s z -d 'Terminate entries with NULL character'
complete -f -c git -n '__fish_git_using_command status' -s u -l untracked-files -x -a 'no normal all' -d 'The untracked files handling mode'
complete -f -c git -n '__fish_git_using_command status' -l ignore-submodules -x -a 'none untracked dirty all' -d 'Ignore changes to submodules'
# TODO options
diff --git a/share/completions/grep.fish b/share/completions/grep.fish
index 0a256105..2785e735 100644
--- a/share/completions/grep.fish
+++ b/share/completions/grep.fish
@@ -19,7 +19,7 @@ complete -c grep -s F -l fixed --description "Pattern is a fixed string"
complete -c grep -s f -l file -r --description "Use pattern from file"
complete -c grep -s G -l basic-regexp --description "Pattern is basic regex"
complete -c grep -s H -l with-filename --description "Print filename"
-complete -c grep -s h -l no-filename --description "Supress printing filename"
+complete -c grep -s h -l no-filename --description "Suppress printing filename"
complete -c grep -l help --description "Display help and exit"
complete -c grep -s I --description "Skip binary files"
complete -c grep -s i -l ignore-case --description "Ignore case"
@@ -27,7 +27,7 @@ complete -c grep -s L -l files-without-match --description "Print first non-matc
complete -c grep -s l -l files-with-match --description "Print first matching file"
complete -c grep -s m -l max-count --description "Stop reading after NUM matches"
complete -c grep -l mmap --description "Use the mmap system call to read input"
-complete -c grep -s n -l line-number --description "Print linenumber"
+complete -c grep -s n -l line-number --description "Print line number"
complete -c grep -s o -l only-matching --description "Show only matching part"
complete -c grep -l label --description "Rename stdin"
complete -c grep -l line-buffered --description "Use line buffering"
diff --git a/share/completions/gunzip.fish b/share/completions/gunzip.fish
index b4ffd18a..aad2a793 100644
--- a/share/completions/gunzip.fish
+++ b/share/completions/gunzip.fish
@@ -10,7 +10,7 @@ complete -c gunzip -s l -l list --description "List compression information"
complete -c gunzip -s L -l license --description "Print license"
complete -c gunzip -s n -l no-name --description "Do not save/restore filename"
complete -c gunzip -s N -l name --description "Save/restore filename"
-complete -c gunzip -s q -l quiet --description "Supress warnings"
+complete -c gunzip -s q -l quiet --description "Suppress warnings"
complete -c gunzip -s r -l recursive --description "Recurse directories"
complete -c gunzip -s S -l suffix -r --description "Suffix"
complete -c gunzip -s t -l test --description "Check integrity"
diff --git a/share/completions/gzip.fish b/share/completions/gzip.fish
index 507eb71d..8a91d8b5 100644
--- a/share/completions/gzip.fish
+++ b/share/completions/gzip.fish
@@ -12,7 +12,7 @@ complete -c gzip -s l -l list --description "List compression information"
complete -c gzip -s L -l license --description "Print license"
complete -c gzip -s n -l no-name --description "Do not save/restore filename"
complete -c gzip -s N -l name --description "Save/restore filename"
-complete -c gzip -s q -l quiet --description "Supress warnings"
+complete -c gzip -s q -l quiet --description "Suppress warnings"
complete -c gzip -s r -l recursive --description "Recurse directories"
complete -c gzip -s S -l suffix -r --description "Suffix"
complete -c gzip -s t -l test --description "Check integrity"
diff --git a/share/completions/hg.fish b/share/completions/hg.fish
index ae4e3378..27b5f20e 100644
--- a/share/completions/hg.fish
+++ b/share/completions/hg.fish
@@ -430,7 +430,7 @@ complete -c hg -n 'contains \'status\' (commandline -poc)' -s u -l unknown --des
complete -c hg -n 'contains \'status\' (commandline -poc)' -s i -l ignored --description 'Show ignored files'
complete -c hg -n 'contains \'status\' (commandline -poc)' -s n -l no-status --description 'Hide status prefix'
complete -c hg -n 'contains \'status\' (commandline -poc)' -s C -l copies --description 'Show source of copied files'
-complete -c hg -n 'contains \'status\' (commandline -poc)' -s 0 -l print0 --description 'End filenames with NUL, for use with xargs'
+complete -c hg -n 'contains \'status\' (commandline -poc)' -s 0 -l print0 --description 'End filenames with NULL, for use with xargs'
complete -c hg -n 'contains \'status\' (commandline -poc)' -s I -l include --description 'Include names matching the given patterns'
complete -c hg -n 'contains \'status\' (commandline -poc)' -s X -l exclude --description 'Exclude names matching the given patterns'
diff --git a/share/completions/mount.fish b/share/completions/mount.fish
index 133c47cc..fb441886 100644
--- a/share/completions/mount.fish
+++ b/share/completions/mount.fish
@@ -8,7 +8,7 @@ complete -x -c mount -a '(cat /etc/fstab|sed -e "s/^\([^ \t]*\)[ \t]*\([^ \t]*\)
complete -c mount -s V --description 'Display version and exit'
complete -c mount -s h --description 'Display help and exit'
complete -c mount -s v --description 'Verbose mode'
-complete -c mount -s a --description 'Mount filesystems in fstab'
+complete -c mount -s a --description 'Mount file systems in fstab'
complete -c mount -s F --description 'Fork process for each mount'
complete -c mount -s f --description 'Fake mounting'
complete -c mount -s l --description 'Add label to output'
@@ -18,10 +18,10 @@ complete -c mount -s r --description 'Read only'
complete -c mount -s w --description 'Read/Write mode'
complete -x -c mount -s L --description 'Mount partition with specified label'
complete -x -c mount -s U --description 'Mount partition with specified UID'
-complete -c mount -s O -x --description 'Exclude filesystems'
+complete -c mount -s O -x --description 'Exclude file systems'
complete -c mount -l bind -f --description 'Remount a subtree to a second position'
complete -c mount -l move -f --description 'Move a subtree to a new position'
-complete -c mount -x -s t --description 'Filesystem' -a "(__fish_print_filesystems)"
+complete -c mount -x -s t --description 'File system' -a "(__fish_print_filesystems)"
complete -c mount -x -s o --description 'Mount option' -a '(__fish_append , $__fish_mount_opts)'
diff --git a/share/completions/scp.fish b/share/completions/scp.fish
index 3482e929..e22f778e 100644
--- a/share/completions/scp.fish
+++ b/share/completions/scp.fish
@@ -47,5 +47,5 @@ complete -c scp -s P -x --description "Port"
complete -c scp -s p --description "Preserves modification times, access times, and modes from the original file"
complete -c scp -s q --description "Do not display progress bar"
complete -c scp -s r --description "Recursively copy"
-complete -c scp -s S --description "Encyption program"
+complete -c scp -s S --description "Encryption program"
diff --git a/share/completions/scrot.fish b/share/completions/scrot.fish
index 81bf4a12..5cd03e90 100644
--- a/share/completions/scrot.fish
+++ b/share/completions/scrot.fish
@@ -7,5 +7,5 @@ complete -c scrot -s d -l delay -x -d 'wait NUM seconds before taking a shot'
complete -c scrot -s e -l exec -d 'run APP on the resulting screenshot' -xa '(complete -C(commandline -ct))'
complete -c scrot -s q -l quality -x -d 'Image quality (1-100) high value means high size, low compression. Default: 75. For lossless compression formats, like png, low quality means high compression.'
complete -c scrot -s m -l multidisp -d 'For multiple heads, grab shot from each and join them together.'
-complete -c scrot -s s -l select -d 'interactively choose a window or rectnagle with the mouse'
+complete -c scrot -s s -l select -d 'interactively choose a window or rectangle with the mouse'
complete -c scrot -s t -l thumb -x -d 'generate thumbnail too. NUM is the percentage of the original size for the thumbnail to be, or the geometry in percent, e.g. 50x60 or 80x20.'
diff --git a/share/completions/top.fish b/share/completions/top.fish
index 8b5a6b75..43875364 100644
--- a/share/completions/top.fish
+++ b/share/completions/top.fish
@@ -4,7 +4,7 @@ complete -c top -s c --description "Toggle command line/program name"
complete -c top -s d --description "Update interval" -x
complete -c top -s h --description "Display help and exit"
complete -c top -s i --description "Toggle idle processes"
-complete -c top -s n --description "Maximium iterations" -x
+complete -c top -s n --description "Maximum iterations" -x
complete -c top -s u --description "Monitor effective UID" -x -a "(__fish_complete_users)"
complete -c top -s U --description "Monitor user" -x -a "(__fish_complete_users)"
complete -c top -s p --description "Monitor PID" -x -a "(__fish_complete_pids)"
diff --git a/share/completions/type.fish b/share/completions/type.fish
index 769808af..c5233057 100644
--- a/share/completions/type.fish
+++ b/share/completions/type.fish
@@ -1,7 +1,7 @@
complete -c type -s h -l help --description "Display help and exit"
complete -c type -s a -l all --description "Print all possible definitions of the specified name"
-complete -c type -s f -l no-functions --description "Supress function and builtin lookup"
+complete -c type -s f -l no-functions --description "Suppress function and builtin lookup"
complete -c type -s t -l type --description "Print command type"
complete -c type -s p -l path --description "Print path to command, or nothing if name is not a command"
complete -c type -s P -l force-path --description "Print path to command"
diff --git a/share/completions/xterm.fish b/share/completions/xterm.fish
index 1bd3da5e..fb33ad79 100644
--- a/share/completions/xterm.fish
+++ b/share/completions/xterm.fish
@@ -12,7 +12,7 @@ complete -c xterm -n '__fish_test_arg "+*"' -a +cm --description 'Enable recogni
complete -c xterm -n '__fish_test_arg "+*"' -a +cn --description 'Cut newlines in line-mode selections'
complete -c xterm -n '__fish_test_arg "+*"' -a +cu --description 'Don\'t workaround the bug in more(1)'
complete -c xterm -n '__fish_test_arg "+*"' -a +dc --description 'Disable dynamic color changing'
-complete -c xterm -n '__fish_test_arg "+*"' -a +fbb --description 'Don\'t ensure compatibilty between normal and bold fonts bounding boxes'
+complete -c xterm -n '__fish_test_arg "+*"' -a +fbb --description 'Don\'t ensure compatibility between normal and bold fonts bounding boxes'
complete -c xterm -n '__fish_test_arg "+*"' -a +fbx --description 'Normal and bold fonts have VT100 line-drawing characters'
complete -c xterm -n '__fish_test_arg "+*"' -a +hf --description 'Don\'t generate HP Function Key escape codes for function keys'
complete -c xterm -n '__fish_test_arg "+*"' -a +hold --description 'Close xterm\'s window after the shell exits'
@@ -63,7 +63,7 @@ complete -c xterm -o cm --description 'Disable recognition of ANSI color-change
complete -c xterm -o cn --description 'Don\'t cut newlines in line-mode selections'
complete -c xterm -o cu --description 'Workaround for bug in more(1)'
complete -c xterm -o dc --description 'Enable dynamic color changing'
-complete -c xterm -o fbb --description 'Ensure compatibilty between normal and bold fonts bounding boxes'
+complete -c xterm -o fbb --description 'Ensure compatibility between normal and bold fonts bounding boxes'
complete -c xterm -o fbx --description 'Normal and bold fonts don\'t have VT100 line-drawing characters'
complete -c xterm -o hf --description 'Generate HP Function Key escape codes for function keys'
complete -c xterm -o hold --description 'Don\'t close xterm\'s window after the shell exits'
diff --git a/share/functions/__fish_complete_atool.fish b/share/functions/__fish_complete_atool.fish
index 896129a6..f9b0a746 100644
--- a/share/functions/__fish_complete_atool.fish
+++ b/share/functions/__fish_complete_atool.fish
@@ -25,12 +25,12 @@ function __fish_complete_atool --description 'Complete atool' --argument-names c
complete -c $cmd -s 0 -l null -d 'filenames from standard in are null-byte separated'
complete -c $cmd -s E -l explain -d 'explain what is being done by atool'
complete -c $cmd -s S -l simulate -d 'simulation mode - no filesystem changes are made'
- complete -c $cmd -s o -l option -x -d 'override a configuration optioni (KEY=VALUE)'
+ complete -c $cmd -s o -l option -x -d 'override a configuration option (KEY=VALUE)'
complete -c $cmd -l config -r -d 'load configuration defaults from file'
switch $cmd
case als aunpack acat
- complete -c $cmd -a '(__fish_complete_atool_archive_contents)' -d 'Achive content'
+ complete -c $cmd -a '(__fish_complete_atool_archive_contents)' -d 'Archive content'
end
#man -P cat atool | grep '(default')'
diff --git a/share/functions/__fish_complete_list.fish b/share/functions/__fish_complete_list.fish
index c02a561e..99d65ef1 100644
--- a/share/functions/__fish_complete_list.fish
+++ b/share/functions/__fish_complete_list.fish
@@ -6,7 +6,7 @@ where:
separator - a symbol, separating individual entries
function - a function which prints a completion list to complete each entry
prefix - a prefix, which is printed before the list
- itemprefix - a prefi, which is printed before each item" > /dev/stderr
+ itemprefix - a prefix, which is printed before each item" > /dev/stderr
return 1
end
set -q iprefix[1]
diff --git a/share/functions/__fish_complete_pacman.fish b/share/functions/__fish_complete_pacman.fish
index 9967df3a..3be581f9 100644
--- a/share/functions/__fish_complete_pacman.fish
+++ b/share/functions/__fish_complete_pacman.fish
@@ -38,7 +38,7 @@ function __fish_complete_pacman -d 'Complete pacman (ARCH package manager)' --ar
complete -c $progname -s v -l verbose -d 'Output more status messages'
complete -c $progname -l arch -d 'Alternate architecture'
complete -c $progname -l cachedir -d 'Alternative package cache location'
- complete -c $progname -l config -d 'Altenate config file'
+ complete -c $progname -l config -d 'Alternate config file'
complete -c $progname -l debug -d 'Display debug messages'
complete -c $progname -l gpgdir -d 'GPG directory to verify signatures'
complete -c $progname -l logfile -d 'Specify alternative log file'
@@ -48,8 +48,8 @@ function __fish_complete_pacman -d 'Complete pacman (ARCH package manager)' --ar
for condition in sync remove upgrade
complete -c $progname -n $$condition -s d -l nodeps -d 'Skip [all] dependency checks'
complete -c $progname -n $$condition -l dbonly -d 'Modify database entry only'
- complete -c $progname -n $$condition -l noprogressbar -d 'Do not display progressbar'
- complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute intall script'
+ complete -c $progname -n $$condition -l noprogressbar -d 'Do not display progress bar'
+ complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute install script'
complete -c $progname -n $$condition -s p -l print -d 'Dry run, only print targets'
complete -c $progname -n $$condition -l print-format -x -d 'Specify printf-like format'
end
@@ -78,7 +78,7 @@ function __fish_complete_pacman -d 'Complete pacman (ARCH package manager)' --ar
end
# Query options
- complete -c $progname -n $query -s c -l changelog -d 'View the changelog of PACKAGE'
+ complete -c $progname -n $query -s c -l changelog -d 'View the change log of PACKAGE'
complete -c $progname -n $query -s d -l deps -d 'List only non-explicit packages (dependencies)'
complete -c $progname -n $query -s e -l explicit -d 'List only explicitly installed packages'
complete -c $progname -n $query -s k -l check -d 'Check if all files owned by PACKAGE are present'
diff --git a/share/functions/__fish_complete_pgrep.fish b/share/functions/__fish_complete_pgrep.fish
index 4fca97fc..816ea238 100644
--- a/share/functions/__fish_complete_pgrep.fish
+++ b/share/functions/__fish_complete_pgrep.fish
@@ -1,11 +1,11 @@
function __fish_complete_pgrep -d 'Complete pgrep/pkill' --argument-names cmd
complete -c $cmd -xa '(__fish_complete_proc)'
- complete -c $cmd -s f -d 'Match pattern agains full commandline'
+ complete -c $cmd -s f -d 'Match pattern against full command line'
complete -c $cmd -s g -d 'Only match processes in the process group' -xa '(__fish_complete_list , __fish_complete_groups)'
- complete -c $cmd -s G -d "Only match processes whose real group ID is listed. Group 0 is tranlated into $cmd\'s own process group" -xa '(__fish_complete_list , __fish_complete_groups)'
- complete -c $cmd -s n -d 'Selec only the newest process'
- complete -c $cmd -s o -d 'Selec only the oldest process'
+ complete -c $cmd -s G -d "Only match processes whose real group ID is listed. Group 0 is translated into $cmd\'s own process group" -xa '(__fish_complete_list , __fish_complete_groups)'
+ complete -c $cmd -s n -d 'Select only the newest process'
+ complete -c $cmd -s o -d 'Select only the oldest process'
complete -c $cmd -s P -d 'Only match processes whose parent process ID is listed' -xa '(__fish_complete_list , __fish_complete_pids)'
complete -c $cmd -s s -d "Only match processes whose process session ID is listed. Session ID 0 is translated into $cmd\'s own session ID."
complete -c $cmd -s t -d 'Only match processes whose controlling terminal is listed. The terminal name should be specified without the "/dev/" prefix' -r
diff --git a/share/functions/__fish_complete_ssh.fish b/share/functions/__fish_complete_ssh.fish
index b4189c8d..b1154a53 100644
--- a/share/functions/__fish_complete_ssh.fish
+++ b/share/functions/__fish_complete_ssh.fish
@@ -1,8 +1,8 @@
function __fish_complete_ssh -d "common completions for ssh commands" --argument command
- complete -c $command -s 1 --description "Protocoll version 1 only"
- complete -c $command -s 2 --description "Protocoll version 2 only"
+ complete -c $command -s 1 --description "Protocol version 1 only"
+ complete -c $command -s 2 --description "Protocol version 2 only"
complete -c $command -s 4 --description "IPv4 addresses only"
complete -c $command -s 6 --description "IPv6 addresses only"
complete -c $command -s C --description "Compress all data"
diff --git a/share/functions/__fish_complete_tex.fish b/share/functions/__fish_complete_tex.fish
index 1334ddda..152658b6 100644
--- a/share/functions/__fish_complete_tex.fish
+++ b/share/functions/__fish_complete_tex.fish
@@ -10,10 +10,10 @@ function __fish_complete_tex -d "Common completions for all tex commands"
complete -c $argv -o file-line-error -d "Show errors in style file:line"
complete -c $argv -o no-file-line-error -d "Show errors not in style file:line"
complete -c $argv -o halt-on-error -d "Stop processing at the first error"
- complete -c $argv -o interaction=batchmode -d "Set interation mode"
- complete -c $argv -o interaction=nonstopmode -d "Set interation mode"
- complete -c $argv -o interaction=scrollmode -d "Set interation mode"
- complete -c $argv -o interaction=errorstopmode -d "Set interation mode"
+ complete -c $argv -o interaction=batchmode -d "Set interaction mode"
+ complete -c $argv -o interaction=nonstopmode -d "Set interaction mode"
+ complete -c $argv -o interaction=scrollmode -d "Set interaction mode"
+ complete -c $argv -o interaction=errorstopmode -d "Set interaction mode"
complete -c $argv -o output-directory= -x -a "(__fish_complete_directories (commandline -ct))" -d "Output directory"
complete -c $argv -o shell-escape -d "Enable \write18{SHELL COMMAND}"
complete -c $argv -o no-shell-escape -d "Disable \write18{SHELL COMMAND}"
diff --git a/share/functions/__fish_complete_vi.fish b/share/functions/__fish_complete_vi.fish
index 7eb36437..f2f253da 100644
--- a/share/functions/__fish_complete_vi.fish
+++ b/share/functions/__fish_complete_vi.fish
@@ -24,11 +24,11 @@ function __fish_complete_vi -d "Compleletions for vi and its aliases" --argument
complete $cmds -s o -r --description 'Open stacked windows for each file'
complete $cmds -s O -r --description 'Open side by side windows for each file'
complete $cmds -s p -r --description 'Open tab pages for each file'
- complete $cmds -s q -r --description 'Start in quickFix mode'
+ complete $cmds -s q -r --description 'Start in quickFix mode'
complete $cmds -s r -r --description 'Use swap files for recovery'
complete $cmds -s s -r --description 'Source and execute script file'
complete $cmds -s t -r --description 'Set the cursor to tag'
- complete $cmds -s T -r --description 'Termninal name'
+ complete $cmds -s T -r --description 'Terminal name'
complete $cmds -s u -r --description 'Use alternative vimrc'
complete $cmds -s U -r --description 'Use alternative vimrc in GUI mode'
complete $cmds -s w -r --description 'Record all typed characters'
@@ -57,7 +57,7 @@ function __fish_complete_vi -d "Compleletions for vi and its aliases" --argument
complete $cmds -s s --description 'Start in silent mode'
complete $cmds -s V --description 'Start in verbose mode'
complete $cmds -s v --description 'Start in vi mode'
- complete $cmds -s x --description 'Use encription when writing files'
+ complete $cmds -s x --description 'Use encryption when writing files'
complete $cmds -s X --description 'Don\'t connect to X server'
complete $cmds -s y --description 'Start in easy mode'
complete $cmds -s Z --description 'Start in restricted mode'
@@ -92,7 +92,7 @@ function __fish_complete_vi -d "Compleletions for vi and its aliases" --argument
complete $cmds -s C --description 'Encrypt/decrypt text'
complete $cmds -s l --description 'Set up for editing LISP programs'
complete $cmds -s L --description 'List saved file names after crash'
- complete $cmds -s R --description 'Readonly mode'
+ complete $cmds -s R --description 'Read-only mode'
complete $cmds -s S --description 'Use linear search for tags if tag file not sorted'
complete $cmds -s v --description 'Start in display editing state'
complete $cmds -s V --description 'Verbose mode'
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish
index 0e226b01..446493c9 100644
--- a/share/functions/__fish_git_prompt.fish
+++ b/share/functions/__fish_git_prompt.fish
@@ -39,8 +39,8 @@
# __fish_git_prompt_showstashstate to a nonempty value. If something is
# stashed, then a '$' will be shown next to the branch name.
#
-# If you would like to see if there're untracked files, then you can set
-# __fish_git_prompt_showuntrackedfiles to a nonempty value. If there're
+# If you would like to see if they're untracked files, then you can set
+# __fish_git_prompt_showuntrackedfiles to a nonempty value. If they're
# untracked files, then a '%' will be shown next to the branch name.
#
# If you would like to see the difference between HEAD and its upstream, set
diff --git a/share/functions/__fish_gnu_complete.fish b/share/functions/__fish_gnu_complete.fish
index ae800940..62e6dde3 100644
--- a/share/functions/__fish_gnu_complete.fish
+++ b/share/functions/__fish_gnu_complete.fish
@@ -1,4 +1,4 @@
-function __fish_gnu_complete -d "Wrapper for the complete builtin. Skips the long completions on non-GNU systems"
+function __fish_gnu_complete -d "Wrapper for the complete built-in. Skips the long completions on non-GNU systems"
set is_gnu 0
set -l argv_out
diff --git a/share/functions/__fish_make_completion_signals.fish b/share/functions/__fish_make_completion_signals.fish
index 81347569..c957f90b 100644
--- a/share/functions/__fish_make_completion_signals.fish
+++ b/share/functions/__fish_make_completion_signals.fish
@@ -1,4 +1,4 @@
-function __fish_make_completion_signals --description 'Make list of kill signals for copmletion'
+function __fish_make_completion_signals --description 'Make list of kill signals for completion'
set -q __kill_signals; and return 0
if kill -L ^/dev/null >/dev/null
diff --git a/share/functions/__fish_not_contain_opt.fish b/share/functions/__fish_not_contain_opt.fish
index 8320607f..6f97655e 100644
--- a/share/functions/__fish_not_contain_opt.fish
+++ b/share/functions/__fish_not_contain_opt.fish
@@ -1,4 +1,4 @@
-function __fish_not_contain_opt -d "Checks that a specific option is not in the current commandline"
+function __fish_not_contain_opt -d "Checks that a specific option is not in the current command line"
set -l next_short
set -l short_opt
diff --git a/share/functions/trap.fish b/share/functions/trap.fish
index d88bdd4e..5432df1a 100644
--- a/share/functions/trap.fish
+++ b/share/functions/trap.fish
@@ -20,7 +20,7 @@ function __trap_switch
end
-function trap -d 'Perform an action when the shell recives a signal'
+function trap -d 'Perform an action when the shell receives a signal'
set -l mode
set -l cmd