{"thread":{"id":"43489","subject":"Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt","startedAt":"2006-12-16T23:41:34Z","lastAt":"2006-12-17T18:20:33Z","messageCount":5,"participants":["A Large Angry SCM","Randal L. Schwartz","Johannes Schindelin","The Answering Machine"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"295747","messageId":"86y7p7cssx.fsf@blue.stonehenge.com","threadId":"43489","inReplyTo":null,"subject":"[BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2006-12-16T23:41:34Z","receivedAt":"2006-12-16T23:41:34Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":"\nasciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt\nERROR: manpage document title is mandatory\nERROR: git-merge-file.txt: line 3: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 8: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 15: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 46: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 65: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 79: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 84: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 89: title not permitted in sidebar body\nERROR: git-merge-file.txt: line 92: closing [blockdef-example] delimiter expected\nmake[1]: *** [git-merge-file.html] Error 1\nmake: *** [doc] Error 2\n\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\n"},{"id":"295087","messageId":"4584857D.703@gmail.com","threadId":"43489","inReplyTo":"86y7p7cssx.fsf@blue.stonehenge.com","subject":"Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2006-12-16T23:47:09Z","receivedAt":"2006-12-16T23:47:09Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Randal L. Schwartz wrote:\n> asciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt\n> ERROR: manpage document title is mandatory\n> ERROR: git-merge-file.txt: line 3: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 8: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 15: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 46: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 65: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 79: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 84: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 89: title not permitted in sidebar body\n> ERROR: git-merge-file.txt: line 92: closing [blockdef-example] delimiter expected\n> make[1]: *** [git-merge-file.html] Error 1\n> make: *** [doc] Error 2\n> \n> \n\n"},{"id":"298056","messageId":"20061216234717.15ECE8F5A8@blue.stonehenge.com","threadId":"43489","inReplyTo":"4584857D.703@gmail.com","subject":"Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt","fromName":"The Answering Machine","fromEmail":"merlyn.'s-answering.machine@stonehenge.com","sentAt":"2006-12-16T23:47:17Z","receivedAt":"2006-12-16T23:47:17Z","isPatch":false,"sender":{"key":"merlyn.'s-answering.machine@stonehenge.com","avatar":null},"body":"I've received your mail.\nYour message has been queued, and will probably be read within 48 hours.\n\nIn the meanwhile, if you're curious about where I am, or what I'm\ndoing, or have a question that you think I might get asked frequently,\nor answer frequently even when not asked, you can check out my FAQ by\nsending email to the FAQserver at:\n\n\t\n\n(The subject line and body of the message are ignored.)\n\nThank you!\n\n(Please save this message. You'll get it only once a month, although\nthe FAQ above is updated frequently and you can request it as you wish.)\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":"297525","messageId":"Pine.LNX.4.63.0612171546180.3635@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43489","inReplyTo":"4584857D.703@gmail.com","subject":"[PATCH] Documentation/git-merge-file.txt: make asciidoc not complain","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-17T14:48:12Z","receivedAt":"2006-12-17T14:48:12Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nNoticed by Randal L. Schwartz, this is a fix proposed by\nA Large Angry SCM.\n\nSigned-off-by: Johannes Schindelin \n---\n\n\tOn Sat, 16 Dec 2006, A Large Angry SCM wrote:\n\n\t> Randal L. Schwartz wrote:\n\t> > asciidoc -b xhtml11 -d manpage -f asciidoc.conf git-merge-file.txt\n\t> > ERROR: manpage document title is mandatory\n\t> > ERROR: git-merge-file.txt: line 3: title not permitted in sidebar body\n\t> > [...]\n\t> > make[1]: *** [git-merge-file.html] Error 1\n\t> > make: *** [doc] Error 2\n\t> \n\t> Add 5 \"=\" to line 2.\n\n\t... which this patch does. This time, it is asciidoc-tested, too.\n\n Documentation/git-merge-file.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt\nindex 0b41d66..09fe24f 100644\n--- a/Documentation/git-merge-file.txt\n+++ b/Documentation/git-merge-file.txt\n@@ -1,5 +1,5 @@\n git-merge-file(1)\n-============\n+=================\n \n NAME\n ----\n-- \n1.4.4.2.ga4be2-dirty\n"},{"id":"295347","messageId":"86ac1mcrke.fsf@blue.stonehenge.com","threadId":"43489","inReplyTo":"20061216234717.15ECE8F5A8@blue.stonehenge.com","subject":"Re: [BUG] making docs blows up in b1bfcae438ad:git-merge-file.txt","fromName":"Randal L. Schwartz","fromEmail":"merlyn@stonehenge.com","sentAt":"2006-12-17T18:20:33Z","receivedAt":"2006-12-17T18:20:33Z","isPatch":false,"sender":{"key":"merlyn@stonehenge.com","avatar":"https://gravatar.com/avatar/dc528d210743ff0333e6213f9ee7b33b23f1b7bc1f3c5a8c2d819074ecd7ab19?d=mp&s=160"},"body":">>>>> \"The\" == The Answering Machine writes:\n\nThe> I've received your mail.\nThe> Your message has been queued, and will probably be read within 48 hours.\n\nNaughty SCM sent email addressed to me personally, but added a reply-to\nof the list.\n\nMy answering machine behaved perfectly in this case, but SCM triggered it\nbadly. :(\n\n-- \nRandal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095\n \nPerl/Unix/security consulting, Technical writing, Comedy, etc. etc.\n"}]}