Remove proprietary XML output option.

It has been deprecated for years, and was announced to be removed in 0.8
in 2006 but has stuck around for some reason until now.

3 files changed, 9 insertions, 85 deletions

diff --git a/htdocs/docs/users.html b/htdocs/docs/users.html
index 8e239aa..62fb51b 100755
--- a/htdocs/docs/users.html
+++ b/htdocs/docs/users.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: users.html,v 1.35 2009-09-27 18:27:14 ville Exp $"
---><!--#set var="date" value="\$Date: 2009-09-27 18:27:14 $"
+<!--#set var="revision" value="\$Id: users.html,v 1.36 2009-10-23 20:46:02 ville Exp $"
+--><!--#set var="date" value="\$Date: 2009-10-23 20:46:02 $"
 --><!--#set var="title" value="User Documentation for The W3C Markup Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -318,19 +318,15 @@
         <a href="http://wiki.whatwg.org/wiki/Validator.nu_JSON_Output">JSON
           output for validator.nu</a>.
       </dd>
-      <dt id="output-xml">XML (<code>output=xml</code>)</dt>
-      <dd>
-        This output option has been deprecated, and will be removed from future
-        versions of the validator.
-      </dd>
     </dl>
 
     <h4 id="deprecated_options">Deprecated options</h4>
     <p>
       A number of options once available  have been deprecated and are not
-      available any more. These includee the <em>Show parse tree</em> and
-      <em>exclude attributes from the parse tree</em>, as well as <em>Show
-        ESIS</em> and <em>Show raw errors</em> options.
+      available any more. These include the <em>Show parse tree</em> and
+      <em>exclude attributes from the parse tree</em>, as well as
+      <em>Show ESIS</em> and <em>Show raw errors</em> options, and the
+      <code>xml</code> output option.
     </p>
   </div>
 
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 84d3abf..b2395e5 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.714 2009-10-23 19:18:00 ville Exp $
+# $Id: check,v 1.715 2009-10-23 20:46:13 ville Exp $
 #
 # Disable buffering on STDOUT!
 $| = 1;
@@ -208,7 +208,7 @@ Directory not readable (permission denied): @_r
 
   #
   # Strings
-  $VERSION =  q$Revision: 1.714 $;
+  $VERSION =  q$Revision: 1.715 $;
   $VERSION =~ s/Revision: ([\d\.]+) /$1/;
 
   #
@@ -829,9 +829,7 @@ if (!$File->{'Is Valid'} && $File->{Opt}->{'Show Tidy'}) {
 
 my $template;
 
-if ($File->{Opt}->{Output} eq 'xml') {
-  $template = &get_template($File, 'xml_output.tmpl');
-} elsif ($File->{Opt}->{Output} eq 'earl') {
+if ($File->{Opt}->{Output} eq 'earl') {
   $template = &get_template($File, 'earl_xml.tmpl');
 } elsif ($File->{Opt}->{Output} eq 'n3') {
   $template = &get_template($File, 'earl_n3.tmpl');
diff --git a/share/templates/en_US/xml_output.tmpl b/share/templates/en_US/xml_output.tmpl
deleted file mode 100644
index fd031ed..0000000
--- a/share/templates/en_US/xml_output.tmpl
+++ /dev/null
@@ -1,70 +0,0 @@
-Content-Type: application/xml; charset=UTF-8
-X-W3C-Validator-Recursion: <TMPL_VAR NAME="depth" DEFAULT="1"><TMPL_IF NAME="fatal_error">
-X-W3C-Validator-Status: Abort<TMPL_ELSE><TMPL_IF NAME="valid_status">
-X-W3C-Validator-Status: <TMPL_VAR NAME="valid_status"></TMPL_IF>
-X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num">
-X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  FIXME: text/xsl is not a registered media type
--->
-<?xml-stylesheet type="text/xsl" href="xml-results.xsl"?>
-
-<!--
-  This interface is highly experimental and the output *will* change
-  (probably even several times) before finished. Do *not* rely on it!
-  See http://validator.w3.org/docs/users.html#api-warning
--->
-
-<!DOCTYPE result [
-  <!ELEMENT result (meta, warnings?, messages?)>
-  <!ATTLIST result
-    version CDATA #FIXED '0.9.1'
-  >
-
-  <!ELEMENT meta (uri, modified, server, size, encoding, doctype, errors)>
-  <!ELEMENT uri      (#PCDATA)>
-  <!ELEMENT modified (#PCDATA)>
-  <!ELEMENT server   (#PCDATA)>
-  <!ELEMENT size     (#PCDATA)>
-  <!ELEMENT encoding (#PCDATA)>
-  <!ELEMENT doctype  (#PCDATA)>
-  <!ELEMENT errors   (#PCDATA)>
-
-  <!ELEMENT warnings (warning)+>
-  <!ELEMENT warning  (#PCDATA)>
-
-  <!ELEMENT messages (msg)*>
-  <!ELEMENT msg      (#PCDATA)>
-  <!ATTLIST msg
-    line   CDATA #IMPLIED
-    col    CDATA #IMPLIED
-    offset CDATA #IMPLIED
-  >
-]>
-
-<result>
-  <meta>
-    <uri><TMPL_VAR NAME="file_uri" ESCAPE="HTML"></uri>
-    <modified><TMPL_VAR NAME="file_modified" ESCAPE="HTML"></modified>
-    <server><TMPL_VAR NAME="file_server" ESCAPE="HTML"></server>
-    <size><TMPL_VAR NAME="file_size" ESCAPE="HTML"></size>
-    <encoding><TMPL_VAR NAME="file_charset" ESCAPE="HTML"></encoding>
-    <doctype><TMPL_VAR NAME="file_doctype" ESCAPE="HTML"></doctype>
-    <errors><TMPL_VAR NAME="valid_errors_num" ESCAPE="HTML"></errors>
-  </meta>
-
-  <warnings>
-    <TMPL_IF NAME="have_warnings"><TMPL_INCLUDE NAME="ucn_warnings.tmpl"></TMPL_IF>
-  </warnings>
-
-  <messages>
-<TMPL_LOOP NAME="file_errors">
-    <msg line="<TMPL_VAR NAME="line" ESCAPE="HTML">"
-         col="<TMPL_VAR NAME="char" ESCAPE="HTML">"
-    ><TMPL_VAR NAME="msg" ESCAPE="HTML"></msg>
-</TMPL_LOOP>
-  </messages>
-
-</result>