From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: user-manual.html invalid HTML Date: Sat, 21 Aug 2010 02:21:22 -0400 Message-ID: <20100821062122.GA28735@coredump.intra.peff.net> References: <20081212023003.GD23128@sigill.intra.peff.net> <87hc5ahzy8.fsf@jidanni.org> <20100820050401.GC25013@burratino> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: jidanni@jidanni.org, git@vger.kernel.org, Junio C Hamano To: Jonathan Nieder X-From: git-owner@vger.kernel.org Sat Aug 21 08:21:44 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OmhSZ-0001Dd-O8 for gcvg-git-2@lo.gmane.org; Sat, 21 Aug 2010 08:21:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751289Ab0HUGV1 (ORCPT ); Sat, 21 Aug 2010 02:21:27 -0400 Received: from xen6.gtisc.gatech.edu ([143.215.130.70]:34435 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919Ab0HUGV0 (ORCPT ); Sat, 21 Aug 2010 02:21:26 -0400 Received: (qmail 26483 invoked by uid 111); 21 Aug 2010 06:21:24 -0000 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net (HELO coredump.intra.peff.net) (99.108.226.0) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.40) with (AES128-SHA encrypted) ESMTPSA; Sat, 21 Aug 2010 06:21:24 +0000 Received: by coredump.intra.peff.net (sSMTP sendmail emulation); Sat, 21 Aug 2010 02:21:22 -0400 Content-Disposition: inline In-Reply-To: <20100820050401.GC25013@burratino> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Fri, Aug 20, 2010 at 12:04:02AM -0500, Jonathan Nieder wrote: > > The versions I build locally have: > > > > > "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> > > > > in each HTML file, which is added by asciidoc. Maybe the package you > > are looking at was built with an older version of asciidoc that doesn't > > do this (I don't actually know the history of this feature, but it seems > > to me that this is something asciidoc should be doing, not git). > > It looks like the HTML for user-manual.html (unlike the reference > manual and other articles) is not generated by asciidoc after all; > instead, the rule in Documentation/Makefile uses xsltproc directly to > convert the asciidoc-generated XML to HTML. Thanks for tracking this down. > Apparently the caller is supposed to set the > chunker.output.doctype-public parameter. > http://www.sagehill.net/docbookxsl/Chunking.html#OutputDoctype Your patch works fine for me, though I am using the exact same toolchain as you. I have no idea if older docbook's will work less well. > + + encoding="UTF-8" indent="no" > + doctype-public="-//W3C//DTD HTML 4.01//EN" > + doctype-system="http://www.w3.org/TR/html4/strict.dtd" /> My asciidoc-generated pages are xhtml. We are using "html/docbook.xsl" from docbook, and now "xhtml", so probably some form of html is right. But is html4 strict right? With nothing else to go on, it seems a good guess to me, but I'm wondering if you actually found the answer somewhere. Also, while testing your patch, I found and fixed the following buglet: -- >8 -- Subject: [PATCH] docs: fix Makefile dependency for user manual We use our custom xsl file to build the user manual, so make sure we depend on it. We don't use it anywhere else, so we can stick it straight in the rule. Signed-off-by: Jeff King --- Documentation/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index a4c4063..e117bc4 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -279,7 +279,7 @@ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt XSLT = docbook.xsl XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css -user-manual.html: user-manual.xml +user-manual.html: user-manual.xml $(XSLT) $(QUIET_XSLTPROC)$(RM) $@+ $@ && \ xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \ mv $@+ $@ -- 1.7.2.2.350.g9c7e