From nobody Mon Dec 15 23:04:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1501091500109883.8329355822975; Wed, 26 Jul 2017 10:51:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00EEA64375; Wed, 26 Jul 2017 17:51:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 699A169334; Wed, 26 Jul 2017 17:51:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BCE86180597B; Wed, 26 Jul 2017 17:51:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6QHpYcs025514 for ; Wed, 26 Jul 2017 13:51:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id A0DB6692BC; Wed, 26 Jul 2017 17:51:34 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id C89E0692BA; Wed, 26 Jul 2017 17:51:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 00EEA64375 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Wed, 26 Jul 2017 18:51:05 +0100 Message-Id: <20170726175115.400-3-berrange@redhat.com> In-Reply-To: <20170726175115.400-1-berrange@redhat.com> References: <20170726175115.400-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/12] docs: drop XHTML 1.0 validation of website X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 26 Jul 2017 17:51:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 --- .travis.yml | 1 - docs/Makefile.am | 18 +++++------------- libvirt.spec.in | 1 - m4/virt-external-programs.m4 | 1 - 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a3e76510..f05ba8454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,6 @@ addons: - libapparmor-dev - dnsmasq-base - librbd-dev - - w3c-dtd-xhtml =20 notifications: irc: diff --git a/docs/Makefile.am b/docs/Makefile.am index e32758f4a..f478d9505 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -260,14 +260,10 @@ MAINTAINERCLEANFILES +=3D \ || { rm $@ && exit 1; }; fi =20 %.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=3D'$(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 =20 %.php.tmp: %.php.in site.xsl page.xsl @if [ -x $(XSLTPROC) ] ; then \ @@ -290,12 +286,8 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $= (APIBUILD_STAMP) $(XSLTPROC) --nonet -o $(srcdir)/ \ --stringparam builddir '$(abs_top_builddir)' \ $(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//E= N" \ - > /dev/null ; then \ - SGML_CATALOG_FILES=3D'$(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 =20 $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhel= pxsl) $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ diff --git a/libvirt.spec.in b/libvirt.spec.in index b074bd171..d1cff4caf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -301,7 +301,6 @@ BuildRequires: systemd-units BuildRequires: xen-devel %endif BuildRequires: libxml2-devel -BuildRequires: xhtml1-dtds BuildRequires: libxslt BuildRequires: readline-devel BuildRequires: ncurses-devel diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index f2f62f492..4a10c85ad 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -24,7 +24,6 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ =20 dnl Miscellaneous external programs. AC_PATH_PROG([XMLLINT], [xmllint], [/usr/bin/xmllint]) - AC_PATH_PROG([XMLCATALOG], [xmlcatalog], [/usr/bin/xmlcatalog]) AC_PATH_PROG([XSLTPROC], [xsltproc], [/usr/bin/xsltproc]) AC_PATH_PROG([AUGPARSE], [augparse], [/usr/bin/augparse]) AC_PROG_MKDIR_P --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list