[SCM] UNNAMED PROJECT branch, master, updated. 20090201-1-45-g46c2aeb

[Chris Lamb]

The following commit has been merged in the master branch:
commit ceb921bb47625bdafde6b493be0d0e7bd1045b55
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Feb 22 14:36:30 2009 +0000

    Use &lenny;, etc and match up lenny->stable, etc.

diff --git a/xml/chapters/about/manual.xml b/xml/chapters/about/manual.xml
index 883411c..ab6e86a 100644
--- a/xml/chapters/about/manual.xml
+++ b/xml/chapters/about/manual.xml
@@ -62,8 +62,10 @@
 <listitem><para>FIXME</para></listitem>
 </varlistentry>
 
-<varlistentry><term>lenny/squeeze/sid stable/testing/unstable</term>
-<listitem><para>The "stable" distribution contains the latest officially released distribution of Debian. The "testing" distribution is the staging area for the next stable release a - the main advantage of using this distribution is that it has more recent versions of software relative to the "stable" release.. The "unstable" distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.</para></listitem>
+<varlistentry><term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
+<listitem><para>The "stable" distribution contains the latest officially released distribution of Debian. The "testing" distribution is the staging area for the next stable release a - the main advantage of using this distribution is that it has more recent versions of software relative to the "stable" release.. The "unstable" distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.</para>
+<para>At the time of writing, &lenny; is the current "stable" release and &squeeze; is the current "testing" release. &sid; will always be a synonym for the "unstable" release.</para>
+</listitem>
 </varlistentry>
 
 </variablelist>

-- 
UNNAMED PROJECT