{"thread":{"id":"35237","subject":"Why is git-subtree docs XML and not HTML?","startedAt":"2013-10-29T14:03:40Z","lastAt":"2013-10-30T17:48:36Z","messageCount":5,"participants":["Sebastian Schuberth","Jeff King","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"229724","messageId":"CAHGBnuO1xPrAFG1tvS5zaVD9yefa2VUNYM93YLt1pQ1yJwHkrw@mail.gmail.com","threadId":"35237","inReplyTo":null,"subject":"Why is git-subtree docs XML and not HTML?","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2013-10-29T14:03:40Z","receivedAt":"2013-10-29T14:03:40Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Hi,\n\nI'm currently looking at subtree's Makefile and wondering why the\ngenerated markup docs is git-subtree.xml, and not git-subtree.html\nlike for the rest of the git commands. I have not looked at\ngit-subtree.xml because I'm lacking asciidoc right now, but is it just\na matter of changing the file extension from .xml to .html, or does\ngenerating a HTML file involve more work?\n\n-- \nSebastian Schuberth\n"},{"id":"229730","messageId":"20131029155037.GA3628@sigill.intra.peff.net","threadId":"35237","inReplyTo":"CAHGBnuO1xPrAFG1tvS5zaVD9yefa2VUNYM93YLt1pQ1yJwHkrw@mail.gmail.com","subject":"Re: Why is git-subtree docs XML and not HTML?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-10-29T15:50:37Z","receivedAt":"2013-10-29T15:50:37Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 29, 2013 at 03:03:40PM +0100, Sebastian Schuberth wrote:\n\n> I'm currently looking at subtree's Makefile and wondering why the\n> generated markup docs is git-subtree.xml, and not git-subtree.html\n> like for the rest of the git commands. I have not looked at\n> git-subtree.xml because I'm lacking asciidoc right now, but is it just\n> a matter of changing the file extension from .xml to .html, or does\n> generating a HTML file involve more work?\n\nThe XML is an intermediate format for the manpage; the original source\nis .txt, from which asciidoc generate docbook .xml, from which xmlto\ngenerate the roff git-subtree.1.\n\nIf you want HTML, you need to have asciidoc generate .html from the .txt\ndirectly (you probably _can_ generate it from docbook, but that is more\ncomplicated, and not how regular git commands work).\n\nI think this would do what you want:\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 435b2de..e9026da 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -21,6 +21,7 @@ GIT_SUBTREE := git-subtree\n GIT_SUBTREE_DOC := git-subtree.1\n GIT_SUBTREE_XML := git-subtree.xml\n GIT_SUBTREE_TXT := git-subtree.txt\n+GIT_SUBTREE_HTML := git-subtree.html\n \n all: $(GIT_SUBTREE)\n \n@@ -46,6 +47,10 @@ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n \tasciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \\\n \t\t-agit_version=$(gitver) $^\n \n+$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)\n+\tasciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \\\n+\t\t-agit_version=$(gitver) $^\n+\n test:\n \t$(MAKE) -C t/ test\n \n"},{"id":"229731","messageId":"CAHGBnuNDBH-V+Ebi27BOE8ebNQdhn+MCvabh97_zL3nTctz4yA@mail.gmail.com","threadId":"35237","inReplyTo":"20131029155037.GA3628@sigill.intra.peff.net","subject":"Re: Why is git-subtree docs XML and not HTML?","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2013-10-29T16:03:53Z","receivedAt":"2013-10-29T16:03:53Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"On Tue, Oct 29, 2013 at 4:50 PM, Jeff King wrote:\n\n> I think this would do what you want:\n>\n> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\n> index 435b2de..e9026da 100644\n> --- a/contrib/subtree/Makefile\n> +++ b/contrib/subtree/Makefile\n> @@ -21,6 +21,7 @@ GIT_SUBTREE := git-subtree\n> GIT_SUBTREE_DOC := git-subtree.1\n> GIT_SUBTREE_XML := git-subtree.xml\n> GIT_SUBTREE_TXT := git-subtree.txt\n> +GIT_SUBTREE_HTML := git-subtree.html\n>\n> all: $(GIT_SUBTREE)\n>\n> @@ -46,6 +47,10 @@ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n> asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \\\n> -agit_version=$(gitver) $^\n>\n> +$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)\n> + asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \\\n> + -agit_version=$(gitver) $^\n> +\n> test:\n> $(MAKE) -C t/ test\n>\n\nI just gave it a try and it works nicely:\n\nTested-by: Sebastian Schuberth \n\nAlso, the clean target already contains \"*.html\", so nothing else to\ndo there. Any chance to get this queued in pu?\n\nThanks a lot!\n\n-- \nSebastian Schuberth\n"},{"id":"229732","messageId":"20131029163037.GB3628@sigill.intra.peff.net","threadId":"35237","inReplyTo":"CAHGBnuNDBH-V+Ebi27BOE8ebNQdhn+MCvabh97_zL3nTctz4yA@mail.gmail.com","subject":"[PATCH] subtree: add makefile target for html docs","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-10-29T16:30:37Z","receivedAt":"2013-10-29T16:30:37Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Oct 29, 2013 at 05:03:53PM +0100, Sebastian Schuberth wrote:\n\n> I just gave it a try and it works nicely:\n> \n> Tested-by: Sebastian Schuberth \n> \n> Also, the clean target already contains \"*.html\", so nothing else to\n> do there. Any chance to get this queued in pu?\n\nHere it is with a commit message, and the additional wiring into \"make\ndoc\".\n\n-- >8 --\nSubject: subtree: add makefile target for html docs\n\nThe Makefile currently builds the roff manpage, but not the\nhtml form. As some people may prefer the latter, let's make\nit an option to build that, too. We also wire it into \"make\ndoc\" so that it is built by default.\n\nThis patch does not build or install it as part of\n\"install-doc\"; that would require extra infrastructure to\nhandle installing the html as we do in git's regular\nDocumentation/ tree. That can come later if somebody is\ninterested.\n\nTested-by: Sebastian Schuberth \nSigned-off-by: Jeff King \n---\n contrib/subtree/Makefile | 7 ++++++-\n 1 file changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 435b2de..4030a16 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -21,13 +21,14 @@ GIT_SUBTREE := git-subtree\n GIT_SUBTREE_DOC := git-subtree.1\n GIT_SUBTREE_XML := git-subtree.xml\n GIT_SUBTREE_TXT := git-subtree.txt\n+GIT_SUBTREE_HTML := git-subtree.html\n \n all: $(GIT_SUBTREE)\n \n $(GIT_SUBTREE): $(GIT_SUBTREE_SH)\n \tcp $< $@ && chmod +x $@\n \n-doc: $(GIT_SUBTREE_DOC)\n+doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)\n \n install: $(GIT_SUBTREE)\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)\n@@ -46,6 +47,10 @@ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n \tasciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \\\n \t\t-agit_version=$(gitver) $^\n \n+$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)\n+\tasciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \\\n+\t\t-agit_version=$(gitver) $^\n+\n test:\n \t$(MAKE) -C t/ test\n \n-- \n1.8.4.1.898.g8bf8a41.dirty\n"},{"id":"229843","messageId":"xmqqwqkubqff.fsf@gitster.dls.corp.google.com","threadId":"35237","inReplyTo":"20131029163037.GB3628@sigill.intra.peff.net","subject":"Re: [PATCH] subtree: add makefile target for html docs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-10-30T17:48:36Z","receivedAt":"2013-10-30T17:48:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Tue, Oct 29, 2013 at 05:03:53PM +0100, Sebastian Schuberth wrote:\n>\n>> I just gave it a try and it works nicely:\n>> \n>> Tested-by: Sebastian Schuberth \n>> \n>> Also, the clean target already contains \"*.html\", so nothing else to\n>> do there. Any chance to get this queued in pu?\n>\n> Here it is with a commit message, and the additional wiring into \"make\n> doc\".\n\nThanks, both.\n"}]}