various backported errata

Author: schacon

book/05-distributed-git/sections/contributing.asc

@@ -267,7 +267,7 @@ Fast forward
  2 files changed, 6 insertions(+), 1 deletions(-)
 -----
 
-No problems occur; as you can see it, was a simple fast-forward.
+No problems occur; as you can see it was a simple fast-forward.
 Now Jessica merges in John's work (`origin/master`):
 
 [source,console]
@@ -453,12 +453,12 @@ Jessica wants to tweak something, so she commits again and then pushes this back
 [source,console]
 -----
 $ git commit -am 'small tweak'
-[featureA ed774b3] small tweak
+[featureA 774b3ed] small tweak
  1 files changed, 1 insertions(+), 1 deletions(-)
 $ git push
 ...
 To jessica@githost:simplegit.git
-   3300904..ed774b3  featureA -> featureA
+   3300904..774b3ed  featureA -> featureA
 -----
 
 Jessica's commit history now looks something like this:

book/07-git-tools/sections/rewriting-history.asc

@@ -164,7 +164,7 @@ When you save and exit the editor, Git rewinds your branch to the parent of thes
 You effectively change the order of those commits and remove the ``added cat-file'' commit completely.
 
 [[_squashing]]
-==== Squashing a Commit
+==== Squashing Commits
 
 It’s also possible to take a series of commits and squash them down into a single commit with the interactive rebasing tool.
 The script puts helpful instructions in the rebase message:

book/07-git-tools/sections/stashing-cleaning.asc

@@ -181,7 +181,7 @@ Saved working directory and index state WIP on master: 1b65b17 added the index f
 
 ==== Un-applying a Stash
 
-In some use case scenarios you might want to apply stashed changes, do some work, but then un-apply those changes that originally came form the stash.
+In some use case scenarios you might want to apply stashed changes, do some work, but then un-apply those changes that originally came from the stash.
 Git does not provide such a `stash unapply` command, but it is possible to achieve the effect by simply retrieving the patch associated with a stash and applying it in reverse:
 
 [source,console]

book/08-customizing-git/sections/attributes.asc

@@ -110,7 +110,7 @@ Git successfully and succinctly tells me that I added the string ``Testing: 1, 2
 It's not perfect – formatting changes wouldn't show up here – but it certainly works.
 
 Another interesting problem you can solve this way involves diffing image files.
-One way to do this is to run JPEG files through a filter that extracts their EXIF information – metadata that is recorded with most image formats.
+One way to do this is to run image files through a filter that extracts their EXIF information – metadata that is recorded with most image formats.
 If you download and install the `exiftool` program, you can use it to convert your images into text about the metadata, so at least the diff will show you a textual representation of any changes that happened:
 
 [source,console]
@@ -168,8 +168,8 @@ The next time you check out this file, Git injects the SHA of the blob:
 
 [source,console]
 ----
-$ rm text.txt
-$ git checkout -- text.txt
+$ rm test.txt
+$ git checkout -- test.txt
 $ cat test.txt
 $Id: 42812b7653c7b88933f8a9d6cad0ca16714b9bb3 $
 ----

book/08-customizing-git/sections/policy.asc

@@ -216,7 +216,7 @@ Now your users can't push any commits with badly formed messages or with modifie
 
 ===== Testing It Out
 
-If you run `chmod u+x .git/hooks/update`, which is the file you into which you should have put all this code, and then try to push a commit with a non-compliant message, you get something like this:
+If you run `chmod u+x .git/hooks/update`, which is the file into which you should have put all this code, and then try to push a commit with a non-compliant message, you get something like this:
 
 [source,console]
 ----