{"thread":{"id":"31919","subject":"[Patch 0/1] Makefile extensions for topic ta/doc-cleanup in pu","startedAt":"2012-10-23T17:55:13Z","lastAt":"2012-11-12T20:13:16Z","messageCount":8,"participants":["Thomas Ackermann","Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"201739","messageId":"139737172.296334.1351014913982.JavaMail.ngmail@webmail16.arcor-online.net","threadId":"31919","inReplyTo":null,"subject":"[Patch 0/1] Makefile extensions for topic ta/doc-cleanup in pu","fromName":"Thomas Ackermann","fromEmail":"th.acker66@arcor.de","sentAt":"2012-10-23T17:55:13Z","receivedAt":"2012-10-23T17:55:13Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"This patch adds rules to the \"html\" taget in Documentation/Makefile to create html\nalso for the new asciidoc files in Documentation/technical and Documentation/howto\nwhich were added in this topic.\n\n\n---\nThomas\n"},{"id":"201740","messageId":"1531209463.296427.1351015084181.JavaMail.ngmail@webmail16.arcor-online.net","threadId":"31919","inReplyTo":"139737172.296334.1351014913982.JavaMail.ngmail@webmail16.arcor-online.net","subject":"[Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Thomas Ackermann","fromEmail":"th.acker66@arcor.de","sentAt":"2012-10-23T17:58:04Z","receivedAt":"2012-10-23T17:58:04Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\n- target \"html\" creates html for all files in Documentation/howto and Documentation/technical\n\nSigned-off-by: Thomas Ackermann \n---\n Documentation/Makefile | 26 ++++++++++++++++++++++++--\n 1 file changed, 24 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 267dfe1..c4e5594 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -24,8 +24,30 @@ SP_ARTICLES = user-manual\n SP_ARTICLES += howto/revert-branch-rebase\n SP_ARTICLES += howto/using-merge-subtree\n SP_ARTICLES += howto/using-signed-tag-in-pull-request\n+SP_ARTICLES += howto/use-git-daemon\n+SP_ARTICLES += howto/update-hook-example\n+SP_ARTICLES += howto/setup-git-server-over-http\n+SP_ARTICLES += howto/separating-topic-branches\n+SP_ARTICLES += howto/revert-a-faulty-merge\n+SP_ARTICLES += howto/recover-corrupted-blob-object\n+SP_ARTICLES += howto/rebuild-from-update-hook\n+SP_ARTICLES += howto/rebuild-from-update-hook\n+SP_ARTICLES += howto/rebase-from-internal-branch\n+SP_ARTICLES += howto/maintain-git\n API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))\n SP_ARTICLES += $(API_DOCS)\n+\n+TECH_DOCS = technical/index-format\n+TECH_DOCS += technical/pack-format\n+TECH_DOCS += technical/pack-heuristics\n+TECH_DOCS += technical/pack-protocol\n+TECH_DOCS += technical/protocol-capabilities\n+TECH_DOCS += technical/protocol-common\n+TECH_DOCS += technical/racy-git\n+TECH_DOCS += technical/send-pack-pipeline\n+TECH_DOCS += technical/shallow\n+TECH_DOCS += technical/trivial-merge\n+SP_ARTICLES += $(TECH_DOCS)\n SP_ARTICLES += technical/api-index\n \n DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))\n@@ -231,7 +253,7 @@ clean:\n \t$(RM) *.texi *.texi+ *.texi++ git.info gitman.info\n \t$(RM) *.pdf\n \t$(RM) howto-index.txt howto/*.html doc.dep\n-\t$(RM) technical/api-*.html technical/api-index.txt\n+\t$(RM) technical/*.html technical/api-index.txt\n \t$(RM) $(cmds_txt) *.made\n \t$(RM) manpage-base-url.xsl\n \n@@ -264,7 +286,7 @@ technical/api-index.txt: technical/api-index-skel.txt \\\n \t$(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh\n \n technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../\n-$(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt\n+$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt\n \t$(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \\\n \t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt\n \n-- \n1.7.11.msysgit.1\n\n\n---\nThomas\n"},{"id":"201878","messageId":"20121025094205.GI8390@sigill.intra.peff.net","threadId":"31919","inReplyTo":"1531209463.296427.1351015084181.JavaMail.ngmail@webmail16.arcor-online.net","subject":"Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-10-25T09:42:05Z","receivedAt":"2012-10-25T09:42:05Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 23, 2012 at 07:58:04PM +0200, Thomas Ackermann wrote:\n\n> - target \"html\" creates html for all files in Documentation/howto and\n> Documentation/technical\n\nThanks.\n\n> +TECH_DOCS = technical/index-format\n> +TECH_DOCS += technical/pack-format\n> +TECH_DOCS += technical/pack-heuristics\n> +TECH_DOCS += technical/pack-protocol\n> +TECH_DOCS += technical/protocol-capabilities\n> +TECH_DOCS += technical/protocol-common\n> +TECH_DOCS += technical/racy-git\n> +TECH_DOCS += technical/send-pack-pipeline\n> +TECH_DOCS += technical/shallow\n> +TECH_DOCS += technical/trivial-merge\n> +SP_ARTICLES += $(TECH_DOCS)\n\nI wonder if these could even be part of the generated api-index.html\n(that is, if somebody is reading about the API, they just as well may\nwant to see these format documents). But I do not overly care much, as I\n(and I suspect most other developers) just read the technical\ndocumentation in its original txt format.\n\nIf somebody cares, we can easily build it on top.\n\n-Peff\n"},{"id":"202133","messageId":"884264929.71955.1351535627736.JavaMail.ngmail@webmail09.arcor-online.net","threadId":"31919","inReplyTo":"20121025094205.GI8390@sigill.intra.peff.net","subject":"Aw: Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Thomas Ackermann","fromEmail":"th.acker66@arcor.de","sentAt":"2012-10-29T18:33:47Z","receivedAt":"2012-10-29T18:33:47Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":" \nThis patch addresses Junios comment in WC:\n\"Misapplication of a patch fixed; the ones near the tip needs to\n update the links to point at the html files, though.\"\n\nSee older mail in this thread:\n---\nThomas Ackermann writes:\n\n> BTW1: As only the changes in the doc files where cherry-picked, currently on pu howto-index.sh\n> will create invalid links in howto-index.html because it scans all .txt-files in ./howto for \n> 'Content-type: text/asciidoc' and if found, creates a reference to a html file. But these are not created\n> for the new asciidoc files. So the changes in Documentation/Makefile which create html for the new \n> files should be merged also.\n\nAh, I didn't notice that.\n\nThat means that for the patch [6/8], which adds content-type to the\ntext files, to be complete, it needs to update Makefile to produce\nhtml files from them.\n\nThanks.\n---\n\nSo IMHO no open issues with this patch.\n\n----- Original Nachricht ----\nVon: Jeff King \nAn: Thomas Ackermann \nDatum: 25.10.2012 11:42\nBetreff: Re: [Patch 1/1] Wire html for all files in ./technical and ./howto\n in Makefile\n\n> On Tue, Oct 23, 2012 at 07:58:04PM +0200, Thomas Ackermann wrote:\n> \n> > - target \"html\" creates html for all files in Documentation/howto and\n> > Documentation/technical\n> \n> Thanks.\n> \n\n\n---\nThomas\n"},{"id":"202144","messageId":"20121029215739.GG20513@sigill.intra.peff.net","threadId":"31919","inReplyTo":"884264929.71955.1351535627736.JavaMail.ngmail@webmail09.arcor-online.net","subject":"Re: Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-10-29T21:57:39Z","receivedAt":"2012-10-29T21:57:39Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote:\n\n> This patch addresses Junios comment in WC:\n> \"Misapplication of a patch fixed; the ones near the tip needs to\n> update the links to point at the html files, though.\"\n> \n> See older mail in this thread:\n> [...]\n> That means that for the patch [6/8], which adds content-type to the\n> text files, to be complete, it needs to update Makefile to produce\n> html files from them.\n> [...]\n> So IMHO no open issues with this patch.\n\nOK, that explains the situation. Thanks, I'll merge it to master in the\nnext iteration.\n\n-Peff\n"},{"id":"202976","messageId":"7vpq3iiukk.fsf@alter.siamese.dyndns.org","threadId":"31919","inReplyTo":"20121029215739.GG20513@sigill.intra.peff.net","subject":"Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-12T17:45:31Z","receivedAt":"2012-11-12T17:45:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote:\n>\n>> This patch addresses Junios comment in WC:\n>> \"Misapplication of a patch fixed; the ones near the tip needs to\n>> update the links to point at the html files, though.\"\n>> \n>> See older mail in this thread:\n>> [...]\n>> That means that for the patch [6/8], which adds content-type to the\n>> text files, to be complete, it needs to update Makefile to produce\n>> html files from them.\n>> [...]\n>> So IMHO no open issues with this patch.\n>\n> OK, that explains the situation. Thanks, I'll merge it to master in the\n> next iteration.\n\nWhat happened to this topic?\n"},{"id":"202984","messageId":"20121112191953.GA4623@sigill.intra.peff.net","threadId":"31919","inReplyTo":"7vpq3iiukk.fsf@alter.siamese.dyndns.org","subject":"Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-11-12T19:19:53Z","receivedAt":"2012-11-12T19:19:53Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 12, 2012 at 09:45:31AM -0800, Junio C Hamano wrote:\n\n> Jeff King writes:\n> \n> > On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote:\n> >\n> >> This patch addresses Junios comment in WC:\n> >> \"Misapplication of a patch fixed; the ones near the tip needs to\n> >> update the links to point at the html files, though.\"\n> >> \n> >> See older mail in this thread:\n> >> [...]\n> >> That means that for the patch [6/8], which adds content-type to the\n> >> text files, to be complete, it needs to update Makefile to produce\n> >> html files from them.\n> >> [...]\n> >> So IMHO no open issues with this patch.\n> >\n> > OK, that explains the situation. Thanks, I'll merge it to master in the\n> > next iteration.\n> \n> What happened to this topic?\n\nI mistyped in the above response; it should have been \"next\" not\n\"master\".\n\nBut then I forgot to merge it to next in the last iteration; it is\nta/doc-cleanup in pu, and is marked in \"What's Cooking\" to be merged to\nnext.\n\n-Peff\n"},{"id":"202991","messageId":"7vvcdah95v.fsf@alter.siamese.dyndns.org","threadId":"31919","inReplyTo":"20121112191953.GA4623@sigill.intra.peff.net","subject":"Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-12T20:13:16Z","receivedAt":"2012-11-12T20:13:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Mon, Nov 12, 2012 at 09:45:31AM -0800, Junio C Hamano wrote:\n>\n>> Jeff King writes:\n>> \n>> > On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote:\n>> >\n>> >> This patch addresses Junios comment in WC:\n>> >> \"Misapplication of a patch fixed; the ones near the tip needs to\n>> >> update the links to point at the html files, though.\"\n>> >> \n>> >> See older mail in this thread:\n>> >> [...]\n>> >> That means that for the patch [6/8], which adds content-type to the\n>> >> text files, to be complete, it needs to update Makefile to produce\n>> >> html files from them.\n>> >> [...]\n>> >> So IMHO no open issues with this patch.\n>> >\n>> > OK, that explains the situation. Thanks, I'll merge it to master in the\n>> > next iteration.\n>> \n>> What happened to this topic?\n>\n> I mistyped in the above response; it should have been \"next\" not\n> \"master\".\n\nAh, ok, I was just wondering why I didn't see it in your 'master'.\nThanks.\n\n> But then I forgot to merge it to next in the last iteration; it is\n> ta/doc-cleanup in pu, and is marked in \"What's Cooking\" to be merged to\n> next.\n>\n> -Peff\n"}]}