From f21ad3756540aa93c786d1a3e00d927e659daa67 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 29 Oct 2012 00:16:12 +0000
Subject: Update authors files to reflect the current state of things. I'd like
 to thank Jelmer and Maurits for their past contributions.

Also, list Miklos, pesco, Geert, ulim and Marijn who have done some
substantial contributions (recently).
---
 debian/copyright        |  4 ++--
 doc/AUTHORS             | 29 +++++++++++++++++++++--------
 doc/bitlbee.8           |  4 ----
 doc/user-guide/help.xml |  2 +-
 motd.txt                |  2 +-
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a29a43b3..42f70d03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,9 @@ Mon,  8 Jul 2002 13:17:42 +0200.
 The source can be downloaded from http://www.bitlbee.org/
 
 Authors: Wilmer van der Gaast, Sjoerd Hemminga, Jelmer Vernooij,
-         Maurits Dijkstra and others.
+         Maurits Dijkstra, Geert Mulders, Miklos Vajna and others.
 
-Mainly Copyright 2002-2004 Wilmer van der Gaast.
+Mainly Copyright 2002-2012 Wilmer van der Gaast.
 Some parts are borrowed from Gaim (version 0.58) <http://gaim.sf.net/>.
 For the copyrights on those parts, please read the Gaim source code.
 
diff --git a/doc/AUTHORS b/doc/AUTHORS
index 6dab1040..3cc01570 100644
--- a/doc/AUTHORS
+++ b/doc/AUTHORS
@@ -1,19 +1,32 @@
-Current developers:
+Core team:
 
 Wilmer van der Gaast <wilmer@gaast.net>
 	Main developer
 
-Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org>
-	Documentation, general hacking, Win32 port
 
-Maurits Dijkstra <mauritsd@xs4all.nl>
-	Daemon dude, plus some other stuff
+Other contributors:
 
+Miklos Vajna <vmiklos@frugalware.org>
+	Skype module
 
-Retired developer:
+pesco <pesco@khjk.org>
+	OTR support
+
+
+Retired developers:
 
 Sjoerd 'lucumo' Hemminga <sjoerd@hemminga-online.nl>
 	NickServ, documentation
 
-The development team wishes to thank Sjoerd for his contributions to the
-Bee.
+Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org>
+	Documentation, general hacking, Win32 port
+
+Maurits Dijkstra <mauritsd@xs4all.nl>
+	Daemon dude, plus some other stuff
+
+Geert Mulders <g.c.w.m.mulders@gmail.com>
+	Initial version of the Twitter module
+
+ulim <a.sporto+bee@gmail.com>
+Marijn Kruisselbrink
+	File transfer support
diff --git a/doc/bitlbee.8 b/doc/bitlbee.8
index d01ec39e..62e6758f 100644
--- a/doc/bitlbee.8
+++ b/doc/bitlbee.8
@@ -113,7 +113,3 @@ Foundation, Inc., 59 Temple PLace, Suite 330, Boston, MA  02111-1307  USA
 .SH AUTHORS
 .PP
  Wilmer van der Gaast <wilmer@gaast.net>
-.BR
- Jelmer Vernooij <jelmer@vernstok.nl>
-.BR
- Maurits Dijkstra <mauritsd@xs4all.nl>
diff --git a/doc/user-guide/help.xml b/doc/user-guide/help.xml
index 48ed8a48..e40a04d1 100644
--- a/doc/user-guide/help.xml
+++ b/doc/user-guide/help.xml
@@ -25,7 +25,7 @@ You can read more about them with <emphasis>help &lt;subject&gt;</emphasis>
 </para>
 
 <para>
-BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
+Some more help can be found on <ulink link="http://wiki.bitlbee.org/">http://wiki.bitlbee.org/</ulink>. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
 </para>
 
 <para>
diff --git a/motd.txt b/motd.txt
index 9e854d54..93249eb3 100644
--- a/motd.txt
+++ b/motd.txt
@@ -13,6 +13,6 @@ information.
 
 The developers of the Bee hope you have a buzzing time.
 
-* BitlBee development team: wilmer, jelmer, Maurits
+* BitlBee development team.
  
 ... Buzzing, haha, get it?
-- 
cgit v1.2.3