Merge branch 'mw/doc-typofixes' into maint

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index a515648ab018b849897dd3506183f57359be598a..262db049d772d4249983da5ca0d21d8f6b0f8d92 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -25,7 +25,7 @@ and/or refs/tags) semi-visually.
 It cannot show more than 29 branches and commits at a time.
 
 It uses `showbranch.default` multi-valued configuration items if
-no <rev> nor <glob> is given on the command line.
+no <rev> or <glob> is given on the command line.
 
 
 OPTIONS
@@ -60,7 +60,7 @@ OPTIONS
         are shown before their parents).
 
 --date-order::
-       This option is similar to '--topo-order' in the sense that no
+       This option is similar to `--topo-order` in the sense that no
        parent comes before all of its children, but otherwise commits
        are ordered according to their commit date.
 
@@ -173,8 +173,8 @@ The "fixes" branch adds one commit "Introduce "reset type" flag to
 The current branch is "master".
 
 
-EXAMPLE
--------
+EXAMPLES
+--------
 
 If you keep your primary branches immediately under
 `refs/heads`, and topic branches in subdirectories of