4 files changed, 38 insertions, 36 deletions
diff --git a/network/bitlbee/README b/network/bitlbee/README
index 80aa8a0fa6..a47cd5c1df 100644
--- a/network/bitlbee/README
+++ b/network/bitlbee/README
@@ -1,42 +1,44 @@
-BitlBee is an IRC instant messaging gateway licensed under the terms of the
-GPL.  It communicates with the end user via the IRC protocol whilst interacting
-with popular chat networks such as AIM, ICQ, MSN, Yahoo, and Jabber. The user's
-buddies appear as normal IRC users in a channel, and conversations use the
-private message facility of IRC.
+BitlBee is an IRC instant messaging gateway licensed under the terms of
+the GPL.  It communicates with the end user via the IRC protocol whilst
+interacting with popular chat networks such as AIM, ICQ, MSN, Yahoo,
+and Jabber. The user's buddies appear as normal IRC users in a channel,
+and conversations use the private message facility of IRC.
 
-After your installation you will need to configure bitlbee. There are two ways 
-starting bitlbee: Either as a forked deamon (preferred), or the old way of starting 
-it through inetd (mostly deprecated these days).
+After your installation you will need to configure bitlbee. There are
+two ways starting bitlbee: Either as a forked deamon (preferred), or
+the old way of starting it through inetd (mostly deprecated these days).
 
-Bitlbee now includes a standard rc.bitlbee. To have this start on boot-up, add 
-the following code to /etc/rc.d/rc.local for example
+Bitlbee now includes a standard rc.bitlbee. To have this start on boot-up,
+add the following code to /etc/rc.d/rc.local for example
 
 if [ -x /etc/rc.d/rc.bitlbee ]; then
   /etc/rc.d/rc.bitlbee start
 fi
 
-If you choose to use inetd , you need to modify your /etc/inetd.conf so bitlbee will
-be started when /etc/rc.d/rc.inetd is called on bootup.  Add the line below to
-your /etc/inetd.conf file:
-	6667    stream  tcp nowait  nobody  /usr/sbin/tcpd /usr/sbin/bitlbee
+If you choose to use inetd , you need to modify your /etc/inetd.conf
+so bitlbee will be started when /etc/rc.d/rc.inetd is called on bootup.
+Add the line below to your /etc/inetd.conf file:
+	6667	stream	tcp nowait  nobody  /usr/sbin/tcpd
+	/usr/sbin/bitlbee
 
-Restart inetd (/etc/rc.d/rc.inetd restart). All that is left to do now is
-connect your irc client to the localhost.
+Restart inetd (/etc/rc.d/rc.inetd restart). All that is left to do now
+is connect your irc client to the localhost.
 
-if you want to use libevent for events, instead of the default glib, install 
-libevent and run the script like this:  EVENTS=libevent ./bitlbee.SlackBuild
+if you want to use libevent for events, instead of the default glib,
+install libevent and run the script like this:	EVENTS=libevent
+./bitlbee.SlackBuild
 
-OTR (Off the record) is not compiled by default. If you want bitlbee to 
-compile with OTR capabilities, you'll need to install libotr from Slackware
-and run the script as follows: OTR=yes ./bitlbee.SlackBuild
+OTR (Off the record) is not compiled by default. If you want bitlbee
+to compile with OTR capabilities, you'll need to install libotr from
+Slackware and run the script as follows: OTR=yes ./bitlbee.SlackBuild
 
-NOTE: The default "bot"/bitlbee daemon is called 'root'. This is not the root
-user on your system. You can easily change it. Register and identify yourself
-first, and then:
-	rename root BitlBot
-	(or whatever you want)
+NOTE: The default "bot"/bitlbee daemon is called 'root'. This is not
+the root user on your system. You can easily change it. Register and
+identify yourself first, and then:
+	rename root BitlBot (or whatever you want)
 
-NOTE: Since bitlbee now runs as a daemon instead of from inetd, bitlbee runs
-under its own user (UID/GID: 250). If you have older databases of bitlbee, you 
-may want to change the permissions on the files in /var/lib/bitlbee.
+NOTE: Since bitlbee now runs as a daemon instead of from inetd, bitlbee
+runs under its own user (UID/GID: 250). If you have older databases
+of bitlbee, you may want to change the permissions on the files in
+/var/lib/bitlbee.
 
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild
index 44564ac02f..27f1928a25 100644
--- a/network/bitlbee/bitlbee.SlackBuild
+++ b/network/bitlbee/bitlbee.SlackBuild
@@ -2,7 +2,7 @@
  
 # SlackBuild Script for bitlbee
 
-# Copyright 2007-2011  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2007-2011  Michiel van Wessem, Leicester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitlbee
-VERSION=${VERSION:-3.0.3}
+VERSION=${VERSION:-3.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info
index 59c87e3b77..16958281a6 100644
--- a/network/bitlbee/bitlbee.info
+++ b/network/bitlbee/bitlbee.info
@@ -1,10 +1,10 @@
 PRGNAM="bitlbee"
-VERSION="3.0.3"
+VERSION="3.0.4"
 HOMEPAGE="http://www.bitlbee.org"
-DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.0.3.tar.gz"
-MD5SUM="4fe688e3a80efe011743f4c9265c0310"
+DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.0.4.tar.gz"
+MD5SUM="3eb1e3e30c015885c641503eec4b05cb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/network/bitlbee/slack-desc b/network/bitlbee/slack-desc
index c678df1d5a..c43716bbc6 100644
--- a/network/bitlbee/slack-desc
+++ b/network/bitlbee/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 bitlbee: bitlbee (an IRC instant messaging gateway)
 bitlbee:
 bitlbee: BitlBee is an IRC instant messaging gateway licensed under