RelNotes/1.8.0: various typo and style fixes

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt
index cc460a474257fa0569f9bf15a8220c533cf4113a..a17f893dd449acf5c02800a4a050a6464de782c9 100644 (file)
--- a/Documentation/RelNotes/1.8.0.txt
+++ b/Documentation/RelNotes/1.8.0.txt
@@ -4,11 +4,11 @@ Git v1.8.0 Release Notes
 Backward compatibility notes
 ----------------------------
 
 Backward compatibility notes
 ----------------------------
 

-In the next major release, we will change the behaviour of the "git
+In the next major release, we will change the behavior of the "git

 push" command.  When "git push [$there]" does not say what to push, we
 push" command.  When "git push [$there]" does not say what to push, we

-have used the traditional "matching" semantics (all your branches were
+have used the traditional "matching" semantics so far (all your branches were

 sent to the remote as long as there already are branches of the same
 sent to the remote as long as there already are branches of the same

-name over there).  We will use the "simple" semantics, that pushes the
+name over there).  We will now use the "simple" semantics, that pushes the

 current branch to the branch with the same name only when the current
 branch is set to integrate with that remote branch.  There is a user
 preference configuration variable "push.default" to change this, and
 current branch to the branch with the same name only when the current
 branch is set to integrate with that remote branch.  There is a user
 preference configuration variable "push.default" to change this, and


@@ -33,9 +33,9 @@ UI, Workflows & Features
  * A credential helper to allow access to the Gnome keyring has been
    added.
 
  * A credential helper to allow access to the Gnome keyring has been
    added.
 

- * When "git am" sanitizes the Subject: line, we strip the prefix from
+ * When "git am" sanitizes the "Subject:" line, we strip the prefix from

    "Re: subject" and also from a less common "re: subject", but left
    "Re: subject" and also from a less common "re: subject", but left

-   even less common "RE: subject" intact.
+   the even less common "RE: subject" intact. We strip that now, too.

 
  * It was tempting to say "git branch --set-upstream origin/master",
    but that tells Git to arrange the local branch "origin/master" to
 
  * It was tempting to say "git branch --set-upstream origin/master",
    but that tells Git to arrange the local branch "origin/master" to


@@ -57,15 +57,15 @@ UI, Workflows & Features
    repository path, etc.
 
  * "git difftool --dir-diff" learned to use symbolic links to prepare
    repository path, etc.
 
  * "git difftool --dir-diff" learned to use symbolic links to prepare

-   temporary copy of the working tree when available.
+   a temporary copy of the working tree when available.

 
  * "git grep" learned to use a non-standard pattern type by default if
    a configuration variable tells it to.
 
 
  * "git grep" learned to use a non-standard pattern type by default if
    a configuration variable tells it to.
 

- * "git merge-base" learned "--is-ancestor A B" option to tell if A is
+ * "git merge-base" learned the "--is-ancestor A B" option to tell if A is

    an ancestor of B.  The result is indicated by its exit status code.
 
    an ancestor of B.  The result is indicated by its exit status code.
 

- * "git mergetool" allows users to override the actual command used
+ * "git mergetool" now allows users to override the actual command used

    with the mergetool.$name.cmd configuration variable even for built-in
    mergetool backends.
 
    with the mergetool.$name.cmd configuration variable even for built-in
    mergetool backends.
 


@@ -73,14 +73,14 @@ UI, Workflows & Features
    effect even on binary files.
 
  * "git rebase -i" learned the "--edit-todo" option to open an editor
    effect even on binary files.
 
  * "git rebase -i" learned the "--edit-todo" option to open an editor

-   to edit the insn sheet.
+   to edit the instruction sheet.

 
 
 Foreign Interface
 
  * "git svn" has been updated to work with SVN 1.7.
 
 
 
 Foreign Interface
 
  * "git svn" has been updated to work with SVN 1.7.
 

- * "git p4" learned "--conflicts" option to specify what to do when
+ * "git p4" learned the "--conflicts" option to specify what to do when

    encountering a conflict during "p4 submit".
 
 
    encountering a conflict during "p4 submit".
 
 


@@ -88,12 +88,12 @@ Performance, Internal Implementation, etc. (please report possible regressions)
 
  * Git ships with a fall-back regexp implementation for platforms with
    buggy regexp library, but it was easy for people to keep using their
 
  * Git ships with a fall-back regexp implementation for platforms with
    buggy regexp library, but it was easy for people to keep using their

-   platform regexp.  A new test has been added to check this.
+   platform regexp by mistake.  A new test has been added to check this.

 
  * The "check-docs" build target has been updated and greatly
    simplified.
 
 
  * The "check-docs" build target has been updated and greatly
    simplified.
 

- * The test suite is run under MALLOC_CHECK_ when running with glibc
+ * The test suite is run under MALLOC_CHECK_ when running with a glibc

    that supports the feature.
 
  * The documentation in the TeXinfo format was using indented output
    that supports the feature.
 
  * The documentation in the TeXinfo format was using indented output


@@ -101,7 +101,7 @@ Performance, Internal Implementation, etc. (please report possible regressions)
    monospace.
 
  * Compatibility wrapper around some mkdir(2) implementations that
    monospace.
 
  * Compatibility wrapper around some mkdir(2) implementations that

