Release notes: grammatical fixes

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.1.0.txt b/Documentation/RelNotes/2.1.0.txt
index 9899e4b22b85faa04e82f0f6067721b1961f57b1..ae4753728eff71191842a8c19b318d7caef098a8 100644 (file)
--- a/Documentation/RelNotes/2.1.0.txt
+++ b/Documentation/RelNotes/2.1.0.txt
@@ -12,7 +12,7 @@ Backward compatibility notes
      $ git config core.pager "less -S"
 
    to restore the traditional behaviour.  It is expected that people
      $ git config core.pager "less -S"
 
    to restore the traditional behaviour.  It is expected that people

-   find output from the most subcommands easier to read with the new
+   find output from most subcommands easier to read with the new

    default, except for "blame" which tends to produce really long
    lines.  To override the new default only for "git blame", you can
    do this:
    default, except for "blame" which tends to produce really long
    lines.  To override the new default only for "git blame", you can
    do this:


@@ -31,7 +31,7 @@ UI, Workflows & Features
    default value "FRSX" when we spawn "less" as the pager.  "S" (chop
    long lines instead of wrapping) has been removed from this default
    set of options, because it is more or less a personal taste thing,
    default value "FRSX" when we spawn "less" as the pager.  "S" (chop
    long lines instead of wrapping) has been removed from this default
    set of options, because it is more or less a personal taste thing,

-   as opposed to others that have good justifications (i.e. "R" is
+   as opposed to the others that have good justifications (i.e. "R" is

    very much justified because many kinds of output we produce are
    colored and "FX" is justified because output we produce is often
    shorter than a page).
    very much justified because many kinds of output we produce are
    colored and "FX" is justified because output we produce is often
    shorter than a page).


@@ -39,47 +39,47 @@ UI, Workflows & Features
  * The logic and data used to compute the display width needed for
    UTF-8 strings have been updated to match Unicode 7.0 better.
 
  * The logic and data used to compute the display width needed for
    UTF-8 strings have been updated to match Unicode 7.0 better.
 

- * HTTP-based transports learned to propagate the error messages from
-   the webserver better to the client coming over the HTTP transport.
+ * HTTP-based transports learned to better propagate the error messages from
+   the webserver to the client coming over the HTTP transport.

 
  * The completion script for bash (in contrib/) has been updated to
 
  * The completion script for bash (in contrib/) has been updated to

-   handle aliases that define complex sequence of commands better.
+   better handle aliases that define a complex sequence of commands.

 
 

- * The "core.preloadindex" configuration variable is by default
-   enabled, allowing modern platforms to take advantage of the
-   multiple cores they have.
+ * The "core.preloadindex" configuration variable is enabled by default,
+   allowing modern platforms to take advantage of their
+   multiple cores.

 
  * "git clone" applies the "if cloning from a local disk, physically
 
  * "git clone" applies the "if cloning from a local disk, physically

-   copy repository using hardlinks, unless otherwise told not to with
-   --no-local" optimization when url.*.insteadOf mechanism rewrites a
-   "git clone $URL" that refers to a repository over the network to a
+   copy the repository using hardlinks, unless otherwise told not to with
+   --no-local" optimization when the url.*.insteadOf mechanism rewrites a
+   remote-repository "git clone $URL" into a

    clone from a local disk.
 
    clone from a local disk.
 

- * "git commit --date=<date>" option learned to read from more
+ * "git commit --date=<date>" option learned more

    timestamp formats, including "--date=now".
 
  * The `core.commentChar` configuration variable is used to specify a
    timestamp formats, including "--date=now".
 
  * The `core.commentChar` configuration variable is used to specify a

-   custom comment character other than the default "#" to be used in
-   the commit log editor.  This can be set to `auto` to attempt to
-   choose a different character that does not conflict with what
-   already starts a line in the message being edited for cases like
+   custom comment character (other than the default "#") for
+   the commit message editor.  This can be set to `auto` to attempt to
+   choose a different character that does not conflict with any that
+   already starts a line in the message being edited, for cases like

    "git commit --amend".
 
    "git commit --amend".
 

- * "git format-patch" learned --signature-file=<file> to take the mail
-   signature from.
+ * "git format-patch" learned --signature-file=<file> to add the contents
+   of a file as a signature to the mail message it produces.

 
 

