Auto merge of #5168 - colby-swandale:documentation-and-error-improvements, r=segiddins

Documentation and error improvements

This PR is just making a few small improvements to error messages, documentation and code indentation.

Let me know what you think.

Thanks!

5 files changed, 11 insertions, 11 deletions

diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index f66716b39d..b5a54ae8b5 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -57,7 +57,7 @@ module Bundler
 
       if options["binstubs"]
         Bundler::SharedHelpers.major_deprecation \
-          "the --binstubs option will be removed in favor of `bundle binstubs`"
+          "The --binstubs option will be removed in favor of `bundle binstubs`"
       end
 
       Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins?
@@ -167,8 +167,8 @@ module Bundler
     def check_for_options_conflicts
       if (options[:path] || options[:deployment]) && options[:system]
         error_message = String.new
-        error_message << "You have specified both a path to install your gems to as well as --system. Please choose.\n" if options[:path]
-        error_message << "You have specified both --deployment as well as --system. Please choose.\n" if options[:deployment]
+        error_message << "You have specified both --path as well as --system. Please choose only one option.\n" if options[:path]
+        error_message << "You have specified both --deployment as well as --system. Please choose only one option.\n" if options[:deployment]
         raise InvalidOption.new(error_message)
       end
     end
diff --git a/man/bundle.ronn b/man/bundle.ronn
index 10756946d4..f2b1daa08f 100644
--- a/man/bundle.ronn
+++ b/man/bundle.ronn
@@ -73,10 +73,10 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle init(1)`:
   Generate a simple `Gemfile`, placed in the current directory
 
-* [bundle gem(1)][bundle-gem]:
+* [`bundle gem(1)`][bundle-gem]:
   Create a simple gem, suitable for development with bundler
 
-* [bundle platform(1)][bundle-platform]:
+* [`bundle platform(1)`][bundle-platform]:
   Display platform compatibility information
 
 * `bundle clean(1)`:
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index c73cff5e80..02f9983cef 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -22,15 +22,15 @@ describe "install with --deployment or --frozen" do
   it "disallows --deployment --system" do
     bundle "install --deployment --system"
     expect(out).to include("You have specified both --deployment")
-    expect(out).to include("Please choose.")
+    expect(out).to include("Please choose only one option")
     expect(exitstatus).to eq(15) if exitstatus
   end
 
   it "disallows --deployment --path --system" do
     bundle "install --deployment --path . --system"
-    expect(out).to include("You have specified both a path to install your gems to")
-    expect(out).to include("You have specified both --deployment")
-    expect(out).to include("Please choose.")
+    expect(out).to include("You have specified both --path")
+    expect(out).to include("as well as --system")
+    expect(out).to include("Please choose only one option")
     expect(exitstatus).to eq(15) if exitstatus
   end
 
diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb
index 03c42f008c..0a961981b3 100644
--- a/spec/install/path_spec.rb
+++ b/spec/install/path_spec.rb
@@ -38,7 +38,7 @@ describe "bundle install" do
 
     it "disallows --path vendor/bundle --system" do
       bundle "install --path vendor/bundle --system"
-      expect(out).to include("Please choose.")
+      expect(out).to include("Please choose only one option.")
       expect(exitstatus).to eq(15) if exitstatus
     end
 
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb
index 6505023d13..3fc3d06d2a 100644
--- a/spec/other/major_deprecation_spec.rb
+++ b/spec/other/major_deprecation_spec.rb
@@ -97,7 +97,7 @@ describe "major deprecations" do
         G
 
         bundle :install, :binstubs => true
-        expect(warnings).to have_major_deprecation a_string_including("the --binstubs option will be removed")
+        expect(warnings).to have_major_deprecation a_string_including("The --binstubs option will be removed")
       end
     end
   end