Update DSA contact points. Closes: #713043

diff --git a/debian/changelog b/debian/changelog
index 7c499e66067e55806aa8966aaea51997667b5ee5..eb6c421e73ce61f49a90632f3a1cd6adaadc425c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ developers-reference (3.4.14) UNRELEASED; urgency=medium
     Closes: #736232
   * Fix typos in german translation. Patch from Thomas Schumm (Thanks!).
     Closes: #686253
+  * Update DSA contact points. Closes: #713043
 
  -- Paul Wise <pabs@debian.org>  Wed, 20 Aug 2014 18:43:04 -0700
 

diff --git a/resources.dbk b/resources.dbk
index f308162822c4fb74edb160c9e18ff8208228822e..456c752a9b8bd5cbf9e8d37a44b5aca26c7b1fa1 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