--- a/doc/editors/new-entry-checkin.html
+++ b/doc/editors/new-entry-checkin.html
@@ -11,54 +11,59 @@
 
 <p>[<a href="#setup">setup</a>] [<a href="#new">new submission</a>] [<a href="#devel">new submission in devel</a>]</p>
 
-<p><a name="setup"><b>CVS Setup</b></a></p>
-<p>As editor you have two working copies of the repository: release and
-development version.</p>
+<p><a name="setup"><b>Mercurial Setup</b></a></p>
+<p>As editor you have at least two working copies of the repository: current
+release branch and development version.</p>
 
 <ul>
-<li>To set up the release version, do (fill in 200X and login)<br>
-<code>cvs -d &lt;login&gt;@afp.cvs.sf.net:/cvsroot/afp co -d afp-release -r Isabelle200X "."</code>
+<li>
+Start by making a directory <code>~/afp</code> where the different branches 
+will go.
+</li>
+	
+<li>To set up the release version, in that directory do (fill in 20XX and login)<br>
+<code>hg clone ssh://&lt;login&gt;@afp.hg.sourceforge.net/hgroot/afp/Isabelle20XX release</code>
 </li>
 
 <li>for development<br>
-<code>cvs -d &lt;login&gt;@afp.cvs.sf.net:/cvsroot/afp co -d afp-devel "."</code></li>
+<code>hg clone ssh://&lt;login&gt;@afp.hg.sourceforge.net/hgroot/afp/afp devel
+</code></li>
 </ul>
 
-<p>CVS_RSH should be set to ssh. More information to CVS over ssh on sourceforge is available <a href="http://sourceforge.net/cvs/?group_id=101909">here
-[afp]</a> and <a 
-href="http://sourceforge.net/docman/display_doc.php?docid=761&group_id=1">here
+<p>You might need to set up ssh keys on sourceforge for this to work. More information on ssh at sourceforge is available <a
+href="http://sourceforge.net/apps/trac/sourceforge/wiki/SSH%20keys">here
 [ssh keys]</a>.</p>
 
 <p>New submissions, changes to the web site and to admin scripts go into
-afp-release. A script automatically propagates these to the development
+afp/release. A script automatically propagates these to the development
 branch once a day.</p>
 
-<p>Maintenance and changes on existing submissions all occur in afp-devel and go
+<p>Maintenance and changes on existing submissions all occur in afp/devel and go
 properly public with the next Isabelle release (they are only available as
 (public) development tar.gz's)</p>
 
 
 <p><a name="new"><b>New Submissions</b></a></p>
 
-<p>Everything happens in the release branch <tt>afp-release</tt>.</p>
+<p>Everything happens in the release branch <tt>afp/release</tt>.</p>
 
 <ol>
-<li>unpack tar file and move new entry to <tt>afp-release/thys</tt></li>
+<li>unpack tar file and move new entry to <tt>afp/release/thys</tt></li>
 
 <li>to check, run in <tt>afp-release/thys</tt><br>
 <code>../admin/testall -r Isabelle200X -c &lt;name&gt;</code><br>
-(be sure to have ISABELLE_RELEASES set to the path where Isabelle releases are kept, e.g. /usr/proj/isabelle/)
+(be sure to have ISABELLE_RELEASES set to the path where Isabelle releases are kept, e.g. /home/proj/isabelle/)
 
 </li>
 
 <li>create/adjust <tt>config</tt> file (template in <tt>thys/Example-Submission/config</tt>)</li>
 
-<li><code>cvs add</code> and <code>cvs commit</code> new submission</li>
+<li><code>hg add</code> and <code>hg commit</code> the new submission</li>
 
 <li>create a web page for the entry in <tt>afp-release/web/entries</tt>.
   Copy <tt>Submission-Template.shtml</tt> (the s in shtml is important). Look for ??? to find slots.</li>
 
-<li><code>cvs add</code> and commit the new file.
+<li><code>hg add</code> and commit the new file.
   You only need to create this file, tar.gz, pdf, etc is generated by 
 script.</li>
 
@@ -67,7 +72,9 @@
   Copy the template, look for 'template' to find an empty entry, look for
   ??? to find slots.</li>
 
-<li><code>cvs commit</code> the changes.
+<li><code>hg commit</code> the changes.
+
+<li>finally, when you are happy with everything, <code>hg push</code> the changes to sourceforge. The publish script will refuse to publish if the changes aren't pushed.
 
 <li>to publish the changes to the web, run<br>
 <code>
@@ -76,7 +83,7 @@
 </code>
 <p>
 This will check out the Isabelle200X (=release) version of the archive from
-CVS, will run the session <name> with /usr/proj/isabelle/Isabelle200X/bin/isatool to generate
+sourceforge, will run the session <name> with /usr/proj/isabelle/Isabelle200X/bin/isatool to generate
 HTML, produce a tar.gz for the archive and for the entry, and will update the
 web pages on the server. The script will ask before it does the copy to the
 server, so you can check locally if everything is as you want it.
@@ -95,7 +102,7 @@
 The check-in procedure is the same as for a normal release entry, apart from the fact that everything happens in the devel instead of release directory and that the last step (publish) is omitted.</p>
 
 <p>
-The authors of the entry should of course be notified that the entry will only show up on the front page when the next Isabelle version is released.</p>
+The authors of the entry should be notified that the entry will only show up on the front page when the next Isabelle version is released.</p>
 
 </body>
 </html>