Replace 'Debian GNU/Linux' with 'Debian' (except at one place). Thanks to 'victory...

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index 387ab28fa2e7282dd52ae26b7137e1ffb5b7d3fc..0ca7bd1bb3b84af4721d064b69b7a236f8c741a2 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -4,7 +4,7 @@
   <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
 ]>
 <chapter id="resources">
-<title>Resources for Debian Developers</title>
+<title>Resources for Debian Developers and Debian Maintainers</title>
 <para>
 In this chapter you will find a very brief road map of the Debian mailing
 lists, the Debian machines which may be available to you as a developer, and
@@ -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>
@@ -530,7 +530,7 @@ Debian decided to build some ports based on other Unix kernels, like
 <literal>hurd</literal> and <literal>kfreebsd</literal>.
 </para>
 <para>
-&debian-formal; 1.3 was only available as <literal>i386</literal>.  Debian
+Debian GNU/Linux 1.3 was only available as <literal>i386</literal>.  Debian
 2.0 shipped for <literal>i386</literal> and <literal>m68k</literal>
 architectures.  Debian 2.1 shipped for the <literal>i386</literal>,
 <literal>m68k</literal>, <literal>alpha</literal>, and
@@ -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>
@@ -1569,22 +1570,26 @@ For more information please visit the following links:
 </section>
 
 <section id="developer-misc">
-<title>Goodies for Developers</title>
+<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.  Details on how to get access to this benefit are
+interested Debian Developers and Debian Maintainers.
+Details on how to get access to this benefit are
 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>.
+<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="http://&lists-host;/debian-devel-announce/2014/01/msg00006.html"></ulink>.
 </para>
 </section>