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

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index 387ab28fa2e7282dd52ae26b7137e1ffb5b7d3fc..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>
@@ -627,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
@@ -763,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>
@@ -1579,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>