Merge branch 'maint' into ph/checkout

diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index 1ba85a259a2d8896b5634f3496542b5561dbf2de..75a8da1ca906aee4cc6a7d0c3ff19862b8e0fc2f 100644 (file)
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -7,7 +7,7 @@ git-count-objects - Count unpacked number of objects and their disk consumption
 
 SYNOPSIS
 --------
-'git-count-objects' [-v]
+'git count-objects' [-v]
 
 DESCRIPTION
 -----------
@@ -22,12 +22,12 @@ OPTIONS
        In addition to the number of loose objects and disk
        space consumed, it reports the number of in-pack
        objects, number of packs, and number of objects that can be
-       removed by running `git-prune-packed`.
+       removed by running `git prune-packed`.
 
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------