W3C home > Mailing lists > Public > www-validator-cvs@w3.org > February 2008

validator/share/templates/en_US warnings.tmpl,1.39,1.40

From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 12 Feb 2008 06:30:27 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1JOoex-0007vl-IW@lionel-hutz.w3.org>

Update of /sources/public/validator/share/templates/en_US
In directory hutz:/tmp/cvs-serv25517/share/templates/en_US

Modified Files:
	warnings.tmpl 
Log Message:
additional fix for http://www.w3.org/Bugs/Public/show_bug.cgi?id=4848
- we were checking whether the SI matched a recognized FPI
- we are now also checking, in case the FPI is not recognized, whether it matches a known SI.



Index: warnings.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/warnings.tmpl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- warnings.tmpl	17 Jan 2008 11:28:20 -0000	1.39
+++ warnings.tmpl	12 Feb 2008 06:30:25 -0000	1.40
@@ -467,12 +467,25 @@
 </TMPL_IF>
 <TMPL_IF NAME="W26">
 <li class="msg_warn" id="W26"><p><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Mismatch between Public and System identifiers in the DOCTYPE declaration</span></p>
-    <p>This document uses an inconsistent DOCTYPE declaration. The Public identifier  
+    <p>This document uses an inconsistent DOCTYPE declaration. 
+    <TMPL_IF NAME="W26_dtd_sys_recommend">
+    The Public Identifier  
 	<code><TMPL_VAR NAME="W26_dtd_pub" ESCAPE="HTML"></code> declares the 
-	<code><TMPL_VAR NAME="W26_dtd_pub_display" ESCAPE="HTML"></code> document type, but the associated System identifier
+	<code><TMPL_VAR NAME="W26_dtd_pub_display" ESCAPE="HTML"></code> document type, but the associated System Identifier
 	<code><TMPL_VAR NAME="W26_dtd_sys" ESCAPE="HTML"></code> does not match this document type.</p>
 	<p>The recommended System Identifier 
-	for <code><TMPL_VAR NAME="W26_dtd_pub_display" ESCAPE="HTML"></code> is <code><TMPL_VAR NAME="W26_dtd_sys_recommend" ESCAPE="HTML"></code>.</p>
+	for <code><TMPL_VAR NAME="W26_dtd_pub_display" ESCAPE="HTML"></code> is <code><TMPL_VAR NAME="W26_dtd_sys_recommend" ESCAPE="HTML"></code>.
+    </TMPL_IF>
+    <TMPL_IF NAME="W26_dtd_pub_recommend">
+    The System Identifier  
+	<code><TMPL_VAR NAME="W26_dtd_sys" ESCAPE="HTML"></code> declares the 
+	<code><TMPL_VAR NAME="W26_dtd_pub_display" ESCAPE="HTML"></code> document type, but the associated Public Identifier
+	<code><TMPL_VAR NAME="W26_dtd_pub" ESCAPE="HTML"></code> does not match this document type.</p>
+	<p>The recommended Public Identifier 
+	for <code><TMPL_VAR NAME="W26_dtd_sys" ESCAPE="HTML"></code> is <code><TMPL_VAR NAME="W26_dtd_pub_recommend" ESCAPE="HTML"></code>.
+    </TMPL_IF>	
+	
+	</p>
 	<p>The safest way to use a correct DOCTYPE declaration is to copy and paste one from the 
 	<a href="http://www.w3.org/QA/2002/04/valid-dtd-list.html" 
 	title="W3C QA - Recommended list of DTDs you can use in your Web document">recommended list</a> 
Received on Tuesday, 12 February 2008 06:30:38 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:00 GMT