Merge branch 'maint-1.5.6' into maint-1.6.0

diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index 05027d2c9386d1963e739cd1538ffe71e0c36c0a..8282a5e82b6e897ac501ef05c982d5e69415363f 100644 (file)
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/git-peek-remote.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-This command is deprecated; use `git-ls-remote` instead.
+This command is deprecated; use 'git-ls-remote' instead.
 
 OPTIONS
 -------
@@ -39,7 +39,7 @@ OPTIONS
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------