diff options
| author | ot <ot@localhost> | 2008-01-17 11:15:14 +0000 |
|---|---|---|
| committer | ot <ot@localhost> | 2008-01-17 11:15:14 +0000 |
| commit | bf9149525639619970ef20d70fa6480470bffd3f (patch) | |
| tree | 3a88adcc6d14a5e758a767bc9d8d2e8064c30086 | |
| parent | 5c9fad8c2442f188e571aa05a4d04758cb125121 (diff) | |
| download | markup-validator-bf9149525639619970ef20d70fa6480470bffd3f.zip markup-validator-bf9149525639619970ef20d70fa6480470bffd3f.tar.gz markup-validator-bf9149525639619970ef20d70fa6480470bffd3f.tar.bz2 | |
Rewording of the warning title and text for doctype FPI/SI mismatch, as suggested by Terje.
| -rwxr-xr-x | httpd/cgi-bin/check | 9 | ||||
| -rw-r--r-- | share/templates/en_US/warnings.tmpl | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 16a4f54..52a6018 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.579 2008-01-17 08:09:23 ot Exp $ +# $Id: check,v 1.580 2008-01-17 11:15:13 ot Exp $ # # Disable buffering on STDOUT! @@ -186,7 +186,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.579 $; + $VERSION = q$Revision: 1.580 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -1885,7 +1885,10 @@ sub match_DTD_FPI_SI { if ($CFG->{Types}->{$FPI}) { if ($CFG->{Types}->{$FPI}->{SysID}){ if ($SI ne $CFG->{Types}->{$FPI}->{SysID}) { - &add_warning('W26', {W26_dtd_pub => $CFG->{Types}->{$FPI}->{Display}, W26_dtd_sys=> $SI, W26_dtd_sys_recommend=> $CFG->{Types}->{$FPI}->{SysID}}); + &add_warning('W26', {W26_dtd_pub => $CFG->{Types}->{$FPI}, + W26_dtd_pub_display =>$CFG->{Types}->{$FPI}->{Display}, + W26_dtd_sys=> $SI, + W26_dtd_sys_recommend=> $CFG->{Types}->{$FPI}->{SysID}}); } } } diff --git a/share/templates/en_US/warnings.tmpl b/share/templates/en_US/warnings.tmpl index f15745e..c43df5f 100644 --- a/share/templates/en_US/warnings.tmpl +++ b/share/templates/en_US/warnings.tmpl @@ -466,12 +466,17 @@ to check these potential issues, and, if necessary, fix them and re-validate the </li> </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">Broken DOCTYPE detected</span></p> - <p>The document uses a DOCTYPE declaration with the <code><TMPL_VAR NAME="W26_dtd_sys" ESCAPE="HTML"></code> System Identifier, but the recommended System Identifier - for <code><TMPL_VAR NAME="W26_dtd_pub" ESCAPE="HTML"></code> is <code><TMPL_VAR NAME="W26_dtd_sys_recommend" ESCAPE="HTML"></code>.</p> +<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 + <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_sys" ESCAPE="HTML"></code> does not match this document type.</p> + <p>he 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> <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> - and avoid editing that part of your markup by hand.</p> + <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> + and avoid editing that part of your markup by hand.</p> </li> </TMPL_IF> |