{"thread":{"id":"36681","subject":"[PATCH] RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles","startedAt":"2014-05-17T03:30:34Z","lastAt":"2014-05-20T04:27:55Z","messageCount":4,"participants":["Jason St. John","Junio C Hamano","Richard Hansen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"242018","messageId":"1400297434-30254-1-git-send-email-jstjohn@purdue.edu","threadId":"36681","inReplyTo":null,"subject":"[PATCH] RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles","fromName":"Jason St. John","fromEmail":"jstjohn@purdue.edu","sentAt":"2014-05-17T03:30:34Z","receivedAt":"2014-05-17T03:30:34Z","isPatch":true,"sender":{"key":"jstjohn@purdue.edu","avatar":"https://avatars.githubusercontent.com/u/1393510?v=4"},"body":"Signed-off-by: Jason St. John <jstjohn@purdue.edu>\n---\n Documentation/RelNotes/2.0.0.txt | 75 ++++++++++++++++++++--------------------\n 1 file changed, 38 insertions(+), 37 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt\nindex 6e628d4..e6bf9d6 100644\n--- a/Documentation/RelNotes/2.0.0.txt\n+++ b/Documentation/RelNotes/2.0.0.txt\n@@ -44,7 +44,7 @@ with \"git diff-files --diff-filter=d\").\n The default prefix for \"git svn\" has changed in Git 2.0.  For a long\n time, \"git svn\" created its remote-tracking branches directly under\n refs/remotes, but it now places them under refs/remotes/origin/ unless\n-it is told otherwise with its --prefix option.\n+it is told otherwise with its \"--prefix\" option.\n \n \n Updates since v1.9 series\n@@ -53,7 +53,7 @@ Updates since v1.9 series\n UI, Workflows & Features\n \n  * The \"multi-mail\" post-receive hook (in contrib/) has been updated\n-   to a more recent version from the upstream.\n+   to a more recent version from upstream.\n \n  * \"git gc --aggressive\" learned \"--depth\" option and\n    \"gc.aggressiveDepth\" configuration variable to allow use of a less\n@@ -63,12 +63,13 @@ UI, Workflows & Features\n    single strand-of-pearls is broken in its output.\n \n  * The \"rev-parse --parseopt\" mechanism used by scripted Porcelains to\n-   parse command line options and to give help text learned to take\n+   parse command-line options and to give help text learned to take\n    the argv-help (the placeholder string for an option parameter,\n    e.g. \"key-id\" in \"--gpg-sign=<key-id>\").\n \n  * The pattern to find where the function begins in C/C++ used in\n-   \"diff\" and \"grep -p\" has been updated to help C++ source better.\n+   \"diff\" and \"grep -p\" has been updated to improve viewing C++\n+   sources.\n \n  * \"git rebase\" learned to interpret a lone \"-\" as \"@{-1}\", the\n    branch that we were previously on.\n@@ -79,7 +80,7 @@ UI, Workflows & Features\n    \"--sort=version:refname\".\n \n  * Discard the accumulated \"heuristics\" to guess from which branch the\n-   result wants to be pulled from and make sure what the end user\n+   result wants to be pulled from and make sure that what the end user\n    specified is not second-guessed by \"git request-pull\", to avoid\n    mistakes.  When you pushed out your 'master' branch to your public\n    repository as 'for-linus', use the new \"master:for-linus\" syntax to\n@@ -88,7 +89,7 @@ UI, Workflows & Features\n  * \"git grep\" learned to behave in a way similar to native grep when\n    \"-h\" (no header) and \"-c\" (count) options are given.\n \n- * \"git push\" via transport-helper interface (e.g. remote-hg) has\n+ * \"git push\" via transport-helper interfaces (e.g. remote-hg) has\n    been updated to allow forced ref updates in a way similar to the\n    natively supported transports.\n \n@@ -114,28 +115,28 @@ UI, Workflows & Features\n  * The progress indicators from various time-consuming commands have\n    been marked for i18n/l10n.\n \n- * \"git notes -C <blob>\" diagnoses an attempt to use an object that\n-   is not a blob as an error.\n+ * \"git notes -C <blob>\" diagnoses as an error an attempt to use an\n+   object that is not a blob.\n \n  * \"git config\" learned to read from the standard input when \"-\" is\n    given as the value to its \"--file\" parameter (attempting an\n-   operation to update the configuration in the standard input of\n-   course is rejected).\n+   operation to update the configuration in the standard input is\n+   rejected, of course).\n \n  * Trailing whitespaces in .gitignore files, unless they are quoted\n    for fnmatch(3), e.g. \"path\\ \", are warned and ignored.  Strictly\n-   speaking, this is a backward incompatible change, but very unlikely\n+   speaking, this is a backward-incompatible change, but very unlikely\n    to bite any sane user and adjusting should be obvious and easy.\n \n- * Many commands that create commits, e.g. \"pull\", \"rebase\",\n-   learned to take the --gpg-sign option on the command line.\n+ * Many commands that create commits, e.g. \"pull\" and \"rebase\",\n+   learned to take the \"--gpg-sign\" option on the command line.\n \n  * \"git commit\" can be told to always GPG sign the resulting commit\n-   by setting \"commit.gpgsign\" configuration variable to true (the\n-   command line option --no-gpg-sign should override it).\n+   by setting the \"commit.gpgsign\" configuration variable to \"true\"\n+   (the command-line option \"--no-gpg-sign\" should override it).\n \n  * \"git pull\" can be told to only accept fast-forward by setting the\n-   new \"pull.ff\" configuration.\n+   new \"pull.ff\" configuration variable.\n \n  * \"git reset\" learned the \"-N\" option, which does not reset the index\n    fully for paths the index knows about but the tree-ish the command\n@@ -152,7 +153,7 @@ Performance, Internal Implementation, etc.\n \n  * Uses of curl's \"multi\" interface and \"easy\" interface do not mix\n    well when we attempt to reuse outgoing connections.  Teach the RPC\n-   over http code, used in the smart HTTP transport, not to use the\n+   over HTTP code, used in the smart HTTP transport, not to use the\n    \"easy\" interface.\n \n  * The bitmap-index feature from JGit has been ported, which should\n@@ -190,20 +191,20 @@ notes for details).\n \n  * The remote-helper interface to fast-import/fast-export via the\n    transport-helper has been tightened to avoid leaving the import\n-   marks file from a failed/crashed run, as such a file that is out of\n-   sync with the reality confuses a later invocation of itself.\n+   marks file from a failed/crashed run, as such a file that is out-of-\n+   sync with reality confuses a later invocation of itself.\n \n- * \"git rebase\" used a POSIX shell construct FreeBSD /bin/sh does not\n+ * \"git rebase\" used a POSIX shell construct FreeBSD's /bin/sh does not\n    work well with.\n    (merge 8cd6596 km/avoid-non-function-return-in-rebase later to maint).\n \n  * zsh prompt (in contrib/) leaked unnecessary error messages.\n \n- * bash completion (in contrib/) did not complete the refs and remotes\n+ * Bash completion (in contrib/) did not complete the refs and remotes\n    correctly given \"git pu<TAB>\" when \"pu\" is aliased to \"push\".\n \n- * Some more Unicode codepoints defined in Unicode 6.3 as having zero\n-   width have been taught to our display column counting logic.\n+ * Some more Unicode code points, defined in Unicode 6.3 as having zero\n+   width, have been taught to our display column counting logic.\n    (merge d813ab9 tb/unicode-6.3-zero-width later to maint).\n \n  * Some tests used shell constructs that did not work well on FreeBSD\n@@ -217,7 +218,7 @@ notes for details).\n  * \"git diff --no-index -Mq a b\" fell into an infinite loop.\n    (merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint).\n \n- * \"git fetch --prune\", when the right-hand-side of multiple fetch\n+ * \"git fetch --prune\", when the right-hand side of multiple fetch\n    refspecs overlap (e.g. storing \"refs/heads/*\" to\n    \"refs/remotes/origin/*\", while storing \"refs/frotz/*\" to\n    \"refs/remotes/origin/fr/*\"), aggressively thought that lack of\n@@ -272,7 +273,7 @@ notes for details).\n    (merge 3c3e6f5 rr/doc-merge-strategies later to maint).\n \n  * Serving objects from a shallow repository needs to write a\n-   new file to hold the temporary shallow boundaries but it was not\n+   new file to hold the temporary shallow boundaries, but it was not\n    cleaned when we exit due to die() or a signal.\n    (merge 7839632 jk/shallow-update-fix later to maint).\n \n@@ -295,19 +296,19 @@ notes for details).\n    \".git\" tells us where it is.\n    (merge fcfec8b da/difftool-git-files later to maint).\n \n- * \"git push\" did not pay attention to branch.*.pushremote if it is\n-   defined earlier than remote.pushdefault; the order of these two\n+ * \"git push\" did not pay attention to \"branch.*.pushremote\" if it is\n+   defined earlier than \"remote.pushdefault\"; the order of these two\n    variables in the configuration file should not matter, but it did\n    by mistake.\n    (merge 98b406f jk/remote-pushremote-config-reading later to maint).\n \n- * Codepaths that parse timestamps in commit objects have been\n+ * Code paths that parse timestamps in commit objects have been\n    tightened.\n    (merge f80d1f9 jk/commit-dates-parsing-fix later to maint).\n \n  * \"git diff --external-diff\" incorrectly fed the submodule directory\n-   in the working tree to the external diff driver when it knew it is\n-   the same as one of the versions being compared.\n+   in the working tree to the external diff driver when it knew that it\n+   is the same as one of the versions being compared.\n    (merge aba4727 tr/diff-submodule-no-reuse-worktree later to maint).\n \n  * \"git reset\" needs to refresh the index when working in a working\n@@ -318,7 +319,7 @@ notes for details).\n \n  * \"git check-attr\" when working on a repository with a working tree\n    did not work well when the working tree was specified via the\n-   --work-tree (and obviously with --git-dir) option.\n+   \"--work-tree\" (and obviously with \"--git-dir\") option.\n    (merge cdbf623 jc/check-attr-honor-working-tree later to maint).\n \n  * \"merge-recursive\" was broken in 1.7.7 era and stopped working in\n@@ -326,12 +327,12 @@ notes for details).\n    involved.  This has been corrected.\n    (merge 6e2068a bk/refresh-missing-ok-in-merge-recursive later to maint.)\n \n- * \"git rev-parse\" was loose in rejecting command line arguments\n+ * \"git rev-parse\" was loose in rejecting command-line arguments\n    that do not make sense, e.g. \"--default\" without the required\n    value for that option.\n    (merge a43219f ds/rev-parse-required-args later to maint.)\n \n- * include.path variable (or any variable that expects a path that\n+ * \"include.path\" variable (or any variable that expects a path that\n    can use ~username expansion) in the configuration file is not a\n    boolean, but the code failed to check it.\n    (merge 67beb60 jk/config-path-include-fix later to maint.)\n@@ -343,20 +344,20 @@ notes for details).\n    (merge later 655ee9e mw/symlinks to maint.)\n \n  * \"git diff --quiet -- pathspec1 pathspec2\" sometimes did not return\n-   correct status value.\n+   the correct status value.\n    (merge f34b205 nd/diff-quiet-stat-dirty later to maint.)\n \n  * Attempting to deepen a shallow repository by fetching over smart\n-   HTTP transport failed in the protocol exchange, when no-done\n+   HTTP transport failed in the protocol exchange, when the no-done\n    extension was used.  The fetching side waited for the list of\n-   shallow boundary commits after the sending end stopped talking to\n+   shallow boundary commits after the sending side stopped talking to\n    it.\n    (merge 0232852 nd/http-fetch-shallow-fix later to maint.)\n \n  * Allow \"git cmd path/\", when the 'path' is where a submodule is\n    bound to the top-level working tree, to match 'path', despite the\n    extra and unnecessary trailing slash (such a slash is often\n-   given by command line completion).\n+   given by command-line completion).\n    (merge 2e70c01 nd/submodule-pathspec-ending-with-slash later to maint.)\n \n  * Documentation and in-code comments had many instances of mistaken\n-- \n1.9.2\n"},{"id":"242224","messageId":"xmqq1tvpuyas.fsf@gitster.dls.corp.google.com","threadId":"36681","inReplyTo":"1400297434-30254-1-git-send-email-jstjohn@purdue.edu","subject":"Re: [PATCH] RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-05-19T23:46:35Z","receivedAt":"2014-05-19T23:46:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jason St. John\" <jstjohn@purdue.edu> writes:\n\n> Signed-off-by: Jason St. John <jstjohn@purdue.edu>\n> ---\n\nPlease accept \"Thanks\" for all the hunks I won't comment below; they\nlooked correct to me.\n\n> @@ -53,7 +53,7 @@ Updates since v1.9 series\n>  UI, Workflows & Features\n>  \n>   * The \"multi-mail\" post-receive hook (in contrib/) has been updated\n> -   to a more recent version from the upstream.\n> +   to a more recent version from upstream.\n\nHmph, I have only one multi-mail upstream; shouldn't I call it \"the\"\nupstream from my point of view?\n\n> @@ -63,12 +63,13 @@ UI, Workflows & Features\n>     single strand-of-pearls is broken in its output.\n>  \n>   * The \"rev-parse --parseopt\" mechanism used by scripted Porcelains to\n> -   parse command line options and to give help text learned to take\n> +   parse command-line options and to give help text learned to take\n\nWe seem to have 30 \"command line option\" in Documentation/ vs 16\n\"command-line option\", but this is two words used as an adjective,\nand it may read better with the dash in between.\n\nThanks.\n\n> @@ -190,20 +191,20 @@ notes for details).\n>  \n>   * The remote-helper interface to fast-import/fast-export via the\n>     transport-helper has been tightened to avoid leaving the import\n> -   marks file from a failed/crashed run, as such a file that is out of\n> -   sync with the reality confuses a later invocation of itself.\n> +   marks file from a failed/crashed run, as such a file that is out-of-\n> +   sync with reality confuses a later invocation of itself.\n\nLikewise, but I somehow think this is borderline; the spelling\nwithout hyphen is used frequently enough.\n\n> @@ -217,7 +218,7 @@ notes for details).\n>   * \"git diff --no-index -Mq a b\" fell into an infinite loop.\n>     (merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint).\n>  \n> - * \"git fetch --prune\", when the right-hand-side of multiple fetch\n> + * \"git fetch --prune\", when the right-hand side of multiple fetch\n>     refspecs overlap (e.g. storing \"refs/heads/*\" to\n\nHmph, I read this as a \"right-hand\", a multi-word adjective, is used\nto describe one \"side\" (the other side being the \"left-hand side\").\nOtherwise, you would be writing command-line-option, no?\n\n> - * Codepaths that parse timestamps in commit objects have been\n> + * Code paths that parse timestamps in commit objects have been\n>     tightened.\n>     (merge f80d1f9 jk/commit-dates-parsing-fix later to maint).\n\nWe seem to spell this as one-word in the documentation too often,\nbut \"Code path\" is the right form, I agree.\n"},{"id":"242232","messageId":"537AD699.8070503@bbn.com","threadId":"36681","inReplyTo":"xmqq1tvpuyas.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles","fromName":"Richard Hansen","fromEmail":"rhansen@bbn.com","sentAt":"2014-05-20T04:14:17Z","receivedAt":"2014-05-20T04:14:17Z","isPatch":true,"sender":{"key":"rhansen@rhansen.org","avatar":null},"body":"On 2014-05-19 19:46, Junio C Hamano wrote:\n> \"Jason St. John\" <jstjohn@purdue.edu> writes:\n>> @@ -53,7 +53,7 @@ Updates since v1.9 series\n>>  UI, Workflows & Features\n>>  \n>>   * The \"multi-mail\" post-receive hook (in contrib/) has been updated\n>> -   to a more recent version from the upstream.\n>> +   to a more recent version from upstream.\n> \n> Hmph, I have only one multi-mail upstream; shouldn't I call it \"the\"\n> upstream from my point of view?\n\nPlain \"upstream\" (without \"the\") is correct because it's an adverb, not\na noun.  (Alternatively, this could be written \"from the upstream\nrepository\" or \"from the upstream project\".)\n\n>> @@ -217,7 +218,7 @@ notes for details).\n>>   * \"git diff --no-index -Mq a b\" fell into an infinite loop.\n>>     (merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint).\n>>  \n>> - * \"git fetch --prune\", when the right-hand-side of multiple fetch\n>> + * \"git fetch --prune\", when the right-hand side of multiple fetch\n>>     refspecs overlap (e.g. storing \"refs/heads/*\" to\n> \n> Hmph, I read this as a \"right-hand\", a multi-word adjective, is used\n> to describe one \"side\" (the other side being the \"left-hand side\").\n> Otherwise, you would be writing command-line-option, no?\n\nAre you reading the diff backwards?  (The second hyphen is being\nremoved, not added.)\n\n-Richard\n"},{"id":"242222","messageId":"xmqq8upx2hx0.fsf@gitster.dls.corp.google.com","threadId":"36681","inReplyTo":"537AD699.8070503@bbn.com","subject":"Re: [PATCH] RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-05-20T04:27:55Z","receivedAt":"2014-05-20T04:27:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Richard Hansen <rhansen@bbn.com> writes:\n\n> On 2014-05-19 19:46, Junio C Hamano wrote:\n>> \"Jason St. John\" <jstjohn@purdue.edu> writes:\n>>> @@ -53,7 +53,7 @@ Updates since v1.9 series\n>>>  UI, Workflows & Features\n>>>  \n>>>   * The \"multi-mail\" post-receive hook (in contrib/) has been updated\n>>> -   to a more recent version from the upstream.\n>>> +   to a more recent version from upstream.\n>> \n>> Hmph, I have only one multi-mail upstream; shouldn't I call it \"the\"\n>> upstream from my point of view?\n>\n> Plain \"upstream\" (without \"the\") is correct because it's an adverb, not\n> a noun.  (Alternatively, this could be written \"from the upstream\n> repository\" or \"from the upstream project\".)\n\nOK; I was trying to use \"upstream\" as a noun.\n\n>\n>>> @@ -217,7 +218,7 @@ notes for details).\n>>>   * \"git diff --no-index -Mq a b\" fell into an infinite loop.\n>>>     (merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint).\n>>>  \n>>> - * \"git fetch --prune\", when the right-hand-side of multiple fetch\n>>> + * \"git fetch --prune\", when the right-hand side of multiple fetch\n>>>     refspecs overlap (e.g. storing \"refs/heads/*\" to\n>> \n>> Hmph, I read this as a \"right-hand\", a multi-word adjective, is used\n>> to describe one \"side\" (the other side being the \"left-hand side\").\n>> Otherwise, you would be writing command-line-option, no?\n>\n> Are you reading the diff backwards?  (The second hyphen is being\n> removed, not added.)\n\nYes.  Thanks.\n"}]}