From 834c3b35455ed50c7ad879b3e2f807eaa9b0a328 Mon Sep 17 00:00:00 2001 From: James Hill Date: Thu, 31 Mar 2022 11:58:39 +1100 Subject: [rubygems/rubygems] Update bundler documentation to reflect bundle config scope changes In https://github.com/rubygems/rubygems/pull/4152 `bundle config` was changed to default to local scope (instead of global) if the command was executed from inside an application directory. Updated documentation reflects this change. https://github.com/rubygems/rubygems/commit/d92d42cae5 --- lib/bundler/man/bundle-config.1 | 6 +++--- lib/bundler/man/bundle-config.1.ronn | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1 index c84a2b106e..d657910e83 100644 --- a/lib/bundler/man/bundle-config.1 +++ b/lib/bundler/man/bundle-config.1 @@ -36,13 +36,13 @@ Executing \fBbundle config list\fR with will print a list of all bundler configu Executing \fBbundle config get \fR will print the value of that configuration setting, and where it was set\. . .P -Executing \fBbundle config set \fR will set that configuration to the value specified for all bundles executed as the current user\. The configuration will be stored in \fB~/\.bundle/config\fR\. If \fIname\fR already is set, \fIname\fR will be overridden and user will be warned\. +Executing \fBbundle config set \fR defaults to setting \fBlocal\fR configuration if executing from within a local application, otherwise it will set \fBglobal\fR configuration\. See \fB\-\-local\fR and \fB\-\-global\fR options below\. . .P -Executing \fBbundle config set \-\-global \fR works the same as above\. +Executing \fBbundle config set \-\-local \fR will set that configuration in the directory for the local application\. The configuration will be stored in \fB/\.bundle/config\fR\. If \fBBUNDLE_APP_CONFIG\fR is set, the configuration will be stored in \fB$BUNDLE_APP_CONFIG/config\fR\. . .P -Executing \fBbundle config set \-\-local \fR will set that configuration in the directory for the local application\. The configuration will be stored in \fB/\.bundle/config\fR\. If \fBBUNDLE_APP_CONFIG\fR is set, the configuration will be stored in \fB$BUNDLE_APP_CONFIG/config\fR\. +Executing \fBbundle config set \-\-global \fR will set that configuration to the value specified for all bundles executed as the current user\. The configuration will be stored in \fB~/\.bundle/config\fR\. If \fIname\fR already is set, \fIname\fR will be overridden and user will be warned\. . .P Executing \fBbundle config unset \fR will delete the configuration in both local and global sources\. diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn index e0533e05be..7d1cb271a9 100644 --- a/lib/bundler/man/bundle-config.1.ronn +++ b/lib/bundler/man/bundle-config.1.ronn @@ -23,18 +23,20 @@ was set. Executing `bundle config get ` will print the value of that configuration setting, and where it was set. -Executing `bundle config set ` will set that configuration to the -value specified for all bundles executed as the current user. The configuration -will be stored in `~/.bundle/config`. If already is set, will be -overridden and user will be warned. - -Executing `bundle config set --global ` works the same as above. +Executing `bundle config set ` defaults to setting `local` +configuration if executing from within a local application, otherwise it will +set `global` configuration. See `--local` and `--global` options below. Executing `bundle config set --local ` will set that configuration in the directory for the local application. The configuration will be stored in `/.bundle/config`. If `BUNDLE_APP_CONFIG` is set, the configuration will be stored in `$BUNDLE_APP_CONFIG/config`. +Executing `bundle config set --global ` will set that +configuration to the value specified for all bundles executed as the current +user. The configuration will be stored in `~/.bundle/config`. If already +is set, will be overridden and user will be warned. + Executing `bundle config unset ` will delete the configuration in both local and global sources. -- cgit v1.2.3