- * "git grep" learned grep.fullname configuration variable to force
-   "--full-name" to be default.  This may cause regressions on
-   scripted users that do not expect this new behaviour.
+ * "git grep" learned the grep.fullname configuration variable to force
+   "--full-name" to be the default.  This may cause regressions for
+   scripted users who do not expect this new behaviour.

 
  * "git imap-send" learned to ask the credential helper for auth
    material.
 
 
  * "git imap-send" learned to ask the credential helper for auth
    material.
 

- * "git log" and friends now understand the value "auto" set to the
+ * "git log" and friends now understand the value "auto" for the

    "log.decorate" configuration variable to enable the "--decorate"
    option automatically when the output is sent to tty.
 
    "log.decorate" configuration variable to enable the "--decorate"
    option automatically when the output is sent to tty.
 

- * "git merge" without argument, even when there is an upstream
+ * "git merge" without an argument, even when there is an upstream

    defined for the current branch, refused to run until
    merge.defaultToUpstream is set to true.  Flip the default of that
    configuration variable to true.
    defined for the current branch, refused to run until
    merge.defaultToUpstream is set to true.  Flip the default of that
    configuration variable to true.


@@ -87,22 +87,20 @@ UI, Workflows & Features
  * "git mergetool" learned to drive the vimdiff3 backend.
 
  * mergetool.prompt used to default to 'true', always asking "do you
  * "git mergetool" learned to drive the vimdiff3 backend.
 
  * mergetool.prompt used to default to 'true', always asking "do you

-   really want to run the tool on this path?".  Among the two
-   purposes this prompt serves, ignore the use case to confirm that
-   the user wants to view particular path with the named tool, and
-   redefine the meaning of the prompt only to confirm the choice of
-   the tool made by the autodetection (for those who configured the
-   tool explicitly, the prompt shown for the latter purpose is
-   simply annoying).
-
-   Strictly speaking, this is a backward incompatible change and the
+   really want to run the tool on this path?".  The default has been
+   changed to 'false'.  However, the prompt will still appear if
+   mergetool used its autodetection system to guess which tool to use.
+   Users who explicitly specify or configure a tool will no longer see
+   the prompt by default.
+
+   Strictly speaking, this is a backward incompatible change and

    users need to explicitly set the variable to 'true' if they want
    users need to explicitly set the variable to 'true' if they want

-   to resurrect the now-ignored use case.
+   to be prompted to confirm running the tool on each path.

 
  * "git replace" learned the "--edit" subcommand to create a
    replacement by editing an existing object.
 
 
  * "git replace" learned the "--edit" subcommand to create a
    replacement by editing an existing object.
 

- * "git replace" learned a "--graft" option to rewrite parents of a
+ * "git replace" learned a "--graft" option to rewrite the parents of a

    commit.
 
  * "git send-email" learned "--to-cover" and "--cc-cover" options, to
    commit.
 
  * "git send-email" learned "--to-cover" and "--cc-cover" options, to


@@ -117,10 +115,10 @@ UI, Workflows & Features
    being edited as a comment in the editor.
 
  * "git tag" learned to pay attention to "tag.sort" configuration, to
    being edited as a comment in the editor.
 
  * "git tag" learned to pay attention to "tag.sort" configuration, to

-   be used as the default sort order when no --sort=<value> the option
+   be used as the default sort order when no --sort=<value> option

    is given.
 
    is given.
 

- * "git verify-commit" command to check GPG signature in signed
+ * A new "git verify-commit" command, to check GPG signatures in signed

    commits, in a way similar to "git verify-tag" is used to check
    signed tags, was added.
 
    commits, in a way similar to "git verify-tag" is used to check
    signed tags, was added.
 


@@ -129,8 +127,8 @@ Performance, Internal Implementation, etc.
 
  * Build procedure for 'subtree' (in contrib/) has been cleaned up.
 
 
  * Build procedure for 'subtree' (in contrib/) has been cleaned up.
 

- * The support for the profile-feedback build, which has been left
-   bit-rotten for quite a while, has been updated.
+ * Support for the profile-feedback build, which has
+   bit-rotted for quite a while, has been updated.

 
  * An experimental format to use two files (the base file and
    incremental changes relative to it) to represent the index has been
 
  * An experimental format to use two files (the base file and
    incremental changes relative to it) to represent the index has been


