Merge branch 'jm/maint-misc-fix' into maint

diff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt
index 8a5842bb937a0f8f89a561566d1d7ce129edc4b0..98933764870fa73d693c636e713fd1f08eb8244d 100644 (file)
--- a/Documentation/git-relink.txt
+++ b/Documentation/git-relink.txt
@@ -7,7 +7,7 @@ git-relink - Hardlink common objects in local repositories
 
 SYNOPSIS
 --------
-'git relink' [--safe] <dir> [<dir>]* <master_dir>
+'git relink' [--safe] <dir>... <master_dir>
 
 DESCRIPTION
 -----------
@@ -24,14 +24,6 @@ OPTIONS
 <dir>::
        Directories containing a .git/objects/ subdirectory.
 
-Author
-------
-Written by Ryan Anderson <ryan@michonline.com>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite