Merge pull request #347 from nobozo/master

Several Trivial Text Changes

Author: ben

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

@@ -105,7 +105,7 @@ Changes not staged for commit:
 
 ----
 
-The ``CONTRIBUTING.md'' file appears under a section named ``Changed but not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged.
+The ``CONTRIBUTING.md'' file appears under a section named ``Changes not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged.
 To stage it, you run the `git add` command.
 `git add` is a multipurpose command – you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved.
 It may be helpful to think of it more as ``add this content to the next commit'' rather than ``add this file to the project''.(((git commands, add)))
@@ -266,7 +266,7 @@ On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)
 
-    new file:   README
+    modified:   README
 
 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)

book/02-git-basics/sections/viewing-history.asc

@@ -273,7 +273,7 @@ In <<limit_options>> we'll list these and a few other common options for your re
 | `-S`                  | Only show commits adding or removing code matching the string
 |================================
 
-For example, if you want to see which commits modifying test files in the Git source code history were committed by Junio Hamano and were not merges in the month of October 2008, you can run something like this:(((log filtering)))
+For example, if you want to see which commits modifying test files in the Git source code history were committed by Junio Hamano and were not merged in the month of October 2008, you can run something like this:(((log filtering)))
 
 [source,console]
 ----