aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Dunn2015-07-05 20:07:08 -0700
committerDominyk Tiller2015-07-08 02:43:32 +0100
commit8071dcac242da8e78f80e09feaf46fef101f5236 (patch)
tree041db317b862b572fc119b4d305add52fe8143d3
parent10495fb1fa29a4229d9f1edbc3ab5a90f84c3fd0 (diff)
downloadbrew-8071dcac242da8e78f80e09feaf46fef101f5236.tar.bz2
brew.1: document `install --force-bottle`
Closes Homebrew/homebrew#41398. Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
-rw-r--r--Library/Homebrew/manpages/brew.1.md5
-rw-r--r--share/man/man1/brew.15
2 files changed, 8 insertions, 2 deletions
diff --git a/Library/Homebrew/manpages/brew.1.md b/Library/Homebrew/manpages/brew.1.md
index 3281f148d..d5c6fa17c 100644
--- a/Library/Homebrew/manpages/brew.1.md
+++ b/Library/Homebrew/manpages/brew.1.md
@@ -184,7 +184,7 @@ Note that these flags should only appear after a command.
See the docs for examples of using the JSON:
<https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Querying-Brew.md>
- * `install [--debug] [--env=<std|super>] [--ignore-dependencies] [--only-dependencies] [--cc=<compiler>] [--build-from-source] [--devel|--HEAD]` <formula>:
+ * `install [--debug] [--env=<std|super>] [--ignore-dependencies] [--only-dependencies] [--cc=<compiler>] [--build-from-source|--force-bottle] [--devel|--HEAD]` <formula>:
Install <formula>.
<formula> is usually the name of the formula to install, but it can be specified
@@ -213,6 +213,9 @@ Note that these flags should only appear after a command.
If `--build-from-source` is passed, compile from source even if a bottle
is provided for <formula>.
+ If `--force-bottle` is passed, install from a bottle if it exists
+ for the current version of OS X, even if custom options are given.
+
If `--devel` is passed, and <formula> defines it, install the development version.
If `--HEAD` is passed, and <formula> defines it, install the HEAD version,
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index cfd85264a..eb3b46ebf 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -185,7 +185,7 @@ Pass \fB\-\-all\fR to get information on all formulae, or \fB\-\-installed\fR to
See the docs for examples of using the JSON: \fIhttps://github\.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Querying\-Brew\.md\fR
.
.IP "\(bu" 4
-\fBinstall [\-\-debug] [\-\-env=<std|super>] [\-\-ignore\-dependencies] [\-\-only\-dependencies] [\-\-cc=<compiler>] [\-\-build\-from\-source] [\-\-devel|\-\-HEAD]\fR \fIformula\fR: Install \fIformula\fR\.
+\fBinstall [\-\-debug] [\-\-env=<std|super>] [\-\-ignore\-dependencies] [\-\-only\-dependencies] [\-\-cc=<compiler>] [\-\-build\-from\-source|\-\-force\-bottle] [\-\-devel|\-\-HEAD]\fR \fIformula\fR: Install \fIformula\fR\.
.
.IP
\fIformula\fR is usually the name of the formula to install, but it can be specified several different ways\. See \fISPECIFYING FORMULAE\fR\.
@@ -212,6 +212,9 @@ If \fB\-\-cc=<compiler>\fR is passed, attempt to compile using \fIcompiler\fR\.
If \fB\-\-build\-from\-source\fR is passed, compile from source even if a bottle is provided for \fIformula\fR\.
.
.IP
+If \fB\-\-force\-bottle\fR is passed, install from a bottle if it exists for the current version of OS X, even if custom options are given\.
+.
+.IP
If \fB\-\-devel\fR is passed, and \fIformula\fR defines it, install the development version\.
.
.IP