merging from 0.7 branch into trunk at tag validator-0_7_2-release

14 files changed, 103 insertions, 44 deletions

diff --git a/htdocs/base.css b/htdocs/base.css
index 9677a47..462f6fa 100644
--- a/htdocs/base.css
+++ b/htdocs/base.css
@@ -1,10 +1,10 @@
 /*
    Base Style Sheet for the W3C Markup Validation Service.
 
-   Copyright 2000-2005 W3C (MIT, INRIA, Keio). All Rights Reserved.
+   Copyright 2000-2006 W3C (MIT, INRIA, Keio). All Rights Reserved.
    See http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright
 
-   $Id: base.css,v 1.56 2005-08-12 01:56:47 ot Exp $
+   $Id: base.css,v 1.57 2006-03-31 05:48:01 ot Exp $
 */
 
 @import url("results.css"); /* CSS for validation results. */
diff --git a/htdocs/config/charset.cfg b/htdocs/config/charset.cfg
index 6e22607..e7c91cd 100644
--- a/htdocs/config/charset.cfg
+++ b/htdocs/config/charset.cfg
@@ -1,7 +1,7 @@
 #
 # List of accepted encodings.
 #
-# $Id: charset.cfg,v 1.11 2005-08-18 02:52:50 bjoern Exp $
+# $Id: charset.cfg,v 1.12 2006-03-31 05:48:02 ot Exp $
 #
 # The Validator will refuse to decode documents in an encoding
 # other than those listed here. The list is independent of what
diff --git a/htdocs/config/types.conf b/htdocs/config/types.conf
index 9eaff26..cd2504f 100644
--- a/htdocs/config/types.conf
+++ b/htdocs/config/types.conf
@@ -1,7 +1,7 @@
 #
 # Main Document Type Database for the W3C Markup Validation Service.
 #
-# $Id: types.conf,v 1.15 2005-09-21 04:55:42 ot Exp $
+# $Id: types.conf,v 1.16 2006-03-31 05:48:02 ot Exp $
 #
 # Maintains all information for each of the document types we support.
 # See 'perldoc Config::General' for the syntax, and be aware that the
@@ -401,7 +401,7 @@
 </MathML_2>
 
 <XHTML_1.1_MathML_2>
-  Name       = math
+  Name       = html
   Display    = XHTML 1.1 plus MathML 2.0
   Info URL   = http://www.w3.org/TR/MathML2/
   PubID      = -//W3C//DTD XHTML 1.1 plus MathML 2.0//EN
@@ -418,7 +418,7 @@
 </XHTML_1.1_MathML_2>
 
 <XHTML_1.1_MathML_2_SVG_1.1>
-  Name       = math
+  Name       = html
   Display    = XHTML 1.1 plus MathML 2.0 plus SVG 1.1
   Info URL   = http://www.w3.org/TR/XHTMLplusMathMLplusSVG/
   PubID      = -//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN
diff --git a/htdocs/detailed-form.html b/htdocs/detailed-form.html
index bc6a321..51ddd18 100755
--- a/htdocs/detailed-form.html
+++ b/htdocs/detailed-form.html
@@ -10,14 +10,14 @@
                 <option value="iso-8859-3">iso-8859-3 (Southern Europe)</option>
                 <option value="iso-8859-4">iso-8859-4 (North European)</option>
                 <option value="iso-8859-5">iso-8859-5 (Cyrillic)</option>
-                <option value="iso-8859-6">iso-8859-6 (Arabic)</option>
+                <option value="iso-8859-6-i">iso-8859-6-i (Arabic)</option>
                 <option value="iso-8859-7">iso-8859-7 (Greek)</option>
                 <option value="iso-8859-8">iso-8859-8 (Hebrew, visual)</option>
                 <option value="iso-8859-8-i">iso-8859-8-i (Hebrew, logical)</option>
                 <option value="iso-8859-9">iso-8859-9 (Turkish)</option>
                 <option value="iso-8859-10">iso-8859-10 (Latin 6)</option>
-                <option value="iso-8859-13">iso-8859-13 (Baltic Rim)</option>
-                <option value="iso-8859-14">iso-8859-14 (Celtic)</option>
+                <option value="iso-8859-13">iso-8859-13 (Latin 7, Baltic Rim)</option>
+                <option value="iso-8859-14">iso-8859-14 (Latin 8, Celtic)</option>
                 <option value="iso-8859-15">iso-8859-15 (Latin 9)</option>
                 <option value="iso-8859-16">iso-8859-16 (Latin 10)</option>
                 <option value="us-ascii">us-ascii (basic English)</option>
diff --git a/htdocs/docs/users.html b/htdocs/docs/users.html
index 3e80b32..eba24f1 100755
--- a/htdocs/docs/users.html
+++ b/htdocs/docs/users.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: users.html,v 1.22 2005-07-29 06:23:06 ot Exp $"
---><!--#set var="date" value="\$Date: 2005-07-29 06:23:06 $"
+<!--#set var="revision" value="\$Id: users.html,v 1.23 2006-03-31 05:48:02 ot Exp $"
+--><!--#set var="date" value="\$Date: 2006-03-31 05:48:02 $"
 --><!--#set var="title" value="User Documentation for The W3C Markup Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -102,7 +102,7 @@
 	  <p>This allows you to <strong>override</strong> the DOCTYPE declaration for you
 	  document. You may use this option for test 
           purposes, but you will eventually have to serve your document with the
-          correct character encoding, or the validator will <a href="help#faq-doctype">complain</a>
+          correct DOCTYPE declaration, or the validator will <a href="help#faq-doctype">complain</a>
           about it and you document will not be valid.</p>
 	</dd>
 	<dt><a id="option-fbd" name="option-fbd"></a>Use Fallback instead of Override (Type) (<code>fbd</code>)</dt>
@@ -201,7 +201,7 @@
         In spite of our efforts,  interpreting the Markup Validator's error messages 
 	isn't quite what you'd call easy. The error messages are generated in the 
 	context of a full SGML environment which demands a somewhat higher level 
-	of technical detail then your average HTML document. We have set up a page 
+	of technical detail than your average HTML document. We have set up a page 
 	listing <a href="errors.html">errors and their explanation</a>, which should
 	help you find out what meaning lies behind the cryptic messages, and fix
 	your markup.
diff --git a/htdocs/footer.html b/htdocs/footer.html
index d96d4a9..8439da7 100755
--- a/htdocs/footer.html
+++ b/htdocs/footer.html
@@ -8,10 +8,10 @@
 	<a title="Send Feedback for the W3C Markup Validation Service"
         href="<!--#echo var="relroot" -->feedback.html">The W3C Validator Team</a><br />
       <!--#echo var="date" -->
-      <!-- SSI Template Version: $Id: footer.html,v 1.11 2005-01-09 20:40:33 ville Exp $ -->
+      <!-- SSI Template Version: $Id: footer.html,v 1.12 2006-03-31 05:48:01 ot Exp $ -->
     </address>
     <p class="copyright">
-      <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2005
+      <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2006
       <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>&reg;
       (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
       <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
diff --git a/htdocs/header.html b/htdocs/header.html
index eb1131c..0662cb8 100755
--- a/htdocs/header.html
+++ b/htdocs/header.html
@@ -15,7 +15,7 @@
     <!--#if expr="$feeds = 1" -->
     <link rel="alternate" type="application/atom+xml" href="whatsnew.atom" />
     <!--#endif -->
-    <!-- SSI Template Version: $Id: header.html,v 1.39 2005-11-15 05:17:25 ot Exp $ -->
+    <!-- SSI Template Version: $Id: header.html,v 1.40 2006-03-31 05:48:01 ot Exp $ -->
   </head>
 
   <body>
@@ -34,7 +34,6 @@
         <li><a href="<!--#echo var="relroot" -->docs/" accesskey="3" title="Documentation for this Service">Docs</a></li>
 	<li><a href="<!--#echo var="relroot" -->docs/help.html" title="Help and answers to frequently asked questions">Help&nbsp;&amp;&nbsp;<acronym title="Frequently Asked Questions">FAQ</acronym></a></li>
         <li><a href="<!--#echo var="relroot" -->feedback.html" accesskey="4" title="How to provide feedback on this service">Feedback</a></li>
-	<li><a href="http://validator.w3.org/checklink" title="In addition to fixing your markup, fix your links with the W3C Link Checker">Link Checker</a></li>
     </ul>
 
     <div id="main"><!-- This DIV encapsulates everything in this page - necessary for the positioning -->
diff --git a/htdocs/index.html b/htdocs/index.html
index b2405f1..3dbc102 100755
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: index.html,v 1.76 2005-11-15 05:17:25 ot Exp $"
---><!--#set var="date" value="\$Date: 2005-11-15 05:17:25 $"
+<!--#set var="revision" value="\$Id: index.html,v 1.77 2006-03-31 05:48:01 ot Exp $"
+--><!--#set var="date" value="\$Date: 2006-03-31 05:48:01 $"
 --><!--#set var="title" value="The W3C Markup Validation Service"
 --><!--#set var="relroot" value="./"
 --><!--#set var="feeds" value="1"
@@ -24,7 +24,13 @@
       <p><a name="skip" id="skip"></a>
         This is the W3C Markup Validation Service, a free service that checks Web
         documents in formats like HTML and XHTML for conformance to W3C Recommendations
-        and other standards. 
+        and other standards.</p>
+      <p>
+        if you wish to validate specific content such as 
+        <a href="http://validator.w3.org/feed/">RSS/Atom feeds</a> or
+	<a href="http://jigsaw.w3.org/css-validator/">CSS stylesheets</a>
+        or to <a href="http://validator.w3.org/checklink">find broken links</a>, 
+ there are <a href="http://www.w3.org/QA/Tools/">other validators and tools</a> available.
       </p>
     </div>
 
@@ -88,6 +94,16 @@
     <div id="recent">
       <h2>Recent Updates</h2>
       <dl id="news">
+      <dt><a href="whatsnew.html#t2006-02-20">2006-02-20</a>: Markup Validator v0.7.2 Released</dt>
+      <dd>
+        <p>
+          Releasing version 0.7.2 of the Markup Validator, a maintenance release 
+          updating the codebase for compatibility issues with recent versions of the 
+          Config::General perl module, as well as including minor fixes in 
+          document types and character encoding support, and documentation.
+        </p>
+      </dd>
+
       <dt><a href="whatsnew.html#t2005-10-18">2005-10-18</a>: Markup Validator v0.7.1 Released</dt>
       <dd>
           Released version 0.7.1 of the Markup Validator, a maintenance release 
@@ -95,11 +111,6 @@
           in the user interface and in the "Direct Input" validation results.
       </dd>
 
-        <dt><a href="whatsnew.html#t2005-08-08">2005-08-08</a>:
-          Markup Validator v0.7.0 Released</dt>
-        <dd>Released version 0.7.0, including improvements in User Interface and feedback mechanisms,
-        support for installation on Windows platform, better support for both W3C and non-W3C document
-        types, usage of templates for validation results, and a number of bug fixes.</dd>
       </dl>
       <p class="intro">
         These are the most recent major changes to this service. See
diff --git a/htdocs/navbar.css b/htdocs/navbar.css
index be1c218..afddea4 100644
--- a/htdocs/navbar.css
+++ b/htdocs/navbar.css
@@ -1,10 +1,10 @@
 /*
    Navigation Style Sheet for the W3C Markup Validation Service.
 
-   Copyright 2000-2005 W3C (MIT, INRIA, Keio). All Rights Reserved.
+   Copyright 2000-2006 W3C (MIT, INRIA, Keio). All Rights Reserved.
    See http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright
 
-   $Id: navbar.css,v 1.22 2005-06-21 05:18:12 ot Exp $
+   $Id: navbar.css,v 1.23 2006-03-31 05:48:01 ot Exp $
 */
 
 
diff --git a/htdocs/source/index.html b/htdocs/source/index.html
index 7ec47af..d8bbb25 100755
--- a/htdocs/source/index.html
+++ b/htdocs/source/index.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: index.html,v 1.39 2005-10-20 06:46:50 ot Exp $"
---><!--#set var="date" value="\$Date: 2005-10-20 06:46:50 $"
+<!--#set var="revision" value="\$Id: index.html,v 1.40 2006-03-31 05:48:02 ot Exp $"
+--><!--#set var="date" value="\$Date: 2006-03-31 05:48:02 $"
 --><!--#set var="title" value="Source Code Availability for The W3C Markup Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -13,8 +13,9 @@
        <ul>	
 	<li><a href="#browse">Browsing the code</a></li>
 	<li><a href="#tarball">Download tarballs</a></li>
-	<li><a href="#rpm">RPM package</a></li>
-	<li><a href="#deb">Debian package</a></li>
+	<li><a href="#rpm">Fedora/Red Hat RPM package</a></li>
+	<li><a href="#suse">SuSE Linux (OSS) RPM package</a></li>
+	<li><a href="#deb">Debian GNU/Linux package</a></li>
 	<li><a href="#CVS">CVS repository</a></li>
        </ul>
       </li>
@@ -62,9 +63,9 @@
 	    (~300kB) and <a href="http://validator.w3.org/sgml-lib.tar.gz">the <acronym
               title="Document Type Definitions">DTDs</acronym></a> (~500kB).
           </p>
-        <h4><a id="rpm" name="rpm"></a>RPM package</h4>
+        <h4><a id="rpm" name="rpm"></a>Fedora/Red Hat RPM package</h4>
           <p>
-            RPM packages are available, courtesy of Ville Skytt&auml;, at
+            Fedora/Red Hat RPM packages are available, courtesy of Ville Skytt&auml;, at
             Fedora Extras,
             &lt;<a href="http://fedoraproject.org/wiki/Extras">http://fedoraproject.org/wiki/Extras</a>&gt;.
           </p>
@@ -77,7 +78,7 @@
             have to get at least the following RPMs from Fedora Extras (other
             dependencies are included in the Fedora Core distribution):
           </p>
-          <ul>
+          <ul id="rpmdeps">
             <li>w3c-markup-validator</li>
             <li>w3c-markup-validator-libs</li>
             <li>perl-Config-General</li>
@@ -97,7 +98,34 @@
             <a href="http://fedoraproject.org/wiki/Extras/UsingExtras">documentation</a>
             for information about configuring these tools.
           </p>
-        <h4><a name="deb" id="deb"></a>Debian package</h4>
+        <h4><a id="suse" name="suse"></a>SuSE Linux (OSS) RPM package</h4>
+          <p>
+            RPM packages for SuSE Linux (OSS) are available, courtesy of Sierk
+            Bornemann, at sierkbornemann.de,
+            &lt;<a href="http://sierkbornemann.de/pub/tools/w3c-markup-validator/">http://sierkbornemann.de/pub/tools/w3c-markup-validator/</a>&gt;.
+          </p>
+          <p>
+            The RPM packages from sierkbornemann.de are optimized for use in
+            a local network (recommended running in a VirtualHost) for home
+            office or web agency use.
+          </p>
+          <p>
+            Note that the Validator RPMs have several dependencies, you'll
+            have to satisfy at least the same <a href="#rpmdeps">RPM
+            dependencies</a> as listed above for Fedora/Red Hat.
+            You can get these RPMs from SuSE (other dependencies are included
+            in the SuSE Linux (OSS) distribution) or partly from
+            sierkbornemann.de.
+          </p>
+          <p>
+            In addition, each of these may have further dependencies that must
+            be satisfied. All the necessary RPMs are either included in
+            the SuSE Linux distribution(s) or are available from
+            <a href="http://sierkbornemann.de/pub/tools/w3c-markup-validator/perl-modules/">sierkbornemann.de</a>.
+            Use of an automated package management tool to install the
+            packages, such as YaST, yum or up2date is recommended.
+          </p>
+        <h4><a name="deb" id="deb"></a>Debian GNU/Linux package</h4>
           <p>
             A Debian package is available, courtesy of Fr&eacute;d&eacute;ric
             Sch&uuml;tz. 
diff --git a/htdocs/whatsnew.html b/htdocs/whatsnew.html
index 27f2d5d..aa4bc0f 100755
--- a/htdocs/whatsnew.html
+++ b/htdocs/whatsnew.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: whatsnew.html,v 1.54 2005-11-15 05:17:25 ot Exp $"
---><!--#set var="date" value="\$Date: 2005-11-15 05:17:25 $"
+<!--#set var="revision" value="\$Id: whatsnew.html,v 1.55 2006-03-31 05:48:02 ot Exp $"
+--><!--#set var="date" value="\$Date: 2006-03-31 05:48:02 $"
 --><!--#set var="title" value="What's New at The W3C Markup Validation Service"
 --><!--#set var="relroot" value="./"
 --><!--#set var="feeds" value="1"
@@ -19,7 +19,24 @@
       </p>
     </div>
     <dl id="news">
-      <dt id="t2005-10-18">2005-10-18 &mdash; 0.7.1 Release:</dt>
+      <dt id="t2006-02-20">2006-02-20 &mdash; 0.7.2 Release:</dt>
+      <dd>
+        <p>
+          Releasing version 0.7.2 of the Markup Validator, a maintenance release 
+          including minor fixes as described below:
+        </p>
+<ul>
+<li> update for compatibility with new version of Config::General module</li>
+<li> fixed the recognized root element for XHTML 1.1 plus MathML 2.0 (plus SVG)</li>
+<li> avoid Text::Wrap error with deeply nested documents</li>
+<li> documentation fixes (typos, broken link)</li>
+<li> avoid trailing comma in failed validation results if number of errors is unknown</li>
+<li> consistency fixes for character encoding selection</li>
+<li>fixed support for iso-8859-3 and iso-8859-4 encodings, added support for iso-ir-111</li>
+</ul>
+
+      </dd>
+       <dt id="t2005-10-18">2005-10-18 &mdash; 0.7.1 Release:</dt>
       <dd>
         <p>
           Releasing version 0.7.1 of the Markup Validator, a maintenance release 
diff --git a/misc/bundle/README b/misc/bundle/README
index 28eff43..ef4ccf1 100644
--- a/misc/bundle/README
+++ b/misc/bundle/README
@@ -15,7 +15,7 @@ COPYRIGHT AND LICENCE
 Originally by Ville Skyttä, <ville.skytta@iki.fi>, for the W3C
 Maintained by the W3C Markup Validator Team, <www-validator@w3.org>
 
-Copyright (C) 1994-2005 World Wide Web Consortium, (Massachusetts
+Copyright (C) 1994-2006 World Wide Web Consortium, (Massachusetts
 Institute of Technology, European Research Consortium for Informatics
 and Mathematics, Keio University). All Rights Reserved. This work is
 distributed under the W3C(R) Software License [1] in the hope that it
diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm
index ddd7751..45ac788 100644
--- a/misc/bundle/lib/Bundle/W3C/Validator.pm
+++ b/misc/bundle/lib/Bundle/W3C/Validator.pm
@@ -46,7 +46,7 @@ The W3C Markup Validator Team, E<lt>www-validator@w3.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 1994-2005 World Wide Web Consortium, (Massachusetts
+Copyright (C) 1994-2006 World Wide Web Consortium, (Massachusetts
 Institute of Technology, European Research Consortium for Informatics
 and Mathematics, Keio University). All Rights Reserved. This work is
 distributed under the W3C(R) Software License [1] in the hope that it
diff --git a/misc/w3c-markup-validator.spec b/misc/w3c-markup-validator.spec
index 0b3aef2..5c80735 100644
--- a/misc/w3c-markup-validator.spec
+++ b/misc/w3c-markup-validator.spec
@@ -1,18 +1,18 @@
 # RPM spec file for the W3C Markup Validator
-# $Id: w3c-markup-validator.spec,v 1.6 2005-10-20 06:48:53 ot Exp $
+# $Id: w3c-markup-validator.spec,v 1.7 2006-03-31 05:51:50 ot Exp $
 
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.1
+Version:        0.7.2
 Release:        1
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
 License:        W3C Software License
 URL:            http://validator.w3.org/
-Source0:        http://validator.w3.org/validator-%{tbver}.tar.gz
-Source1:        http://validator.w3.org/sgml-lib-%{tbver}.tar.gz
+Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
+Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -116,6 +116,10 @@ done
 
 
 %changelog
+
+* Thu Feb  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.72-1
+- 0.7.2.
+
 * Sat Oct  8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-1
 - 0.7.1.