Merge branch 'maint-2.0' into maint

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

diff --combined Documentation/git-tag.txt
index 320908369f067f5d494c6bc0c3c9f28fa26859a6,303de8eee55be473b3e76abde6373391c5a80fdf..e953ba4439f5995c797b4d7ad869847a5479d982
--- 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
@@@ -99,9 -99,7 +99,9 @@@ OPTION
        Sort in a specific order. Supported type is "refname"
        (lexicographic order), "version:refname" or "v:refname" (tag
        names are treated as versions). Prepend "-" to reverse sort
 -      order.
 +      order. When this option is not given, the sort order defaults to the
 +      value configured for the 'tag.sort' variable if it exists, or
 +      lexicographic order otherwise. See linkgit:git-config[1].
  
  --column[=<options>]::
  --no-column::
@@@ -319,7 -317,6 +319,7 @@@ include::date-formats.txt[
  SEE ALSO
  --------
  linkgit:git-check-ref-format[1].
 +linkgit:git-config[1].
  
  GIT
  ---