@@ -152,7 +150,7 @@ Performance, Internal Implementation, etc.
    structure that is used to keep track of the work to be done.
 
  * "git diff" that compares 3-or-more trees (e.g. parents and the
    structure that is used to keep track of the work to be done.
 
  * "git diff" that compares 3-or-more trees (e.g. parents and the

-   result of a merge) have been optimized.
+   result of a merge) has been optimized.

 
  * The API to update/delete references are being converted to handle
    updates to multiple references in a transactional way.  As an
 
  * The API to update/delete references are being converted to handle
    updates to multiple references in a transactional way.  As an


@@ -188,8 +186,8 @@ notes for details).
    to a tty.
    (merge 38de156 mn/sideband-no-ansi later to maint).
 
    to a tty.
    (merge 38de156 mn/sideband-no-ansi later to maint).
 

- * Mishandling of patterns in .gitignore that has trailing SPs quoted
-   with backslashes (e.g. ones that end with "\ ") have been
+ * Mishandling of patterns in .gitignore that have trailing SPs quoted
+   with backslashes (e.g. ones that end with "\ ") has been

    corrected.
    (merge 97c1364be6b pb/trim-trailing-spaces later to maint).
 
    corrected.
    (merge 97c1364be6b pb/trim-trailing-spaces later to maint).
 


@@ -226,7 +224,7 @@ notes for details).
    and to allow the caller find the length of the object.
    (merge 218aa3a jk/commit-buffer-length later to maint).
 
    and to allow the caller find the length of the object.
    (merge 218aa3a jk/commit-buffer-length later to maint).
 

- * The "mailmap.file" configuration option did not support the tilde
+ * The "mailmap.file" configuration option did not support tilde

    expansion (i.e. ~user/path and ~/path).
    (merge 9352fd5 ow/config-mailmap-pathname later to maint).
 
    expansion (i.e. ~user/path and ~/path).
    (merge 9352fd5 ow/config-mailmap-pathname later to maint).
 


@@ -238,7 +236,7 @@ notes for details).
  * The unix-domain socket used by the sample credential cache daemon
    tried to unlink an existing stale one at a wrong path, if the path
    to the socket was given as an overlong path that does not fit in
  * The unix-domain socket used by the sample credential cache daemon
    tried to unlink an existing stale one at a wrong path, if the path
    to the socket was given as an overlong path that does not fit in

-   sun_path member of the sockaddr_un structure.
+   the sun_path member of the sockaddr_un structure.

    (merge 2869b3e rs/fix-unlink-unix-socket later to maint).
 
  * An ancient rewrite passed a wrong pointer to a curl library
    (merge 2869b3e rs/fix-unlink-unix-socket later to maint).
 
  * An ancient rewrite passed a wrong pointer to a curl library


@@ -246,12 +244,12 @@ notes for details).
    (merge 479eaa8 ah/fix-http-push later to maint).
 
  * "--ignore-space-change" option of "git apply" ignored the spaces
    (merge 479eaa8 ah/fix-http-push later to maint).
 
  * "--ignore-space-change" option of "git apply" ignored the spaces

-   at the beginning of line too aggressively, which is inconsistent
-   with the option of the same name "diff" and "git diff" have.
+   at the beginning of lines too aggressively, which is inconsistent
+   with the option of the same name that "diff" and "git diff" have.

    (merge 14d3bb4 jc/apply-ignore-whitespace later to maint).
 
    (merge 14d3bb4 jc/apply-ignore-whitespace later to maint).
 

- * "git blame" miscounted number of columns needed to show localized
-   timestamps, resulting in jaggy left-side-edge of the source code
+ * "git blame" miscounted the number of columns needed to show localized
+   timestamps, resulting in a jaggy left-side-edge for the source code

    lines in its output.
    (merge dd75553 jx/blame-align-relative-time later to maint).
 
    lines in its output.
    (merge dd75553 jx/blame-align-relative-time later to maint).
 


@@ -265,17 +263,17 @@ notes for details).
    because it incorrectly used strstr().
    (merge 60a5f5f jc/fix-clone-single-starting-at-a-tag later to maint).
 
    because it incorrectly used strstr().
    (merge 60a5f5f jc/fix-clone-single-starting-at-a-tag later to maint).
 

