Move maintenance to Git & collab-maint. Update Vcs-*.

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index 8844be64743c22724da18d07b79ba6ff14b0faff..d8bd0561bec0bfb9addbdbdd7adcf9a113f57e5c 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -184,7 +184,7 @@ signed mail where you tell what your nick is.  Put cloak somewhere in the
 Subject: header.  The nick should be registered: <ulink
 url="http://freenode.net/faq.shtml#nicksetup">Nick Setup Page</ulink>.  The
 mail needs to be signed by a key in the Debian keyring.  Please see <ulink
-url="http://freenode.net/faq.shtml#projectcloak">Freenodes
+url="http://freenode.net/faq.shtml#projectcloak">Freenode
 documentation</ulink> for more information about cloaks.
 </para>
 </section>
@@ -238,7 +238,8 @@ etc.
 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 "guest" and password "readonly").
+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.
 </para>
@@ -626,7 +627,7 @@ development process of the Debian project.
 <para>
 Active development is done in the <literal>unstable</literal> distribution
 (that's why this distribution is sometimes called the <literal>development
-distribution</literal>).  Every Debian developer can update his or her
+distribution</literal>).  Every Debian developer can update their
 packages in this distribution at any time.  Thus, the contents of this
 distribution change from day to day.  Since no special effort is made to make
 sure everything in this distribution is working properly, it is sometimes
@@ -762,7 +763,8 @@ 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>; Debian 5.0, <literal>lenny</literal>
+Debian 4.0, <literal>etch</literal>; Debian 5.0, <literal>lenny</literal>;
+Debian 6.0, <literal>squeeze</literal>
 and the next release will be called <literal>wheezy</literal>.
 There is also a ``pseudo-distribution'', called
 <literal>sid</literal>, which is the current <literal>unstable</literal>
@@ -1578,14 +1580,6 @@ 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>