6 files changed, 18 insertions, 27 deletions
diff --git a/htdocs/dev/tests/index.html b/htdocs/dev/tests/index.html
index 67584c9..7b0818d 100755
--- a/htdocs/dev/tests/index.html
+++ b/htdocs/dev/tests/index.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: index.html,v 1.84 2007-08-16 06:24:14 ot Exp $"
---><!--#set var="date" value="\$Date: 2007-08-16 06:24:14 $"
+<!--#set var="revision" value="\$Id: index.html,v 1.85 2007-09-03 06:57:40 ot Exp $"
+--><!--#set var="date" value="\$Date: 2007-09-03 06:57:40 $"
 --><!--#set var="title" value="The W3C Markup Validation Service: Tests"
 --><!--#set var="relroot" value="../../"
 --><!--#include virtual="../../header.html" -->
@@ -271,6 +271,13 @@ All these documents should validate, without "pretty print" for the document typ
     HTML 4.01 Document with Ampersand as data <br />
     (OK in SGML, not XML :see <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=798">Bug798: Ampersand as data in XHTML</a>)
   </li>
+  <li>
+    <a href="../../check?uri=http://qa-dev.w3.org/wmvs/HEAD/dev/tests/texthtml_unknownparsemode.html;ss">validate</a> - 
+    <a href="http://validator.w3.org/check?uri=http://qa-dev.w3.org/wmvs/HEAD/dev/tests/texthtml_unknownparsemode.html;ss">with v.w.o</a> - 
+    <a href="texthtml_unknownparsemode.html">view</a>:
+    document served as <code>text/html</code>, using a custom DTD and for which parse mode is impossible to determine via generic heuristics (triggers warning W06)
+  </li>
+
 </ul>
 
 <h4 id="wrong_mime">Valid Documents served with a wrong media type</h4>
diff --git a/htdocs/dev/tests/texthtml_unknownparsemode.html.utf8 b/htdocs/dev/tests/texthtml_unknownparsemode.html.utf8
index d7c0bee..def9b85 100644
--- a/htdocs/dev/tests/texthtml_unknownparsemode.html.utf8
+++ b/htdocs/dev/tests/texthtml_unknownparsemode.html.utf8
@@ -8,23 +8,17 @@
 -->
 <html>
 <head>
-<title>test for text/html Document using Custom DTD, unknown parse mode - W08</title>
+<title>test for text/html Document using Custom DTD, unknown parse mode - W06</title>
 
 </head>
 
 <body lang="en">
-<p>This test document corresponds to validator warning W08:
+<p>This test document corresponds to validator warning W06:
 <code>
-Unknown Parse Mode!
+Unable to Determine Parse Mode
 </code>
 </p>
 
-<p>This document is a subset of the <a href="http://www.w3.org/Style/">W3C Style</a>
-homepage, using <a href="http://www.w3.org/Style/customdtd">Custom DTD</a> 
-allowing <blink>The nonstandard blink element</blink>.
-</p>
-
-<p>It is valid against that particular DTD</p>
 
 </body>
 </html>
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 369ac7d..58209e0 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.558 2007-08-23 15:31:54 ville Exp $
+# $Id: check,v 1.559 2007-09-03 06:57:41 ot Exp $
 
 #
 # Disable buffering on STDOUT!
@@ -186,7 +186,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.558 $;
+  $VERSION =  q$Revision: 1.559 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -2025,7 +2025,10 @@ sub set_parse_mode {
     # if the mime type is text/html (ambiguous, hence TBD mode)
     # and XML prolog detection was unsuccessful
     # and the doctype isn't in the catalogue... we scream
-    &add_warning('W08', {W08_mime => $File->{ContentType}});
+    &add_warning('W06', {
+      W06_mime => $File->{ContentType},
+      w06_doctype => $File->{DOCTYPE}
+    });
     return;
   }
 
diff --git a/share/templates/en_US/soap_warnings.tmpl b/share/templates/en_US/soap_warnings.tmpl
index e145221..c74a636 100644
--- a/share/templates/en_US/soap_warnings.tmpl
+++ b/share/templates/en_US/soap_warnings.tmpl
@@ -28,7 +28,6 @@
   <m:warning><m:messageid>W07</m:messageid><m:message>Contradictory Parse Modes Detected!</m:message></m:warning>
 </TMPL_IF>
 <TMPL_IF NAME="W08">
-  <m:warning><m:messageid>W08</m:messageid><m:message>Unknown Parse Mode!</m:message></m:warning>
 </TMPL_IF>
 <TMPL_IF NAME="W09">
   <m:warning><m:messageid>W09</m:messageid><m:message>No DOCTYPE found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</m:message></m:warning>
diff --git a/share/templates/en_US/ucn_warnings.tmpl b/share/templates/en_US/ucn_warnings.tmpl
index 04e0736..b284729 100644
--- a/share/templates/en_US/ucn_warnings.tmpl
+++ b/share/templates/en_US/ucn_warnings.tmpl
@@ -28,7 +28,6 @@
   <warning><messageid>W07</messageid><message>Contradictory Parse Modes Detected!</message></warning>
 </TMPL_IF>
 <TMPL_IF NAME="W08">
-  <warning><messageid>W08</messageid><message>Unknown Parse Mode!</message></warning>
 </TMPL_IF>
 <TMPL_IF NAME="W09">
   <warning><messageid>W09</messageid><message>No DOCTYPE found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</message></warning>
diff --git a/share/templates/en_US/warnings.tmpl b/share/templates/en_US/warnings.tmpl
index 4cc1364..8a4bea8 100644
--- a/share/templates/en_US/warnings.tmpl
+++ b/share/templates/en_US/warnings.tmpl
@@ -155,17 +155,6 @@
   </li>
 </TMPL_IF>
 <TMPL_IF NAME="W08">
-  <li class="msg_warn" id="W08"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Unknown Parse Mode!</span>
-  
-    <p>
-      The MIME Media Type
-      (<code><TMPL_VAR NAME="W08_mime" ESCAPE="HTML"></code>) for this
-      document is used to serve both SGML and XML based documents, 
-      and it is not possible to disambiguate it 
-      based on the <code>DOCTYPE</code> Declaration in your document. Parsing
-      will continue in SGML mode.
-    </p>
-  </li>
 </TMPL_IF>
 <TMPL_IF NAME="W09">
   <li class="msg_warn" id="W09"><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">No <code>DOCTYPE</code> found! Attempting validation with <TMPL_VAR NAME="W09_dtd" ESCAPE="HTML">.</span>