Merge branch 'sb/daemon'

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index b9228dc88716275735d03b64336e6b3e438b7ea3..d3f258869f5d441bea16b46d8030eb64ecb7df99 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -29,7 +29,7 @@ no <rev> nor <glob> is given on the command line.
 OPTIONS
 -------
 <rev>::
-       Arbitrary extended SHA1 expression (see `git-rev-parse`)
+       Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])
        that typically names a branch HEAD or a tag.
 
 <glob>::
@@ -182,7 +182,7 @@ topologically related with each other.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation