X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=resources.dbk;h=dc4a748c5be35bbfc01e4f0baf21fd5b3c34bc8d;hp=15e818bb41e112a7c5f9c7c5a0a46b7f88ed94e1;hb=a6030264a6e43fbaa26bd1b2c18a7d469e653836;hpb=acf9d704554019d9c436bf634136df8595ce1dc9

diff --git a/resources.dbk b/resources.dbk
index 15e818b..dc4a748 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -164,9 +164,8 @@ parties.  <emphasis>#debian-boot</emphasis> is used to coordinate the work on
 the debian-installer.  <emphasis>#debian-doc</emphasis> is occasionally used to
 talk about documentation, like the document you are reading.  Other channels
 are dedicated to an architecture or a set of packages:
-<emphasis>#debian-bsd</emphasis>, <emphasis>#debian-kde</emphasis>,
+<emphasis>#debian-kde</emphasis>, <emphasis>#debian-dpkg</emphasis>,
 <emphasis>#debian-jr</emphasis>, <emphasis>#debian-edu</emphasis>,
-<emphasis>#debian-sf</emphasis> (SourceForge package),
 <emphasis>#debian-oo</emphasis> (OpenOffice package) ...
 </para>
 <para>
@@ -210,7 +209,7 @@ functions in the Debian project.  Most of the machines are used for porting
 activities, and they all have a permanent connection to the Internet.
 </para>
 <para>
-Most of the machines are available for individual developers to use, as long as
+Some of the machines are available for individual developers to use, as long as
 the developers follow the rules set forth in the <ulink
 url="&url-dmup;">Debian Machine Usage Policies</ulink>.
 </para>
@@ -238,9 +237,11 @@ etc.
 </para>
 <para>
 If you have a problem with the operation of a Debian server, and you think that
-the system operators need to be notified of this problem, the Debian system
-administrator team is reachable at
-<email>debian-admin@&lists-host;</email>.
+the system operators need to be notified of this problem, you can check
+the list of open issues in the DSA queue of our request tracker at <ulink
+url="&url-rt;" /> (you can login with user "guest" and password "readonly").
+To report a new problem, simply send a mail to &email-rt-dsa; and make
+sure to put the string "Debian RT" somewhere in the subject.
 </para>
 <para>
 If you have a problem with a certain service, not related to the system
@@ -274,8 +275,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 (excluding the non-US packages).  Generally, package uploads
-go to this server; see <xref linkend="upload"/> .
+the Debian archive.  Generally, package uploads go to this server; see
+<xref linkend="upload"/>.
 </para>
 <para>
 It is restricted; a mirror is available on <literal>merkel</literal>.
@@ -288,15 +289,6 @@ the procedures in <xref linkend="archive-manip"/> .
 </para>
 </section>
 
-<section id="servers-non-us">
-<title>The non-US server</title>
-<para>
-The non-US server <literal>&non-us-host;</literal> was discontinued with
-the release of sarge.  The pseudo-package <systemitem
-role="package">nonus.debian.org</systemitem> still exists for now.
-</para>
-</section>
-
 <section id="servers-www">
 <title>The www-master server</title>
 <para>
@@ -339,28 +331,23 @@ Send mail to &email-debian-devel; if you have any questions.
 </para>
 </section>
 
-<section id="servers-cvs">
-<title>The CVS server</title>
-<!-- TODO: document svn.debian.org, arch.debian.org also -->
-<para>
-Our CVS server is located on <literal>cvs.debian.org</literal>.
-</para>
+<section id="servers-vcs">
+<title>The VCS servers</title>
 <para>
