Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index 4d95c6c8914d6db7d4ea3de4a25fff17ed887582..c8611632d1d501d57eb7000de0ec3c3b36810b80 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Reads given idx file for packed git archive created with the
-`git-pack-objects` command and verifies idx file and the
+'git-pack-objects' command and verifies idx file and the
 corresponding pack file.
 
 OPTIONS
@@ -42,7 +42,7 @@ for objects that are deltified.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------