updated IRC stuff based on patch from SynrG, closes: #161403

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@1830 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/common.ent b/common.ent
index 203ee2aa707c474032de520cb828017c3c7ce300..d43ac1ecc9eabfbd0e15750ec43b17e7dd68026d 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -111,7 +111,7 @@
 <!entity url-rfc2440 "http://www.gnupg.org/rfc2440.html">
 <!entity url-u.s.-export "http://www.bxa.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html">
 <!entity url-notification-of-export "http://www.bxa.doc.gov/Encryption/">
-<!entity url-openprojects "http://www.openprojects.net">
+<!entity url-openprojects "http://www.freenode.net/">
 
 <!-- Debian email addresses -->
 <!entity email-listmaster "<email>listmaster@&lists-host;</email>">

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 7253cad50195d12456fb528aed8fed9749836fc0..dea325efb3d5bce8ef4e4639b8066c435aa5b040 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -6,7 +6,7 @@
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
 
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.132 $">
+  <!entity cvs-rev "$Revision: 1.133 $">
   <!-- if you are translating this document, please notate the CVS
        revision of the developers reference here -->
   <!--
@@ -118,8 +118,7 @@ bit before doing any coding, and you should post about your intentions
 to work on something to avoid duplicated effort.
        <p>
 Another good list to subscribe to is &email-debian-mentors;.  See <ref
-id="mentors"> for details.  The IRC channel <tt>#debian</tt> on the
-Linux People IRC network (e.g., <tt>irc.debian.org</tt>) can also be
+id="mentors"> for details.  The IRC channel <tt>#debian</tt> can also be
 helpful.
 
        <p>
@@ -484,20 +483,30 @@ might be useful to have the discussion archived somewhere.
 
       <sect id="irc-channels">IRC channels
        <p>
-Several IRC channels are dedicated to Debian's development. They are all
-hosted on the <url id="&url-openprojects;" name="OpenProjects"> network.
-The <tt>irc.debian.org</tt> DNS entry is just an alias to
+Several IRC channels are dedicated to Debian's development. They are mainly
+hosted on the <url id="&url-openprojects;" name="freenode"> network
+(previously known as Open Projects Network).
+The <tt>irc.debian.org</tt> DNS entry is an alias to
 <tt>irc.openprojects.net</tt>.
        <p>
-The main channel <em>#debian-devel</em> is very active since more
-than 150 persons are always logged in. It's a channel for people who work
+The main channel for Debian in general is <em>#debian</em>. This is a large,
+general-purpose channel where users can find recent news in the topic and
+served by bots. <em>#debian</em> is for English speakers; there are also
+<em>#debian.de</em>, <em>#debian-fr</em>, <em>#debian-br</em> and other
+similarly named channels for speakers of other languages.
+       <p>
+The main channel for Debian development is <em>#debian-devel</em>.
+It is a very active channel since usually over 150 people are always
+logged in. It's a channel for people who work
 on Debian, it's not a support channel (there's <em>#debian</em> for that).
 It is however open to anyone who wants to lurk (and learn). Its topic is
-always full of interesting information. Since it's an open channel, you
+commonly full of interesting information for developers.
+       <p>
+Since <em>#debian-devel</em> it's an open channel, you
 should not speak there of issues that are discussed in
-&email-debian-private;. There's a key protected channel
-<em>#debian-private</em> for that purpose. The key is available 
-in the archives of debian-private in
+&email-debian-private;. There's another channel for this purpose,
+it's called <em>#debian-private</em> and it's protected by a key.
+This key is available in the archives of debian-private in
 <file>master.debian.org:&file-debian-private-archive;</file>,
 just <prgn>zgrep</prgn> for <em>#debian-private</em> in
 all the files.
@@ -506,13 +515,15 @@ There are other additional channels dedicated to specific subjects.
 <em>#debian-bugs</em> is used for coordinating bug squash parties.
 <em>#debian-boot</em> is used to coordinate the work on the boot
 floppies (i.e. the installer). <em>#debian-doc</em> is
-occasionally used to work on documentation like the one you are
+occasionally used to talk about documentation, like the document you are
 reading. Other channels are dedicated to an architecture or a set of
-packages: <em>#debian-bsd</em>, <em>#debian-kde</em>,
+packages: <em>#debian-bsd</em>, <em>#debian-kde</em>, <em>#debian-jr</em>,
+<em>#debian-edu</em>,
 <em>#debian-sf</em> (SourceForge package), <em>#debian-oo</em> (OpenOffice
 package) ...
        <p>
-Some non-English channels exist, for example <em>#debian-devel-fr</em> for
+Some non-English developers' channels exist as well, for example
+<em>#debian-devel-fr</em> for
 French speaking people interested in Debian's development.