Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 05550c5ac7e0fe6e4a480c957df1e18ff04c5456..ac928e198e75595a6fcd4e83b89aaf68987bd420 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -16,7 +16,7 @@ Computes the object ID value for an object with specified type
 with the contents of the named file (which can be outside of the
 work tree), and optionally writes the resulting object into the
 object database.  Reports its object ID to its standard output.
-This is used by `git-cvsimport` to update the index
+This is used by 'git-cvsimport' to update the index
 without modifying files in the work tree.  When <type> is not
 specified, it defaults to "blob".
 
@@ -37,7 +37,7 @@ OPTIONS
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------