Merge tag 'v1.6.7'

Conflicts:
	CHANGELOG.md
	lib/bundler/dsl.rb
	lib/bundler/version.rb

1 files changed, 17 insertions, 0 deletions

diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index 7353b5ed4a..f56c306da1 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -50,6 +50,23 @@ include the credentials in the Gemfile as part of the source URL.
 Credentials in the source URL will take precedence over credentials set using
 `config`.
 
+### CREDENTIALS (#credentials)
+
+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
+
+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 in the source URL will take precedence over credentials set using
+`config`.
+
 ## RUBY (#ruby)
 
 If your application requires a specific Ruby version or engine, specify your