Merge pull request #306 from Thannoy/master-review/basic-items

Small set of minor fixes (mainly typo)

Author: ben

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

@@ -205,6 +205,7 @@ The rules for the patterns you can put in the `.gitignore` file are as follows:
 
 *  Blank lines or lines starting with `#` are ignored.
 *  Standard glob patterns work.
+*  You can start patterns with a forward slash (`/`) to avoid recursivity.
 *  You can end patterns with a forward slash (`/`) to specify a directory.
 *  You can negate a pattern by starting it with an exclamation point (`!`).
 
@@ -222,7 +223,7 @@ Here is another example .gitignore file:
 # but do track lib.a, even though you're ignoring .a files above
 !lib.a
 
-# only ignore the root TODO file, not subdir/TODO
+# only ignore the TODO file in the current directory, not subdir/TODO
 /TODO
 
 # ignore all files in the build/ directory

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

@@ -53,7 +53,7 @@ initctl start local-git-daemon
 
 On other systems, you may want to use `xinetd`, a script in your `sysvinit` system, or something else – as long as you get that command daemonized and watched somehow.
 
-Next, you have to tell Git which repositories to allow unauthenticated Git server-based access to. You can do this in each repository by creating a file name `git-daemon-export-ok`.
+Next, you have to tell Git which repositories to allow unauthenticated Git server-based access to. You can do this in each repository by creating a file named `git-daemon-export-ok`.
 
 [source,console]
 ----

book/04-git-server/sections/smart-http.asc

@@ -22,7 +22,7 @@ Next we need to add some things to the Apache configuration to run the `git-http
 ----
 SetEnv GIT_PROJECT_ROOT /opt/git
 SetEnv GIT_HTTP_EXPORT_ALL
-ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
+ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
 ----
 
 If you leave out `GIT_HTTP_EXPORT_ALL` environment variable, then Git will only serve to unauthenticated clients the repositories with the `git-daemon-export-ok` file in them, just like the Git daemon did.

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

@@ -115,7 +115,7 @@ $ git status -sb
 
 The `git merge --abort` option tries to revert back to your state before you ran the merge. The only cases where it may not be able to do this perfectly would be if you had unstashed, uncommitted changes in your working directory when you ran it, otherwise it should work fine.
 
-If for some reason you find yourself in a horrible state and just want to start over, you can also run `git reset --hard HEAD` or wherever you want to get back to. Remember again that this will blow away your working directory, so make sure you don't want any changes there.
+If for some reason you just want to start over, you can also run `git reset --hard HEAD`, and your repository will be back to the last committed state. Remember that any uncommitted work will be lost, so make sure you don't want any of your changes.
 
 ===== Ignoring Whitespace