--- test/xhtmlbasic10dtd	2004/02/04 05:52:15	1.2
+++ test/xhtmlbasic10dtd	2005/04/13 11:32:57	1.3
@@ -6,9 +6,9 @@
      This is XHTML Basic, a proper subset of XHTML.
 
      The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2000 World Wide Web Consortium
-        (Massachusetts Institute of Technology, Institut National de
-         Recherche en Informatique et en Automatique, Keio University).
+     Copyright 1998-2005 World Wide Web Consortium
+        (Massachusetts Institute of Technology, European Research Consortium
+         for Informatics and Mathematics, Keio University).
          All Rights Reserved.
 
      Permission to use, copy, modify and distribute the XHTML Basic DTD
@@ -49,8 +49,8 @@
 <!ENTITY % XLINK.xmlns.attrib "" >
 
 <!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the FPI in the DOCTYPE declaration, with the xmlns attribute
-     on the document element to identify the default namespace:
+     the public identifier in the DOCTYPE declaration, with the namespace
+     declaration on the document element to identify the default namespace:
 
          <?xml version="1.0"?>
          <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
@@ -79,11 +79,11 @@
 
 <!ENTITY % xhtml-model.mod
      PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-            "xhtml-basic10-model-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-basic10-model-1.mod" >
 
 <!ENTITY % xhtml-framework.mod
      PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "xhtml-framework-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" >
 %xhtml-framework.mod;
 
 <!ENTITY % pre.content
@@ -96,17 +96,17 @@
 
 <!ENTITY % xhtml-text.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "xhtml-text-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" >
 %xhtml-text.mod;
 
 <!ENTITY % xhtml-hypertext.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "xhtml-hypertext-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" >
 %xhtml-hypertext.mod;
 
 <!ENTITY % xhtml-list.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "xhtml-list-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" >
 %xhtml-list.mod;
 
 <!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
@@ -116,7 +116,7 @@
 <![%xhtml-image.module;[
 <!ENTITY % xhtml-image.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "xhtml-image-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" >
 %xhtml-image.mod;]]>
 
 <!-- Tables Module ............................................... -->
@@ -124,7 +124,7 @@
 <![%xhtml-table.module;[
 <!ENTITY % xhtml-table.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "xhtml-basic-table-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-basic-table-1.mod" >
 %xhtml-table.mod;]]>
 
 <!-- Forms Module  ............................................... -->
@@ -132,7 +132,7 @@
 <![%xhtml-form.module;[
 <!ENTITY % xhtml-form.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "xhtml-basic-form-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-basic-form-1.mod" >
 %xhtml-form.mod;]]>
 
 <!-- Link Element Module  ........................................ -->
@@ -140,7 +140,7 @@
 <![%xhtml-link.module;[
 <!ENTITY % xhtml-link.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "xhtml-link-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" >
 %xhtml-link.mod;]]>
 
 <!-- Document Metainformation Module  ............................ -->
@@ -148,7 +148,7 @@
 <![%xhtml-meta.module;[
 <!ENTITY % xhtml-meta.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "xhtml-meta-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" >
 %xhtml-meta.mod;]]>
 
 <!-- Base Element Module  ........................................ -->
@@ -156,7 +156,7 @@
 <![%xhtml-base.module;[
 <!ENTITY % xhtml-base.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "xhtml-base-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" >
 %xhtml-base.mod;]]>
 
 <!-- Param Element Module  ....................................... -->
@@ -164,7 +164,7 @@
 <![%xhtml-param.module;[
 <!ENTITY % xhtml-param.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "xhtml-param-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" >
 %xhtml-param.mod;]]>
 
 <!-- Embedded Object Module  ..................................... -->
@@ -172,12 +172,12 @@
 <![%xhtml-object.module;[
 <!ENTITY % xhtml-object.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "xhtml-object-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" >
 %xhtml-object.mod;]]>
 
 <!ENTITY % xhtml-struct.mod
      PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "xhtml-struct-1.mod" >
+            "http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" >
 %xhtml-struct.mod;
 
 <!-- end of XHTML Basic 1.0 DTD  ........................................... -->
