summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAditya Prakash <aditya.prakash132@gmail.com>2016-03-07 13:05:57 +0530
committerAditya Prakash <aditya.prakash132@gmail.com>2016-03-08 21:14:09 +0530
commitfeb41629b7cf0267e624857393f7cf198c764755 (patch)
tree746b39d7baf9cd85aacac38099d0d05a5f09a910
parentc4f1238b64714385be143ae121a51f320ca73f4e (diff)
downloadbundler-feb41629b7cf0267e624857393f7cf198c764755.tar.gz
Remove iffy words from the doc
-rw-r--r--man/bundle-install.ronn4
-rw-r--r--man/bundle-package.ronn6
-rw-r--r--man/bundle-platform.ronn2
-rw-r--r--man/bundle-update.ronn4
-rw-r--r--man/gemfile.5.ronn12
5 files changed, 14 insertions, 14 deletions
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
index b756ae2f7d..efbf06d136 100644
--- a/man/bundle-install.ronn
+++ b/man/bundle-install.ronn
@@ -207,7 +207,7 @@ other steps in `bundle install` must be performed as the current user:
Of these three, the first two could theoretically be performed by
`chown`ing the resulting files to `$SUDO_USER`. The third, however,
-can only be performed by actually invoking the `git` command as
+can only be performed by invoking the `git` command as
the current user. Therefore, git gems are downloaded and installed
into `~/.bundle` rather than $GEM_HOME or $BUNDLE_PATH.
@@ -266,7 +266,7 @@ This also means that you cannot include different versions of the same
gem in different groups, because doing so would result in different
sets of dependencies used in development and production. Because of
the vagaries of the dependency resolution process, this usually
-affects more than just the gems you list in your Gemfile(5), and can
+affects more than the gems you list in your Gemfile(5), and can
(surprisingly) radically change the gems you are using.
## REMEMBERED OPTIONS
diff --git a/man/bundle-package.ronn b/man/bundle-package.ronn
index efdfc125d6..eacb83b54d 100644
--- a/man/bundle-package.ronn
+++ b/man/bundle-package.ronn
@@ -44,12 +44,12 @@ to JRuby and run `bundle install`, bundler is forced to check to
see whether a `"java"` platformed `nokogiri` exists.
Even though the `nokogiri` gem for the Ruby platform is
-_technically_ acceptable on JRuby, it actually has a C extension
+_technically_ acceptable on JRuby, it has a C extension
that does not run on JRuby. As a result, bundler will, by default,
still connect to `rubygems.org` to check whether it has a version
of one of your gems more specific to your platform.
-This problem is also not just limited to the `"java"` platform.
+This problem is also not limited to the `"java"` platform.
A similar (common) problem can happen when developing on Windows
and deploying to Linux, or even when developing on OSX and
deploying to Linux.
@@ -57,7 +57,7 @@ deploying to Linux.
If you know for sure that the gems packaged in `vendor/cache`
are appropriate for the platform you are on, you can run
`bundle install --local` to skip checking for more appropriate
-gems, and just use the ones in `vendor/cache`.
+gems, and use the ones in `vendor/cache`.
One way to be sure that you have the right platformed versions
of all your gems is to run `bundle package` on an identical
diff --git a/man/bundle-platform.ronn b/man/bundle-platform.ronn
index 922a9f1a09..b5d3283fb6 100644
--- a/man/bundle-platform.ronn
+++ b/man/bundle-platform.ronn
@@ -38,5 +38,5 @@ match the running Ruby VM, it will tell you what part does not.
## OPTIONS
* `--ruby`:
- It will just display the ruby directive information, so you don't have to
+ It will display the ruby directive information, so you don't have to
parse it from the Gemfile(5).
diff --git a/man/bundle-update.ronn b/man/bundle-update.ronn
index b9900e3b50..d38c9d2f36 100644
--- a/man/bundle-update.ronn
+++ b/man/bundle-update.ronn
@@ -79,8 +79,8 @@ all of the dependencies, all the way down, and install what you need:
Bundle complete! 2 Gemfile dependencies, 26 gems total.
Use `bundle show [gemname]` to see where a bundled gem is installed.
-As you can see, even though you have just two gems in the Gemfile(5), your application
-actually needs 26 different gems in order to run. Bundler remembers the exact versions
+As you can see, even though you have two gems in the Gemfile(5), your application
+needs 26 different gems in order to run. Bundler remembers the exact versions
it installed in `Gemfile.lock`. The next time you run [bundle install(1)][bundle-install], bundler skips
the dependency resolution and installs the same gems as it installed last time.
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index dc1a6b5acb..b707e2a5c5 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -137,10 +137,10 @@ The Bundler runtime allows its two main methods, `Bundler.setup` and
Bundler.setup(:default, :test) # set up the _default_ and _test_ groups, but no others
# require requires all of the gems in the specified groups
- Bundler.require # defaults to just the _default_ group
+ Bundler.require # defaults to the _default_ group
Bundler.require(:default) # identical
Bundler.require(:default, :test) # requires the _default_ and _test_ groups
- Bundler.require(:test) # requires just the _test_ group
+ Bundler.require(:test) # requires the _test_ group
The Bundler CLI allows you to specify a list of groups whose gems `bundle install` should
not install with the `--without` option. To specify multiple groups to ignore, specify a
@@ -155,7 +155,7 @@ without any `--without option`, bundler will recall it.
Also, calling `Bundler.setup` with no parameters, or calling `require "bundler/setup"`
will setup all groups except for the ones you excluded via `--without` (since they
-are obviously not available).
+are not available).
Note that on `bundle install`, bundler downloads and evaluates all gems, in order to
create a single canonical list of all of the required gems and their dependencies.
@@ -353,7 +353,7 @@ currently expands to an insecure `git://` URL. This allows a
man-in-the-middle attacker to compromise your system.
If the git repository you want to use is hosted on GitHub and is public, you can use the
-:github shorthand to specify just the github username and repository name (without the
+:github shorthand to specify the github username and repository name (without the
trailing ".git"), separated by a slash. If both the username and repository name are the
same, you can omit one.
@@ -369,7 +369,7 @@ Since the `github` method is a specialization of `git_source`, it accepts a `:br
### GIST (:gist)
If the git repository you want to use is hosted as a Github Gist and is public, you can use
-the :gist shorthand to specify just the gist identifier (without the trailing ".git").
+the :gist shorthand to specify the gist identifier (without the trailing ".git").
gem "the_hatch", :gist => "4815162342"
@@ -382,7 +382,7 @@ Since the `gist` method is a specialization of `git_source`, it accepts a `:bran
### BITBUCKET (:bitbucket)
If the git repository you want to use is hosted on Bitbucket and is public, you can use the
-:bitbucket shorthand to specify just the bitbucket username and repository name (without the
+:bitbucket shorthand to specify the bitbucket username and repository name (without the
trailing ".git"), separated by a slash. If both the username and repository name are the
same, you can omit one.