Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
git-tag.txt: Add a missing hyphen to `-s`

diff --combined Documentation/git-tag.txt
index 404257df9fcad2ac5428b0608341e0c6d1337384,a82d2e27bdd9c923603404d8bb9445e5de3f8edc..8c82b87c8026ed6531e55708be3577144932075b
--- 1/Documentation/git-tag.txt
--- 2/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@@ -42,7 -42,7 +42,7 @@@ committer identity for the current use
  GnuPG key for signing.        The configuration variable `gpg.program`
  is used to specify custom GnuPG binary.
  
- Tag objects (created with `-a`, `s`, or `-u`) are called "annotated"
+ Tag objects (created with `-a`, `-s`, or `-u`) are called "annotated"
  tags; they contain a creation date, the tagger name and e-mail, a
  tagging message, and an optional GnuPG signature. Whereas a
  "lightweight" tag is simply a name for an object (usually a commit
@@@ -103,9 -103,8 +103,9 @@@ OPTION
  +
  This option is only applicable when listing tags without annotation lines.
  
 ---contains <commit>::
 -      Only list tags which contain the specified commit.
 +--contains [<commit>]::
 +      Only list tags which contain the specified commit (HEAD if not
 +      specified).
  
  --points-at <object>::
        Only list tags of the given object.