summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2014-08-04 14:26:38 -0700
committerTim Moore <tmoore@incrementalism.net>2014-10-12 16:42:02 +1100
commit1334606435a6caf6aede845044c775e0339d386c (patch)
tree3425e1e61d9f41773f0fab1966c1c51731ecb0df
parent436bd9db41d9be5356f75f1fc3ed20880c0c0808 (diff)
downloadbundler-1334606435a6caf6aede845044c775e0339d386c.tar.gz
Reword credential docs for consistency and spelling
-rw-r--r--man/bundle-config.ronn21
-rw-r--r--man/gemfile.5.ronn14
2 files changed, 21 insertions, 14 deletions
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index f01144edfa..d158f5b02d 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -145,23 +145,26 @@ Finally, Bundler also ensures that the current revision in the
`Gemfile.lock` exists in the local git repository. By doing this, Bundler
forces you to fetch the latest changes in the remotes.
-## MIRRORS OF GEM REPOSITORIES
+## MIRRORS OF GEM SOURCES
Bundler supports overriding gem sources with mirrors. This allows you to
configure rubygems.org as the gem source in your Gemfile while still using your
mirror to fetch gems.
- bundle config mirror.http://rubygems.org http://rubygems-mirror.org
+ bundle config mirror.SOURCE_URL MIRROR_URL
+
+For example, to use a mirror of rubygems.org hosted at
-## CREDENTIALS FOR PRIVATE REPOSITORIES
+ bundle config mirror.http://rubygems.org http://rubygems-mirror.org
-Bundler allows you to configure credentials for private repositories on a per
-source basis.
+## CREDENTIALS FOR GEM SOURCES
- bundle config REMOTE_URI USERNAME:PASSWORD
+Bundler allows you to configure credentials for any gem source, which allows
+you to avoid putting secrets into your Gemfile.
-For example to use your company geminabox server you can call:
+ bundle config SOURCE_URL USERNAME:PASSWORD
- bundle config https://gems.example.com/ username:password
+For example, to save the credentials of user `claudette` for the gem source at
+`gems.longerous.com`, you would run:
-This way you can avoid putting secrets into your Gemfile.
+ bundle config https://gems.longerous.com/ claudette:s00pers3krit
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index 756970d540..ac49f8c08d 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -33,18 +33,22 @@ be selected for gems that need to use a non-standard repository, suppressing
this warning, by using the [`:source` option](#SOURCE-source-) or a
[`source` block](#BLOCK-FORM-OF-SOURCE-GIT-PATH-GROUP-and-PLATFORMS).
-### PRIVATE REPOSITORIES
+### CREDENTIALS (#credentials)
-To access private repositories you can use `bundle config` to set user and
-password on a per source basis.
+Some gem sources require a username and password. Use `bundle config` to set
+the username and password for any sources that need it. The command must be run
+once on each computer that will install the Gemfile, but this keeps the
+credentials from being stored in plain text in version control.
bundle config https://gems.example.com/ user:password
-As alternative you can provide credentials directly in the source URI.
+For some sources, like a company Gemfury account, it may be easier to simply
+include the credentials in the Gemfile as part of the source URL.
source "https://user:password@gems.example.com"
-Credentials provided in the source URI will take presedence.
+Credentials in the source URL will take precedence over credentials set using
+`config`.
## RUBY (#ruby)