From a51f973ee72ff1001b70f388d2f106098cf5750e Mon Sep 17 00:00:00 2001
From: aba <aba@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sat, 11 Nov 2006 18:15:34 +0000
Subject: [PATCH] irc.d.o is now oftc

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@3942 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 common.ent                |  1 +
 debian/changelog          |  2 ++
 developers-reference.sgml | 13 ++++++-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common.ent b/common.ent
index afce3c1..2f96f48 100644
--- a/common.ent
+++ b/common.ent
@@ -127,6 +127,7 @@
 <!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.freenode.net/">
+<!ENTITY url-oftc "http://www.oftc.net/oftc/">
 
 <!-- Debian email addresses -->
 <!ENTITY email-listmaster "<email>listmaster@&lists-host;</email>">
diff --git a/debian/changelog b/debian/changelog
index fa9b515..43ce201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ developers-reference (3.3.8) unstable; urgency=low
     Closes: #376411
   * better destinction between maintainer and developer. Thanks for
     the suggestion to Colin Tuckley. Closes: #380458
+  * irc.d.o points to oftc. Thanks, Christoph Biedl, Jon Dowland.
+    Closes: #382721
 
  -- Andreas Barth <aba@not.so.argh.org>  Sat, 11 Nov 2006 10:55:44 -0700
 
diff --git a/developers-reference.sgml b/developers-reference.sgml
index f4fb30c..95b1fbf 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -7,7 +7,7 @@
   <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->
-  <!ENTITY cvs-rev "$Revision: 1.295 $">
+  <!ENTITY cvs-rev "$Revision: 1.296 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -562,10 +562,9 @@ id="&url-debian-lists-new;">.
       <sect id="irc-channels">IRC channels
 	<p>
 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.freenode.net</tt>.
+hosted on the <url id="&url-oftc;" name="Open and free technology community
+(OFTC)"> network.  The <tt>irc.debian.org</tt> DNS entry is an alias to
+<tt>irc.oftc.net</tt>.
 	<p>
 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
@@ -605,8 +604,8 @@ Some non-English developers' channels exist as well, for example
 French speaking people interested in Debian's development.
 	<p>
 Channels dedicated to Debian also exist on other IRC networks, notably on
-the <url name="Open and free technology community (OFTC)"
-id="http://www.oftc.net/"> IRC network.
+the <url id="&url-openprojects;" name="freenode"> IRC network, which was 
+pointed at by the <tt>irc.debian.org</tt> alias until 4th June 2006.
 	<p>
 To get a cloak on freenode, you send J&ouml;rg Jaspert &lt;joerg@debian.org&gt;
 a signed mail where you tell what your nick is.
-- 
2.30.2