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

diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index c3ed4a10f4d9ba015ebe20a9ca039d44796c0784..8282a5e82b6e897ac501ef05c982d5e69415363f 100644 (file)
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/git-peek-remote.txt
@@ -12,12 +12,12 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-This command is deprecated; use `git-ls-remote` instead.
+This command is deprecated; use 'git-ls-remote' instead.
 
 OPTIONS
 -------
 --upload-pack=<git-upload-pack>::
-       Use this to specify the path to `git-upload-pack` on the
+       Use this to specify the path to 'git-upload-pack' on the
        remote side, if it is not found on your $PATH. Some
        installations of sshd ignores the user's environment
        setup scripts for login shells (e.g. .bash_profile) and
@@ -30,7 +30,7 @@ OPTIONS
 
 <host>::
        A remote host that houses the repository.  When this
-       part is specified, `git-upload-pack` is invoked via
+       part is specified, 'git-upload-pack' is invoked via
        ssh.
 
 <directory>::
@@ -39,7 +39,7 @@ OPTIONS
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------