summaryrefslogtreecommitdiff
path: root/lib/bundler/man
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2023-08-02 17:17:21 +0900
committergit <svn-admin@ruby-lang.org>2023-08-02 09:56:13 +0000
commit28c2136722823ce5b69d07bd723b8a76b8b172d8 (patch)
tree4919cf064be5aade59b5d291562ca2675336cf65 /lib/bundler/man
parentfd8dd7199665ed26818a140de945cca71d6fc84b (diff)
[rubygems/rubygems] Replaced remained local to lockfile
https://github.com/rubygems/rubygems/commit/6ed69223d4
Diffstat (limited to 'lib/bundler/man')
-rw-r--r--lib/bundler/man/bundle-config.12
-rw-r--r--lib/bundler/man/bundle-config.1.ronn2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1
index c442172452..920849a065 100644
--- a/lib/bundler/man/bundle-config.1
+++ b/lib/bundler/man/bundle-config.1
@@ -296,7 +296,7 @@ The following is a list of all configuration keys and their purpose\. You can le
\fBuser_agent\fR (\fBBUNDLE_USER_AGENT\fR): The custom user agent fragment Bundler includes in API requests\.
.
.IP "\(bu" 4
-\fBversion\fR (\fBBUNDLE_VERSION\fR): The version of Bundler to use when running under Bundler environment\. Defaults to \fBlocal\fR\. You can also specify \fBsystem\fR or \fBx\.y\.z\fR\. \fBlockfile\fR will use the Bundler version specified in the \fBGemfile\.lock\fR, \fBsystem\fR will use the system version of Bundler, and \fBx\.y\.z\fR will use the specified version of Bundler\.
+\fBversion\fR (\fBBUNDLE_VERSION\fR): The version of Bundler to use when running under Bundler environment\. Defaults to \fBlockfile\fR\. You can also specify \fBsystem\fR or \fBx\.y\.z\fR\. \fBlockfile\fR will use the Bundler version specified in the \fBGemfile\.lock\fR, \fBsystem\fR will use the system version of Bundler, and \fBx\.y\.z\fR will use the specified version of Bundler\.
.
.IP "\(bu" 4
\fBwith\fR (\fBBUNDLE_WITH\fR): A \fB:\fR\-separated list of groups whose gems bundler should install\.
diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn
index 3e2e01dd82..b935329b4e 100644
--- a/lib/bundler/man/bundle-config.1.ronn
+++ b/lib/bundler/man/bundle-config.1.ronn
@@ -276,7 +276,7 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html).
The custom user agent fragment Bundler includes in API requests.
* `version` (`BUNDLE_VERSION`):
The version of Bundler to use when running under Bundler environment.
- Defaults to `local`. You can also specify `system` or `x.y.z`.
+ Defaults to `lockfile`. You can also specify `system` or `x.y.z`.
`lockfile` will use the Bundler version specified in the `Gemfile.lock`,
`system` will use the system version of Bundler, and `x.y.z` will use
the specified version of Bundler.