X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=resources.dbk;fp=resources.dbk;h=fbe53c726cc71b996dbd22907e51ed492d5cc9cf;hb=7a1dd3850e8b088ac4ec7dcb3cb92eceab058027;hp=e577d6796a6b7992ee3ef87afd46123297897972;hpb=f7c28267a332a4043fa6f1e8149b4fd98ec26da9;p=developers-reference.git

diff --git a/resources.dbk b/resources.dbk
index e577d67..fbe53c7 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -534,12 +534,12 @@ Debian decided to build some ports based on other Unix kernels, like
 architectures.  Debian 2.1 shipped for the <literal>i386</literal>,
 <literal>m68k</literal>, <literal>alpha</literal>, and
 <literal>sparc</literal> architectures.  Since then Debian has grown hugely.
-Debian 5 supports a total of twelve architectures: <literal>alpha</literal>,
-<literal>amd64</literal>, <literal>arm</literal>,
-<literal>armel</literal>, <literal>hppa</literal>,
-<literal>i386</literal>, <literal>ia64</literal>, <literal>mips</literal>,
+Debian 6 supports a total of nine Linux architectures (<literal>amd64</literal>,
+<literal>armel</literal>, <literal>i386</literal>,
+<literal>ia64</literal>, <literal>mips</literal>,
 <literal>mipsel</literal>, <literal>powerpc</literal>,
-<literal>s390</literal>, <literal>sparc</literal>.
+<literal>s390</literal>, <literal>sparc</literal>) and two kFreeBSD architectures
+(<literal>kfreebsd-i386</literal> and <literal>kfreebsd-amd64</literal>).
 </para>
 <para>
 Information for developers and users about the specific ports are available at
@@ -669,8 +669,8 @@ additions to <literal>stable</literal> in the
 <filename>proposed-updates</filename> directory.  Those packages in
 <filename>proposed-updates</filename> that pass muster are periodically moved
 as a batch into the stable distribution and the revision level of the stable
-distribution is incremented (e.g., ‘3.0’ becomes ‘3.0r1’, ‘2.2r4’
-becomes ‘2.2r5’, and so forth).  Please refer to
+distribution is incremented (e.g., ‘6.0’ becomes ‘6.0.1’, ‘5.0.7’
+becomes ‘5.0.8’, and so forth).  Please refer to
 <link linkend="upload-stable">uploads to the <literal>stable</literal>
 distribution</link> for details.
 </para>
@@ -763,7 +763,7 @@ 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>; Debian 5.0, <literal>lenny</literal>
-and the next release will be called <literal>squeeze</literal>.
+and the next release will be called <literal>wheezy</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