-   reject parameter with trailing slash has been introduced.
+   reject parameters with trailing slash has been introduced.

 
  * Compatibility wrapper for systems that lack usable setitimer() has
    been added.
 
  * Compatibility wrapper for systems that lack usable setitimer() has
    been added.


@@ -113,7 +113,7 @@ Performance, Internal Implementation, etc. (please report possible regressions)
    when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a
    good name for a branch).
 
    when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a
    good name for a branch).
 

- * Many internal uses of "git merge-base" equivalent were only to see
+ * Many internal uses of a "git merge-base" equivalent were only to see

    if one commit fast-forwards to the other, which did not need the
    full set of merge bases to be computed. They have been updated to
    use less expensive checks.
    if one commit fast-forwards to the other, which did not need the
    full set of merge bases to be computed. They have been updated to
    use less expensive checks.


@@ -164,7 +164,7 @@ to them for details).
 
  * Output from "git branch -v" contains "(no branch)" that could be
    localized, but the code to align it along with the names of
 
  * Output from "git branch -v" contains "(no branch)" that could be
    localized, but the code to align it along with the names of

-   branches were counting in bytes, not in display columns.
+   branches was counting in bytes, not in display columns.

 
  * "git cherry-pick A C B" used to replay changes in A and then B and
    then C if these three commits had committer timestamps in that
 
  * "git cherry-pick A C B" used to replay changes in A and then B and
    then C if these three commits had committer timestamps in that


@@ -189,11 +189,11 @@ to them for details).
  * Earlier we made the diffstat summary line that shows the number of
    lines added/deleted localizable, but it was found irritating having
    to see them in various languages on a list whose discussion language
  * Earlier we made the diffstat summary line that shows the number of
    lines added/deleted localizable, but it was found irritating having
    to see them in various languages on a list whose discussion language

-   is English.
+   is English, and this change has been reverted.

 
  * "git fetch --all", when passed "--no-tags", did not honor the
    "--no-tags" option while fetching from individual remotes (the same
 
  * "git fetch --all", when passed "--no-tags", did not honor the
    "--no-tags" option while fetching from individual remotes (the same

-   issue existed with "--tags", but combination "--all --tags" makes
+   issue existed with "--tags", but the combination "--all --tags" makes

    much less sense than "--all --no-tags").
 
  * "git fetch" over http had an old workaround for an unlikely server
    much less sense than "--all --no-tags").
 
  * "git fetch" over http had an old workaround for an unlikely server


@@ -202,13 +202,13 @@ to them for details).
    (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint).
 
  * "git fetch" over http advertised that it supports "deflate", which
    (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint).
 
  * "git fetch" over http advertised that it supports "deflate", which

-   is much less common, and did not advertise more common "gzip" on
+   is much less common, and did not advertise the more common "gzip" on

    its Accept-Encoding header.
    (merge aa90b96 sp/maint-http-enable-gzip later to maint).
 
  * After "gitk" showed the contents of a tag, neither "Reread
    its Accept-Encoding header.
    (merge aa90b96 sp/maint-http-enable-gzip later to maint).
 
  * After "gitk" showed the contents of a tag, neither "Reread

-   references" nor "Reload" did not update what is shown as the
-   contents of it, when the user overwrote the tag with "git tag -f".
+   references" nor "Reload" updated what is shown as the
+   contents of it when the user overwrote the tag with "git tag -f".

 
  * "git log --all-match --grep=A --grep=B" ought to show commits that
    mention both A and B, but when these three options are used with
 
  * "git log --all-match --grep=A --grep=B" ought to show commits that
    mention both A and B, but when these three options are used with


@@ -224,21 +224,21 @@ to them for details).
    (merge 74eb32d jk/receive-pack-unpack-error-to-pusher later to maint).
 
  * When you misspell the command name you give to the "exec" action in
    (merge 74eb32d jk/receive-pack-unpack-error-to-pusher later to maint).
 
  * When you misspell the command name you give to the "exec" action in

-   the "git rebase -i" insn sheet, you are told that 'rebase' is not a
+   the "git rebase -i" instruction sheet you were told that 'rebase' is not a

    git subcommand from "git rebase --continue".
 
  * The subcommand in "git remote" to remove a defined remote was
    "rm" and the command did not take a fully-spelled "remove".
 
    git subcommand from "git rebase --continue".
 
  * The subcommand in "git remote" to remove a defined remote was
    "rm" and the command did not take a fully-spelled "remove".
 

- * The interactive prompt "git send-email" gives was error prone. It
+ * The interactive prompt that "git send-email" gives was error prone. It

    asked "What e-mail address do you want to use?" with the address it
    guessed (correctly) the user would want to use in its prompt,
    tempting the user to say "y". But the response was taken as "No,
    please use 'y' as the e-mail address instead", which is most
    certainly not what the user meant.
 
    asked "What e-mail address do you want to use?" with the address it
    guessed (correctly) the user would want to use in its prompt,
    tempting the user to say "y". But the response was taken as "No,
    please use 'y' as the e-mail address instead", which is most
    certainly not what the user meant.
 

- * "git show --format='%ci'" did not give timestamp correctly for
-   commits created without human readable name on "committer" line.
+ * "git show --format='%ci'" did not give the timestamp correctly for
+   commits created without human readable name on the "committer" line.

 
  * "git show --quiet" ought to be a synonym for "git show -s", but
    wasn't.
 
  * "git show --quiet" ought to be a synonym for "git show -s", but
    wasn't.