aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Cheng2015-05-06 16:19:07 +0800
committerXu Cheng2015-05-06 16:19:07 +0800
commit1f7c4ee6449e8458824bab62cef04fb5b7b93388 (patch)
tree4514c729746510f16b048424ca1821c15e145f07
parent83bcde23170ceed42f6b86b5ea66a5ce20e00ff4 (diff)
downloadbrew-1f7c4ee6449e8458824bab62cef04fb5b7b93388.tar.bz2
replace `brew upgrade` with `brew upgrade --all`.
-rw-r--r--Library/Homebrew/cmd/help.rb2
-rw-r--r--Library/Homebrew/manpages/brew.1.md4
-rw-r--r--share/doc/homebrew/FAQ.md2
-rw-r--r--share/man/man1/brew.14
4 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb
index f4fedc529..ce015a42b 100644
--- a/Library/Homebrew/cmd/help.rb
+++ b/Library/Homebrew/cmd/help.rb
@@ -6,7 +6,7 @@ Example usage:
brew search [foo]
brew list [FORMULA...]
brew update
- brew upgrade [FORMULA...]
+ brew upgrade [--all | FORMULA...]
brew pin/unpin [FORMULA...]
Troubleshooting:
diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md
index e8e8cacb0..212a3aa90 100644
--- a/Library/Homebrew/manpages/brew.1.md
+++ b/Library/Homebrew/manpages/brew.1.md
@@ -308,7 +308,7 @@ Note that these flags should only appear after a command.
* `pin` <formulae>:
Pin the specified <formulae>, preventing them from being upgraded when
- issuing the `brew upgrade` command without arguments. See also `unpin`.
+ issuing the `brew upgrade --all` command without arguments. See also `unpin`.
* `prune`:
Remove dead symlinks from the Homebrew prefix. This is generally not
@@ -390,7 +390,7 @@ Note that these flags should only appear after a command.
source. This is useful for creating patches for the software.
* `unpin` <formulae>:
- Unpin <formulae>, allowing them to be upgraded by `brew upgrade`. See also
+ Unpin <formulae>, allowing them to be upgraded by `brew upgrade --all`. See also
`pin`.
* `untap` <tap>:
diff --git a/share/doc/homebrew/FAQ.md b/share/doc/homebrew/FAQ.md
index 7a6baeaef..ab793c6d5 100644
--- a/share/doc/homebrew/FAQ.md
+++ b/share/doc/homebrew/FAQ.md
@@ -57,7 +57,7 @@ and run `./uninstall --help` to view more uninstall options.
### How do I uninstall a formula?
If you do not uninstall all of the versions that Homebrew has installed,
Homebrew will continue to attempt to install the newest version it knows
-about when you do (`brew upgrade`). This can be surprising.
+about when you do (`brew upgrade --all`). This can be surprising.
To remove a formula entirely, you may do
(`brew uninstall formula_name --force`).
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index 120b6ff63..1da570ad6 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -331,7 +331,7 @@ If \fB\-\-verbose\fR is passed, display detailed version information\.
.
.TP
\fBpin\fR \fIformulae\fR
-Pin the specified \fIformulae\fR, preventing them from being upgraded when issuing the \fBbrew upgrade\fR command without arguments\. See also \fBunpin\fR\.
+Pin the specified \fIformulae\fR, preventing them from being upgraded when issuing the \fBbrew upgrade \-\-all\fR command without arguments\. See also \fBunpin\fR\.
.
.TP
\fBprune\fR
@@ -415,7 +415,7 @@ If \fB\-\-git\fR is passed, a Git repository will be initalized in the unpacked
.
.TP
\fBunpin\fR \fIformulae\fR
-Unpin \fIformulae\fR, allowing them to be upgraded by \fBbrew upgrade\fR\. See also \fBpin\fR\.
+Unpin \fIformulae\fR, allowing them to be upgraded by \fBbrew upgrade \-\-all\fR\. See also \fBpin\fR\.
.
.TP
\fBuntap\fR \fItap\fR