X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=resources.dbk;h=0591af7c587fd90f6564e2ad7ce2f18c1c752d1e;hb=1a3c57034ada63e6ca12243296044e38beea49fd;hp=fa9cc705d10b0cf35958b7181bc5bd92d0089dc2;hpb=d83ad0ef98fc97553ef37b7a9e1fe63f7d16096f;p=developers-reference.git

diff --git a/resources.dbk b/resources.dbk
index fa9cc70..0591af7 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -772,8 +772,9 @@ Every released Debian distribution has a <literal>code name</literal>: Debian
 Debian 1.3, <literal>bo</literal>; Debian 2.0, <literal>hamm</literal>;
 Debian 2.1, <literal>slink</literal>; Debian 2.2, <literal>potato</literal>;
 Debian 3.0, <literal>woody</literal>; Debian 3.1, <literal>sarge</literal>;
-Debian 4.0, <literal>etch</literal> and Debian 5.0 will be called <literal>
-lenny</literal>.  There is also a ``pseudo-distribution'', called
+Debian 4.0, <literal>etch</literal>; Debian 5.0, <literal>lenny</literal>
+and the next release will be called <literal>squeeze</literal>.
+There is also a ``pseudo-distribution'', called
 <literal>sid</literal>, which is the current <literal>unstable</literal>
 distribution; since packages are moved from <literal>unstable</literal> to
 <literal>testing</literal> as they approach stability, <literal>sid</literal>
@@ -971,28 +972,30 @@ a given package at the URL
 </para>
 </section>
 
-<section id="madison">
-<title>The <command>madison</command> utility</title>
+<section id="dak-ls">
+<title>The <command>dak ls</command> utility</title>
 <para>
-<command>madison</command> is a command-line utility that is available on
-<literal>&ftp-master-host;</literal>, and on the mirror on
-<literal>&ftp-master-mirror;</literal>.  It uses a single argument corresponding
-to a package name.  In result it displays which version of the package is
-available for each architecture and distribution combination.  An example will
-explain it better.
+<command>dak ls</command> is part of the dak suite of tools, listing
+available package versions for all known distributions and architectures.
+The <command>dak</command> tool is available on <literal>&ftp-master-host;
+</literal>, and on the mirror on <literal>&ftp-master-mirror;</literal>.
+It uses a single argument corresponding to a package name. An example will
+explain it better:
 </para>
 <screen>
-$ madison libdbd-mysql-perl
-libdbd-mysql-perl |   1.2202-4 |        stable | source, alpha, arm, i386, m68k, powerpc, sparc
-libdbd-mysql-perl |   1.2216-2 |       testing | source, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc
-libdbd-mysql-perl | 1.2216-2.0.1 |       testing | alpha
-libdbd-mysql-perl |   1.2219-1 |      unstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc
+$ dak ls evince
+evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc
+evince |    0.4.0-5 |     etch-m68k | source, m68k
+evince |    0.4.0-5 |        stable | source, alpha, amd64, arm, hppa, i386, ia64, mips, mipsel, powerpc, s390, sparc
+evince |   2.20.2-1 |       testing | source
+evince | 2.20.2-1+b1 |       testing | alpha, amd64, arm, armel, hppa, i386, ia64, mips, mipsel, powerpc, s390, sparc
+evince |   2.22.2-1 |      unstable | source, alpha, amd64, arm, armel, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc
 </screen>
 <para>
 In this example, you can see that the version in <literal>unstable</literal>
 differs from the version in <literal>testing</literal> and that there has
-been a binary-only NMU of the package for the alpha architecture.  Each version
-of the package has been recompiled on most of the architectures.
+been a binary-only NMU of the package for all architectures.  Each version
+of the package has been recompiled on all architectures.
 </para>
 </section>