Merge upstream

Gemfile

@@ -13,6 +13,6 @@ gem 'asciidoctor-pdf', '2.3.17'
 gem 'coderay', '1.1.3'
 gem 'pygments.rb', '2.4.1'
 gem 'thread_safe', '0.3.6'
-gem 'epubcheck-ruby', '5.1.0.0'
+gem 'epubcheck-ruby', '5.2.0.0'
 gem 'html-proofer', '5.0.9'
 gem 'kindlegen', '3.1.1'

book/01-introduction/sections/first-time-setup.asc

@@ -42,7 +42,7 @@ $ git config --global user.name "John Doe"
 $ git config --global user.email johndoe@example.com
 ----
 
-Again, you need to do this only once if you pass the `--global` option, because then Git will always use that information for anything you do on that system.
+Again, you need to do this only once if you pass the `--global` option, because then Git will always use that information for your user on that system.
 If you want to override this with a different name or email address for specific projects, you can run the command without the `--global` option when you're in that project.
 
 Many of the GUI tools will help you do this when you first run them.

book/03-git-branching/sections/remote-branches.asc

@@ -217,8 +217,6 @@ It will simply get the data for you and let you merge it yourself.
 However, there is a command called `git pull` which is essentially a `git fetch` immediately followed by a `git merge` in most cases.
 If you have a tracking branch set up as demonstrated in the last section, either by explicitly setting it or by having it created for you by the `clone` or `checkout` commands, `git pull` will look up what server and branch your current branch is tracking, fetch from that server and then try to merge in that remote branch.
 
-Generally it's better to simply use the `fetch` and `merge` commands explicitly as the magic of `git pull` can often be confusing.
-
 [[_delete_branches]]
 ==== Deleting Remote Branches
 

book/07-git-tools/sections/debugging.asc

@@ -111,7 +111,7 @@ Bisecting: 1 revisions left to test after this
 ----
 
 This commit is fine, and now Git has all the information it needs to determine where the issue was introduced.
-It tells you the SHA-1 of the first bad commit and show some of the commit information and which files were modified in that commit so you can figure out what happened that may have introduced this bug:
+It tells you the SHA-1 of the first bad commit and shows some of the commit information and which files were modified in that commit so you can figure out what happened that may have introduced this bug:
 
 [source,console]
 ----

book/07-git-tools/sections/submodules.asc

@@ -166,7 +166,7 @@ $
 ----
 
 The `DbConnector` directory is there, but empty.
-You must run two commands: `git submodule init` to initialize your local configuration file, and `git submodule update` to fetch all the data from that project and check out the appropriate commit listed in your superproject:
+You must run two commands from the main project: `git submodule init` to initialize your local configuration file, and `git submodule update` to fetch all the data from that project and check out the appropriate commit listed in your superproject:
 
 [source,console]
 ----

book/09-git-and-other-scms/sections/client-svn.asc

@@ -158,7 +158,7 @@ c3dcbe8488c6240392e8a5d7553bbffcb0f94ef0 refs/remotes/origin/master
 6dcb09b5b57875f334f61aebed695e2e4193db5e refs/tags/v1.0.0
 ----
 
-Git fetches the tags directly into `refs/tags`, rather than treating them remote branches.
+Git fetches the tags directly into `refs/tags`, rather than treating them as remote branches.
 
 ===== Committing Back to Subversion