Merge remote-tracking branch 'origin/master' into master

3 files changed, 34 insertions, 12 deletions

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index 44af05225..398d3263c 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -10,16 +10,16 @@ plugins=(... brew)
 
 ## Aliases
 
-| Alias    | Command                                                     | Description                                                         |
-|----------|-------------------------------------------------------------|---------------------------------------------------------------------|
-| `brewp`  | `brew pin`                                                  | Pin a specified formula so that it's not upgraded.                  |
-| `brews`  | `brew list -1`                                              | List installed formulae or the installed files for a given formula. |
-| `brewsp` | `brew list --pinned`                                        | List pinned formulae, or show the version of a given formula.       |
-| `bubo`   | `brew update && brew outdated`                              | Update Homebrew and all formulae, then list outdated formulae.      |
-| `bubc`   | `brew upgrade && brew cleanup`                              | Upgrade outdated formulae, then run cleanup.                        |
-| `bubu`   | `bubo && bubc`                                              | Do the last two operations above.                                   |
-| `bcubo`  | `brew update && brew cask outdated`                         | Update Homebrew and alll formulae, then list outdated casks.        |
-| `bcubc`  | `brew cask reinstall $(brew cask outdated) && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| Alias    | Command                                                       | Description                                                         |
+|----------|-------------------------------------------------------------  |---------------------------------------------------------------------|
+| `brewp`  | `brew pin`                                                    | Pin a specified formula so that it's not upgraded.                  |
+| `brews`  | `brew list -1`                                                | List installed formulae or the installed files for a given formula. |
+| `brewsp` | `brew list --pinned`                                          | List pinned formulae, or show the version of a given formula.       |
+| `bubo`   | `brew update && brew outdated`                                | Update Homebrew and all formulae, then list outdated formulae.      |
+| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae, then run cleanup.                        |
+| `bubu`   | `bubo && bubc`                                                | Do the last two operations above.                                   |
+| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew and all formulae, then list outdated casks.        |
+| `bcubc`  | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup.                            |
 
 ## Completion
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index fdea76c74..c8b1e3568 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -4,5 +4,5 @@ alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
-alias bcubo='brew update && brew cask outdated'
-alias bcubc='brew cask reinstall $(brew cask outdated) && brew cleanup'
+alias bcubo='brew update && brew outdated --cask'
+alias bcubc='brew cask reinstall $(brew outdated --cask) && brew cleanup'
diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 241a6a448..fab7aa8f1 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -10,3 +10,25 @@ plugins=(... docker)
 
 A copy of the completion script from the docker/cli git repo:
 https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker
+
+## Settings
+
+By default, the completion doesn't allow option-stacking, meaning if you try to
+complete `docker run -it <TAB>` it won't work, because you're _stacking_ the
+`-i` and `-t` options.
+
+[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding
+the lines below to your zshrc file**, but be aware of the side effects:
+
+> This enables Zsh to understand commands like `docker run -it
+> ubuntu`. However, by enabling this, this also makes Zsh complete
+> `docker run -u<tab>` with `docker run -uapprox` which is not valid. The
+> users have to put the space or the equal sign themselves before trying
+> to complete.
+>
+> Therefore, this behavior is disabled by default. To enable it:
+>
+> ```
+> zstyle ':completion:*:*:docker:*' option-stacking yes
+> zstyle ':completion:*:*:docker-*:*' option-stacking yes
+> ```