Mention collab-maint in the VCS section. Closes: #496815

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index d50e74bcb79578f19ea1373128981e1da7fc5ecc..4fa5909ab7bf9b02db782bb5f535fbcaef8e88ce 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -237,11 +237,16 @@ etc.
 <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, 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 "debian", its password is available at
-<filename>master.debian.org:&file-debian-rt-password;</filename>).
-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.
+the list of open issues in the DSA (Debian System Administration) Team's queue
+of our request tracker at <ulink url="&url-rt;" /> (you can login with user
+"debian", its password is available at
+<filename>master.debian.org:&file-debian-rt-password;</filename>).  To report a
+new problem in the request tracker, simply send a mail to &email-rt-dsa; and
+make sure to put the string "Debian RT" somewhere in the subject.  To contact
+the DSA team by email, use <email>dsa@debian.org</email> for anything that
+contains private or privileged information and should not be made public, and
+<email>debian-admin@lists.debian.org</email> otherwise.  The DSA team is also
+present on the <literal>#debian-admin</literal> IRC channel on OFTC.
 </para>
 <para>
 If you have a problem with a certain service, not related to the system
@@ -332,7 +337,8 @@ 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,
-you can use one of the existing repositories hosted on Alioth or you can
+you can use one of the existing repositories hosted on Alioth
+(e.g. inside the collab-maint project) 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
@@ -587,7 +593,8 @@ made by the Debian maintainer.
 </para>
 <para>
 The <filename>.dsc</filename> file lists all the files in the source package
-together with checksums (<command>md5sums</command>) and some additional info
+together with checksums (<command>md5sums</command>, <command>sha1sums</command>,
+<command>sha256sums</command>) and some additional info
 about the package (maintainer, version, etc.).
 </para>
 </section>
@@ -1571,28 +1578,10 @@ For more information please visit the following links:
 
 <section id="developer-misc">
 <title>Goodies for Debian Developers and Debian Maintainers</title>
-<section id="lwn">
-<title>LWN Subscriptions</title>
 <para>
-Since October of 2002, HP has sponsored a subscription to LWN for all
-interested Debian Developers and Debian Maintainers.
-Details on how to get access to this benefit are
-in <ulink
-url="https://&lists-host;/debian-devel-announce/2002/10/msg00018.html"></ulink>.
+Benefits available to Debian Developers and Debian Maintainers are documented on <ulink
+       url="https://wiki.debian.org/MemberBenefits"></ulink>.
 </para>
-</section>
-<section id="steam">
-<title>Valve games on Steam</title>
-<para>
-Since January 2014, Valve has sponsored free subscribtions to all past and present
-Valve games on the Steam game distribution service for all interested Debian Developers
-and Debian Maintainers.
-Since Steam and Valve games are not Free Software, please avoid using your Debian
-development machines for using Steam and playing games from Steam.
-See <ulink url="https://&lists-host;/debian-devel-announce/2014/01/msg00006.html"></ulink>.
-</para>
-</section>
-
 </section>
 
 </chapter>