Added a few more changes to Chapter 5

 * added a link to the article that contains the commit template
   provided in the book
 * changed a sentence to make it more clear

Author: Kaartic Sivaraam

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

@@ -61,7 +61,7 @@ The Git project requires that the more detailed explanation include your motivat
 It's also a good idea to use the imperative present tense in these messages.
 In other words, use commands.
 Instead of ``I added tests for'' or ``Adding tests for,'' use ``Add tests for.''
-Here is a template originally written by Tim Pope:
+Here is a http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[template originally written by Tim Pope]:
 
 [source,text]
 ----

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

@@ -163,8 +163,8 @@ Falling back to patching base and 3-way merge...
 No changes -- Patch already applied.
 ----
 
-In this case, this patch had already been applied.
-Without the `-3` option, it looks like a conflict.
+In this case, without the `-3` option the patch would have been considered as a conflict.
+Since the `-3` option was used the patch applied cleanly.
 
 If you're applying a number of patches from an mbox, you can also run the `am` command in interactive mode, which stops at each patch it finds and asks if you want to apply it: