Update instructions etc from CVS to Mercurial.

15 files changed, 52 insertions, 252 deletions

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..1e651e7
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,14 @@
+syntax: glob
+
+*.pyc
+*.tar.gz
+httpd/cgi-bin/*.bak
+misc/*.bak
+misc/bundle/*.bak
+misc/bundle/*.tar.gz
+misc/bundle/blib
+misc/bundle/lib/Bundle/W3C/*.bak
+misc/bundle/Makefile
+misc/bundle/Makefile.old
+misc/bundle/pm_to_blib
+misc/testsuite/lib/*.py[co]
diff --git a/README.cvs b/README.cvs
index 14fdc49..c8b9b30 100644
--- a/README.cvs
+++ b/README.cvs
@@ -6,37 +6,20 @@ code page</a>.
 </p>
 
 <p>
-  Our CVS base is available read-only, using CVS pserver
-  authentication.
+  Our Mercurial base is available read-only.
 </p>
 
 <p>In order to get the latest development code:</p>
 
           <pre>
-    bash$ <kbd>export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public"</kbd>
-    bash$ <kbd>cvs login</kbd>
-    (Logging in to anonymous@dev.w3.org)
-    CVS password: <kbd>anonymous</kbd>
-    bash$ <kbd>cvs get validator</kbd>
-    cvs server: Updating validator
-    cvs server: Updating validator/htdocs
-    U validator/htdocs/about.html
-    ...
+    bash$ <kbd>hg clone https://dvcs.w3.org/hg/markup-validator</kbd>
           </pre>
 
 <p>Note that the latest development code may be broken at any time. If you want a working version,
 you should get the latest release version from the tar balls available from the <a href="http://validator.w3.org/source/">source code availability</a> page at validator.w3.org.
-Alternatively, you can get the latest released version, v1.0, via CVS:</p>
+Alternatively, you can get the latest released version, v1.0, via Mercurial:</p>
 
           <pre>
-    bash$ <kbd>export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public"</kbd>
-    bash$ <kbd>cvs login</kbd>
-    (Logging in to anonymous@dev.w3.org)
-    CVS password: <kbd>anonymous</kbd>
-    bash$ <kbd>cvs get -r validator-1_0-release validator</kbd>
-    cvs server: Updating validator
-    cvs server: Updating validator/htdocs
-    U validator/htdocs/about.html
-    ...
+    bash$ <kbd>hg clone -b validator-1_0-release https://dvcs.w3.org/hg/markup-validator</kbd>
           </pre>
 
diff --git a/htdocs/contribute.html b/htdocs/contribute.html
index 0effd45..df27eb2 100644
--- a/htdocs/contribute.html
+++ b/htdocs/contribute.html
@@ -21,7 +21,7 @@
     <li>
         <p id="code"><strong>Code</strong>. The best way you can help the project is to get involved in the software development.</p>
         <p><em>It only takes</em>: some knowledge of the Perl
-        programming language, a few hours to get familiar with the <a href="http://dev.w3.org/cvsweb/validator/">validator
+        programming language, a few hours to get familiar with the <a href="http://dvcs.w3.org/hg/markup-validator/file/tip/">validator
         codebase</a>, and however much time you're comfortable dedicating to the project. See the <a href="docs/devel.html">Developer's 
             Guide</a> for info on getting started, then browse <a href="http://www.w3.org/Bugs/Public/buglist.cgi?product=Validator&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">known bugs and enhancement requests</a> or look at the <a href="todo.html">architectural roadmap</a>. 
         <em>What you get</em>: 
diff --git a/htdocs/dev/tests/index.html b/htdocs/dev/tests/index.html
index 4f17596..de6cb85 100755
--- a/htdocs/dev/tests/index.html
+++ b/htdocs/dev/tests/index.html
@@ -18,7 +18,7 @@
     public mailing-list <a href="http://lists.w3.org/Archives/Public/public-qa-dev/" title="public-qa-dev@w3.org Mail Archives">public-qa-dev@w3.org</a>
 </p>
 <p><strong>do not</strong> edit this page, it is automatically generated from the validator's
-	<a href="http://dev.w3.org/cvsweb/validator/misc/testsuite/">automated test suite</a>. If you
+	<a href="http://dvcs.w3.org/hg/markup-validator/file/tip/misc/testsuite/">automated test suite</a>. If you
 	want to add tests, edit the test suite's catalog instead.</p>
 	
 <div id="toc">
diff --git a/htdocs/docs/devel.html b/htdocs/docs/devel.html
index ec9c282..a39c70b 100755
--- a/htdocs/docs/devel.html
+++ b/htdocs/docs/devel.html
@@ -60,7 +60,7 @@
          compatibility with a <a href="../dev/tests/">list of test cases</a>.
        </p>
 
-       <p>The validator has an <a href="http://dev.w3.org/cvsweb/validator/misc/testsuite/">automated test suite</a> which is used 
+       <p>The validator has an <a href="http://dvcs.w3.org/hg/markup-validator/file/tip/misc/testsuite/">automated test suite</a> which is used 
            frequently to check that no change has broken any feature or resurfaced a bug. Whenever possible, join a <em>test case</em>
            with your patches.</p>
            
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html
index a3609b2..09f3b7a 100755
--- a/htdocs/docs/install.html
+++ b/htdocs/docs/install.html
@@ -215,7 +215,7 @@ install Bundle::W3C::Validator
         <p>Download the <a href="http://validator.w3.org/validator.tar.gz">Validator's Tar Ball</a>
         and the sgml-lib <a href="http://validator.w3.org/sgml-lib.tar.gz">DTD library</a> from our site.</p>
         <p>Alternatively, if you want to work on the latest development version, you can download 
-        both from our CVS repository, but you should be aware that this version may not work at all.</p>
+        both from our Mercurial repository, but you should be aware that this version may not work at all.</p>
         <p>(<a href="../source/">Read more</a> about retrieving the source)</p>
 
 
diff --git a/htdocs/source/index.html b/htdocs/source/index.html
index e282e0c..006555f 100755
--- a/htdocs/source/index.html
+++ b/htdocs/source/index.html
@@ -17,7 +17,7 @@
           <li><a href="#suse">openSUSE/SUSE Linux RPM package</a></li>
 	<li><a href="#deb">Debian GNU/Linux package</a></li>
 	<li><a href="#mac">Mac OS X Application</a></li>
-	<li><a href="#CVS">CVS repository</a></li>
+	<li><a href="#CVS">Mercurial repository</a></li>
        </ul>
       </li>
       <li><a href="#using">Using the code</a></li>
@@ -33,7 +33,7 @@
 	Software License</a>. Source tarball of the latest production
       version is always available at
       &lt;<a href="http://validator.w3.org/validator.tar.gz">http://validator.w3.org/validator.tar.gz</a>&gt;.
-      Development code is only available from CVS.
+      Development code is only available from the Mercurial repository.
     </p>
 
           <h4><a id="browse" name="browse"></a>Browsing the code</h4>
@@ -41,15 +41,15 @@
   <p>
     If you just want to glance at the code, or see its revision
     history, you can
-    <a href="http://dev.w3.org/cvsweb/validator/">browse it on
+    <a href="http://dvcs.w3.org/hg/markup-validator/file/tip/">browse it on
     the web</a>.
   </p>
   <p>
     The most interesting files are currently
-    <a href="http://dev.w3.org/cvsweb/validator/httpd/cgi-bin/check">a
+    <a href="http://dvcs.w3.org/hg/markup-validator/file/tip/httpd/cgi-bin/check">a
     CGI script called "check"</a> that does pretty much everything,
     and possibly also <a
-    href="http://dev.w3.org/cvsweb/validator/httpd/conf/httpd.conf">the
+    href="http://dvcs.w3.org/hg/markup-validator/file/tip/httpd/conf/httpd.conf">the
     httpd.conf configuration file snippet for Apache</a>.
     Select the topmost revision numbers on these
     pages to see the most recent revision of each file.
@@ -128,19 +128,19 @@
           The Validator is also packaged as a standalone Mac OS X Application,
           called <a href="http://habilis.net/validator-sac/">Validator <abbr title="[Stand Alone Complex]">S.A.C.</abbr></a>, courtesy of <a href="http://habilis.net/chuck/" title="Chuck Houpt's Home Page">Chuck Houpt</a>.</p>
 
-        <h4><a id="CVS" name="CVS"></a>CVS repository</h4>
+        <h4><a id="CVS" name="CVS"></a>Mercurial repository</h4>
 
           <p>
             If you intend to actively mirror the code and/or contribute
             patches to the code, you should install and become familiar
-            with <a href="http://www.nongnu.org/cvs/">CVS</a>;
-            this is the tool we use for revision control and is generally
-            a good thing to <a href="http://ximbiot.com/cvs/manual/">get to
-            know</a>.
+            with <a href="http://mercurial.selenic.com/">Mercurial</a>;
+            this is the tool we use for revision control.
           </p>
-  <p>
-    For instructions on how to retrieve the code using CVS, 
-              see our <a href="http://dev.w3.org/cvsweb/validator/">web-based interface to the repository.</a>
+          <p>
+            For instructions on how to retrieve the code using Mercurial, 
+            see the "markup-validator" entry in our
+            <a href="http://dvcs.w3.org/hg/">web-based interface to the
+              repository.</a>
           </p>
             
   <h3><a id="using" name="using"></a>Using the code</h3>
diff --git a/htdocs/whatsnew.html b/htdocs/whatsnew.html
index ff6f7cb..1feea52 100755
--- a/htdocs/whatsnew.html
+++ b/htdocs/whatsnew.html
@@ -12,8 +12,8 @@
           <acronym title="World Wide Web Consortium">W3C</acronym> Markup
           Validation Service</a>. For minor changes and bug fixes that aren't
         listed on this page, see
-        <a href="http://dev.w3.org/cvsweb/validator/">the
-          <acronym title="Concurrent Versions System">CVS</acronym> log</a>.
+        <a href="http://dvcs.w3.org/hg/markup-validator/log/tip">the
+          Mercurial log</a>.
       </p>
       <p>
         News for this service are also available as
@@ -1331,9 +1331,7 @@
         <p>
           Added username/password proxying for validation of documents protected
           by HTTP Basic Authentication, thanks to patches from
-          <a href="http://www.w3.org/People/Renaud/">Renaud Bruyeron</a>. (see
-          <a href="http://dev.w3.org/cvsweb/validator/httpd/cgi-bin/check.diff?r1=text&amp;tr1=1.16&amp;r2=text&amp;tr2=1.18&amp;f=h">the
-          changes</a>)
+          <a href="http://www.w3.org/People/Renaud/">Renaud Bruyeron</a>.
         </p>
         <p>
           This revision also includes patches to use the Perl5 version
@@ -1348,7 +1346,7 @@
            title="eXtensible HyperText Markup Language">XHTML</acronym></a>,
           using the <acronym title="Document Type Definitions">DTDs</acronym>
           from <a href="http://www.w3.org/TR/1999/WD-html-in-xml-19990304/">the
-          19990304 working draft</a>. (see <a href="http://dev.w3.org/cvsweb/validator/httpd/cgi-bin/check.diff?r1=text&amp;tr1=1.13&amp;r2=text&amp;tr2=1.16&amp;f=h">the changes</a>)
+          19990304 working draft</a>.
         </p>
       </dd>
 
@@ -1366,8 +1364,7 @@
           Updated the SGML declaration according to the
           <a href="http://www.w3.org/MarkUp/html40-updates/REC-html40-19980424-errata.html">
           <acronym title="HyperText Markup Language">HTML</acronym>
-          4.0 spec errata</a>. (see <a href="http://dev.w3.org/cvsweb/validator/htdocs/sgml-lib/REC-html40-971218/Attic/HTML4.decl?r1=1.1&amp;r2=1.2">the
-          changes</a>).
+          4.0 spec errata</a>.
         </p>
       </dd>
 
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index d937ae9..26513a1 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -8,8 +8,9 @@
 # and Mathematics, Keio University). All Rights Reserved.
 #
 # Originally written by Gerald Oskoboiny <gerald@w3.org>
-# for additional contributors, see http://dev.w3.org/cvsweb/validator/
-# and http://validator.w3.org/about.html#credits
+# for additional contributors, see
+# http://dvcs.w3.org/hg/markup-validator/shortlog/tip and
+# http://validator.w3.org/about.html#credits
 #
 # This source code is available under the license at:
 #     http://www.w3.org/Consortium/Legal/copyright-software
diff --git a/misc/bundle/ChangeLog b/misc/bundle/ChangeLog
deleted file mode 100644
index 3a1ec36..0000000
--- a/misc/bundle/ChangeLog
+++ /dev/null
@@ -1,176 +0,0 @@
-2010-01-14  ville
-
-	* README, lib/Bundle/W3C/Validator.pm: Update years in copyright
-	notices.
-
-2009-12-14  ville
-
-	* lib/Bundle/W3C/Validator.pm: Add minimum required XML::LibXML
-	version (best guess, not necessarily accurate)
-
-2009-12-02  ville
-
-	* lib/Bundle/W3C/Validator.pm: Preparing for 0.8.6.
-
-2009-11-24  ville
-
-	* lib/Bundle/W3C/Validator.pm: Fix perlcritic "Code before
-	strictures/warnings" errors.
-
-2009-09-16  ville
-
-	* lib/Bundle/W3C/Validator.pm: Remove fuzzy matching/"Did you mean
-	..." implementation due to too many incorrect suggestions emitted.
-	We'd need to be aware of which attributes and/or elements are valid
-	in the checked document in the particular position; flat lists of
-	all HTML elements and attributes results in too many false
-	positives.  String::Approx usage would have probably needed some
-	work as well, or perhaps it wasn't the best choice for the task to
-	begin with.
-
-2009-06-29  ville
-
-	* lib/Bundle/W3C/Validator.pm: Drop SGML::Parser::OpenSP < 0.991
-	workarounds, require >= 0.991.
-
-2009-06-29  ville
-
-	* lib/Bundle/W3C/Validator.pm: Fix JSON output errors
-	(missing/extra commas, incorrect escaping) (#7000).  New
-	dependency: JSON >= 2.00.
-
-2009-06-29  ville
-
-	* lib/Bundle/W3C/Validator.pm: Drop Config::General <= 2.31
-	workarounds, require >= 2.32.
-
-2009-06-23  ville
-
-	* lib/Bundle/W3C/Validator.pm: Require libwww-perl >= 5.802.
-
-2009-03-27  ville
-
-	* README, lib/Bundle/W3C/Validator.pm: Update author/maintainer
-	info.
-
-2009-03-27  ville
-
-	* lib/Bundle/W3C/Validator.pm: Avoid v-string non-portability
-	warning with Perl 5.10.0.
-
-2009-03-27  ville
-
-	* lib/Bundle/W3C/Validator.pm: List all dependencies, mention
-	"hard" and optional ones.
-
-2009-03-13  ot
-
-	* lib/Bundle/W3C/Validator.pm: preparing 0.8.5. still need some
-	testing before we get green light
-
-2009-02-19  ville
-
-	* lib/Bundle/W3C/Validator.pm: Add String::Approx dependency.
-
-2009-02-04  ville
-
-	* README, lib/Bundle/W3C/Validator.pm: 2009
-
-2009-02-04  ville
-
-	* lib/Bundle/W3C/Validator.pm: Make Encode::JIS2K optional.
-
-2009-01-07  ville
-
-	* lib/Bundle/W3C/Validator.pm: Improve doctype preparse performance
-	by aborting as soon as possible, fix required HTML::Parser version.
-
-2009-01-04  ville
-
-	* lib/Bundle/W3C/Validator.pm: Purge Config::General <= 2.30
-	compatibility hack; 2.31 one still preserved for current Debian
-	stable.
-
-2009-01-04  ville
-
-	* lib/Bundle/W3C/Validator.pm: LWP::UserAgent >= 2.032 (libwww-perl
-	>= 5.800) is required for default_header().
-
-2009-01-04  ville
-
-	* lib/Bundle/W3C/Validator.pm: Use File::Spec::Functions for
-	somewhat more compact code.
-
-2008-11-18  ot
-
-	* lib/Bundle/W3C/Validator.pm: version bump. Preparing for v0.8.4
-
-2008-02-21  ot
-
-	* lib/Bundle/W3C/Validator.pm: getting reading for 0.8.3
-
-2007-10-10  ot
-
-	* lib/Bundle/W3C/Validator.pm: pushing towards 0.8.2 release
-
-2007-08-07  ot
-
-	* lib/Bundle/W3C/Validator.pm: preparing 0.8.1, changelog and
-	version bump
-
-2007-07-26  ville
-
-	* lib/Bundle/W3C/Validator.pm: Back down to unversioned
-	XML::LibXML, load_catalog no longer used.
-
-2007-07-25  ville
-
-	* lib/Bundle/W3C/Validator.pm: XML::LibXML >= 1.53 is needed for
-	load_catalog().
-
-2007-07-10  ot
-
-	* lib/Bundle/W3C/Validator.pm: requiring extra perl libs for CJK
-	character encodings, and documenting the new requirements
-
-2007-04-04  ville
-
-	* lib/Bundle/W3C/Validator.pm: +XML::LibXML
-
-2007-04-02  ville
-
-	* README: 2007
-
-2007-04-02  ville
-
-	* lib/Bundle/W3C/Validator.pm: Update dependencies
-
-2006-03-31  ot
-
-	* README, lib/Bundle/W3C/Validator.pm: merging from 0.7 branch into
-	trunk at tag validator-0_7_2-release
-
-2006-01-26  ville
-
-	* README, lib/Bundle/W3C/Validator.pm: Update copyright years.
-
-2005-01-09  ville
-
-	* README, lib/Bundle/W3C/Validator.pm: 2005.
-
-2004-10-10  ville
-
-	* lib/Bundle/W3C/Validator.pm: Add HTML::Template dependency and
-	minimum Config::General version.
-
-2004-07-21  link
-
-	* README, lib/Bundle/W3C/Validator.pm, t/00load.t: Re-adding
-	bundle/* taken from validator-0_6_0-branch at tag
-	validator-0_6_7-pre3 (0.6.7-release candidate).
-
-2004-05-05  ville
-
-	* README, lib/Bundle/W3C/Validator.pm, t/00load.t: First release,
-	for the W3C Markup Validator 0.6.5.
-
diff --git a/misc/bundle/MANIFEST b/misc/bundle/MANIFEST
index 1f2fb54..c3f64b7 100644
--- a/misc/bundle/MANIFEST
+++ b/misc/bundle/MANIFEST
@@ -1,4 +1,3 @@
-ChangeLog                       Recent changes
 MANIFEST
 META.yml                        Module meta-data (added by MakeMaker)
 Makefile.PL
diff --git a/misc/bundle/META.yml b/misc/bundle/META.yml
index e007db3..77c7e1d 100644
--- a/misc/bundle/META.yml
+++ b/misc/bundle/META.yml
@@ -44,7 +44,7 @@ resources:
     bugtracker:   http://www.w3.org/Bugs/Public/
     homepage:     http://validator.w3.org/
     MailingList:  http://lists.w3.org/Archives/Public/www-validator/
-    repository:   http://dev.w3.org/cvsweb/validator/
+    repository:   http://dvcs.w3.org/hg/
 no_index:
     directory:
         - t
diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL
index a1c04af..270965e 100644
--- a/misc/bundle/Makefile.PL
+++ b/misc/bundle/Makefile.PL
@@ -49,26 +49,12 @@ WriteMakefile(
         resources => {
             homepage   => 'http://validator.w3.org/',
             bugtracker => 'http://www.w3.org/Bugs/Public/',
-            repository => 'http://dev.w3.org/cvsweb/validator/',
+            repository => 'http://dvcs.w3.org/hg/',
             MailingList =>
                 'http://lists.w3.org/Archives/Public/www-validator/',
         },
 
     },
-    depend => {distdir  => 'ChangeLog'},
-    dist   => {TARFLAGS => '--owner=0 --group=0 -cvf'},
-    clean  => {
-        FILES =>
-            'ChangeLog.bak Makefile.PL.bak lib/Bundle/W3C/Validator.pm.bak'
-    },
+    dist  => {TARFLAGS => '--owner=0 --group=0 -cvf'},
+    clean => {FILES    => 'Makefile.PL.bak lib/Bundle/W3C/Validator.pm.bak'},
 );
-
-sub MY::postamble
-{
-    return <<'MAKE_FRAG';
-ChangeLog: README lib/Bundle/W3C/Validator.pm t/00load.t
-	cvs2cl --FSF --utc --prune \
-	  --ignore ChangeLog --ignore cvsignore --ignore SIGNATURE \
-	  --ignore Makefile.PL --ignore META.yml --ignore MANIFEST
-MAKE_FRAG
-}
diff --git a/misc/mkrelease.sh b/misc/mkrelease.sh
index 45f54d3..bd088cf 100755
--- a/misc/mkrelease.sh
+++ b/misc/mkrelease.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 
 # Typical usage:
-#   mkdir foo
-#   cd foo
-#   export CVSROOT=:pserver:anonymous@dev.w3.org:/sources/public
-#   cvs -z3 export -r validator-0_6_7-release validator
-#   cd validator
-#   misc/mkrelease.sh 0.6.7
+#   hg clone -b validator-1_0-release https://dvcs.w3.org/hg/markup-validator
+#   cd markup-validator
+#   misc/mkrelease.sh 1.0
 
 version="$1"
 if [ -z "$version" ] ; then
@@ -34,8 +31,7 @@ cp -pR $topdir/{htdocs,httpd,misc,share,README.cvs} $tmpdir/validator-$version
 
 cd $tmpdir
 
-find validator-$version -type d -name CVS | xargs -r rm -rf
-find validator-$version -name .cvsignore  | xargs -r rm -rf
+rm -rf validator-$version/.hg*
 find validator-$version -name "*~"        | xargs -r rm -rf
 find validator-$version -name ".#*"       | xargs -r rm -rf
 find validator-$version -name "*.py[co]"  | xargs -r rm -rf
diff --git a/misc/testsuite/templates/index.html b/misc/testsuite/templates/index.html
index 113e9a1..494411c 100644
--- a/misc/testsuite/templates/index.html
+++ b/misc/testsuite/templates/index.html
@@ -18,7 +18,7 @@
     public mailing-list <a href="http://lists.w3.org/Archives/Public/public-qa-dev/" title="public-qa-dev@w3.org Mail Archives">public-qa-dev@w3.org</a>
 </p>
 <p><strong>do not</strong> edit this page, it is automatically generated from the validator's
-	<a href="http://dev.w3.org/cvsweb/validator/misc/testsuite/">automated test suite</a>. If you
+	<a href="http://dvcs.w3.org/hg/markup-validator/file/tip/misc/testsuite/">automated test suite</a>. If you
 	want to add tests, edit the test suite's catalog instead.</p>
 	
 <div id="toc">