Refresh some release-specific information. Closes: #643931 Based on a patch by Luca...

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index 72740732edf9d0757870041403f9c3ad3a1c52a5..fbe53c726cc71b996dbd22907e51ed492d5cc9cf 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -260,9 +260,6 @@ mirrored to another server.
 the Bug Tracking System (BTS).
 </para>
 <para>
 the Bug Tracking System (BTS).
 </para>
 <para>

-It is restricted; a mirror is available on <literal>merkel</literal>.
-</para>
-<para>

 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on
 &email-debian-devel; before implementing anything, however, to
 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on
 &email-debian-devel; before implementing anything, however, to


@@ -278,7 +275,7 @@ the Debian archive.  Generally, package uploaded to &ftp-upload-host;
 end up on this server, see <xref linkend="upload"/>.
 </para>
 <para>
 end up on this server, see <xref linkend="upload"/>.
 </para>
 <para>

-It is restricted; a mirror is available on <literal>merkel</literal>.
+It is restricted; a mirror is available on <literal>&ftp-master-mirror;</literal>.

 </para>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs
 </para>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs


@@ -334,7 +331,7 @@ Send mail to &email-debian-devel; if you have any questions.
 <title>The VCS servers</title>
 <para>
 If you need to use a Version Control System for any of your Debian work,
 <title>The VCS servers</title>
 <para>
 If you need to use a Version Control System for any of your Debian work,

-you can use one the existing repositories hosted on Alioth or you can
+you can use one of the existing repositories hosted on Alioth or you can

 request a new project and ask for the VCS repository of your choice.
 Alioth supports CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion
 (svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar
 request a new project and ask for the VCS repository of your choice.
 Alioth supports CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion
 (svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar


@@ -537,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.
 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>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
 </para>
 <para>
 Information for developers and users about the specific ports are available at


@@ -639,9 +636,9 @@ literally unstable.
 The <link linkend="testing">testing</link> distribution is generated
 automatically by taking packages from <literal>unstable</literal> if they
 satisfy certain criteria.  Those criteria should ensure a good quality for
 The <link linkend="testing">testing</link> distribution is generated
 automatically by taking packages from <literal>unstable</literal> if they
 satisfy certain criteria.  Those criteria should ensure a good quality for

-packages within <literal>testing</literal>.  The update to <literal>testing
-</literal> is launched twice each day, right  after the new packages
-have been installed.  See <xref linkend="testing"/>.
+packages within <literal>testing</literal>.  The update to
+<literal>testing</literal> is launched twice each day, right  after the new
+packages have been installed.  See <xref linkend="testing"/>.

 </para>
 <para>
 After a period of development, once the release manager deems fit, the
 </para>
 <para>
 After a period of development, once the release manager deems fit, the


@@ -658,7 +655,7 @@ the Release Team, the distribution is released.  Releasing means that
 new copy is created for the new <literal>testing</literal>, and the previous
 <literal>stable</literal> is renamed to <literal>oldstable</literal> and
 stays there until it is finally archived.  On archiving, the contents are moved
 new copy is created for the new <literal>testing</literal>, and the previous
 <literal>stable</literal> is renamed to <literal>oldstable</literal> and
 stays there until it is finally archived.  On archiving, the contents are moved

-to <literal>&archive-host;</literal>).
+to <literal>&archive-host;</literal>.

 </para>
 <para>
 This development cycle is based on the assumption that the
 </para>
 <para>
 This development cycle is based on the assumption that the


@@ -672,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
 <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>
 <link linkend="upload-stable">uploads to the <literal>stable</literal>
 distribution</link> for details.
 </para>


@@ -766,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>
 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
 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


@@ -970,10 +967,10 @@ a given package at the URL
 <para>
 <command>dak ls</command> is part of the dak suite of tools, listing
 available package versions for all known distributions and architectures.
 <para>
 <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:
+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>
 $ dak ls evince
 </para>
 <screen>
 $ dak ls evince