--- index.wml.orig	2009-02-23 11:48:52.000000000 +0800
+++ index.wml	2009-02-23 12:06:07.000000000 +0800
@@ -1,7 +1,7 @@
 #use wml::debian::template title="The debian-volatile Project"
-<define-tag current_testing_name>lenny</define-tag>
-<define-tag current_stable_name>etch</define-tag>
-<define-tag current_oldstable_name>sarge</define-tag>
+<define-tag current_testing_name>squeeze</define-tag>
+<define-tag current_stable_name>lenny</define-tag>
+<define-tag current_oldstable_name>etch</define-tag>
 
 <h2>debian-volatile for end users</h2>
 
@@ -48,20 +48,21 @@
 a <a href="volatile-mirrors">network of mirrors</a> is active and available.
 </p>
 <p>
-Please only use either sarge/volatile or etch/volatile with<br />
-deb http://volatile.debian.org/debian-volatile sarge/volatile main contrib non-free<br />
+Please only use either <current_oldstable_name>/volatile or <current_stable_name>/volatile with<br />
+deb http://volatile.debian.org/debian-volatile <current_oldstable_name>sarge/volatile main contrib non-free<br />
 or<br />
-deb http://volatile.debian.org/debian-volatile etch/volatile main contrib non-free
+deb http://volatile.debian.org/debian-volatile <current_stable_name>/volatile main contrib non-free
 </p>
 
 <p>
 If you want to use the sloppy archive, use the following APT sources:<br />
-deb http://volatile.debian.org/debian-volatile sarge/volatile-sloppy main contrib non-free<br />
+deb http://volatile.debian.org/debian-volatile <current_oldstable_name>/volatile-sloppy main contrib non-free<br />
 or<br />
-deb http://volatile.debian.org/debian-volatile etch/volatile-sloppy main contrib non-free
+deb http://volatile.debian.org/debian-volatile <current_stable_name>/volatile-sloppy main contrib non-free
 </p>
 
 <p><strong>Archive signing key</strong><br />
+The key for lenny is in the debian-archive-keyring package.
 Please see <a href="$(HOME)/volatile/ziyi-sarge.asc">ziyi-sarge.asc</a> for sarge,
 and <a href="$(HOME)/volatile/etch-volatile.asc">etch-volatile.asc</a> for etch.
 </p>