Sync with maint to grab trivial doc fixes

* maint:
fix typo in documentation of git-svn
Documentation/rev-list-options: add missing word in --*-parents
log doc: the argument to --encoding is not optional

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 65ac27e0c9f1f7c8a0313314574831a546bb3862..045b37b82e7544ddb753cdec7ead2bc8d97ad1c8 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -40,7 +40,7 @@ SYNOPSIS
             [ \--right-only ]
             [ \--cherry-mark ]
             [ \--cherry-pick ]
-            [ \--encoding[=<encoding>] ]
+            [ \--encoding=<encoding> ]
             [ \--(author|committer|grep)=<pattern> ]
             [ \--regexp-ignore-case | -i ]
             [ \--extended-regexp | -E ]

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index aad452f1697b92713a032c36bf40477c51008f04..4dd3bcb5117f31a76281ef09847b0171cdbf9b80 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -256,7 +256,7 @@ first have already been pushed into SVN.
        For each patch, one may answer "yes" (accept this patch), "no" (discard this
        patch), "all" (accept all patches), or "quit".
        +
-       'git svn dcommit' returns immediately if answer if "no" or "quit", without
+       'git svn dcommit' returns immediately if answer is "no" or "quit", without
        committing anything to SVN.
 
 'branch'::

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 5e499421a43526e133c7bd3be134da803b35c00d..eea0e306a83834e75f44c1b932e5a7747195f85c 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -28,7 +28,7 @@ people using 80-column terminals.
        This is a shorthand for "--pretty=oneline --abbrev-commit"
        used together.
 
---encoding[=<encoding>]::
+--encoding=<encoding>::
        The commit objects record the encoding used for the log message
        in their encoding header; this option can be used to tell the
        command to re-code the commit log message in the encoding

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 27f8de3d8616d831e4a5b6d9ae7ab22e8ad12115..5bdfb4285247770722434541700b0f7547e3a113 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -119,7 +119,7 @@ if it is part of the log message.
 --no-min-parents::
 --no-max-parents::
 
-       Show only commits which have at least (or at most) that many
+       Show only commits which have at least (or at most) that many parent
        commits. In particular, `--max-parents=1` is the same as `--no-merges`,
        `--min-parents=2` is the same as `--merges`.  `--max-parents=0`
        gives all root commits and `--min-parents=3` all octopus merges.