X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=resources.dbk;h=936bef2a0be55b8c3ce855d71a3da6223a61e571;hb=af43b0c1cfb4cf5b37332212429aef34e914d2db;hp=45aeaf1b97d66e8e9d0d7ebb38657e218fbe713c;hpb=c0e2a26f7817b5396ee5267d2e678c4f95593b76;p=developers-reference.git

diff --git a/resources.dbk b/resources.dbk
index 45aeaf1..936bef2 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -152,10 +152,8 @@ Since <literal>#debian-devel</literal> is an open channel, you should not
 speak there of issues that are discussed in
 &email-debian-private;.  There's another channel for this
 purpose, it's called <literal>#debian-private</literal> and it's protected by
-a key.  This key is available in the archives of debian-private in
-<filename>master.debian.org:&file-debian-private-archive;</filename>,
-just <command>zgrep</command> for <literal>#debian-private</literal> in all
-the files.
+a key.  This key is available at
+<filename>master.debian.org:&file-debian-private-key;</filename>.
 </para>
 <para>
 There are other additional channels dedicated to specific subjects.
@@ -275,8 +273,8 @@ reduce unnecessary duplication of effort or wasted processing time.
 <title>The ftp-master server</title>
 <para>
 The <literal>&ftp-master-host;</literal> server holds the canonical copy of
-the Debian archive.  Generally, package uploads go to this server; see
-<xref linkend="upload"/>.
+the Debian archive.  Generally, package uploaded to &ftp-upload-host;
+end up on this server, see <xref linkend="upload"/>.
 </para>
 <para>
 It is restricted; a mirror is available on <literal>merkel</literal>.
@@ -772,8 +770,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>
@@ -938,7 +937,7 @@ snippet to your configuration file:
 <programlisting>
 $delay = ($ENV{DELAY} || 7);
 $cfg{'delayed'} = {
-         fqdn => "&ftp-master-host;",
+         fqdn => "&ftp-upload-host;",
          login => "yourdebianlogin",
          incoming => "/org/&ftp-debian-org;/incoming/DELAYED/$delay-day/",
          dinstall_runs => 1,
@@ -1075,8 +1074,11 @@ aliases.
 <term><literal>summary</literal></term>
 <listitem>
 <para>
-Regular summary emails about the package's status.  Currently, only progression
-in <literal>testing</literal> is sent.
+Regular summary emails about the package's status, including progression
+into <literal>testing</literal>,
+<ulink url="&url-dehs;">DEHS</ulink> notifications of
+new upstream versions, and a notification if the package is removed or
+orphaned.
 </para>
 </listitem>
 </varlistentry>
@@ -1556,6 +1558,14 @@ in <ulink
 url="http://&lists-host;/debian-devel-announce/2002/10/msg00018.html"></ulink>.
 </para>
 </section>
+<section id="gandi">
+<title>Gandi.net Hosting Discount</title>
+<para>
+As of November 2008, Gandi.net offers a discount rate on their VPS
+hosting for Debian Developers.  See
+<ulink url="http://&lists-host;/debian-devel-announce/2008/11/msg00004.html"></ulink>.
+</para>
+</section>
 
 </section>