Merge pull request #1875 from petk/patch-grammar

Fix grammar and letter case

Author: ben

book/04-git-server/sections/protocols.asc

@@ -202,7 +202,7 @@ Due to the lack of TLS or other cryptography, cloning over `git://` might lead t
   If you then compile/run the code you just cloned, you will execute the malicious code.
   Running `git clone http://example.com/project.git` should be avoided for the same reason.
 * Running `git clone https://example.com/project.git` does not suffer from the same problem (unless the attacker can provide a TLS certificate for example.com).
-  Running `git clone git@example.com:project.git` only suffers from this problem if you accept a wrong ssh key fingerprint.
+  Running `git clone git@example.com:project.git` only suffers from this problem if you accept a wrong SSH key fingerprint.
 
 It also has no authentication, i.e. anyone can clone the repo (although this is often exactly what you want).
 It's also probably the most difficult protocol to set up.

book/06-github/sections/1-setting-up-account.asc

@@ -64,7 +64,7 @@ image::images/avatar-crop.png[Crop your uploaded avatar]
 
 Now anywhere you interact on the site, people will see your avatar next to your username.
 
-If you happen to have uploaded an avatar to the popular Gravatar service (often used for Wordpress accounts), that avatar will be used by default and you don't need to do this step.
+If you happen to have uploaded an avatar to the popular Gravatar service (often used for WordPress accounts), that avatar will be used by default and you don't need to do this step.
 
 ==== Your Email Addresses
 

book/07-git-tools/sections/advanced-merging.asc

@@ -164,7 +164,7 @@ What we really need to do is run the file we're trying to merge in through a `do
 So how would we do that?
 
 First, we get into the merge conflict state.
-Then we want to get copies of my version of the file, their version (from the branch we're merging in) and the common version (from where both sides branched off).
+Then we want to get copies of our version of the file, their version (from the branch we're merging in) and the common version (from where both sides branched off).
 Then we want to fix up either their side or our side and re-try the merge again for just this single file.
 
 Getting the three file versions is actually pretty easy.

book/09-git-and-other-scms/sections/import-hg.asc

@@ -39,7 +39,7 @@ Joe Smith <joe@company.com>
 
 In this example, the same person (Bob) has created changesets under four different names, one of which actually looks correct, and one of which would be completely invalid for a Git commit.
 Hg-fast-export lets us fix this by turning each line into a rule: `"<input>"="<output>"`, mapping an `<input>` to an `<output>`.
-Inside the `<input>` and `<output>` strings, all escape sequences understood by the python `string_escape` encoding are supported.
+Inside the `<input>` and `<output>` strings, all escape sequences understood by the Python `string_escape` encoding are supported.
 If the author mapping file does not contain a matching `<input>`, that author will be sent on to Git unmodified.
 If all the usernames look fine, we won't need this file at all.
 In this example, we want our file to look like this:

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

@@ -106,7 +106,7 @@ $ for b in $(git for-each-ref --format='%(refname:short)' refs/remotes); do git
 
 It may happen that you'll see some extra branches which are suffixed by `@xxx` (where xxx is a number), while in Subversion you only see one branch.
 This is actually a Subversion feature called "`peg-revisions`", which is something that Git simply has no syntactical counterpart for.
-Hence, `git svn` simply adds the svn version number to the branch name just in the same way as you would have written it in svn to address the peg-revision of that branch.
+Hence, `git svn` simply adds the SVN version number to the branch name just in the same way as you would have written it in SVN to address the peg-revision of that branch.
 If you do not care anymore about the peg-revisions, simply remove them:
 
 [source,console]