]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
docs: news: remove sed sorcery
authorJán Tomko <jtomko@redhat.com>
Wed, 17 Jul 2019 14:28:54 +0000 (16:28 +0200)
committerJán Tomko <jtomko@redhat.com>
Wed, 17 Jul 2019 15:34:08 +0000 (17:34 +0200)
Set a default namespace in the stylesheet instead.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
docs/Makefile.am
docs/news-html.xsl

index 1cfa38dc805c6902d2a56f57aee2f8ffca0c98e1..ae2673ca9b04ae1e688c8cd473bb7f0df809e131 100644 (file)
@@ -236,20 +236,14 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
        $(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir)/src > $@ \
                || { rm $@ && exit 1; }
 
-# xsltproc seems to add the xmlns="" attribute to random output elements:
-# use sed to strip it out, as leaving it there triggers XML errors during
-# further transformation steps
 news.html.in: \
          $(srcdir)/news.xml \
          $(srcdir)/news-html.xsl
        $(AM_V_GEN)$(XSLTPROC) --nonet \
            $(srcdir)/news-html.xsl \
            $(srcdir)/news.xml \
-         >$@-tmp \
-           || { rm -f $@-tmp; exit 1; }; \
-         sed 's/ xmlns=""//g' $@-tmp >$@ \
-           || { rm -f $@-tmp; exit 1; }; \
-         rm -f $@-tmp
+         >$@ \
+           || { rm -f $@; exit 1; };
 EXTRA_DIST += \
        $(srcdir)/news.xml \
        $(srcdir)/news.rng \
index 2b02578cb93e771ed721301f057fbc39057a73fc..b9f624cff01883b0187b1a8eac5b88ac3437d881 100644 (file)
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
 
   <!-- This XSLT stylesheet can be applied to the XML version of the release