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

diff --git a/resources.dbk b/resources.dbk
index 15e818b..c207fe9 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>
@@ -1493,19 +1485,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,8 +1506,13 @@ 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:
+<list>
+<item><ulink url="&url-alioth-wiki;" /></item>
+<item><ulink url="&url-alioth-faq;" /></item>
+<item><ulink url="&url-alioth-pkg;" /></item>
+<item><ulink url="&url-alioth;" /></item>
+</list>
 </para>
 </section>