-If you need to use a publicly accessible CVS server, for instance, to help
-coordinate work on a package between many different developers, you can request
-a CVS area on the server.
+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
+request a new project and ask for the VCS repository of your choice.
+Alioth supports CVS (alioth.debian.org), Subversion
+(svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar
+(bzr.debian.org), Darcs (darcs.debian.org), Mercurial (hg.debian.org) and Git
+(git.debian.org).  Checkout <ulink url="&url-alioth-pkg;" /> if you plan
+to maintain packages in a VCS repository. See <xref linkend="alioth"/> for
+information on the services provided by Alioth.
 </para>
 <para>
-Generally, <literal>cvs.debian.org</literal> offers a combination of local CVS
-access, anonymous client-server read-only access, and full client-server access
-through <command>ssh</command>.  Also, the CVS area can be accessed read-only
-via the Web at <ulink url="&url-cvsweb;"></ulink>.
-</para>
-<para>
-To request a CVS area, send a request via email to
-&email-debian-admin;.  Include the name of the requested CVS
-area, the Debian account that should own the CVS root area, and why you need
-it.
+Historically, Debian first used <literal>cvs.debian.org</literal> to host
+CVS repositories. But that service is deprecated in favor of Alioth.
+Only a few projects are still using it.
 </para>
 </section>
 
@@ -1065,6 +1052,15 @@ In order to prevent spam, all messages sent to these addresses must contain the
 </listitem>
 </varlistentry>
 <varlistentry>
+<term><literal>contact</literal></term>
+<listitem>
+<para>
+Mails sent to the maintainer through the *@packages.debian.org email
+aliases.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
 <term><literal>summary</literal></term>
 <listitem>
 <para>
@@ -1093,8 +1089,10 @@ how your package gets recompiled for all architectures.
 <term><literal>cvs</literal></term>
 <listitem>
 <para>
-CVS commit notifications, if the package has a CVS repository and the
-maintainer has set up forwarding commit notifications to the PTS.
+VCS commit notifications, if the package has a VCS repository and the
+maintainer has set up forwarding of commit notifications to the PTS. The
+"cvs" name is historic, in most cases commit notifications will come
+from some other VCS like subversion or git.
 </para>
 </listitem>
 </varlistentry>
@@ -1193,7 +1191,13 @@ package
 </listitem>
 <listitem>
 <para>
-<literal>cvs</literal>: notification of CVS commits
+<literal>contact</literal>: mails sent to the maintainer through the
+*@packages.debian.org aliases
+</para>
+</listitem>
+<listitem>
+<para>
+<literal>cvs</literal>: notification of VCS commits
 </para>
 </listitem>
 <listitem>
@@ -1306,24 +1310,30 @@ Here is an example of added headers for a source upload notification on the
 X-Loop: dpkg@&pts-host;
 X-PTS-Package: dpkg
 X-PTS-Keyword: upload-source
-X-Unsubscribe: echo 'unsubscribe dpkg' | mail pts@qa.debian.org
+List-Unsubscribe: &lt;mailto:pts@qa.debian.org?body=unsubscribe+dpkg&gt;
 </screen>
 </section>
 
-<section id="pts-cvs-commit">
-<title>Forwarding CVS commits in the PTS</title>
+<section id="pts-vcs-commit">
+<title>Forwarding VCS commits in the PTS</title>
 <para>
-If you use a publicly accessible CVS repository for maintaining your Debian
+If you use a publicly accessible VCS repository for maintaining your Debian
 package, you may want to forward the commit notification to the PTS so that the
 subscribers (and possible co-maintainers) can closely follow the package's
 evolution.
 </para>
 <para>
-Once you set up the CVS repository to generate commit notifications, you just
+Once you set up the VCS repository to generate commit notifications, you just
 have to make sure it sends a copy of those mails to
 <literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.
 Only the people who accept the <emphasis>cvs</emphasis> keyword will receive
-these notifications.
+these notifications. Note that the mail need to be sent from a
+<literal>debian.org</literal> machine, otherwise you'll have to add
+the <literal>X-PTS-Approved: 1</literal> header.
+</para>
+<para>
+For Subversion repositories, the usage of svnmailer is recommended.
+See <ulink url="&url-alioth-pkg;" /> for an example on how to do it.
 </para>
 </section>
 
@@ -1493,19 +1503,20 @@ responsibility.
 </section>
 
 <section id="alioth">
-<title>Debian *Forge: Alioth</title>
+<title>Debian's GForge installation: Alioth</title>
 <para>
-Alioth is a fairly new Debian service, based on a slightly modified version of
-the GForge software (which evolved from SourceForge).  This software offers
-developers access to easy-to-use tools such as bug trackers, patch manager,
-project/task managers, file hosting services, mailing lists, CVS repositories
-etc.  All these tools are managed via a web interface.
+Alioth is a Debian service based on a slightly modified version of the
+GForge software (which evolved from SourceForge). This software offers
+developers access to easy-to-use tools such as bug trackers, patch
+manager, project/task managers, file hosting services, mailing lists, CVS
+repositories etc.  All these tools are managed via a web interface.
 </para>
 <para>
 It is intended to provide facilities to free software projects backed or led by
 Debian, facilitate contributions from external developers to projects started
 by Debian, and help projects whose goals are the promotion of Debian or its
-derivatives.
+derivatives. It's heavily used by many Debian teams and provides
+hosting for all sorts of VCS repositories.
 </para>
 <para>
 All Debian developers automatically have an account on Alioth.  They can
@@ -1513,9 +1524,14 @@ activate it by using the recover password facility.  External developers can
 request guest accounts on Alioth.
 </para>
 <para>
-For more information please visit <ulink
-url="&url-alioth;"></ulink>.
+For more information please visit the following links:
 </para>
+<itemizedlist>
+<listitem><para><ulink url="&url-alioth-wiki;" /></para></listitem>
+<listitem><para><ulink url="&url-alioth-faq;" /></para></listitem>
+<listitem><para><ulink url="&url-alioth-pkg;" /></para></listitem>
+<listitem><para><ulink url="&url-alioth;" /></para></listitem>
+</itemizedlist>
 </section>
 
 <section id="developer-misc">