aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2011-11-28 14:37:16 -0600
committerJack Nagel2011-11-28 14:43:54 -0600
commit093974f200d27c5f396e582b6cbb33d55929024a (patch)
tree8de7aaec781e058de68a703682269473ef35f62f
parent8b88ea3eaea716f14a0764e66cd5d08f3eab1fbf (diff)
downloadbrew-093974f200d27c5f396e582b6cbb33d55929024a.tar.bz2
Document 'install --devel'
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Contributions/brew_bash_completion.sh4
-rw-r--r--Library/Contributions/manpages/brew.1.md6
-rw-r--r--share/man/man1/brew.17
3 files changed, 11 insertions, 6 deletions
diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 722083e6f..028920471 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -127,11 +127,11 @@ _brew_to_completion()
local opts=$(
local opts=(--force --verbose --debug --use-clang --use-gcc
--use-llvm --ignore-dependencies --build-from-source --HEAD
- --interactive --fresh $(brew options --compact "$prev"))
+ --interactive --fresh --devel $(brew options --compact "$prev"))
# options that make sense with '--interactive'
if [[ "${COMP_WORDS[*]}" =~ "--interactive" ]]; then
- opts=(--force --git --use-clang --use-gcc --use-llvm --HEAD)
+ opts=(--force --git --use-clang --use-gcc --use-llvm --HEAD --devel)
fi
for o in ${opts[*]}; do
diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index ba7b1df4b..db1b37939 100644
--- a/Library/Contributions/manpages/brew.1.md
+++ b/Library/Contributions/manpages/brew.1.md
@@ -134,7 +134,7 @@ For the full command list, see the COMMANDS section.
* `info` <URL>:
Print the name and version that will be detected for <URL>.
- * `install [--force] [--debug] [--ignore-dependencies] [--fresh] [--use-clang] [--use-gcc] [--use-llvm] [--build-from-source] [--HEAD]` <formula>:
+ * `install [--force] [--debug] [--ignore-dependencies] [--fresh] [--use-clang] [--use-gcc] [--use-llvm] [--build-from-source] [--devel] [--HEAD]` <formula>:
Install <formula>.
<formula> is usually the name of the formula to install, but may also be
@@ -165,8 +165,10 @@ For the full command list, see the COMMANDS section.
If `--build-from-source` is passed, compile from source even if a bottle
is provided for <formula>.
+ If `--devel` is passed, and <formula> defines it, install the development version.
+
If `--HEAD` is passed, and <formula> defines it, install the HEAD version,
- aka master, trunk, unstable, dev.
+ aka master, trunk, unstable.
To install a newer version of HEAD use
`brew rm <foo> && brew install --HEAD <foo>`
diff --git a/share/man/man1/brew.1 b/share/man/man1/brew.1
index c7ae10e6f..c799be8c5 100644
--- a/share/man/man1/brew.1
+++ b/share/man/man1/brew.1
@@ -158,7 +158,7 @@ To view formula history locally: \fBbrew log \-p <formula>\fR\.
Print the name and version that will be detected for \fIURL\fR\.
.
.TP
-\fBinstall [\-\-force] [\-\-debug] [\-\-ignore\-dependencies] [\-\-fresh] [\-\-use\-clang] [\-\-use\-gcc] [\-\-use\-llvm] [\-\-build\-from\-source] [\-\-HEAD]\fR \fIformula\fR
+\fBinstall [\-\-force] [\-\-debug] [\-\-ignore\-dependencies] [\-\-fresh] [\-\-use\-clang] [\-\-use\-gcc] [\-\-use\-llvm] [\-\-build\-from\-source] [\-\-devel] [\-\-HEAD]\fR \fIformula\fR
Install \fIformula\fR\.
.
.IP
@@ -189,7 +189,10 @@ If \fB\-\-use\-llvm\fR is passed, attempt to compile using the LLVM front\-end t
If \fB\-\-build\-from\-source\fR is passed, compile from source even if a bottle is provided for \fIformula\fR\.
.
.IP
-If \fB\-\-HEAD\fR is passed, and \fIformula\fR defines it, install the HEAD version, aka master, trunk, unstable, dev\.
+If \fB\-\-devel\fR is passed, and \fIformula\fR defines it, install the development version\.
+.
+.IP
+If \fB\-\-HEAD\fR is passed, and \fIformula\fR defines it, install the HEAD version, aka master, trunk, unstable\.
.
.IP
To install a newer version of HEAD use \fBbrew rm <foo> && brew install \-\-HEAD <foo>\fR or \fBbrew install \-\-force \-\-HEAD <foo>\fR\.