From 11dbe4c286330f81fae5ac6d5f698f5ddb748710 Mon Sep 17 00:00:00 2001 From: Jens Schleusener Date: Thu, 9 Jan 2020 13:39:44 +0000 Subject: 45269: Fix misspellings in completions and elsewhere. --- Completion/Unix/Command/_git | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Completion/Unix/Command/_git') diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index be0c810cc..40d10f431 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1187,7 +1187,7 @@ _git-log () { fi # TODO: Write a wrapper function that checks whether we have a - # committish range or comittish and calls __git_tree_files + # committish range or committish and calls __git_tree_files # appropriately. if __git_is_committish_range $line[1]; then __git_tree_files ${PREFIX:-.} $(__git_committish_range_last $line[1]) && ret=0 @@ -1671,7 +1671,7 @@ _git-shortlog () { ;; (*) # TODO: Write a wrapper function that checks whether we have a - # committish range or comittish and calls __git_tree_files + # committish range or committish and calls __git_tree_files # appropriately. if __git_is_committish_range $line[1]; then __git_tree_files ${PREFIX:-.} $(__git_committish_range_last $line[1]) && ret=0 @@ -2101,7 +2101,7 @@ _git-switch() { case $state in branches) if [[ -n ${opt_args[(i)--guess]} ]]; then - # --guess is the default but if it has been explictly specified, + # --guess is the default but if it has been explicitly specified, # we'll only complete remote branches __git_remote_branch_names_noprefix && ret=0 else @@ -5432,7 +5432,7 @@ _git-daemon () { '--strict-paths[match paths exactly]' \ '--access-hook=-[allow an external tool to accept or decline service]:path:_directories' \ '--base-path=-[remap all the path requests as relative to the given path]:path:_directories' \ - '--base-path-relaxed[allow lookup of base path witout prefix]' \ + '--base-path-relaxed[allow lookup of base path without prefix]' \ '--interpolated-path=-[dynamically construct alternate paths]:path:_directories' \ '--export-all[allow pulling from all repositories without verification]' \ '(--port --listen --user --group)--inetd[run server as an inetd service]' \ @@ -6100,7 +6100,7 @@ _git_column_layouts() { '(always never)auto[show in columns if the output is to the terminal]' \ '(row plain)column[fill columns before rows]' \ '(column plain)row[fill rows before columns]' \ - '(column row)plain[show in one colum]' \ + '(column row)plain[show in one column]' \ '(nodense)dense[make unequal size columns to utilize more space]' \ '(dense)nodense[make equal size columns]' } -- cgit v1.2.3 From 66caa81ab7ffd931be143c6e8f35188c1b57894e Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 9 Jan 2020 14:38:35 +0100 Subject: Fix typos reported by codespell in shell code --- ChangeLog | 4 ++++ Completion/Unix/Command/_ecasound | 2 +- Completion/Unix/Command/_git | 4 ++-- Completion/Unix/Command/_growisofs | 2 +- Completion/Unix/Command/_luarocks | 2 +- Completion/Unix/Command/_moosic | 2 +- Completion/Unix/Command/_pandoc | 2 +- Completion/Unix/Command/_rclone | 2 +- Completion/Unix/Command/_ruby | 2 +- Completion/Unix/Command/_sed | 2 +- Completion/Unix/Type/_canonical_paths | 2 +- Completion/openSUSE/Command/_osc | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) (limited to 'Completion/Unix/Command/_git') diff --git a/ChangeLog b/ChangeLog index 64e3ee82f..19346964c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,10 @@ Src/zsh.h, Src/ztype.h, Test/B01cd.ztst, Test/D04parameter.ztst: Fix misspellings in completions and elsewhere. +2020-01-08 Mikael Magnusson + + * 45272, 45273: Fix more typos. + 2020-01-08 dana * 45261: Completion/Unix/Command/_gcc: Detect clang-as-gcc diff --git a/Completion/Unix/Command/_ecasound b/Completion/Unix/Command/_ecasound index 7ad08d0e1..a39e426db 100644 --- a/Completion/Unix/Command/_ecasound +++ b/Completion/Unix/Command/_ecasound @@ -36,7 +36,7 @@ _arguments -C \ '*-eS\:-[audio stamp]:stamp-id (int)' \ '*-ea\:-[amplify signal]:amplification value (percent)' \ '*-eac\:-[amplify signal of channel]: :->eac' \ - '*-eaw\:-[amplify singal (clipping)]: :->eaw' \ + '*-eaw\:-[amplify signal (clipping)]: :->eaw' \ '*-eal\:-[limits audio level]:limit (percent)' \ '*-ec\:-[compressor (a simple one)]: :->ec' \ '*-eca\:-[a more advanced compressor]: :->eca' \ diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 40d10f431..2906a2276 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -4352,7 +4352,7 @@ _git-send-email () { '--smtp-pass=[specify password to use for SMTP-AUTH]::password' \ '--smtp-server=[specify SMTP server to connect to, or sendmail command]: : __git_sendmail_smtpserver_values' \ '--smtp-server-port=[specify port to connect to SMTP server on]:smtp port:_ports' \ - '--smtp-server-option=[specify the outgoing SMTP server option to use]:SMPT server option' \ + '--smtp-server-option=[specify the outgoing SMTP server option to use]:SMTP server option' \ '--smtp-ssl-cert-path=[path to ca-certificates (directory or file)]:ca certificates path:_files' \ '--smtp-user=[specify user to use for SMTP-AUTH]:smtp user:_users' \ '(--no-smtp-auth)--smtp-auth=[specify allowed AUTH mechanisms]:space-separated list of mechanisms' \ @@ -5421,7 +5421,7 @@ _git-verify-pack () { '*:index file:_files -g "*.idx(-.)"' } -# Synching Repositories +# Syncing Repositories (( $+functions[_git-daemon] )) || _git-daemon () { diff --git a/Completion/Unix/Command/_growisofs b/Completion/Unix/Command/_growisofs index 741a7516b..b7160a474 100644 --- a/Completion/Unix/Command/_growisofs +++ b/Completion/Unix/Command/_growisofs @@ -208,7 +208,7 @@ else '-G[specify path and file-name of a generic boot-image]:boot image:_files' \ '-hard-disk-boot[specify that the el torito boot-image is a hard-disk image]' \ '-no-emul-boot[specify that the el torito boot-image is a "no emulation" image]' \ - '-no-boot[specify that the el torito CD should be markes an non-bootable]' \ + '-no-boot[specify that the el torito CD should be marked an non-bootable]' \ '-boot-load-seg[specify the load-segment address of the boot-image for a "no emulation" image]:segment address' \ '-boot-lead-size[specify the number of 512-byte sectors to load in "no emulation" mode]:load sectors' \ '-boot-info-table[specify that a 56-byte table of CD-ROM-layout information should be written]' \ diff --git a/Completion/Unix/Command/_luarocks b/Completion/Unix/Command/_luarocks index 0b8e45803..0915765dc 100644 --- a/Completion/Unix/Command/_luarocks +++ b/Completion/Unix/Command/_luarocks @@ -305,7 +305,7 @@ __luarocks_installed_rocks(){ fi fi } -# Used to complete one or more of the followings: +# Used to complete one or more of the following: # - .rockspec file # - .src.rock file # - external rock diff --git a/Completion/Unix/Command/_moosic b/Completion/Unix/Command/_moosic index f22fe16c5..54d768c8c 100644 --- a/Completion/Unix/Command/_moosic +++ b/Completion/Unix/Command/_moosic @@ -83,7 +83,7 @@ _moosic_add_cmds() { "noloop:turn loop mode off" "toggle-loop:toggle loop mode" "reconfigure:daemon reload configuration file" - "showconfig:show dameon filetype associations" + "showconfig:show daemon filetype associations" "start-server:starts new instance of daemon with given options" {quit,exit,die}":quit daemon" ) diff --git a/Completion/Unix/Command/_pandoc b/Completion/Unix/Command/_pandoc index 24fee9969..29d3724e0 100644 --- a/Completion/Unix/Command/_pandoc +++ b/Completion/Unix/Command/_pandoc @@ -337,7 +337,7 @@ _arguments -C \ '--strip-empty-paragraphs[deprecated. Use the +empty_paragraphs extension instead]: :' \ '--indented-code-classes=[classes to use for indented code blocks]:class:{_message "Classes separated with ,"}' \ '*--filter=[specify an executable to be used as a filter transforming the pandoc AST after the input is parsed and before the output is written]:file:_pandoc_filter' \ - '*--lua-filter=[transform the document in a similar fashion as JSON filters (see --filter), but use pandoc'"'"'s build-in lua filtering system]:file:_pandoc_lua_filter' \ + '*--lua-filter=[transform the document in a similar fashion as JSON filters (see --filter), but use pandoc'"'"'s built-in lua filtering system]:file:_pandoc_lua_filter' \ {-p,--preserve-tabs}'[preserve tabs instead of converting them to spaces]: :' \ '--tab-stop=[specify the number of spaces per tab (default is 4)]:number:{_message -r "choose a number equals to or greater then 1"}' \ '--track-changes=[specifies what to do with insertions, deletions, and comments produced by the MS Word "Track Changes" feature]: :_pandoc_track_changes' \ diff --git a/Completion/Unix/Command/_rclone b/Completion/Unix/Command/_rclone index 01d851fa1..40f06e0ba 100644 --- a/Completion/Unix/Command/_rclone +++ b/Completion/Unix/Command/_rclone @@ -33,7 +33,7 @@ commands=( "lsjson\:'list directories and objects in the path in JSON format'" "lsl\:'list the objects in path with modification time, size and path'" "md5sum\:'produce an md5sum file for all the objects in the path'" - "mkdir\:'make the path if it doesnt already exist'" + "mkdir\:'make the path if it does not already exist'" "mount\:'mount the remote as file system on a mountpoint'" "move\:'move files from source to dest'" "moveto\:'move file or directory from source to dest'" diff --git a/Completion/Unix/Command/_ruby b/Completion/Unix/Command/_ruby index 11df80f5d..3ed25a3f0 100644 --- a/Completion/Unix/Command/_ruby +++ b/Completion/Unix/Command/_ruby @@ -49,7 +49,7 @@ opts=( '--jit[enable jit with default options]' '--jit-warnings[enable printing JIT warnings]' '--jit-debug[enable JIT debugging (very slow)]' - '--jit-wait[wait until JIT compilation is finished everytime (for testing)]' + '--jit-wait[wait until JIT compilation is finished every time (for testing)]' '--jit-save-temps[save JIT temporary files]' '--jit-verbose=-[print JIT logs of level num or less to stderr]:maximum log level [0]' '--jit-max-cache=-[specify max number of methods to be JIT-ed in a cache]:number [1000]' diff --git a/Completion/Unix/Command/_sed b/Completion/Unix/Command/_sed index b08eaa281..73227901e 100644 --- a/Completion/Unix/Command/_sed +++ b/Completion/Unix/Command/_sed @@ -38,7 +38,7 @@ cmds_end=( 'n:read the next line of input into pattern space' 'N:append the next line of input to the pattern space' 'p:print the current pattern space' - 'P:print upto the first newline of the current pattern space' + 'P:print up to the first newline of the current pattern space' 'x:exchange hold and pattern spaces' '}:end group' ) diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths index cddc3b405..a8fbbb524 100644 --- a/Completion/Unix/Type/_canonical_paths +++ b/Completion/Unix/Type/_canonical_paths @@ -96,7 +96,7 @@ _canonical_paths() { # This style controls how many parent directory links (..) to chase searching # for possible completions. The default is 8. Note that this chasing is - # triggered only when the user enters atleast a .. and the path completed + # triggered only when the user enters at least a .. and the path completed # contains only . or .. components. A value of 0 turns off .. link chasing # altogether. diff --git a/Completion/openSUSE/Command/_osc b/Completion/openSUSE/Command/_osc index 97263da7d..3c479aea8 100644 --- a/Completion/openSUSE/Command/_osc +++ b/Completion/openSUSE/Command/_osc @@ -119,7 +119,7 @@ _osc_cmd_do() { local -a cmdlist local tag=0 - # only start completion if theres some '-' on the line + # only start completion if there's some '-' on the line if ! [ "$words[2]" = "-" ]; then _complete return -- cgit v1.2.3 From 5482d65d5c9b933db8df3d3f39d36df9c5f63bdd Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 11 Jan 2020 13:46:13 +0000 Subject: 45280: _git: add -local variants Technically all timezone formats support the "-local" suffix but it is not meaningful for all of them. As such just list out the specific formats which it does. Also adjust the 'default' description --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'Completion/Unix/Command/_git') diff --git a/ChangeLog b/ChangeLog index 0b904e482..669dac165 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-01-11 Oliver Kiddle + + * Eitan: 45280: Completion/Unix/Command/_git: add -local + variants to completed date formats + 2020-01-11 Peter Stephenson * users/24628 (fixed up): Doc/Zsh/contrib.yo: Add example of how diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 2906a2276..7f2c206c1 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -6116,15 +6116,22 @@ __git_date_formats () { date_formats=( relative:'show dates relative to the current time' - local:'show timestamps in local timezone' + local:'show timestamps in the local timezone' iso{,8601}:'show timestamps in ISO 8601 format' + iso{,8601}-local:'show timestamps in ISO 8601 format in the local timezone' iso-strict:'show timestamps in strict ISO 8601 format' + iso-strict-local:'show timestamps in strict ISO 8601 format in the local timezone' rfc{,2822}:'show timestamps in RFC 2822 format' + rfc{,2822}-local:'show timestamps in RFC 2822 format in the local timezone' short:'show only date but not time' + short-local:'show only date but not time in the local timezone' raw:'show date in internal raw git format (%s %z)' + raw-local:'show date in internal raw git format (%s %z) in the local timezone' human:'elide some current and recent date elements' + human-local:'elide some current and recent date elements in the local timezone' unix:'show date as a Unix epoch timestamp' - default:'show timestamp in the original timezone' + default:'show timestamp in rfc-like format' + default-local:'show timestamp in rfc-like format in the local timezone' ) _describe -t date-formats 'date format' date_formats -- '( format\:custom\ format )' -S : -- cgit v1.2.3