X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=resources.dbk;h=c0351fc53b28233d5913ec2292c32784266ebff4;hp=74fa28ab59f7eba2db78da69e06a1ed466037cf6;hb=5e1f46b6bddf303dafba683aaf09c94b37a182fb;hpb=0715edeff63f1a6ff6c268a58ca76db9119c94ea

diff --git a/resources.dbk b/resources.dbk
index 74fa28a..c0351fc 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>.
@@ -573,20 +571,34 @@ There are two types of Debian packages, namely <literal>source</literal> and
 <literal>binary</literal> packages.
 </para>
 <para>
-Source packages consist of either two or three files: a
-<filename>.dsc</filename> file, and either a <filename>.tar.gz</filename> file
-or both an <filename>.orig.tar.gz</filename> and a
-<filename>.diff.gz</filename> file.
+Depending on the format of the source package, it will consist
+of one or more files in addition to the mandatory <filename>.dsc</filename>
+file:
+<itemizedlist>
+<listitem><para>with format “1.0”, it has either a <filename>.tar.gz</filename>
+file or both an <filename>.orig.tar.gz</filename> and a
+<filename>.diff.gz</filename> file;</para></listitem>
+<listitem><para>with format “3.0 (quilt)”, it has a mandatory
+<filename>.orig.tar.{gz,bz2,lzma}</filename> upstream tarball,
+multiple optional <filename>.orig-<replaceable>component</replaceable>.tar.{gz,bz2,lzma}</filename>
+additional upstream tarballs</para> 
+<para>and a mandatory <filename>debian.tar.{gz,bz2,lzma}</filename> debian tarball;</para></listitem>
+<listitem><para>with format “3.0 (native)”, it has only
+a single <filename>.tar.{gz,bz2,lzma}</filename> tarball.</para></listitem>
+</itemizedlist>
 </para>
 <para>
-If a package is developed specially for Debian and is not distributed outside
-of Debian, there is just one <filename>.tar.gz</filename> file which contains
-the sources of the program.  If a package is distributed elsewhere too, the
-<filename>.orig.tar.gz</filename> file stores the so-called <literal>upstream
-source code</literal>, that is the source code that's distributed by the
-<literal>upstream maintainer</literal> (often the author of the software).
-In this case, the <filename>.diff.gz</filename> contains the changes made by
-the Debian maintainer.
+If a package is developed specially for Debian and is not distributed
+outside of Debian, there is just one
+<filename>.tar.{gz,bz2,lzma}</filename> file which contains the sources of
+the program, it's called a “native” source package.  If a package is
+distributed elsewhere too, the
+<filename>.orig.tar.{gz,bz2,lzma}</filename> file stores the so-called
+<literal>upstream source code</literal>, that is the source code that's
+distributed by the <literal>upstream maintainer</literal> (often the
+author of the software). In this case, the <filename>.diff.gz</filename>
+or the <filename>debian.tar.{gz,bz2,lzma}</filename> contains the changes
+made by the Debian maintainer.
 </para>
 <para>
 The <filename>.dsc</filename> file lists all the files in the source package
@@ -772,8 +784,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 +951,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,
@@ -971,7 +984,7 @@ a given package at the URL
 </para>
 </section>
 
-<section id="dak ls">
+<section id="dak-ls">
 <title>The <command>dak ls</command> utility</title>
 <para>
 <command>dak ls</command> is part of the dak suite of tools, listing
@@ -1075,8 +1088,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 +1572,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>