Merge branch 'md/url-parse-harden' into maint

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index e73ef540176b65f6c049a3b5fcfd7e8faa6a6b58..fcf528c1b30d8045592d117ccc3d5f9248d0edbd 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -9,7 +9,7 @@ git-show - Show various types of objects
 SYNOPSIS
 --------
 [verse]
-'git show' [options] [<object>...]
+'git show' [<options>] [<object>...]
 
 DESCRIPTION
 -----------
@@ -77,7 +77,7 @@ EXAMPLES
        Concatenates the contents of said Makefiles in the head
        of the branch `master`.
 
-Discussion
+DISCUSSION
 ----------
 
 include::i18n.txt[]