Merge branch 'jk/stripspace-asciidoctor-fix' into maint

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index e953ba4439f5995c797b4d7ad869847a5479d982..034d10d633c343b17a83879b00aae3ba2a98a388 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -98,10 +98,13 @@ OPTIONS
 --sort=<type>::
        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. 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].
+       names are treated as versions). The "version:refname" sort
+       order can also be affected by the
+       "versionsort.prereleaseSuffix" configuration variable. Prepend
+       "-" to reverse sort 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::
@@ -155,13 +158,13 @@ This option is only applicable when listing tags without annotation lines.
 CONFIGURATION
 -------------
 By default, 'git tag' in sign-with-default mode (-s) will use your
-committer identity (of the form "Your Name <\your@email.address>") to
+committer identity (of the form `Your Name <your@email.address>`) to
 find a key.  If you want to use a different default key, you can specify
 it in the repository configuration as follows:
 
 -------------------------------------
 [user]
-    signingkey = <gpg-key-id>
+    signingKey = <gpg-key-id>
 -------------------------------------