Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 8243f691138be33c6d9d037a15fabc6786ab385f..1a0df38d5bd9571b70eb47f50bfc114b38632973 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -27,7 +27,7 @@ OPTIONS
        Root of the Maildir to split. This directory should contain the cur, tmp
        and new subdirectories.
 
-<directory>::
+-o<directory>::
        Directory in which to place the individual messages.
 
 -b::
@@ -46,7 +46,7 @@ OPTIONS
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <junkio@cox.net>
+and Junio C Hamano <gitster@pobox.com>
 
 
 Documentation
@@ -55,4 +55,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite