more backported errata

Author: schacon

book/02-git-basics/sections/recording-changes.asc

@@ -214,14 +214,25 @@ You can also use two asterisks to match nested directories; `a/**/z` would match
 
 Here is another example .gitignore file:
 
-[source,console]
+[source]
 ----
-# a comment - this is ignored
-*.a       # no .a files
-!lib.a    # but do track lib.a, even though you're ignoring .a files above
-/TODO     # only ignore the root TODO file, not subdir/TODO
-build/    # ignore all files in the build/ directory
-doc/*.txt # ignore doc/notes.txt, but not doc/server/arch.txt
+# no .a files
+*.a
+
+# but do track lib.a, even though you're ignoring .a files above
+!lib.a
+
+# only ignore the root TODO file, not subdir/TODO
+/TODO
+
+# ignore all files in the build/ directory
+build/
+
+# ignore doc/notes.txt, but not doc/server/arch.txt
+doc/*.txt
+
+# ignore all .txt files in the doc/ directory
+doc/**/*.txt
 ----
 
 [TIP]
@@ -493,7 +504,7 @@ This is a safety feature to prevent accidental removal of data that hasn't yet b
 
 Another useful thing you may want to do is to keep the file in your working tree but remove it from your staging area.
 In other words, you may want to keep the file on your hard drive but not have Git track it anymore.
-This is particularly useful if you forgot to add something to your `.gitignore` file and accidentally added it, like a large log file or a bunch of `.a` compiled files.
+This is particularly useful if you forgot to add something to your `.gitignore` file and accidentally staged it, like a large log file or a bunch of `.a` compiled files.
 To do this, use the `--cached` option:
 
 [source,console]

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

@@ -45,7 +45,7 @@ Name this remote `teamone`, which will be your shortname for that whole URL.
 image::images/remote-branches-4.png[Adding another server as a remote.]
 
 Now, you can run `git fetch teamone` to fetch everything the remote `teamone` server has that you don't have yet.
-Because that server is a subset of the data your `origin` server has right now, Git fetches no data but sets a remote branch called `teamone/master` to point to the commit that `teamone` has as its `master` branch.
+Because that server has a subset of the data your `origin` server has right now, Git fetches no data but sets a remote branch called `teamone/master` to point to the commit that `teamone` has as its `master` branch.
 
 .Remote tracking branch for `teamone/master`
 image::images/remote-branches-5.png[Remote tracking branch for `teamone/master`.]

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

@@ -142,10 +142,10 @@ To clone a Git repository over SSH, you can specify ssh:// URL like this:
 
 [source,console]
 ----
-$ git clone ssh://user@server:project.git
+$ git clone ssh://user@server/project.git
 ----
 
-Or you can not specify a protocol – Git assumes SSH if you aren't explicit:
+Or you can use the shorter scp-like syntax for the SSH protocol:
 
 [source,console]
 ----

book/04-git-server/sections/setting-up-server.asc

@@ -71,6 +71,7 @@ At this point, the others can clone it down and push changes back up just as eas
 [source,console]
 ----
 $ git clone git@gitserver:/opt/git/project.git
+$ cd project
 $ vim README
 $ git commit -am 'fix for the README file'
 $ git push origin master

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

@@ -36,7 +36,6 @@ Now, Git won't try to convert or fix CRLF issues; nor will it try to compute or
 You can also use the Git attributes functionality to effectively diff binary files.
 You do this by telling Git how to convert your binary data to a text format that can be compared via the normal diff.
 
-Because this is a pretty cool and not widely known feature, we'll go over a few examples.
 First, you'll use this technique to solve one of the most annoying problems known to humanity: version-controlling Microsoft Word documents.
 Everyone knows that Word is the most horrific editor around, but oddly, everyone still uses it.
 If you want to version-control Word documents, you can stick them in a Git repository and commit every once in a while; but what good does that do?

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

@@ -282,7 +282,7 @@ So, you can either run four config commands
 ----
 $ git config --global merge.tool extMerge
 $ git config --global mergetool.extMerge.cmd \
-  'extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
+  'extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"'
 $ git config --global mergetool.extMerge.trustExitCode false
 $ git config --global diff.external extDiff
 ----

book/10-git-internals/sections/maintenance.asc

@@ -277,7 +277,7 @@ You can easily see what commits modified this file:
 
 [source,console]
 ----
-$ git log --oneline -- git.tgz
+$ git log --oneline --branches -- git.tgz
 dadf725 oops - removed large tarball
 7b30847 add git tarball
 ----

book/10-git-internals/sections/objects.asc

@@ -149,7 +149,7 @@ image::images/data-model-1.png[Simple version of the Git data model.]
 You can fairly easily create your own tree.
 Git normally creates a tree by taking the state of your staging area or index and writing a series of tree objects from it.
 So, to create a tree object, you first have to set up an index by staging some files.
-To create an index with a single entry – the first version of your text.txt file – you can use the plumbing command `update-index`.
+To create an index with a single entry – the first version of your test.txt file – you can use the plumbing command `update-index`.
 You use this command to artificially add the earlier version of the test.txt file to a new staging area.
 You must pass it the `--add` option because the file doesn't yet exist in your staging area (you don't even have a staging area set up yet) and `--cacheinfo` because the file you're adding isn't in your directory but is in your database.
 Then, you specify the mode, SHA-1, and filename: