Merging from validator-0_6_0-branch (at tag validator-0_6_1-release) to

HEAD. Superficially ok, but probably needs tweaking for merge breakage.

4 files changed, 25 insertions, 28 deletions

diff --git a/htdocs/docs/devel.html b/htdocs/docs/devel.html
index 67e13cf..5b19d43 100755
--- a/htdocs/docs/devel.html
+++ b/htdocs/docs/devel.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: devel.html,v 1.10 2002-11-25 01:27:56 link Exp $"
---><!--#set var="date" value="\$Date: 2002-11-25 01:27:56 $"
+<!--#set var="revision" value="\$Id: devel.html,v 1.11 2002-12-01 13:40:33 link Exp $"
+--><!--#set var="date" value="\$Date: 2002-12-01 13:40:33 $"
 --><!--#set var="title" value="Developer Documentation for The W3C MarkUp Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -36,7 +36,7 @@
         can be found on <a href="http://www.cpan.org/">CPAN</a> (minimum
         versions in parenthesis after the name). The following
         list was complete when CVS spit out:
-        <code>$Date: 2002-11-25 01:27:56 $</code>. <tt>:-)</tt>
+        <code>$Date: 2002-12-01 13:40:33 $</code>. <tt>:-)</tt>
       </p>
       <dl>
         <dt><code>CGI (2.81)</code></dt>
@@ -114,7 +114,7 @@
       <h2>TODO</h2>
       <p>
         The TODO list for the Validator is online at
-        &lt;URL:<a href="../todo.html">http://validator.w3.org/todo.html</a>&gt;.
+        &lt;<a href="../todo.html">http://validator.w3.org/todo.html</a>&gt;.
  	      This is probably the best place to start.
  	    </p>
       <p>
diff --git a/htdocs/docs/sgml.html b/htdocs/docs/sgml.html
index d66beab..a1af197 100755
--- a/htdocs/docs/sgml.html
+++ b/htdocs/docs/sgml.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: sgml.html,v 1.11 2002-10-23 23:11:30 link Exp $"
---><!--#set var="date" value="\$Date: 2002-10-23 23:11:30 $"
+<!--#set var="revision" value="\$Id: sgml.html,v 1.12 2002-12-01 13:40:33 link Exp $"
+--><!--#set var="date" value="\$Date: 2002-12-01 13:40:33 $"
 --><!--#set var="title" value="Introduction To SGML for The W3C MarkUp Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -72,19 +72,16 @@
         Be sure that the syntax is as described above, and that you use the
         correct public identifier; otherwise, The Validator will use the wrong
         DTD, or will be unable to find a DTD at all, and will produce a huge
-        list of absolutely meaningless errors. The Validator's
-        <a href="../sgml-lib/catalog">public identifier catalog</a> lists all the public
-        identifiers The Validator recognizes for various types of HTML; of
-        those, the following public identifiers are most likely to be widely
-        recognized:
+        list of absolutely meaningless errors.
+      </p>
+      <p>
+        The W3C QA Activity maintains a <a
+        href="http://www.w3.org/QA/2002/04/valid-dtd-list.html">List of
+        Valid Doctypes</a> that you can choose from, and the <acronym
+        title="Web Design Group">WDG</acronym> maintains a document on
+        "<a href="http://htmlhelp.com/tools/validator/doctype.html">Choosing
+        a DOCTYPE</a>".
       </p>
-      <dl>
-        <dt><code>For HTML 2.0...</code></dt><dd>...use "-//IETF//DTD HTML 2.0//EN"</dd>
-        <dt><code>For HTML 4.0...</code></dt><dd>...use "-//W3C//DTD HTML 4.0//EN"</dd>
-        <dt><code>For HTML 4.0 Transitional...</code></dt><dd>...use "-//W3C//DTD HTML 4.0 Transitional//EN"</dd>
-        <dt><code>For HTML 4.0 Frameset...</code></dt><dd>...use "-//W3C//DTD HTML 4.0 Frameset//EN"</dd>
-      </dl>
-      <p>Note that the string must appear exactly as shown, including case.</p>
       <p class="warning">
         <strong>WARNING:</strong> Some HTML editors will insert a
         <code>DOCTYPE</code> declaration for you. Unfortunately, this
diff --git a/htdocs/docs/users.html b/htdocs/docs/users.html
index f90bd70..21d4467 100755
--- a/htdocs/docs/users.html
+++ b/htdocs/docs/users.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: users.html,v 1.14 2002-11-25 01:12:44 ot Exp $"
---><!--#set var="date" value="\$Date: 2002-11-25 01:12:44 $"
+<!--#set var="revision" value="\$Id: users.html,v 1.15 2002-12-01 13:40:33 link Exp $"
+--><!--#set var="date" value="\$Date: 2002-12-01 13:40:33 $"
 --><!--#set var="title" value="User Documentation for The W3C MarkUp Validation Service"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -92,15 +92,15 @@
       <h2>Calling/Linking to the Validator</h2>
       <p>
         You can link directly to the Validator home page, or you can call the
-        Validator CGI program. The home page is &lt;URL:<a
+        Validator CGI program. The home page is &lt;<a
           href="http://validator.w3.org/">http://validator.w3.org/</a>&gt; at
         the moment (and for the foreseeable future) and the CGI program can be
-        reached at &lt;URL:<a
+        reached at &lt;<a
         href="http://validator.w3.org/check">http://validator.w3.org/check</a>&gt;.
       </p>
       <p>
         If you call the CGI program with extra path info matching "/referer"
-        (i.e. &lt;URL:<a href="http://validator.w3.org/check/referer">http://validator.w3.org/check/referer</a>&gt;)
+        (i.e. &lt;<a href="http://validator.w3.org/check/referer">http://validator.w3.org/check/referer</a>&gt;)
         it will fetch the refering document and validate that. This means that
         if you embed a link to that URL in your pages, following on that link
         will send you the validation results for that page.
@@ -108,7 +108,7 @@
       <p>
         You can also link to the validation results for a specific page. You do
         this by giving "check" an "uri" parameter pointing at the page you want
-        to validate. For example &lt;URL:<a href="http://validator.w3.org/check?uri=http://www.example.com/">http://validator.w3.org/check?uri=http://www.example.com/</a>&gt;
+        to validate. For example &lt;<a href="http://validator.w3.org/check?uri=http://www.example.com/">http://validator.w3.org/check?uri=http://www.example.com/</a>&gt;
         will validate the www.example.com home page.
       </p>
       <p>
@@ -116,7 +116,7 @@
         "<a href="#Options">The Options</a>" in parenthesis after the long
         name. To add options to your links directly, append the options
         separated by a semi-colon. For example
-        &lt;URL:<a href="http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1;sp=1">http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1;sp=1</a>&gt;
+        &lt;<a href="http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1;sp=1">http://validator.w3.org/check?uri=http://www.example.com/;ss=1;outline=1;sp=1</a>&gt;
         will validate the example.com home page with "Show Source", "Outline" and
         "Show Parse Tree" on, but "Exclude Attributes" off.
       </p>
diff --git a/htdocs/docs/why.html b/htdocs/docs/why.html
index 5ae8c3c..e303081 100755
--- a/htdocs/docs/why.html
+++ b/htdocs/docs/why.html
@@ -1,5 +1,5 @@
-<!--#set var="revision" value="\$Id: why.html,v 1.5 2002-09-08 19:37:42 ville Exp $"
---><!--#set var="date" value="\$Date: 2002-09-08 19:37:42 $"
+<!--#set var="revision" value="\$Id: why.html,v 1.6 2002-12-01 13:40:33 link Exp $"
+--><!--#set var="date" value="\$Date: 2002-12-01 13:40:33 $"
 --><!--#set var="title" value="Why Validate?"
 --><!--#set var="relroot" value="../"
 --><!--#include virtual="../header.html" -->
@@ -13,7 +13,7 @@
       <p>
         The original version was written by
         <a href="http://www.webthing.com/~nick/">Nick Kew</a> of
-        <a href="http://www.webthing.com/">Web&#222;hing Ltd.</a> for their
+        <a href="http://www.webthing.com/">Web&#222;ing Ltd.</a> for their
         <a href="http://valet.webthing.com/">Site Valet</a> service and he has
         generously donated it for our use. This version has been slightly
         modified, but is essentially the same.