Merge from emacs--rel--22

[bpt/emacs.git] / etc / schema / xhtml.rnc

diff --git a/etc/schema/xhtml.rnc b/etc/schema/xhtml.rnc
index 3218cd7..c85cb14 100644 (file)
--- a/etc/schema/xhtml.rnc
+++ b/etc/schema/xhtml.rnc
@@ -10,7 +10,7 @@ include "xhtml-attribs.rnc"
 include "xhtml-frames.rnc"
 include "xhtml-text.rnc"
 include "xhtml-hypertext.rnc"
-include "xhtml-list.rnc"
+include "xhtml-lst.rnc"
 include "xhtml-image.rnc"
 include "xhtml-ssismap.rnc"
 include "xhtml-base.rnc"
@@ -22,16 +22,16 @@ include "xhtml-bdo.rnc"
 include "xhtml-pres.rnc"
 include "xhtml-edit.rnc"
 include "xhtml-applet.rnc"
-# include "xhtml-basic-form.rnc"
+# include "xhtml-bform.rnc"
 include "xhtml-form.rnc"
-include "xhtml-style.rnc"
+include "xhtml-xstyle.rnc"
 include "xhtml-script.rnc"
-# include "xhtml-basic-table.rnc"
+# include "xhtml-btable.rnc"
 include "xhtml-table.rnc"
 include "xhtml-csismap.rnc"
 include "xhtml-events.rnc"
 include "xhtml-inlstyle.rnc"
-include "xhtml-target.rnc"
+include "xhtml-tgt.rnc"
 include "xhtml-iframe.rnc"
 include "xhtml-nameident.rnc"
 include "xhtml-legacy.rnc"