patch by Brett Bieber for Bug 5154

http://lists.w3.org/Archives/Public/www-validator/2007Oct/0027.html

2 files changed, 8 insertions, 7 deletions

diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 2a6b7fa..9faadb4 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.573 2007-10-03 10:42:08 ot Exp $
+# $Id: check,v 1.574 2007-10-09 00:48:23 ot Exp $
 
 #
 # Disable buffering on STDOUT!
@@ -186,7 +186,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.573 $;
+  $VERSION =  q$Revision: 1.574 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -920,7 +920,8 @@ if ($File->{Namespace}) {
       });
     }
   } else {
-    &add_warning('W11', {W11_ns => $File->{Namespace}});
+    &add_warning('W11', {W11_ns => $File->{Namespace},
+    w11_doctype => $File->{DOCTYPE}});
   }
 } else {
   if (&is_xml($File) and $CFG->{Types}->{$File->{Version}}->{Namespace}) {
@@ -1714,8 +1715,8 @@ sub report_errors ($) {
           my $escaped_uri = uri_escape($File->{URI});
           $_msg =~ s/<!--URI-->/$escaped_uri/g;
         }
-        $_msg =~ s/<!--CFG_HOME_PAGE-->/$CFG->{'Home Page'}/g;
         $explanation = "    $_msg\n$explanation"; # The send feedback plea.
+        $explanation =~ s/<!--CFG_HOME_PAGE-->/$CFG->{'Home Page'}/g;
       }
 
       $err->{src} = $line;
diff --git a/share/templates/en_US/error_messages.cfg b/share/templates/en_US/error_messages.cfg
index bb76cef..5c014ac 100644
--- a/share/templates/en_US/error_messages.cfg
+++ b/share/templates/en_US/error_messages.cfg
@@ -428,7 +428,7 @@
     </p>
     <p>
       If this error occurred in a script section of your document, you should probably
-      read this <a href="docs/help.html#faq-javascript">FAQ entry</a>.
+      read this <a href="<!--CFG_HOME_PAGE-->docs/help.html#faq-javascript">FAQ entry</a>.
     </p>
   </div>
 .EOF.
@@ -577,7 +577,7 @@
       check that they are both allowed in the chosen document type, and/or
       use CSS instead of this attribute. If you received this error when using the 
       &lt;embed&gt; element to incorporate flash media in a Web page, see the 
-      <a href="docs/help.html#faq-flash">FAQ item on valid flash</a>.
+      <a href="<!--CFG_HOME_PAGE-->docs/help.html#faq-flash">FAQ item on valid flash</a>.
     </p>
   </div>
 .EOF.
@@ -1005,7 +1005,7 @@
   verbose <<.EOF.
   <div class="ve mid-187">
     <p>The document type could not be determined, because the document had no correct DOCTYPE declaration. The document does not look like HTML, therefore automatic fallback could not be performed, and the document was only checked against basic markup syntax.</p>
-    <p>Learn <a href="docs/help.html#faq-doctype">how to add a doctype to your document</a> 
+    <p>Learn <a href="<!--CFG_HOME_PAGE-->docs/help.html#faq-doctype">how to add a doctype to your document</a> 
     from our <acronym title="Frequently Asked Questions">FAQ</acronym>, or use the validator's
     <code>Document Type</code> option to validate your document against a specific Document Type.</p>
   </div>