Documentation: minor grammatical fixes.

Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index ff307eb27098fd89f718055f2211164da3e0be30..1e71dd536b1881b61a007af09f1dedea37fe984e 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -27,8 +27,8 @@ OPTIONS
 -------
 <mbox>|<Maildir>...::
        The list of mailbox files to read patches from. If you do not
 -------
 <mbox>|<Maildir>...::
        The list of mailbox files to read patches from. If you do not

-       supply this argument, reads from the standard input. If you supply
-       directories, they'll be treated as Maildirs.
+       supply this argument, the command reads from the standard input.
+       If you supply directories, they will be treated as Maildirs.

 
 -s::
 --signoff::
 
 -s::
 --signoff::


@@ -48,7 +48,7 @@ OPTIONS
        preferred encoding if it is not UTF-8).
 +
 This was optional in prior versions of git, but now it is the
        preferred encoding if it is not UTF-8).
 +
 This was optional in prior versions of git, but now it is the

-default.   You could use `--no-utf8` to override this.
+default.   You can use `--no-utf8` to override this.

 
 --no-utf8::
        Pass `-n` flag to 'git-mailinfo' (see
 
 --no-utf8::
        Pass `-n` flag to 'git-mailinfo' (see


@@ -57,8 +57,8 @@ default.   You could use `--no-utf8` to override this.
 -3::
 --3way::
        When the patch does not apply cleanly, fall back on
 -3::
 --3way::
        When the patch does not apply cleanly, fall back on

-       3-way merge, if the patch records the identity of blobs
-       it is supposed to apply to, and we have those blobs
+       3-way merge if the patch records the identity of blobs
+       it is supposed to apply to and we have those blobs

        available locally.
 
 --whitespace=<option>::
        available locally.
 
 --whitespace=<option>::


@@ -121,18 +121,18 @@ the commit, after stripping common prefix "[PATCH <anything>]".
 It is supposed to describe what the commit is about concisely as
 a one line text.
 
 It is supposed to describe what the commit is about concisely as
 a one line text.
 

-The body of the message (iow, after a blank line that terminates
-RFC2822 headers) can begin with "Subject: " and "From: " lines
-that are different from those of the mail header, to override
-the values of these fields.
+The body of the message (the rest of the message after the blank line
+that terminates the RFC2822 headers) can begin with "Subject: " and
+"From: " lines that are different from those of the mail header,
+to override the values of these fields.

 
 The commit message is formed by the title taken from the
 "Subject: ", a blank line and the body of the message up to
 
 The commit message is formed by the title taken from the
 "Subject: ", a blank line and the body of the message up to

-where the patch begins.  Excess whitespaces at the end of the
+where the patch begins.  Excess whitespace characters at the end of the

 lines are automatically stripped.
 
 The patch is expected to be inline, directly following the
 lines are automatically stripped.
 
 The patch is expected to be inline, directly following the

-message.  Any line that is of form:
+message.  Any line that is of the form:

 
 * three-dashes and end-of-line, or
 * a line that begins with "diff -", or
 
 * three-dashes and end-of-line, or
 * a line that begins with "diff -", or


@@ -141,18 +141,18 @@ message.  Any line that is of form:
 is taken as the beginning of a patch, and the commit log message
 is terminated before the first occurrence of such a line.
 
 is taken as the beginning of a patch, and the commit log message
 is terminated before the first occurrence of such a line.
 

-When initially invoking it, you give it names of the mailboxes
-to crunch.  Upon seeing the first patch that does not apply, it
-aborts in the middle,.  You can recover from this in one of two ways:
+When initially invoking it, you give it the names of the mailboxes
+to process.  Upon seeing the first patch that does not apply, it
+aborts in the middle.  You can recover from this in one of two ways:

 
 

-. skip the current patch by re-running the command with '--skip'
+. skip the current patch by re-running the command with the '--skip'

   option.
 
 . hand resolve the conflict in the working directory, and update
   option.
 
 . hand resolve the conflict in the working directory, and update

-  the index file to bring it in a state that the patch should
-  have produced.  Then run the command with '--resolved' option.
+  the index file to bring it into a state that the patch should
+  have produced.  Then run the command with the '--resolved' option.

 
 

-The command refuses to process new mailboxes while `.git/rebase-apply`
+The command refuses to process new mailboxes while the `.git/rebase-apply`

 directory exists, so if you decide to start over from scratch,
 run `rm -f -r .git/rebase-apply` before running the command with mailbox
 names.
 directory exists, so if you decide to start over from scratch,
 run `rm -f -r .git/rebase-apply` before running the command with mailbox
 names.