[libvirt] [PATCH] Fix docs generator regression in previous commit

Daniel P. Berrange berrange at redhat.com
Tue May 7 10:21:45 UTC 2013


On Tue, May 07, 2013 at 09:26:04AM +0800, Daniel Veillard wrote:
> On Fri, May 03, 2013 at 04:59:13PM +0100, Daniel P. Berrange wrote:
> > From: "Daniel P. Berrange" <berrange at redhat.com>
> > 
> > The previous commit failed to update the XSL to take account
> > of fact that in XHTML mode the elements need namespace
> > prefixes. This caused every web page to be blank!
> > 
> > Pushed as a website breaker fix
> > 
> > ---
> >  docs/drvqemu.html.in |  2 +-
> >  docs/page.xsl        | 64 +++++++++++++++++++++++++++-------------------------
> >  docs/site.xsl        |  1 +
> >  3 files changed, 35 insertions(+), 32 deletions(-)
> > 
> 
>   This commit breaks the doc generation, as a result
>     http://www.libvirt.org/html/libvirt-libvirt.html
> is empty.
> 
> > diff --git a/docs/page.xsl b/docs/page.xsl
> > index bc8ea2a..20e4aa6 100644
> > --- a/docs/page.xsl
> > +++ b/docs/page.xsl
> > @@ -1,14 +1,16 @@
> >  <?xml version="1.0"?>
> >  <xsl:stylesheet
> > +  xmlns="http://www.w3.org/1999/xhtml"
> > +  xmlns:html="http://www.w3.org/1999/xhtml"
> >    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
> >    xmlns:exsl="http://exslt.org/common"
> > -  exclude-result-prefixes="xsl exsl"
> > +  exclude-result-prefixes="xsl exsl html"
> >    version="1.0">
> 
>   I suspects that exclude-result-prefixes shoudl not add html there,
> and that's the problem. Run:
>   xsltproc --nonet -o . ./newapi.xsl libvirt-api.xml
> 
> in docs before and after the commit, html/libvirt-libvirt.html just
> gets the navigation bar as a result. I didn't managed yet to find the
> problem and running with the -v logs more than 60MB of output ...

The problem was the newapi.xsl file was not declaring the HTML namespace
as the default. So the XML it produced was then not getting matched by
the rules in page.xsl which now assume a HTML5 namespace. I've pushed
the fix for it.

Sorry for screwing up the website over the weekend

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|




More information about the libvir-list mailing list