- * "git commit --allow-empty-messag -C $commit" did not work when the
+ * "git commit --allow-empty-message -C $commit" did not work when the

    commit did not have any log message.
    (merge 076cbd6 jk/commit-C-pick-empty later to maint).
 
  * "git diff --find-copies-harder" sometimes pretended as if the mode
    commit did not have any log message.
    (merge 076cbd6 jk/commit-C-pick-empty later to maint).
 
  * "git diff --find-copies-harder" sometimes pretended as if the mode

-   bits have changed for paths that are marked with assume-unchanged
+   bits have changed for paths that are marked with the assume-unchanged

    bit.
    (merge 5304810 jk/diff-files-assume-unchanged later to maint).
 
  * "filter-branch" left an empty single-parent commit that results when
    bit.
    (merge 5304810 jk/diff-files-assume-unchanged later to maint).
 
  * "filter-branch" left an empty single-parent commit that results when

-   all parents of a merge commit gets mapped to the same commit, even
+   all parents of a merge commit get mapped to the same commit, even

    under "--prune-empty".
    (merge 79bc4ef cb/filter-branch-prune-empty-degenerate-merges later to maint).
 
    under "--prune-empty".
    (merge 79bc4ef cb/filter-branch-prune-empty-degenerate-merges later to maint).
 


@@ -308,10 +306,10 @@ notes for details).
    mergetag that was and was not correctly validated.
    (merge 42c55ce mg/fix-log-mergetag-color later to maint).
 
    mergetag that was and was not correctly validated.
    (merge 42c55ce mg/fix-log-mergetag-color later to maint).
 

- * "log --show-signature" did not pay attention to "--graph" option.
+ * "log --show-signature" did not pay attention to the "--graph" option.

    (merge cf3983d zk/log-graph-showsig later to maint).
 
    (merge cf3983d zk/log-graph-showsig later to maint).
 

- * "git mailinfo" used to read beyond the end of header string while
+ * "git mailinfo" used to read beyond the ends of header strings while

    parsing an incoming e-mail message to extract the patch.
    (merge b1a013d rs/mailinfo-header-cmp later to maint).
 
    parsing an incoming e-mail message to extract the patch.
    (merge b1a013d rs/mailinfo-header-cmp later to maint).
 


@@ -331,7 +329,7 @@ notes for details).
    (merge fb79947 rs/pack-objects-no-unnecessary-realloc later to maint).
 
  * Recent updates to "git repack" started to duplicate objects that
    (merge fb79947 rs/pack-objects-no-unnecessary-realloc later to maint).
 
  * Recent updates to "git repack" started to duplicate objects that

-   are in packfiles marked with .keep flag into the new packfile by
+   are in packfiles marked with the .keep flag into the new packfile by

    mistake.
    (merge d078d85 jk/repack-pack-keep-objects later to maint).
 
    mistake.
    (merge d078d85 jk/repack-pack-keep-objects later to maint).
 


@@ -369,14 +367,14 @@ notes for details).
  * "git status", even though it is a read-only operation, tries to
    update the index with refreshed lstat(2) info to optimize future
    accesses to the working tree opportunistically, but this could
  * "git status", even though it is a read-only operation, tries to
    update the index with refreshed lstat(2) info to optimize future
    accesses to the working tree opportunistically, but this could

-   race with a "read-write" operation that modify the index while it
+   race with a "read-write" operation that modifies the index while it

    is running.  Detect such a race and avoid overwriting the index.
    (merge 426ddee ym/fix-opportunistic-index-update-race later to maint).
 
  * "git status" (and "git commit") behaved as if changes in a modified
    submodule are not there if submodule.*.ignore configuration is set,
    which was misleading.  The configuration is only to unclutter diff
    is running.  Detect such a race and avoid overwriting the index.
    (merge 426ddee ym/fix-opportunistic-index-update-race later to maint).
 
  * "git status" (and "git commit") behaved as if changes in a modified
    submodule are not there if submodule.*.ignore configuration is set,
    which was misleading.  The configuration is only to unclutter diff

-   output during the course of development, and should not to hide
+   output during the course of development, and not to hide

    changes in the "status" output to cause the users forget to commit
    them.
    (merge c215d3d jl/status-added-submodule-is-never-ignored later to maint).
    changes in the "status" output to cause the users forget to commit
    them.
    (merge c215d3d jl/status-added-submodule-is-never-ignored later to maint).