{"thread":{"id":"20528","subject":"[PATCH] Fix typos in git-remote.txt and git-symbolic-ref.txt","startedAt":"2009-08-11T00:52:07Z","lastAt":"2009-08-12T13:40:08Z","messageCount":5,"participants":["Štěpán Němec","Junio C Hamano","Thomas Rast","Wesley J. Landaker"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"120211","messageId":"20090811005207.GE24183@headley","threadId":"20528","inReplyTo":null,"subject":"[PATCH] Fix typos in git-remote.txt and git-symbolic-ref.txt","fromName":"Štěpán Němec","fromEmail":"stepan.nemec@gmail.com","sentAt":"2009-08-11T00:52:07Z","receivedAt":"2009-08-11T00:52:07Z","isPatch":true,"sender":{"key":"stepnem@gmail.com","avatar":"https://avatars.githubusercontent.com/u/106838?v=4"},"body":"Signed-off-by: Štěpán Němec \n---\nI apologize for the previous mail.\nThank you for clarification and guidance.\n\nI did look at some of the other documentation files (and now also grepped\nthe whole directory for `--' and `\\--' occurences), but wasn't able to see\nany rule or consistence in the usage. Whether it is an indication of\nreal inconsistence or just another example of my ignorance I do not know\n(not now, at least).\n\nThe stray backslashes were fixed by setting ASCIIDOC8, thanks again.\n\nŠtěpán Němec\n\n\n Documentation/git-remote.txt | 4 ++--\n Documentation/git-symbolic-ref.txt | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt\nindex 9e2b4ea..82a3d29 100644\n--- a/Documentation/git-remote.txt\n+++ b/Documentation/git-remote.txt\n@@ -114,14 +114,14 @@ These stale branches have already been removed from the remote repository\n referenced by , but are still locally available in\n \"remotes/\".\n +\n-With `--dry-run` option, report what branches will be pruned, but do no\n+With `--dry-run` option, report what branches will be pruned, but do not\n actually prune them.\n\n 'update'::\n\n Fetch updates for a named set of remotes in the repository as defined by\n remotes.. If a named group is not specified on the command line,\n-the configuration parameter remotes.default will get used; if\n+the configuration parameter remotes.default will be used; if\n remotes.default is not defined, all remotes which do not have the\n configuration parameter remote..skipDefaultUpdate set to true will\n be updated. (See linkgit:git-config[1]).\ndiff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt\nindex 210fde0..6392538 100644\n--- a/Documentation/git-symbolic-ref.txt\n+++ b/Documentation/git-symbolic-ref.txt\n@@ -14,9 +14,9 @@ DESCRIPTION\n Given one argument, reads which branch head the given symbolic\n ref refers to and outputs its path, relative to the `.git/`\n directory. Typically you would give `HEAD` as the \n-argument to see on which branch your working tree is on.\n+argument to see which branch your working tree is on.\n\n-Give two arguments, create or update a symbolic ref to\n+Given two arguments, creates or updates a symbolic ref to\n point at the given branch .\n\n A symbolic ref is a regular file that stores a string that\n--\n1.6.3.3\n"},{"id":"120219","messageId":"7vbpmnorvf.fsf@alter.siamese.dyndns.org","threadId":"20528","inReplyTo":"20090811005207.GE24183@headley","subject":"Re: [PATCH] Fix typos in git-remote.txt and git-symbolic-ref.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-11T05:13:08Z","receivedAt":"2009-08-11T05:13:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"},{"id":"120221","messageId":"200908110909.33904.trast@student.ethz.ch","threadId":"20528","inReplyTo":"20090811005207.GE24183@headley","subject":"Re: [PATCH] Fix typos in git-remote.txt and git-symbolic-ref.txt","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2009-08-11T07:09:32Z","receivedAt":"2009-08-11T07:09:32Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Thanks for the updated version!\n\nŠtěpán Němec wrote:\n> \n> I did look at some of the other documentation files (and now also grepped\n> the whole directory for `--' and `\\--' occurences), but wasn't able to see\n> any rule or consistence in the usage. Whether it is an indication of\n> real inconsistence or just another example of my ignorance I do not know\n> (not now, at least).\n\nWell, as I said I'm not sure what asciidoc versions, if any, needed\nthe backslash inside backtick quoting. However, there is precedent in\n\ncommit e1ccf53a60657930ae7892387736c8b6a91ec610\nAuthor: Yasushi SHOJI \nDate: Mon Sep 12 02:29:10 2005 +0900\n\n [PATCH] Escape asciidoc's built-in em-dash replacement\n\n AsciiDoc replace '--' with em-dash (—) by default. em-dash\n looks a lot like a single long dash and it's very confusing when\n we are talking about command options.\n\n Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a\n backslash in front of double dash prevent the replacement. This\n patch does just that.\n\n Signed-off-by: Yasushi SHOJI \n Signed-off-by: Junio C Hamano \n\nSo until we know for certain that they're not needed, I'd rather not\nactively remove them. Admittedly, there are lots of instances of `--\nin the docs too, so making sure which way is \"right\" and then\nreplacing _all_ of them would probably be a nice cleanup.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"120338","messageId":"200908111826.12338.wjl@icecavern.net","threadId":"20528","inReplyTo":"200908110909.33904.trast@student.ethz.ch","subject":"Re: [PATCH] Fix typos in git-remote.txt and git-symbolic-ref.txt","fromName":"Wesley J. Landaker","fromEmail":"wjl@icecavern.net","sentAt":"2009-08-12T00:26:10Z","receivedAt":"2009-08-12T00:26:10Z","isPatch":true,"sender":{"key":"wjl@icecavern.net","avatar":"https://avatars.githubusercontent.com/u/67229?v=4"},"body":"On Tuesday 11 August 2009 01:09:32 Thomas Rast wrote:\n> So until we know for certain that they're not needed, I'd rather not\n> actively remove them. Admittedly, there are lots of instances of `--\n> in the docs too, so making sure which way is \"right\" and then\n> replacing _all_ of them would probably be a nice cleanup.\n\nI'm not fully sure of the current situation, but if it, for instance, turns \nout that \"--\" gives an em-dash and \"\\--\" gives two hyphens in a row, we'd only \nwant to change the \"--\"'s to \"\\--\" for things like command-line options, where \nan em-dash is totally inappropriate. If it's a sentence that is actually using \nan em-dash for another purpose, it is probably intentional and desirable to \nactually get an em-dash.\n\nObviously we want consistency, but--as this sentence shows--there is a \ndifference between an em-dash and a command-line option like --version.\n"},{"id":"120404","messageId":"200908121540.09784.trast@student.ethz.ch","threadId":"20528","inReplyTo":"200908111826.12338.wjl@icecavern.net","subject":"Re: [PATCH] Fix typos in git-remote.txt and git-symbolic-ref.txt","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2009-08-12T13:40:08Z","receivedAt":"2009-08-12T13:40:08Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Wesley J. Landaker wrote:\n> On Tuesday 11 August 2009 01:09:32 Thomas Rast wrote:\n> > instances of `--\n[...]\n> Obviously we want consistency, but--as this sentence shows--there is a \n> difference between an em-dash and a command-line option like --version.\n\nNote the backtick. This is solely about `--options` vs. `\\--options`,\nand I highly doubt anyone would want their em-dashes to be typeset in\nfixed-width font (that's what the backticks do).\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}