summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2017-07-26 17:13:40 +0100
committerDaniel P. Berrange <berrange@redhat.com>2017-08-02 17:00:11 +0100
commitf802c9de09b676cdf905ac3ba9665e453680d01a (patch)
treecf1b8603e4ce517e6bcab58be2cd93a51c98cad3 /docs
parent4e42ff6b7e1b5dc2911075a3eb7b86cd2075cfd3 (diff)
downloadlibvirt-f802c9de09b676cdf905ac3ba9665e453680d01a.tar.gz
docs: drop XHTML 1.0 validation of website
The HTML pages are currently validated against an XHTML 1.0 DTD. This makes it impossible to take advantage of features that are introduced in HTML 5, because they'll fail validation. There is intentionally no DTD defined for HTML 5, so there's no alternative to XHTML 1.0 DTD that we could switch to. The only options are to stick with XHTML 1.0 forever, or drop the DTD validation, and we pick the latter. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile.am18
1 files changed, 5 insertions, 13 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 34f84e526d..53eb27f9f6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -268,14 +268,10 @@ MAINTAINERCLEANFILES += \
|| { rm $@ && exit 1; }; fi
%.html: %.html.tmp
- @if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
- if $(XMLCATALOG) '$(XML_CATALOG_FILE)' \
- "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \
+ @if test -x $(XMLLINT) ; then \
echo "Validating $@" ; \
- SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
- $(XMLLINT) --catalogs --nonet --format --valid $< > $(srcdir)/$@ \
- || { rm $(srcdir)/$@ && exit 1; }; \
- else echo "missing XHTML1 DTD"; cat $< > $(srcdir)/$@ ; fi ; fi
+ $(XMLLINT) --nonet --format $< > $(srcdir)/$@ \
+ || { rm $(srcdir)/$@ && exit 1; }; fi
%.php.tmp: %.php.in site.xsl page.xsl
if [ -x $(XSLTPROC) ] ; then \
@@ -300,12 +296,8 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP)
--stringparam builddir '$(abs_top_builddir)' \
--stringparam timestamp $(timestamp) \
$(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \
- if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
- if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \
- > /dev/null ; then \
- SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
- $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \
- else echo "missing XHTML1 DTD"; cat $< > $(srcdir)/$@ ; fi ; fi
+ if test -x $(XMLLINT) ; then \
+ $(XMLLINT) --nonet --noout $(srcdir)/html/*.html ; fi
$(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \