aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-12-08 21:01:45 +0000
committerGitHub2017-12-08 21:01:45 +0000
commit69ab17fc35f8be684d699c40415b07ec41512b31 (patch)
treea555f82cf68160f86f05be469022cdc1f1f10fe6
parente72fde418b439b45c6036774159b8e2479faaefe (diff)
parent4eeeb5eac4df4f0f0860941b86d89cd5c70cc9d4 (diff)
downloadbrew-69ab17fc35f8be684d699c40415b07ec41512b31.tar.bz2
Merge pull request #3547 from MikeMcQuaid/force-vendor-ruby-clarify
brew.1: clarify Homebrew's Ruby isn't 2.0 now.
-rw-r--r--Library/Homebrew/manpages/brew.1.md.erb4
-rw-r--r--docs/Manpage.md4
-rw-r--r--manpages/brew.12
3 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index cdc42a61a..321318b16 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -165,8 +165,8 @@ can take several different forms:
system version.
* `HOMEBREW_FORCE_VENDOR_RUBY`:
- If set, Homebrew will always use its vendored, relocatable Ruby 2.0 version
- even if the system version of Ruby is >=2.0.
+ If set, Homebrew will always use its vendored, relocatable Ruby version
+ even if the system version of Ruby is new enough.
* `HOMEBREW_GIT`:
When using Git, Homebrew will use `GIT` if set,
diff --git a/docs/Manpage.md b/docs/Manpage.md
index ae2047c5b..528798f47 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1007,8 +1007,8 @@ can take several different forms:
system version.
* `HOMEBREW_FORCE_VENDOR_RUBY`:
- If set, Homebrew will always use its vendored, relocatable Ruby 2.0 version
- even if the system version of Ruby is >=2.0.
+ If set, Homebrew will always use its vendored, relocatable Ruby version
+ even if the system version of Ruby is new enough.
* `HOMEBREW_GIT`:
When using Git, Homebrew will use `GIT` if set,
diff --git a/manpages/brew.1 b/manpages/brew.1
index 2d2ef4964..42da906f3 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1033,7 +1033,7 @@ If set, Homebrew will use a Homebrew\-installed \fBcurl\fR rather than the syste
.
.TP
\fBHOMEBREW_FORCE_VENDOR_RUBY\fR
-If set, Homebrew will always use its vendored, relocatable Ruby 2\.0 version even if the system version of Ruby is >=2\.0\.
+If set, Homebrew will always use its vendored, relocatable Ruby version even if the system version of Ruby is new enough\.
.
.TP
\fBHOMEBREW_GIT\fR