{"thread":{"id":"8570","subject":"[PATCH] Edit user manual for grammer.","startedAt":"2007-06-12T12:18:16Z","lastAt":"2007-06-14T04:59:20Z","messageCount":12,"participants":["Steve Hoelzer","Andy Parkins","Johannes Schindelin","J. Bruce Fields","Randal L. Schwartz","David Kastrup","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"44825","messageId":"588192970706120518p201b52fdi9ed48896278b9f3e@mail.gmail.com","threadId":"8570","inReplyTo":null,"subject":"[PATCH] Edit user manual for grammer.","fromName":"Steve Hoelzer","fromEmail":"shoelzer@gmail.com","sentAt":"2007-06-12T12:18:16Z","receivedAt":"2007-06-12T12:18:16Z","isPatch":true,"sender":{"key":"shoelzer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4623209?v=4"},"body":"Signed-off-by: Steve Hoelzer \n---\n Documentation/user-manual.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 0bfa21b..68bf4e2 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -1529,7 +1529,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f\n\n Dangling objects are not a problem. At worst they may take up a little\n extra disk space. They can sometimes provide a last-resort method of\n-recovery lost work--see <> for details. However, if\n+recovering lost work--see <> for details. However, if\n you want, you may remove them with gitlink:git-prune[1] or the --prune\n option to gitlink:git-gc[1]:\n\n--\n1.5.2.73.g18bece\n"},{"id":"44841","messageId":"200706121643.19837.andyparkins@gmail.com","threadId":"8570","inReplyTo":"588192970706120518p201b52fdi9ed48896278b9f3e@mail.gmail.com","subject":"[PATCH] Edit user manual for grammar","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2007-06-12T15:43:19Z","receivedAt":"2007-06-12T15:43:19Z","isPatch":true,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":" - \"last-resort\" is two words, not a conjoined word, it doesn't require\n the hyphen\n - \"method of\" is vulgar, \"method for\" is nicer\n - \"recovery\" becomes \"recovering\" from Steve Hoelzer's original version\n of this patch\n - \"if you want\" is nicer as \"if you wish\"\n - \"you may\" should be \"you can\"; \"you may\" is \"you have permission to\"\n rather than \"you can\"'s \"it is possible to\"\n\nSigned-off-by: Andy Parkins \n---\n\nMy apologies for jumping on your patch, but when I read the context of your\nchange, I couldn't resist fixing some things around it too.\n\n Documentation/user-manual.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 7eaafa8..d62ccd0 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -1527,9 +1527,9 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f\n -------------------------------------------------\n \n Dangling objects are not a problem. At worst they may take up a little\n-extra disk space. They can sometimes provide a last-resort method of\n-recovery lost work--see <> for details. However, if\n-you want, you may remove them with gitlink:git-prune[1] or the --prune\n+extra disk space. They can sometimes provide a last resort method for\n+recovering lost work--see <> for details. However, if\n+you wish, you can remove them with gitlink:git-prune[1] or the --prune\n option to gitlink:git-gc[1]:\n \n -------------------------------------------------\n-- \n1.5.2.1.134.gd166e\n"},{"id":"44843","messageId":"Pine.LNX.4.64.0706121714010.4059@racer.site","threadId":"8570","inReplyTo":"200706121643.19837.andyparkins@gmail.com","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-06-12T16:14:34Z","receivedAt":"2007-06-12T16:14:34Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 12 Jun 2007, Andy Parkins wrote:\n\n> My apologies for jumping on your patch, but when I read the context of \n> your change, I couldn't resist fixing some things around it too.\n\nYou sound like you address somebody personally. However, your \"To:\" only \ncontains the list. Netiquette?\n\nCiao,\nDscho\n"},{"id":"44853","messageId":"20070612175421.GA26767@fieldses.org","threadId":"8570","inReplyTo":"200706121643.19837.andyparkins@gmail.com","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2007-06-12T17:54:21Z","receivedAt":"2007-06-12T17:54:21Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Tue, Jun 12, 2007 at 04:43:19PM +0100, Andy Parkins wrote:\n> - \"last-resort\" is two words, not a conjoined word, it doesn't require\n> the hyphen\n\nRight, but when you've got a couple words functioning together to modify\na following noun, the hyphen's pretty standard: \"rosy-fingered dawn\".\nIs this case an exception? I suspect it's fine either way....\n\n> - \"method of\" is vulgar, \"method for\" is nicer\n\nReference?\n\n> - \"recovery\" becomes \"recovering\" from Steve Hoelzer's original version\n> of this patch\n> - \"if you want\" is nicer as \"if you wish\"\n> - \"you may\" should be \"you can\"; \"you may\" is \"you have permission to\"\n> rather than \"you can\"'s \"it is possible to\"\n\nFair enough, thanks.\n\nWhat we really need is a complete recovery tutorial to stick in here\nsomeplace. (One day git complains about a corrupt pack file. What do\nyou do?) What's been stopping me from doing it, besides time, is no\nidea how to come up with a good example to work with.\n\n--b.\n"},{"id":"44861","messageId":"200706121956.01377.andyparkins@gmail.com","threadId":"8570","inReplyTo":"Pine.LNX.4.64.0706121714010.4059@racer.site","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2007-06-12T18:55:55Z","receivedAt":"2007-06-12T18:55:55Z","isPatch":true,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"On Tuesday 2007, June 12, Johannes Schindelin wrote:\n\n> You sound like you address somebody personally. However, your \"To:\"\n> only contains the list. Netiquette?\n\nApols; I made the patch with git-format-patch, which obviously didn't \nknow who I was replying to.\n\nIt was aimed at Steve Hoelzer, as it's his patch I enhanced (and \neffectively stole :-)\n\n\nAndy\n\n-- \nDr Andy Parkins, M Eng (hons), MIET\nandyparkins@gmail.com\n"},{"id":"44865","messageId":"200706122028.01310.andyparkins@gmail.com","threadId":"8570","inReplyTo":"20070612175421.GA26767@fieldses.org","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2007-06-12T19:27:59Z","receivedAt":"2007-06-12T19:27:59Z","isPatch":true,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"On Tuesday 2007, June 12, J. Bruce Fields wrote:\n> On Tue, Jun 12, 2007 at 04:43:19PM +0100, Andy Parkins wrote:\n> > - \"last-resort\" is two words, not a conjoined word, it doesn't\n> > require the hyphen\n>\n> Right, but when you've got a couple words functioning together to\n> modify a following noun, the hyphen's pretty standard: \"rosy-fingered\n> dawn\". Is this case an exception? I suspect it's fine either way....\n\nIt's certainly common, I don't think that it's correct though. The \nhyphen's is to form a new word from multiple other words; but often \nthese days it's just used to join two words that the author wanted \nsaying faster in his head. The test I always use is if the meaning \nremains the same without the hyphen, it wasn't necessary.\n\nExamples:\n merry-go-round versus merry go round\n editor-in-chief versus editor in chief\n\nBoth of the above loose their meaning when they don't have the hyphens.\n\n\"last-resort\" doesn't need to be compound because separated it still \nmeans \"the resort that is last\".\n\nI don't say that it is a definitive _wrong_ as the meaning is not lost \nnor modified; but I've always viewed English like programming - don't \nadd unnecessary complication.\n\n> > - \"method of\" is vulgar, \"method for\" is nicer\n>\n> Reference?\n\nPlease don't take \"vulgar\" to mean disgusting, I meant \"common\". Sorry \nif that was offensive.\n\nPreposition selection and use is highly localised. I will happily \naccept if you don't agree. Here is the only reference I can find, but \nit is certainly not definitive, not entirely about this subject...\n\nhttp://mb.sparknotes.com/mb.epl?b=2437&m=1259471&t=355765&w=1\n\nHowever, it does make the case that \"of\" is possessive, so a \"method \nof ...\" means \"a method that belongs to ...\", so to my ears \"a method \nfor\" seems the better choice.\n\n> What we really need is a complete recovery tutorial to stick in here\n> someplace. (One day git complains about a corrupt pack file. What\n> do you do?) What's been stopping me from doing it, besides time, is\n> no idea how to come up with a good example to work with.\n\nA big magnet on your hard disk? ;-)\n\n\nAndy\n\n-- \nDr Andy Parkins, M Eng (hons), MIET\nandyparkins@gmail.com\n"},{"id":"44867","messageId":"20070612200525.GC2383@fieldses.org","threadId":"8570","inReplyTo":"200706122028.01310.andyparkins@gmail.com","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2007-06-12T20:05:25Z","receivedAt":"2007-06-12T20:05:25Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Tue, Jun 12, 2007 at 08:27:59PM +0100, Andy Parkins wrote:\n> It's certainly common, I don't think that it's correct though.\n\nIn cases like this some seem to think it's actually required:\n\n\t\"Use a hyphen to connect two or more words functioning together\n\tas an adjective before a noun.\"\n\n(From p. 234 of \"A Writer's Reference\", 3rd ed., Diana Hacker--just what\nI happen to have on my shelf.) I suppose it's there to help find the\nmodified noun when you're constructing modifiers out of multiple words\nthat aren't necessarily adjectives.\n\nBut whatever, I've no real objection to the patch.\n\n> Please don't take \"vulgar\" to mean disgusting, I meant \"common\". Sorry \n> if that was offensive.\n\nNah, just curious. \"For\" seems a little more precise in this case, so\nfair enough.\n\n> > What we really need is a complete recovery tutorial to stick in here\n> > someplace. (One day git complains about a corrupt pack file. What\n> > do you do?) What's been stopping me from doing it, besides time, is\n> > no idea how to come up with a good example to work with.\n> \n> A big magnet on your hard disk? ;-)\n\nHah. OK, next suggestion....\n\n--b.\n"},{"id":"44872","messageId":"86wsy83mpn.fsf@blue.stonehenge.com","threadId":"8570","inReplyTo":"20070612175421.GA26767@fieldses.org","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2007-06-12T21:08:20Z","receivedAt":"2007-06-12T21:08:20Z","isPatch":true,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"J\" == J Bruce Fields writes:\n\nJ> On Tue, Jun 12, 2007 at 04:43:19PM +0100, Andy Parkins wrote:\n>> - \"last-resort\" is two words, not a conjoined word, it doesn't require\n>> the hyphen\n\nJ> Right, but when you've got a couple words functioning together to modify\nJ> a following noun, the hyphen's pretty standard: \"rosy-fingered dawn\".\nJ> Is this case an exception? I suspect it's fine either way....\n\nAccording to , hyphenate\nunless it's a \"ly\" or unless it makes clear sense without it.\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\nSee PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!\n"},{"id":"44897","messageId":"86hcpcxr2v.fsf@lola.quinscape.zz","threadId":"8570","inReplyTo":"20070612175421.GA26767@fieldses.org","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"David Kastrup","fromEmail":"dak@gnu.org","sentAt":"2007-06-13T07:15:52Z","receivedAt":"2007-06-13T07:15:52Z","isPatch":true,"sender":{"key":"dak@gnu.org","avatar":"https://avatars.githubusercontent.com/u/52141349?v=4"},"body":"\"J. Bruce Fields\" writes:\n\n> On Tue, Jun 12, 2007 at 04:43:19PM +0100, Andy Parkins wrote:\n>> - \"last-resort\" is two words, not a conjoined word, it doesn't require\n>> the hyphen\n>\n> Right, but when you've got a couple words functioning together to modify\n> a following noun, the hyphen's pretty standard: \"rosy-fingered\n> dawn\".\n\nThis rendition of ῥοδοδάκτυλος Ἠώς is an adjectivized verb construct,\nlike well-hung, good-natured, forward-looking, thinly-veiled (the\nlatter can be written as two words, too, however).\n\n> Is this case an exception? I suspect it's fine either way....\n\nNope. It was used in \"a last-resort method\", namely in the\nadjectivized meaning. Without the hyphen, it would become the last of\nsome resort methods, quite something different (and nonsensical).\n\n-- \nDavid Kastrup\n"},{"id":"44898","messageId":"86d500xqzt.fsf@lola.quinscape.zz","threadId":"8570","inReplyTo":"200706122028.01310.andyparkins@gmail.com","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"David Kastrup","fromEmail":"dak@gnu.org","sentAt":"2007-06-13T07:17:42Z","receivedAt":"2007-06-13T07:17:42Z","isPatch":true,"sender":{"key":"dak@gnu.org","avatar":"https://avatars.githubusercontent.com/u/52141349?v=4"},"body":"Andy Parkins writes:\n\n> \"last-resort\" doesn't need to be compound because separated it still \n> means \"the resort that is last\".\n\nThe context was \"a last-resort method\". In this case, I consider the\nhyphen necessary in order to keep the adjectivization connected.\n\n-- \nDavid Kastrup\n"},{"id":"44900","messageId":"200706130839.47643.andyparkins@gmail.com","threadId":"8570","inReplyTo":"86hcpcxr2v.fsf@lola.quinscape.zz","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2007-06-13T07:39:42Z","receivedAt":"2007-06-13T07:39:42Z","isPatch":true,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"On Wednesday 2007 June 13, David Kastrup wrote:\n\n> Nope. It was used in \"a last-resort method\", namely in the\n> adjectivized meaning. Without the hyphen, it would become the last of\n> some resort methods, quite something different (and nonsensical).\n\nAgreed. I withdraw my objection.\n\n\nAndy\n-- \nDr Andy Parkins, M Eng (hons), MIET\nandyparkins@gmail.com\n"},{"id":"45037","messageId":"20070614045920.GX6073@spearce.org","threadId":"8570","inReplyTo":"20070612175421.GA26767@fieldses.org","subject":"Re: [PATCH] Edit user manual for grammar","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-06-14T04:59:20Z","receivedAt":"2007-06-14T04:59:20Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"\"J. Bruce Fields\" wrote:\n> On Tue, Jun 12, 2007 at 04:43:19PM +0100, Andy Parkins wrote:\n> > - \"recovery\" becomes \"recovering\" from Steve Hoelzer's original version\n> > of this patch\n> > - \"if you want\" is nicer as \"if you wish\"\n> > - \"you may\" should be \"you can\"; \"you may\" is \"you have permission to\"\n> > rather than \"you can\"'s \"it is possible to\"\n> \n> What we really need is a complete recovery tutorial to stick in here\n> someplace. (One day git complains about a corrupt pack file. What do\n> you do?) What's been stopping me from doing it, besides time, is no\n> idea how to come up with a good example to work with.\n\n dd if=/dev/urandom of=.git/pack/pack-DEAD.pack bs=1 seek=12 count=512\n\nNow run git-log. Its probably toast. The front of the packfile\nis usually commits, and the first object is usually the most\nrecent commit. It starts at byte 12. ;-)\n\nWe actually do this in the test suite to verify that verify-pack will\ndetect the corruption. Recovering from it is a bit more interesting\nand difficult.\n\nThe more common corruption is to repack away an important object\nby accident in a shared object directory arrangement. Or just\nhavee your OS' \"disk corruptor^H^H^H^H^H^H^Hvirus scanner\" delete\nthe thing. E.g. create a few commits, pick one out of git-log\nand just rm its file in .git/objects/??. How do you get out of\nthat mess? ;-)\n\n-- \nShawn.\n"}]}