Update XHTML+RDFa 1.1 to PR-xhtml-rdfa-20120508 + current xhtml-metaAttributes-2.mod.

9 files changed, 40 insertions, 21 deletions

diff --git a/htdocs/footer.html b/htdocs/footer.html
index 7427555..62f2804 100755
--- a/htdocs/footer.html
+++ b/htdocs/footer.html
@@ -17,7 +17,7 @@
 			</a>
 		</p>
     <p id="version_info">
-      This service runs the W3C Markup Validator, <a href="<!--#echo var="relroot" -->whatsnew.html#v13"><abbr title="version">v</abbr>1.3</a>.
+      This service runs the W3C Markup Validator, <a href="<!--#echo var="relroot" -->whatsnew.html#v14"><abbr title="version">v</abbr>1.3+hg</a>.
     </p>
 
 		<p class="copyright">
diff --git a/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/README.txt b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/README.txt
new file mode 100644
index 0000000..789e4ae
--- /dev/null
+++ b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/README.txt
@@ -0,0 +1,3 @@
+Origin: PR-xhtml-rdfa-20120508, except xhtml-metaAttributes-2.mod v1.7
+downloaded on 2012-06-02 from
+http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod
diff --git a/htdocs/sgml-lib/WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod
index a1407f7..a1407f7 100644
--- a/htdocs/sgml-lib/WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod
+++ b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod
diff --git a/htdocs/sgml-lib/WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd
index 9a2d71c..9a2d71c 100644
--- a/htdocs/sgml-lib/WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd
+++ b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd
diff --git a/htdocs/sgml-lib/WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod
index 0bcd536..ad0a345 100644
--- a/htdocs/sgml-lib/WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod
+++ b/htdocs/sgml-lib/PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod
@@ -4,7 +4,7 @@
 
      This is XHTML+RDFa.
      Copyright 1998-2010 W3C (MIT, ERCIM, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-rdfa-model-2.mod,v 1.2 2012/01/31 15:04:04 denis Exp $ SMI
+     Revision: $Id: xhtml-rdfa-model-2.mod,v 1.1 2012/05/07 12:58:39 denis Exp $ SMI
 
      This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
diff --git a/htdocs/sgml-lib/catalog.xml b/htdocs/sgml-lib/catalog.xml
index 0ed19bd..fd23651 100644
--- a/htdocs/sgml-lib/catalog.xml
+++ b/htdocs/sgml-lib/catalog.xml
@@ -214,15 +214,15 @@
   <public publicId="-//W3C//ENTITIES XHTML MetaAttributes 1.0//EN" uri="REC-rdfa-syntax-20081014/xhtml-metaAttributes-1.mod" />
   <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-1.mod" uri="REC-rdfa-syntax-20081014/xhtml-metaAttributes-1.mod" />
   <system systemId="http://www.w3.org/TR/rdfa-syntax/DTD/xhtml-metaAttributes-1.mod" uri="REC-rdfa-syntax-20081014/xhtml-metaAttributes-1.mod" />
-  <public publicId="-//W3C//DTD XHTML+RDFa 1.1//EN" uri="WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd" />
-  <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd" uri="WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd" />
-  <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-2.dtd" uri="WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd" />
-  <public publicId="-//W3C//ENTITIES XHTML+RDFa Document Model 1.1//EN" uri="WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod" />
-  <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-model-2.mod" uri="WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod" />
-  <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-model-2.mod" uri="WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod" />
-  <public publicId="-//W3C//ENTITIES XHTML MetaAttributes 1.1//EN" uri="WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod" />
-  <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod" uri="WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod" />
-  <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-metaAttributes-2.mod" uri="WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod" />
+  <public publicId="-//W3C//DTD XHTML+RDFa 1.1//EN" uri="PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd" />
+  <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd" uri="PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd" />
+  <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-2.dtd" uri="PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd" />
+  <public publicId="-//W3C//ENTITIES XHTML+RDFa Document Model 1.1//EN" uri="PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod" />
+  <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-model-2.mod" uri="PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod" />
+  <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-model-2.mod" uri="PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod" />
+  <public publicId="-//W3C//ENTITIES XHTML MetaAttributes 1.1//EN" uri="PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod" />
+  <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod" uri="PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod" />
+  <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-metaAttributes-2.mod" uri="PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod" />
   <public publicId="-//W3C//DTD XHTML+ARIA 1.0//EN" uri="CR-wai-aria-20110118/xhtml-aria-1.dtd" />
   <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-aria-1.dtd" uri="CR-wai-aria-20110118/xhtml-aria-1.dtd" />
   <system systemId="http://www.w3.org/WAI/ARIA/schemata/xhtml-aria-1.dtd" uri="CR-wai-aria-20110118/xhtml-aria-1.dtd" />
diff --git a/htdocs/sgml-lib/xml.soc b/htdocs/sgml-lib/xml.soc
index 4fd21ea..57d19f4 100644
--- a/htdocs/sgml-lib/xml.soc
+++ b/htdocs/sgml-lib/xml.soc
@@ -568,25 +568,25 @@ SYSTEM "http://www.w3.org/TR/rdfa-syntax/DTD/xhtml-metaAttributes-1.mod"
 -- XHTML + RDFa 1.1 --
 
 PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN"
-       "WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd"
+       "PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd"
 SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd"
-       "WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd"
+       "PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd"
 SYSTEM "http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-2.dtd"
-       "WD-xhtml-rdfa-20120131/xhtml-rdfa-2.dtd"
+       "PR-xhtml-rdfa-20120508/xhtml-rdfa-2.dtd"
 
 PUBLIC "-//W3C//ENTITIES XHTML+RDFa Document Model 1.1//EN"
-       "WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod"
+       "PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod"
 SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-model-2.mod"
-       "WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod"
+       "PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod"
 SYSTEM "http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-model-2.mod"
-       "WD-xhtml-rdfa-20120131/xhtml-rdfa-model-2.mod"
+       "PR-xhtml-rdfa-20120508/xhtml-rdfa-model-2.mod"
 
 PUBLIC "-//W3C//ENTITIES XHTML MetaAttributes 1.1//EN"
-       "WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod"
+       "PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod"
 SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod"
-       "WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod"
+       "PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod"
 SYSTEM "http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-metaAttributes-2.mod"
-       "WD-xhtml-rdfa-20120131/xhtml-metaAttributes-2.mod"
+       "PR-xhtml-rdfa-20120508/xhtml-metaAttributes-2.mod"
 
 
 -- XHTML + ARIA 1.0 --
diff --git a/htdocs/whatsnew.html b/htdocs/whatsnew.html
index 6e9aa56..892a737 100755
--- a/htdocs/whatsnew.html
+++ b/htdocs/whatsnew.html
@@ -26,6 +26,22 @@
     </div>
     <dl id="news">
 
+      <dt id="v14">201x-xx-xx &mdash; 1.4 release:</dt>
+      <dd>
+        <p>
+          The 1.4 release of the markup validator is an enhancement and
+          bug fix release. Changes include:
+        </p>
+        <ul>
+          <li>
+            Enhancement: several updates to validator's internal DTD library
+            and catalog, including
+            <a href="http://www.w3.org/TR/xhtml-rdfa/">XHTML+RDFa</a> 1.1
+            20120508 proposed recommendation.
+          </li>
+        </ul>
+      </dd>
+
       <dt id="v13">2012-03-13 &mdash; 1.3 release:</dt>
       <dd>
         <p>
diff --git a/share/templates/en_US/footer.tmpl b/share/templates/en_US/footer.tmpl
index fab7b05..d8bc153 100644
--- a/share/templates/en_US/footer.tmpl
+++ b/share/templates/en_US/footer.tmpl
@@ -22,7 +22,7 @@
 			</a>
 		</p>
     <p id="version_info">
-      This service runs the W3C Markup Validator, <a href="whatsnew.html#v13"><abbr title="version">v</abbr>1.3</a>.
+      This service runs the W3C Markup Validator, <a href="whatsnew.html#v14"><abbr title="version">v</abbr>1.3+hg</a>.
     </p>
 
 		<p class="copyright">