{"thread":{"id":"14880","subject":"[RFH/PATCH] asciidoc markup fixes","startedAt":"2008-08-07T23:05:25Z","lastAt":"2008-08-08T05:41:52Z","messageCount":3,"participants":["Junio C Hamano","Gustaf Hendeby"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"86442","messageId":"7v8wv8ifyi.fsf@gitster.siamese.dyndns.org","threadId":"14880","inReplyTo":null,"subject":"[RFH/PATCH] asciidoc markup fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-07T23:05:25Z","receivedAt":"2008-08-07T23:05:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I see quite a few pages on k.org site, e.g.\n\n    http://www.kernel.org/pub/software/scm/git/docs/git-rerere.html\n    (scroll down to find \"After this test merge\")\n\nare misformatted to lose teletype text '+' that is followed by a comma,\nand turns the following paragraph all typeset in teletype.\n\nThis patch seems to fix the issue at the site (meaning, with the\nparticular vintage of asciidoc and docbook toolchain), without breaking\nthings with the version I have at my primary development machine, but\nwider testing is very much appreciated.\n\nAfter this patch,\n\n    git grep '`+`,' -- Documentation\n\nshould report noting.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 050c3dd..89c0c3f 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -32,7 +32,7 @@ OPTIONS\n \n <refspec>...::\n \tThe canonical format of each <refspec> parameter is\n-\t`+?<src>:<dst>`; that is, an optional plus `+`, followed\n+\t`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed\n \tby the source ref, followed by a colon `:`, followed by\n \tthe destination ref.\n +\ndiff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt\nindex 89f321b..64715c1 100644\n--- a/Documentation/git-rerere.txt\n+++ b/Documentation/git-rerere.txt\n@@ -90,15 +90,15 @@ One way to do it is to pull master into the topic branch:\n \n The commits marked with `*` touch the same area in the same\n file; you need to resolve the conflicts when creating the commit\n-marked with `+`.  Then you can test the result to make sure your\n+marked with `{plus}`.  Then you can test the result to make sure your\n work-in-progress still works with what is in the latest master.\n \n After this test merge, there are two ways to continue your work\n on the topic.  The easiest is to build on top of the test merge\n-commit `+`, and when your work in the topic branch is finally\n+commit `{plus}`, and when your work in the topic branch is finally\n ready, pull the topic branch into master, and/or ask the\n upstream to pull from you.  By that time, however, the master or\n-the upstream might have been advanced since the test merge `+`,\n+the upstream might have been advanced since the test merge `{plus}`,\n in which case the final commit graph would look like this:\n \n ------------\ndiff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\nindex 00a8d21..ebdd948 100644\n--- a/Documentation/pull-fetch-param.txt\n+++ b/Documentation/pull-fetch-param.txt\n@@ -6,7 +6,7 @@\n \n <refspec>::\n \tThe canonical format of a <refspec> parameter is\n-\t`+?<src>:<dst>`; that is, an optional plus `+`, followed\n+\t`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed\n \tby the source ref, followed by a colon `:`, followed by\n \tthe destination ref.\n +\n"},{"id":"86446","messageId":"489B84A9.2090900@isy.liu.se","threadId":"14880","inReplyTo":"7v8wv8ifyi.fsf@gitster.siamese.dyndns.org","subject":"Re: [RFH/PATCH] asciidoc markup fixes","fromName":"Gustaf Hendeby","fromEmail":"hendeby@isy.liu.se","sentAt":"2008-08-07T23:26:33Z","receivedAt":"2008-08-07T23:26:33Z","isPatch":true,"sender":{"key":"hendeby@isy.liu.se","avatar":"https://avatars.githubusercontent.com/u/730316?v=4"},"body":"Junio C Hamano wrote:\n> After this patch,\n> \n>     git grep '`+`,' -- Documentation\n> \n> should report noting.\n> \n> Signed-off-by: Junio C Hamano <gitster@pobox.com>\n\nPasses the test with ascidoc 8.2.7, xmlto 0.0.21, DocBooks-utils 0.6.14.\n\nTested-by: Gustaf Hendeby <hendeby@isy.liu.se>\n\n\nbegin:vcard\nfn:Gustaf Hendeby\nn:Hendeby;Gustaf\norg;quoted-printable:Link=C3=B6pings universitet;Department of Electrical Enginering\nadr;quoted-printable;quoted-printable:;;;Link=C3=B6ping;;SE-581 83=0D=0A=\n\t;Sweden\nemail;internet:hendeby@isy.liu.se\ntitle:PhD Student\ntel;work:+46 14 28 22 26\ntel;cell:+46 730 64 64 89\nx-mozilla-html:FALSE\nurl:http://www.control.isy.liu.se/~hendeby\nversion:2.1\nend:vcard\n\n"},{"id":"86452","messageId":"7v7iasgj1b.fsf@gitster.siamese.dyndns.org","threadId":"14880","inReplyTo":"489B84A9.2090900@isy.liu.se","subject":"Re: [RFH/PATCH] asciidoc markup fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-08T05:41:52Z","receivedAt":"2008-08-08T05:41:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}