Merge branch 'maint'

* maint:
Fix Documentation for git-describe

diff --combined Documentation/git-describe.txt
index a99b4ef9434f11d46cecbd80cca9548866c1aa48,a30c5ac96618f5010388edd66815ec97971a92e0..b231dbb947791bb4fc5cde552e8c736b3558ca0a
--- 1/Documentation/git-describe.txt
--- 2/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@@ -43,7 -43,7 +43,7 @@@ OPTION
        Automatically implies --tags.
  
  --abbrev=<n>::
-       Instead of using the default 8 hexadecimal digits as the
+       Instead of using the default 7 hexadecimal digits as the
        abbreviated object name, use <n> digits.
  
  --candidates=<n>::
@@@ -87,7 -87,7 +87,7 @@@ With something like git.git current tre
        v1.0.4-14-g2414721
  
  i.e. the current head of my "parent" branch is based on v1.0.4,
 -but since it has a handful commits on top of that,
 +but since it has a few commits on top of that,
  describe has added the number of additional commits ("14") and
  an abbreviated object name for the commit itself ("2414721")
  at the end.