[Erc-commit] [commit][emacs22] erc-networks: Add Ars OpenIRC and LinuxChix

[mwolson]

commit 50932f672d8ff853fb9d87b1c0fcfe1a2f905c02
Author: Michael Olson <address@hidden>
Date:   Thu Dec 28 03:34:54 2006 +0000

    erc-networks: Add Ars OpenIRC and LinuxChix
    
    2006-12-28  Michael Olson  <address@hidden>
    
        * erc-list.el: Change header to mention that this is part of ERC,
        rather than GNU Emacs.
    
        * erc-networks.el (erc-server-alist): Add Ars OpenIRC and
        LinuxChix networks.  Thanks to Angelina Carlton for mentioning
        them.
    git-archimport-id: address@hidden/erc--main--0--patch-76

diff --git a/ChangeLog b/ChangeLog
index 403c6c3..b02d6f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-28  Michael Olson  <address@hidden>
+
+       * erc-list.el: Change header to mention that this is part of ERC,
+       rather than GNU Emacs.
+
+       * erc-networks.el (erc-server-alist): Add Ars OpenIRC and
+       LinuxChix networks.  Thanks to Angelina Carlton for mentioning
+       them.
+
 2006-12-28  Leo  <address@hidden>
 
        * erc.el (erc-iswitchb): Wrap body in unwind-protect so that
diff --git a/erc-list.el b/erc-list.el
index 38ea0ec..a574d6e 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -6,20 +6,20 @@
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm
 
-;; This file is part of GNU Emacs.
+;; This file is part of ERC.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; ERC is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; ERC is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; along with ERC; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
diff --git a/erc-networks.el b/erc-networks.el
index fb7c92a..f27a602 100644
--- a/erc-networks.el
+++ b/erc-networks.el
@@ -64,6 +64,7 @@
   ("AngelEyez: Random server" AngelEyez "irc.angeleyez.net" ((6666 7000)))
   ("AnotherNet: Random server" Anothernet "irc.another.net" (6667 7000 ))
   ("ArabChat: Random server" ArabChat "irc.arabchat.org" ((6660 6667)))
+  ("Ars OpenIRC: Random server" ArsOpenIRC "irc.arstechnica.com" 6667)
   ("AsiaTalk: Random server" AsiaTalk "irc.asiatalk.org" ((6667 6669) 7000 ))
   ("AstroLink: Random server" AstroLink "irc.astrolink.org" ((6660 6667)))
   ("Asylumnet: Random server" Asylumnet "irc.asylum-net.org" ((6661 6669) 7000 
7777 ))
@@ -294,6 +295,7 @@
   ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667)
   ("Librenet: Random server" Librenet "irc.librenet.net" 6667)
   ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669)))
+  ("LinuxChix: Random server" LinuxChix "irc.linuxchix.org" 6667)
   ("Liquidized: Random server" Liquidized "irc.liquidized.net" (6667 7000 ))
   ("M-IRC: Random server" M-IRC "irc.m-sys.org" ((6667 6669)))
   ("MagicStar: Random server" MagicStar "irc.magicstar.net" 6667)