Index: doc/user-guide/Installation.xml
===================================================================
--- doc/user-guide/Installation.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/Installation.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -8,8 +8,8 @@
 <para>
 The latest BitlBee release is always available from <ulink
-url="https://www.bitlbee.org/">https://www.bitlbee.org/</ulink>.
+url="http://www.bitlbee.org/">http://www.bitlbee.org/</ulink>.
 Download the package with your favorite program and unpack it: <command>tar
 xvfz bitlbee-&lt;version&gt;.tar.gz</command> where &lt;version&gt; is to be
-replaced by the version number of the BitlBee you downloaded (e.g. 3.6).
+replaced by the version number of the BitlBee you downloaded (e.g. 0.91).
 </para>
 
@@ -36,6 +36,7 @@
 settings and buddy information. <filename>/var/lib/bitlbee/</filename>
 is the default value.</para></listitem>
-<listitem><para>jabber, twitter - By default, support for all these IM-protocols
-will be compiled in. To make the binary a bit smaller, you can use these options
+<listitem><para>msn, jabber, oscar, yahoo - By default, support for all
+these IM-protocols (OSCAR is the protocol used by both ICQ and AIM) will
+be compiled in. To make the binary a bit smaller, you can use these options
 to leave out support for protocols you're not planning to use.</para></listitem>
 <listitem><para>debug - Generate an unoptimized binary with debugging symbols,
@@ -49,5 +50,6 @@
 you can use this option. It's not compiled in by default because it needs
 more testing first.</para></listitem>
-<listitem><para>ssl - BitlBee can use three different SSL libraries: GnuTLS,
+<listitem><para>ssl - The MSN and Jabber modules require an SSL library for
+some of their tasks. BitlBee can use three different SSL libraries: GnuTLS,
 mozilla-nss and OpenSSL. (OpenSSL is, however, a bit troublesome because of
 licensing issues, so don't forget to read the information configure will
@@ -71,5 +73,5 @@
 <para>
 By default, BitlBee runs as the user nobody. You might want 
-to run it as a separate user (some computers run named or apache as nobody). 
+to run it as a seperate user (some computers run named or apache as nobody). 
 </para>
 
Index: doc/user-guide/Makefile
===================================================================
--- doc/user-guide/Makefile	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/Makefile	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,14 +1,7 @@
 -include ../../Makefile.settings
-ifdef _SRCDIR_
-_SRCDIR_ := $(_SRCDIR_)doc/user-guide/
-endif
+EXTRAPARANEWLINE = 1
+# EXTRAPARANEWLINE = 0
 
-ifndef PYTHON
-PYTHON = python
-endif 
-
-all: help.txt
-
-user-guide: user-guide.txt user-guide.html # user-guide.pdf user-guide.ps user-guide.rtf
+all: user-guide.txt user-guide.html help.txt # user-guide.pdf user-guide.ps user-guide.rtf
 
 %.tex: %.db.xml
@@ -20,5 +13,5 @@
 
 %.html: %.db.xml
-	xsltproc --param generate.consistent.ids 1 --output $@ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+	xsltproc --output $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 %.pdf: %.db.xml
@@ -35,6 +28,6 @@
 	xsltproc --xinclude --output $@ docbook.xsl $< 
 
-help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml $(_SRCDIR_)twitter.xml
-	$(PYTHON) $(_SRCDIR_)genhelp.py $< $@
+help.txt: help.xml help.xsl
+	xsltproc --stringparam extraparanewline "$(EXTRAPARANEWLINE)" --xinclude help.xsl $< | perl -0077 -pe 's/\n\n%/\n%/s; s/_b_/\002/g;' > $@
 
 clean: 
@@ -45,5 +38,5 @@
 	chmod 0755 $(DESTDIR)$(DATADIR)
 	rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions
-	$(INSTALL) -m 0644 $(_SRCDIR_)help.txt $(DESTDIR)$(DATADIR)/help.txt
+	install -m 0644 help.txt $(DESTDIR)$(DATADIR)/help.txt
 
 uninstall:
@@ -51,3 +44,3 @@
 	-rmdir $(DESTDIR)$(DATADIR)
 
-.PHONY: clean install uninstall user-guide
+.PHONY: clean install uninstall
Index: doc/user-guide/Support.xml
===================================================================
--- doc/user-guide/Support.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/Support.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -4,11 +4,10 @@
 
 <sect1>
-<title>Disclaimer</title>
+<title>BitlBee is beta software</title>
 
 <para>
-BitlBee doesn't come with a warranty and is still (and will probably always
-be) under development. That means it can crash at any time, corrupt your
-data or whatever. Don't use it in any production environment and don't rely
-on it, or at least don't blame us if things blow up. :-)
+Although BitlBee has quite some functionality it is still beta. That means it 
+can crash at any time, corrupt your data or whatever. Don't use it in 
+any production environment and don't rely on it.
 </para>
 
@@ -22,5 +21,5 @@
 
 <para>
-<ulink url="https://www.bitlbee.org/">https://www.bitlbee.org/</ulink> 
+<ulink url="http://www.bitlbee.org/">http://www.bitlbee.org/</ulink> 
 is the homepage of bitlbee and contains the most recent news on bitlbee and 
 the latest releases.
Index: doc/user-guide/Usage.xml
===================================================================
--- doc/user-guide/Usage.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/Usage.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -14,26 +14,15 @@
 
 <sect1>
-<title>The &amp;bitlbee control channel</title>
+<title>The #bitlbee control channel</title>
 
 <para>
 Once you are connected to the BitlBee server, you are automatically joined
-to &amp;bitlbee on that server. This channel acts like the 'buddy list' you have
+to #bitlbee on that server. This channel acts like the 'buddy list' you have
 on the various other chat networks.
 </para>
 
 <para>
-The user 'root' always hangs around in &amp;bitlbee and acts as your interface 
-to bitlbee. All commands you give on &amp;bitlbee are 'answered' by root.
-</para>
-
-<para>
-You might be slightly confused by the &amp; in the channel name. This is,
-however, completely allowed by the IRC standards. Just try it on a regular
-IRC server, it should work. The difference between the standard #channels
-and &amp;channels is that the #channels are distributed over all the servers
-on the IRC network, while &amp;channels are local to one server. Because
-the BitlBee control channel is local to one server (and in fact, to one person),
-this name seems more suitable. Also, with this name, it's harder to confuse
-the control channel with the #bitlbee channel on OFTC.
+The user 'root' always hangs around in #bitlbee and acts as your interface 
+to bitlbee. All commands you give on #bitlbee are 'answered' by root.
 </para>
 
Index: doc/user-guide/commands.xml
===================================================================
--- doc/user-guide/commands.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/commands.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -6,10 +6,10 @@
 	<bitlbee-command name="account">
 		<short-description>IM-account list maintenance</short-description>
-		<syntax>account [&lt;account id&gt;] &lt;action&gt; [&lt;arguments&gt;]</syntax>
-
-		<description>
-
-			<para>
-				Available actions: add, del, list, on, off and set. See <emphasis>help account &lt;action&gt;</emphasis> for more information.
+		<syntax>account &lt;action&gt; [&lt;arguments&gt;]</syntax>
+
+		<description>
+
+			<para>
+				Available actions: add, del, list, on, off. See <emphasis>help account &lt;action&gt;</emphasis> for more information.
 			</para>
 
@@ -17,62 +17,64 @@
 
 		<bitlbee-command name="add">
-			<syntax>account add &lt;protocol&gt; &lt;username&gt; [&lt;password&gt;]</syntax>
+			<syntax>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt; [&lt;server&gt;]</syntax>
 
 			<description>
 				<para>
-					Adds an account on the given server with the specified protocol, username and password to the account list. For a list of supported protocols, use the <emphasis>plugins</emphasis> command. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
-				</para>
-
-				<para>
-					You can omit the password and enter it separately using the IRC /OPER command. This lets you enter your password without your IRC client echoing it on screen or recording it in logs.
+					Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ) and Yahoo. For more information about adding an account, see <emphasis>help account add &lt;protocol&gt;</emphasis>.
 				</para>
 			</description>
 			
 			<bitlbee-command name="jabber">
-				<syntax>account add jabber &lt;handle@server.tld&gt; [&lt;password&gt;]</syntax>
+				<syntax>account add jabber &lt;handle&gt; &lt;password&gt; [&lt;servertag&gt;]</syntax>
 
 				<description>
 					<para>
-						The handle should be a full handle, including the domain name. You can specify a servername if necessary. Normally BitlBee doesn't need this though, since it's able to find out the server by doing DNS SRV lookups.
+						Note that the servertag argument is optional. You only have to use it if the part after the @ in your handle isn't the hostname of your Jabber server, or if you want to use SSL/connect to a non-standard port number. The format is simple: [&lt;servername&gt;[:&lt;portnumber&gt;][:ssl]]. For example, this is how you can connect to Google Talk:
 					</para>
-
+				</description>
+
+				<ircexample>
+					<ircline nick="wilmer">account add jabber example@gmail.com hobbelmeeuw talk.google.com:5223:ssl</ircline>
+					<ircline nick="root">Account successfully added</ircline>
+				</ircexample>
+
+				<description>
 					<para>
-						In previous versions it was also possible to specify port numbers and/or SSL in the server tag. This is deprecated and should now be done using the <emphasis>account set</emphasis> command. This also applies to specifying a resource in the handle (like <emphasis>wilmer@bitlbee.org/work</emphasis>).
+						Note that Google talk is SSL-only, but officially reachable over both port 5222 and 5223. However, for some people only port 5222 works, for some people only 5223. This is something you'll have to try out.
 					</para>
 				</description>
 			</bitlbee-command>
 
-			<bitlbee-command name="twitter">
-				<syntax>account add twitter &lt;handle&gt;</syntax>
+			<bitlbee-command name="msn">
+				<syntax>account add msn &lt;handle&gt; &lt;password&gt;</syntax>
 
 				<description>
 					<para>
-						This module gives you simple access to Twitter and Twitter API compatible services.
-					</para>
-					
-					<para>
-						By default all your Twitter contacts will appear in a new channel called #twitter_yourusername. You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
-					</para>
-					
-					<para>
-						To send tweets yourself, send them to the twitter_(yourusername) contact, or just write in the groupchat channel if you enabled that option.
-					</para>
-
-					<para>
-						Since Twitter now requires OAuth authentication, you should not enter your Twitter password into BitlBee. Just type a bogus password. The first time you log in, BitlBee will start OAuth authentication. (See <emphasis>help set oauth</emphasis>.)
-					</para>
-					
-					<para>
-						To use a non-Twitter service, change the <emphasis>base_url</emphasis> setting. For identi.ca, you can simply use <emphasis>account add identica</emphasis>.
+						For MSN connections there are no special arguments.
 					</para>
 				</description>
 			</bitlbee-command>
 			
-			<bitlbee-command name="identica">
-				<syntax>account add identica &lt;handle&gt;</syntax>
+			<bitlbee-command name="oscar">
+				<syntax>account add oscar &lt;handle&gt; &lt;password&gt; [&lt;servername&gt;]</syntax>
 
 				<description>
 					<para>
-						Same protocol as <emphasis>twitter</emphasis>, but defaults to a <emphasis>base_url</emphasis> pointing at identi.ca. It also works with OAuth (so don't specify your password).
+						Specifying a server is required for OSCAR, since OSCAR can be used for both ICQ- and AIM-connections. Although these days it's supposed to be possible to connect to ICQ via AIM-servers and vice versa, we like to stick with this separation for now. For ICQ connections, the servername is <emphasis>login.icq.com</emphasis>, for AIM connections it's <emphasis>login.oscar.aol.com</emphasis>.
+					</para>
+				</description>
+
+				<ircexample>
+					<ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw login.icq.com</ircline>
+					<ircline nick="root">Account successfully added</ircline>
+				</ircexample>
+			</bitlbee-command>
+
+			<bitlbee-command name="yahoo">
+				<syntax>account add yahoo &lt;handle&gt; &lt;password&gt;</syntax>
+
+				<description>
+					<para>
+						For Yahoo! connections there are no special arguments.
 					</para>
 				</description>
@@ -82,14 +84,14 @@
 
 		<bitlbee-command name="del">
-			<syntax>account &lt;account id&gt; del</syntax>
+			<syntax>account del &lt;account id&gt;</syntax>
 
 			<description>
 				<para>
-					This command deletes an account from your account list. You should signoff the account before deleting it.
-				</para>
-
-
-				<para>
-					The account ID can be a number/tag (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+					This commands deletes an account from your account list. You should signoff the account before deleting it.
+				</para>
+
+
+				<para>
+					The account ID can be a number (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
 				</para>
 			</description>
@@ -97,13 +99,13 @@
 
 		<bitlbee-command name="on">
-			<syntax>account [&lt;account id&gt;] on</syntax>
+			<syntax>account on [&lt;account id&gt;]</syntax>
 
 			<description>
 				<para>
-					This command will try to log into the specified account. If no account is specified, BitlBee will log into all the accounts that have the auto_connect flag set.
-				</para>
-
-				<para>
-					The account ID can be a number/tag (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+					This command will try to log into the specified account. If no account is specified, BitlBee will log into all the accounts. (Including accounts awaiting a reconnection)
+				</para>
+
+				<para>
+					The account ID can be a number (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
 				</para>
 			</description>
@@ -112,13 +114,13 @@
 
 		<bitlbee-command name="off">
-			<syntax>account [&lt;account id&gt;] off</syntax>
+			<syntax>account off [&lt;account id&gt;]</syntax>
 
 			<description>
 				<para>
-					This command disconnects the connection for the specified account. If no account is specified, BitlBee will deactivate all active accounts and cancel all pending reconnects.
-				</para>
-
-				<para>
-					The account ID can be a number/tag (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+					This command disconnects the connection for the specified account. If no account is specified, BitlBee will deactivate all active accounts. (Including accounts awaiting a reconnection)
+				</para>
+
+				<para>
+					The account ID can be a number (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
 				</para>
 			</description>
@@ -130,163 +132,13 @@
 			<description>
 				<para>
-					This command gives you a list of all the accounts known by BitlBee.
+					This command gives you a list of all the accounts known by BitlBee, including the numbers you'll need for most account commands.
 				</para>
 			</description>
 		</bitlbee-command>
-
-		<bitlbee-command name="set">
-			<syntax>account &lt;account id&gt; set</syntax>
-			<syntax>account &lt;account id&gt; set &lt;setting&gt;</syntax>
-			<syntax>account &lt;account id&gt; set &lt;setting&gt; &lt;value&gt;</syntax>
-			<syntax>account &lt;account id&gt; set -del &lt;setting&gt;</syntax>
-
-			<description>
-				<para>
-					This command can be used to change various settings for IM accounts. For all protocols, this command can be used to change the handle or the password BitlBee uses to log in and if it should be logged in automatically. Some protocols have additional settings. You can see the settings available for a connection by typing <emphasis>account &lt;account id&gt; set</emphasis>.
-				</para>
-				
-				<para>
-					For more information about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
-				</para>
-				
-				<para>
-					The account ID can be a number/tag (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
-				</para>
-			</description>
-		</bitlbee-command>
-	</bitlbee-command>
-
-	<bitlbee-command name="channel">
-		<short-description>Channel list maintenance</short-description>
-		<syntax>channel [&lt;channel id&gt;] &lt;action&gt; [&lt;arguments&gt;]</syntax>
-
-		<description>
-			<para>
-				Available actions: del, list, set. See <emphasis>help channel &lt;action&gt;</emphasis> for more information.
-			</para>
-			
-			<para>
-				There is no <emphasis>channel add</emphasis> command. To create a new channel, just use the IRC <emphasis>/join</emphasis> command. See also <emphasis>help channels</emphasis> and <emphasis>help groupchats</emphasis>.
-			</para>
-		</description>
-
-		<bitlbee-command name="del">
-			<syntax>channel &lt;channel id&gt; del</syntax>
-
-			<description>
-				<para>
-					Remove a channel and forget all its settings. You can only remove channels you're not currently in, and can't remove the main control channel. (You can, however, leave it.)
-				</para>
-			</description>
-
-		</bitlbee-command>
-
-		<bitlbee-command name="list">
-			<syntax>channel list</syntax>
-
-			<description>
-				<para>
-					This command gives you a list of all the channels you configured.
-				</para>
-			</description>
-
-		</bitlbee-command>
-
-		<bitlbee-command name="set">
-			<syntax>channel [&lt;channel id&gt;] set</syntax>
-			<syntax>channel [&lt;channel id&gt;] set &lt;setting&gt;</syntax>
-			<syntax>channel [&lt;channel id&gt;] set &lt;setting&gt; &lt;value&gt;</syntax>
-			<syntax>channel [&lt;channel id&gt;] set -del &lt;setting&gt;</syntax>
-
-			<description>
-				<para>
-					This command can be used to change various settings for channels. Different channel types support different settings. You can see the settings available for a channel by typing <emphasis>channel &lt;channel id&gt; set</emphasis>.
-				</para>
-				
-				<para>
-					For more information about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
-				</para>
-				
-				<para>
-					The channel ID can be a number (see <emphasis>channel list</emphasis>), or (part of) its name, as long as it matches only one channel. If you want to change settings of the current channel, you can omit the channel ID.
-				</para>
-			</description>
-		</bitlbee-command>
-
-	</bitlbee-command>
-
-	<bitlbee-command name="chat">
-		<short-description>Chatroom list maintenance</short-description>
-		<syntax>chat &lt;action&gt; [&lt;arguments&gt;]</syntax>
-
-		<description>
-
-			<para>
-				Available actions: add, with, list. See <emphasis>help chat &lt;action&gt;</emphasis> for more information.
-			</para>
-
-		</description>
-
-		<bitlbee-command name="add">
-			<syntax>chat add &lt;account id&gt; &lt;room|!index&gt; [&lt;channel&gt;]</syntax>
-
-			<description>
-				<para>
-					Add a chatroom to the list of chatrooms you're interested in. BitlBee needs this list to map room names to a proper IRC channel name.
-				</para>
-
-				<para>
-					After adding a room to your list, you can simply use the IRC /join command to enter the room. Also, you can tell BitlBee to automatically join the room when you log in. (<emphasis>channel &lt;channel&gt; set auto_join true</emphasis>)
-				</para>
-
-				<para>
-					Password-protected rooms work exactly like on IRC, by passing the password as an extra argument to /join.
-				</para>
-			</description>
-
-		</bitlbee-command>
-
-		<bitlbee-command name="list">
-			<syntax>chat list &lt;account id&gt; [&lt;server&gt;]</syntax>
-
-			<description>
-				<para>
-					List existing named chatrooms provided by an account. Chats from this list can be referenced from <emphasis>chat add</emphasis> by using the number in the index column after a "!" as a shortcut.
-				</para>
-
-				<para>
-					The server parameter is optional and currently only used by jabber.
-				</para>
-			</description>
-
-			<ircexample>
-				<ircline nick="dx">chat list facebook</ircline>
-				<ircline pre="1" nick="root">Index  Title                 Topic</ircline>
-				<ircline pre="1" nick="root">    1  869891016470949       cool kids club</ircline>
-				<ircline pre="1" nick="root">    2  457892181062459       uncool kids club</ircline>
-				<ircline nick="root">2 facebook chatrooms</ircline>
-				<ircline nick="dx">chat add facebook !1 #cool-kids-club</ircline>
-			</ircexample>
-		</bitlbee-command>
-
-		<bitlbee-command name="with">
-			<syntax>chat with &lt;nickname&gt;</syntax>
-
-			<description>
-				<para>
-					While most <emphasis>chat</emphasis> subcommands are about named chatrooms, this command can be used to open an unnamed groupchat with one or more persons. This command is what <emphasis>/join #nickname</emphasis> used to do in older BitlBee versions.
-				</para>
-
-				<para>
-					Another way to do this is to join to a new, empty channel with <emphasis>/join #newchannel</emphasis> and invite the first person with <emphasis>/invite nickname</emphasis>
-				</para>
-			</description>
-		</bitlbee-command>
 	</bitlbee-command>
 
 	<bitlbee-command name="add">
 		<short-description>Add a buddy to your contact list</short-description>
-		<syntax>add &lt;account id&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
-		<syntax>add -tmp &lt;account id&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
+		<syntax>add &lt;connection&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
 
 		<description>
@@ -296,15 +148,11 @@
 
 			<para>
-				If you want, you can also tell BitlBee what nick to give the new contact. The -tmp option adds the buddy to the internal BitlBee structures only, not to the real contact list (like done by <emphasis>set handle_unknown add</emphasis>). This allows you to talk to people who are not in your contact list. This normally won't show you any presence notifications.
-			</para>
-
-			<para>
-				If you use this command in a control channel containing people from only one group, the new contact will be added to that group automatically.
+				If you want, you can also tell BitlBee what nick to give the new contact. Of course you can also use the <emphasis>rename</emphasis> command for that, but sometimes this might be more convenient.
 			</para>
 		</description>
 
 		<ircexample>
-			<ircline nick="jelmer">add 3 gryp@jabber.org grijp</ircline>
-			<ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
+			<ircline nick="ctrlsoft">add 3 gryp@jabber.org grijp</ircline>
+			<ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>#bitlbee</emphasis></ircaction>
 		</ircexample>
 	</bitlbee-command>
@@ -317,10 +165,10 @@
 		<description>
 			<para>
-				Requests IM-network-specific information about the specified user. The amount of information you'll get differs per protocol. For some protocols it'll give you an URL which you can visit with a normal web browser to get the information.
+				Requests IM-network-specific information about the specified user. The amount of information you'll get differs per protocol. For some protocols (ATM Yahoo! and MSN) it'll give you an URL which you can visit with a normal web browser to get the information.
 			</para>
 		</description>
 
 		<ircexample>
-			<ircline nick="jelmer">info 0 72696705</ircline>
+			<ircline nick="ctrlsoft">info 0 72696705</ircline>
 			<ircline nick="root">User info - UIN: 72696705   Nick: Lintux   First/Last name: Wilmer van der Gaast   E-mail: lintux@lintux.cx</ircline>
 		</ircexample>
@@ -339,5 +187,5 @@
 
 		<ircexample>
-			<ircline nick="jelmer">remove gryp</ircline>
+			<ircline nick="ctrlsoft">remove gryp</ircline>
 			<ircaction nick="gryp" hostmask="gryp@jabber.jabber.org">has quit <emphasis>[Leaving...]</emphasis></ircaction>
 		</ircexample>
@@ -349,13 +197,8 @@
 		<syntax>block &lt;nick&gt;</syntax>
 		<syntax>block &lt;connection&gt; &lt;handle&gt;</syntax>
-		<syntax>block &lt;connection&gt;</syntax>
 
 		<description>
 			<para>
 				Puts the specified user on your ignore list. Either specify the user's nick when you have him/her in your contact list or a connection number and a user handle.
-			</para>
-			
-			<para>
-				When called with only a connection specification as an argument, the command displays the current block list for that connection.
 			</para>
 		</description>
@@ -371,218 +214,15 @@
 				Reverse of block. Unignores the specified user or user handle on specified connection.
 			</para>
-			
-			<para>
-				When called with only a connection specification as an argument, the command displays the current allow list for that connection.
-			</para>
-		</description>
-	</bitlbee-command>
-	
-	<bitlbee-command name="otr">
-		<short-description>Off-the-Record encryption control</short-description>
-		<syntax>otr &lt;subcommand&gt; [&lt;arguments&gt;]</syntax>
-
-		<description>
-
-			<para>
-				Available subcommands: connect, disconnect, reconnect, smp, smpq, trust, info, keygen, and forget. See <emphasis>help otr &lt;subcommand&gt;</emphasis> for more information.
-			</para>
-
-		</description>
-		
-		<bitlbee-command name="connect">
-			<syntax>otr connect &lt;nick&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Attempts to establish an encrypted connection with the specified user by sending a magic string.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="disconnect">
-			<syntax>otr disconnect &lt;nick&gt;</syntax>
-			<syntax>otr disconnect *</syntax>
-			
-			<description>
-			
-				<para>
-					Resets the connection with the specified user/all users to cleartext.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="reconnect">
-			<syntax>otr reconnect &lt;nick&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Breaks and re-establishes the encrypted connection with the specified user. Useful if something got desynced.
-				</para>
-				
-				<para>
-					Equivalent to <emphasis>otr disconnect</emphasis> followed by <emphasis>otr connect</emphasis>.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="smp">
-			<syntax>otr smp &lt;nick&gt; &lt;secret&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Attempts to authenticate the given user's active fingerprint via the Socialist Millionaires' Protocol.
-				</para>
-				
-				<para>
-					If an SMP challenge has been received from the given user, responds with the specified secret/answer. Otherwise, sends a challenge for the given secret.
-				</para>
-				
-				<para>
-					Note that there are two flavors of SMP challenges: "shared-secret" and "question &amp; answer". This command is used to respond to both of them, or to initiate a shared-secret style exchange. Use the <emphasis>otr smpq</emphasis> command to initiate a "Q&amp;A" session.
-				</para>
-				
-				<para>
-					When responding to a "Q&amp;A" challenge, the local trust value is not altered. Only the <emphasis>asking party</emphasis> sets trust in the case of success. Use <emphasis>otr smpq</emphasis> to pose your challenge. In a shared-secret exchange, both parties set their trust according to the outcome.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="smpq">
-			<syntax>otr smpq &lt;nick&gt; &lt;question&gt; &lt;answer&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Attempts to authenticate the given user's active fingerprint via the Socialist Millionaires' Protocol, Q&amp;A style.
-				</para>
-
-				<para>
-					Initiates an SMP session in "question &amp; answer" style. The question is transmitted with the initial SMP packet and used to prompt the other party. You must be confident that only they know the answer. If the protocol succeeds (i.e. they answer correctly), the fingerprint will be trusted. Note that the answer must be entered exactly, case and punctuation count!
-				</para>
-				
-				<para>
-					Note that this style of SMP only affects the trust setting on your side. Expect your opponent to send you their own challenge. Alternatively, if you and the other party have a shared secret, use the <emphasis>otr smp</emphasis> command.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="trust">
-			<syntax>otr trust &lt;nick&gt; &lt;fp1&gt; &lt;fp2&gt; &lt;fp3&gt; &lt;fp4&gt; &lt;fp5&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Manually affirms trust in the specified fingerprint, given as five blocks of precisely eight (hexadecimal) digits each.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="info">
-			<syntax>otr info</syntax>
-			<syntax>otr info &lt;nick&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Shows information about the OTR state. The first form lists our private keys and current OTR contexts. The second form displays information about the connection with a given user, including the list of their known fingerprints.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="keygen">
-			<syntax>otr keygen &lt;account-no&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Generates a new OTR private key for the given account.
-				</para>
-				
-			</description>
-		
-		</bitlbee-command>
-		
-		<bitlbee-command name="forget">
-			<syntax>otr forget &lt;thing&gt; &lt;arguments&gt;</syntax>
-			
-			<description>
-			
-				<para>
-					Forgets some part of our OTR userstate. Available things: fingerprint, context, and key. See <emphasis>help otr forget &lt;thing&gt;</emphasis> for more information.
-				</para>
-			
-			</description>
-			
-			<bitlbee-command name="fingerprint">
-				<syntax>otr forget fingerprint &lt;nick&gt; &lt;fingerprint&gt;</syntax>
-				
-				<description>
-				
-					<para>
-						Drops the specified fingerprint from the given user's OTR connection context. It is allowed to specify only a (unique) prefix of the desired fingerprint.
-					</para>
-					
-				</description>
-				
-			</bitlbee-command>
-				
-			<bitlbee-command name="context">
-				<syntax>otr forget context &lt;nick&gt;</syntax>
-				
-				<description>
-				
-					<para>
-						Forgets the entire OTR context associated with the given user. This includes current message and protocol states, as well as any fingerprints for that user.
-					</para>
-					
-				</description>
-				
-			</bitlbee-command>
-
-			<bitlbee-command name="key">
-				<syntax>otr forget key &lt;fingerprint&gt;</syntax>
-				
-				<description>
-				
-					<para>
-						Forgets an OTR private key matching the specified fingerprint. It is allowed to specify only a (unique) prefix of the fingerprint.
-					</para>
-					
-				</description>
-				
-			</bitlbee-command>
-		
-		</bitlbee-command>
-		
+		</description>
 	</bitlbee-command>
 
 	<bitlbee-command name="set">
 		<short-description>Miscellaneous settings</short-description>
-		<syntax>set</syntax>
-		<syntax>set &lt;variable&gt;</syntax>
-		<syntax>set &lt;variable&gt; &lt;value&gt;</syntax>
-		<syntax>set -del &lt;variable&gt;</syntax>
-
-		<description>
-
-			<para>
-				Without any arguments, this command lists all the set variables. You can also specify a single argument, a variable name, to get that variable's value. To change this value, specify the new value as the second argument. With <emphasis>-del</emphasis> you can reset a setting to its default value.
+		<syntax>set [&lt;variable&gt; [&lt;value&gt;]]</syntax>
+
+		<description>
+
+			<para>
+				Without any arguments, this command lists all the set variables. You can also specify a single argument, a variable name, to get that variable's value. To change this value, specify the new value as the second argument.
 			</para>
 
@@ -594,5 +234,5 @@
 
 		<ircexample>
-			<ircline nick="jelmer">help set private</ircline>
+			<ircline nick="ctrlsoft">help set private</ircline>
 		</ircexample>
 
@@ -622,43 +262,145 @@
 	</bitlbee-command>
 
-	<bitlbee-setting name="account" type="string" scope="channel">
-
-		<description>
-			<para>
-				For control channels with <emphasis>fill_by</emphasis> set to <emphasis>account</emphasis>: Set this setting to the account id (numeric, or part of the username) of the account containing the contacts you want to see in this channel.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="allow_takeover" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				When you're already connected to a BitlBee server and you connect (and identify) again, BitlBee will offer to migrate your existing session to the new connection. If for whatever reason you don't want this, you can disable this setting.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="always_use_nicks" type="boolean" scope="channel">
-		<default>false</default>
-
-		<description>
-			<para>
-				Jabber groupchat specific. This setting ensures that the nicks defined by the other members of a groupchat are used, instead of the username part of their JID. This only applies to groupchats where their real JID is known (either "non-anonymous" ones, or "semi-anonymous" from the point of view of the channel moderators)
-			</para>
-
-			<para>
-				Enabling this may have the side effect of changing the nick of existing contacts, either in your buddy list or in other groupchats. If a contact is in multiple groupchats with different nicks, enabling this setting for all those would result in multiple nick changes when joining, and the order of those changes may vary.
-			</para>
-
-			<para>
-				Note that manual nick changes done through the <emphasis>rename</emphasis> command always take priority
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="auto_connect" type="boolean" scope="account,global">
-		<default>true</default>
+	<bitlbee-setting name="charset" type="string">
+		<default>iso8859-1</default>
+		<possible-values>you can get a list of all possible values by doing 'iconv -l' in a shell</possible-values>
+
+		<description>
+			<para>
+				The charset setting enables you to use different character sets in BitlBee. These get converted to UTF-8 before sending and from UTF-8 when receiving.
+			</para>
+
+			<para>
+				If you don't know what's the best value for this, at least iso8859-1 is the best choice for most Western countries. You can try to find what works best for you on http://czyborra.com/charsets/iso8859.html
+			</para>
+		</description>
+
+	</bitlbee-setting>
+
+	<bitlbee-setting name="private" type="boolean">
+		<default>True</default>
+
+		<description>
+
+			<para>
+				If value is true, messages from users will appear in separate query windows. If false, messages from users will appear in the control channel.
+			</para>
+
+			<para>
+				This setting is remembered (during one session) per-user, this setting only changes the default state. This option takes effect as soon as you reconnect.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="save_on_quit" type="boolean">
+		<default>True</default>
+
+		<description>
+			<para>
+				If enabled causes BitlBee to save all current settings and account details when user disconnects. This is enabled by default, and these days there's not really a reason to have it disabled anymore.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="html" type="string">
+		<default>nostrip</default>
+		<possible-values>strip, nostrip</possible-values>
+
+		<description>
+			<para>
+				Determines what BitlBee should do with HTML in messages. If set to nostrip, HTML in messages will not be touched. If set to strip, all HTML will be stripped from messages. Unfortunately this sometimes strips too much.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="debug" type="boolean">
+		<default>False</default>
+
+		<description>
+			<para>
+				Some debugging messages can be sent to the control channel if you wish. They're probably not really useful for you, unless you're doing some development on BitlBee.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="to_char" type="string">
+		<default>": "</default>
+
+		<description>
+
+			<para>
+				It's customary that messages meant for one specific person on an IRC channel are prepended by his/her alias followed by a colon ':'. BitlBee does this by default. If you prefer a different character, you can set it using <emphasis>set to_char</emphasis>.
+			</para>
+
+			<para>
+				Please note that this setting is only used for incoming messages. For outgoing messages you can use ':' (colon) or ',' to separate the destination nick from the message, and this is not configurable.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="typing_notice" type="boolean">
+		<default>False</default>
+
+		<description>
+			<para>
+				Sends you a /notice when a user starts typing a message (if the protocol supports it, MSN for example). This is a bug, not a feature. (But please don't report it.. ;-) You don't want to use it. Really. In fact the typing-notification is just one of the least useful 'innovations' ever. It's just there because some guy will probably ask me about it anyway. ;-)
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="ops" type="string">
+		<default>both</default>
+		<possible-values>both, root, user, none</possible-values>
+
+		<description>
+			<para>
+				Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting.
+			</para>
+
+			<para>
+				The value "both" means both user and root get ops. "root" means, well, just root. "user" means just the user. "none" means nobody will get operator status.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="away_devoice" type="boolean">
+		<default>True</default>
+
+		<description>
+			<para>
+				With this option enabled, the root user devoices people when they go away (just away, not offline) and gives the voice back when they come back. You might dislike the voice-floods you'll get if your contact list is huge, so this option can be disabled.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="handle_unknown" type="string">
+		<default>root</default>
+		<possible-values>root, add, add_private, add_channel, ignore</possible-values>
+
+		<description>
+			<para>
+				Messages from unknown users are echoed like this by default:
+			</para>
+
+			<ircexample>
+				<ircline nick="root">Unknown message from handle 3137137:</ircline>
+				<ircline nick="root">j0000! 1 4m l33t h4x0r! kill me!</ircline>
+			</ircexample>
+
+			<para>
+				If you want this lame user to be added automatically, you can set this setting to "add". If you prefer to ignore messages from people you don't know, you can set this one to "ignore". "add_private" and "add_channel" are like add, but you can use them to make messages from unknown buddies appear in the channel instead of a query window.
+			</para>
+
+			<note>
+				<para>
+					Auto-added users aren't added to your real contact list. This is because you don't want the user to get authorization requests. So when you restart BitlBee, the auto-added user will be gone. If you want to keep the person in your buddy-list, you have to fixate the add using the <emphasis>add</emphasis> command.
+				</para>
+			</note>
+		</description>
+
+	</bitlbee-setting>
+
+	<bitlbee-setting name="auto_connect" type="boolean">
+		<default>True</default>
 
 		<description>
@@ -666,23 +408,9 @@
 				With this option enabled, when you identify BitlBee will automatically connect to your accounts, with this disabled it will not do this.
 			</para>
-			
-			<para>
-				This setting can also be changed for specific accounts using the <emphasis>account set</emphasis> command. (However, these values will be ignored if the global <emphasis>auto_connect</emphasis> setting is disabled!)
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="auto_join" type="boolean" scope="channel">
-		<default>false</default>
-
-		<description>
-			<para>
-				With this option enabled, BitlBee will automatically join this channel when you log in.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="auto_reconnect" type="boolean" scope="account,global">
-		<default>true</default>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="auto_reconnect" type="boolean">
+		<default>False</default>
 
 		<description>
@@ -694,21 +422,15 @@
 				See also the <emphasis>auto_reconnect_delay</emphasis> setting.
 			</para>
-
-			<para>
-				This setting can also be changed for specific accounts using the <emphasis>account set</emphasis> command. (However, these values will be ignored if the global <emphasis>auto_reconnect</emphasis> setting is disabled!)
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="auto_reconnect_delay" type="string" scope="global">
-		<default>5*3&lt;900</default>
-
-		<description>
-			<para>
-				Tell BitlBee after how many seconds it should attempt to bring a broken IM-connection back up.
-			</para>
-
-			<para>
-				This can be one integer, for a constant delay. One can also set it to something like &quot;10*10&quot;, which means wait for ten seconds on the first reconnect, multiply it by ten on every failure. Once successfully connected, this delay is re-set to the initial value. With &lt; you can give a maximum delay.
+		</description>
+
+	</bitlbee-setting>
+
+	<bitlbee-setting name="auto_reconnect_delay" type="integer">
+		<default>300</default>
+
+		<description>
+
+			<para>
+				Tell BitlBee after how many seconds it should attempt to bring an IM-connection back up after a crash. It's not a good idea to set this value very low, it will cause too much useless traffic when an IM-server is down for a few hours.
 			</para>
 
@@ -719,171 +441,39 @@
 	</bitlbee-setting>
 
-	<bitlbee-setting name="auto_reply_timeout" type="integer" scope="account">
-		<default>10800</default>
-
-		<description>
-			<para>
-				For Twitter accounts: If you respond to Tweets IRC-style (like "nickname: reply"), this will automatically be converted to the usual Twitter format ("@screenname reply").
-			</para>
-
-			<para>
-				By default, BitlBee will then also add a reference to that person's most recent Tweet, unless that message is older than the value of this setting in seconds.
-			</para>
-
-			<para>
-				If you want to disable this feature, just set this to 0. Alternatively, if you want to write a message once that is <emphasis>not</emphasis> a reply, use the Twitter reply syntax (@screenname).
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="away" type="string" scope="account,global">
-		<description>
-			<para>
-				To mark yourself as away, it is recommended to just use <emphasis>/away</emphasis>, like on normal IRC networks. If you want to mark yourself as away on only one IM network, you can use this per-account setting.
-			</para>
-
-			<para>
-				You can set it to any value and BitlBee will try to map it to the most appropriate away state for every open IM connection, or set it as a free-form away message where possible.
-			</para>
-
-			<para>
-				Any per-account away setting will override globally set away states. To un-set the setting, use <emphasis>set -del away</emphasis>.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="away_devoice" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				With this option enabled, the root user devoices people when they go away (just away, not offline) and gives the voice back when they come back. You might dislike the voice-floods you'll get if your contact list is huge, so this option can be disabled.
-			</para>
-			
-			<para>
-				Replaced with the <emphasis>show_users</emphasis> setting. See <emphasis>help show_users</emphasis>.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="away_reply_timeout" type="integer" scope="global">
-		<default>3600</default>
-
-		<description>
-			<para>
-				Most IRC servers send a user's away message every time s/he gets a private message, to inform the sender that they may not get a response immediately. With this setting set to 0, BitlBee will also behave like this.
-			</para>
-
-			<para>
-				Since not all IRC clients do an excellent job at suppressing these messages, this setting lets BitlBee do it instead. BitlBee will wait this many seconds (or until the away state/message changes) before re-informing you that the person's away.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="base_url" type="string" scope="account">
-		<default>http://api.twitter.com/1</default>
-
-		<description>
-			<para>
-				There are more services that understand the Twitter API than just Twitter.com. BitlBee can connect to all Twitter API implementations.
-			</para>
-
-			<para>
-				For example, set this setting to <emphasis>http://identi.ca/api</emphasis> to use Identi.ca.
-			</para>
-
-			<para>
-				Keep two things in mind: When not using Twitter, you <emphasis>must</emphasis> also disable the <emphasis>oauth</emphasis> setting as it currently only works with Twitter. If you're still having issues, make sure there is <emphasis>no</emphasis> slash at the end of the URL you enter here.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="carbons" type="boolean" scope="account">
-		<default>true</default>
-
-		<description>
-			<para>
-				Jabber specific. "Message carbons" (XEP-0280) is a server feature to get copies of outgoing messages sent from other clients connected to the same account. It's not widely supported by most public XMPP servers (easier if you host your own), but this will probably change in the next few years.
-			</para>
-			<para>
-				This defaults to true, which will enable it if the server supports it, or fail silently if it's not. This setting only exists to allow disabling the feature if anyone considers it undesirable.
-			</para>
-			<para>
-				See also the <emphasis>self_messages</emphasis> setting.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="charset" type="string" scope="global">
-		<default>utf-8</default>
-		<possible-values>you can get a list of all possible values by doing 'iconv -l' in a shell</possible-values>
-
-		<description>
-			<para>
-				This setting tells BitlBee what your IRC client sends and expects. It should be equal to the charset setting of your IRC client if you want to be able to send and receive non-ASCII text properly.
-			</para>
-
-			<para>
-				Most systems use UTF-8 these days. On older systems, an iso8859 charset may work better. For example, iso8859-1 is the best choice for most Western countries. You can try to find what works best for you on http://www.unicodecharacter.com/charsets/iso8859.html
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="color_encrypted" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				If set to true, BitlBee will color incoming encrypted messages according to their fingerprint trust level: untrusted=red, trusted=green.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="chat_type" type="string" scope="channel">
-		<default>groupchat</default>
-		<possible-values>groupchat, room</possible-values>
-
-		<description>
-			<para>
-				There are two kinds of chat channels: simple groupchats (basically normal IM chats with more than two participants) and names chatrooms, more similar to IRC channels.
-			</para>
-			
-			<para>
-				BitlBee supports both types. With this setting set to <emphasis>groupchat</emphasis> (the default), you can just invite people into the room and start talking.
-			</para>
-			
-			<para>
-				For setting up named chatrooms, it's currently easier to just use the <emphasis>chat add</emphasis> command.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="commands" type="boolean" scope="account">
-		<default>true</default>
-		<possible-values>true, false, strict</possible-values>
-
-		<description>
-			<para>
-				With this setting enabled, you can use some commands in your Twitter channel/query. See <emphasis>help twitter</emphasis> for the list of extra commands available.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="debug" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				Some debugging messages can be logged if you wish. They're probably not really useful for you, unless you're doing some development on BitlBee.
-			</para>
-			
-			<para>
-				This feature is not currently used for anything so don't expect this to generate any output.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="default_target" type="string" scope="global">
+	<bitlbee-setting name="buddy_sendbuffer" type="boolean">
+		<default>False</default>
+
+		<description>
+
+			<para>
+				By default, when you send a message to someone, BitlBee forwards this message to the user immediately. When you paste a large number of lines, the lines will be sent in separate messages, which might not be very nice to read. If you enable this setting, BitlBee will buffer your messages and wait for more data.
+			</para>
+
+			<para>
+				Using the <emphasis>buddy_sendbuffer_delay</emphasis> setting you can specify the number of seconds BitlBee should wait for more data before the complete message is sent.
+			</para>
+
+			<para>
+				Please note that if you remove a buddy from your list (or if the connection to that user drops) and there's still data in the buffer, this data will be lost. BitlBee will not try to send the message to the user in those cases.
+			</para>
+		</description>
+
+	</bitlbee-setting>
+
+	<bitlbee-setting name="buddy_sendbuffer_delay" type="integer">
+		<description>
+
+			<para>
+				Tell BitlBee after how many seconds a buffered message should be sent.
+			</para>
+
+			<para>
+				See also the <emphasis>buddy_sendbuffer</emphasis> setting.
+			</para>
+		</description>
+
+	</bitlbee-setting>
+
+	<bitlbee-setting name="default_target" type="string">
 		<default>root</default>
 		<possible-values>root, last</possible-values>
@@ -891,465 +481,27 @@
 		<description>
 			<para>
-				With this value set to <emphasis>root</emphasis>, lines written in a control channel without any nickname in front of them will be interpreted as commands. If you want BitlBee to send those lines to the last person you addressed in that control channel, set this to <emphasis>last</emphasis>.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="display_name" type="string" scope="account">
-		<description>
-			<para>
-				Currently only available for jabber groupchats.
-			</para>
-			<para>
-				For jabber groupchats: this sets the default value of 'nick' for newly created groupchats. There is no way to set an account-wide nick.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="display_namechanges" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name".
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="display_timestamps" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				When incoming messages are old (i.e. offline messages and channel backlogs), BitlBee will prepend them with a timestamp. If you find them ugly or useless, you can use this setting to hide them.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="fill_by" type="string" scope="channel">
-		<default>all</default>
-		<possible-values>all, group, account, protocol</possible-values>
-
-		<description>
-			<para>
-				For control channels only: This setting determines which contacts the channel gets populated with.
-			</para>
-
-			<para>
-				By default, control channels will contain all your contacts. You instead select contacts by buddy group, IM account or IM protocol.
-			</para>
-			
-			<para>
-				Change this setting and the corresponding <emphasis>account</emphasis>/<emphasis>group</emphasis>/<emphasis>protocol</emphasis> setting to set up this selection.
-			</para>
-			
-			<para>
-				With a ! prefix an inverted channel can be created, for example with this setting set to <emphasis>!group</emphasis> you can create a channel with all users <emphasis>not</emphasis> in that group.
-			</para>
-			
-			<para>
-				Note that, when creating a new channel, BitlBee will try to preconfigure the channel for you, based on the channel name. See <emphasis>help channels</emphasis>.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="group" type="string" scope="channel">
-
-		<description>
-			<para>
-				For control channels with <emphasis>fill_by</emphasis> set to <emphasis>group</emphasis>: Set this setting to the name of the group containing the contacts you want to see in this channel.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="handle_unknown" type="string" scope="account,global">
-		<default>add_channel</default>
-		<possible-values>add_private, add_channel, ignore</possible-values>
-
-		<description>
-			<para>
-				By default, messages from people who aren't in your contact list are shown in a control channel (add_channel) instead of as a private message (add_private)
-			</para>
-
-			<para>
-				If you prefer to ignore messages from people you don't know, you can set this one to "ignore". "add_private" and "add_channel" are like add, but you can use them to make messages from unknown buddies appear in the channel instead of a query window.
-			</para>
-
-			<para>
-				This can be set to individual accounts, which is useful to only ignore accounts that are targeted by spammers, without missing messages from legitimate unknown contacts in others. Note that incoming add requests are visible regardless of this setting.
-			</para>
-
-			<note>
-				<para>
-					Although these users will appear in your control channel, they aren't added to your real contact list. When you restart BitlBee, these auto-added users will be gone. If you want to keep someone in your list, you have to fixate the add using the <emphasis>add</emphasis> command.
-				</para>
-			</note>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="mail_notifications" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				Some protocols can notify via IM about new e-mail. If you want these notifications, you can enable this setting.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="mail_notifications_handle" type="string" scope="account">
-		<default>empty</default>
-
-		<description>
-			<para>
-				This setting is available for protocols with e-mail notification functionality. If set to empty all e-mail notifications will go to control channel, if set to some string - this will be the name of a contact who will PRIVMSG you on every new notification.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="message_length" type="integer" scope="account">
-		<default>280</default>
-
-		<description>
-			<para>
-				Since Twitter rejects messages longer than 280 characters, BitlBee can count message length and emit a warning instead of waiting for Twitter to reject it.
-			</para>
-
-			<para>
-				You can change this limit here but this won't disable length checks on Twitter's side. You can also set it to 0 to disable the check in case you believe BitlBee doesn't count the characters correctly.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="stream" type="boolean" scope="account">
-		<default>true</default>
-
-		<description>
-			<para>
-				For Twitter accounts, this setting enables use of the Streaming API. This automatically gives you incoming DMs as well.
-			</para>
-			
-			<para>
-				For other Twitter-like services, this setting is not supported.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-	
-	<bitlbee-setting name="target_url_length" type="integer" scope="account">
-		<default>20</default>
-
-		<description>
-			<para>
-				Twitter replaces every URL with fixed-length t.co URLs. BitlBee is able to take t.co urls into account when calculating <emphasis>message_length</emphasis> replacing the actual URL length with target_url_length. Setting target_url_length to 0 disables this feature.
-			</para>
-
-			<para>
-				This setting is disabled for identica accounts by default and will not affect anything other than message safety checks (i.e. Twitter will still replace your URLs with t.co links, even if that makes them longer).
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="mode" type="string" scope="account">
-		<possible-values>one, many, chat</possible-values>
-		<default>chat</default>
-
-		<description>
-			<para>
-				By default, BitlBee will create a separate channel (called #twitter_yourusername) for all your Twitter contacts/messages.
-			</para>
-
-			<para>
-				If you don't want an extra channel, you can set this setting to "one" (everything will come from one nick, twitter_yourusername), or to "many" (individual nicks for everyone).
-			</para>
-			
-			<para>
-				With modes "chat" and "many", you can send direct messages by /msg'ing your contacts directly. Incoming DMs are only fetched if the "stream" setting is on (default).
-			</para>
-			
-			<para>
-				With modes "many" and "one", you can post tweets by /msg'ing the twitter_yourusername contact. In mode "chat", messages posted in the Twitter channel will also be posted as tweets.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="mobile_is_away" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				Most IM networks have a mobile version of their client. People who use these may not be paying that much attention to messages coming in. By enabling this setting, people using mobile clients will always be shown as away.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="nick" type="string" scope="chat">
-		<description>
-			<para>
-				You can use this option to set your nickname in a chatroom. You won't see this nickname yourself, but other people in the room will. By default, BitlBee will use your username as the chatroom nickname.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="nick_format" type="string" scope="account,global">
-		<default>%-@nick</default>
-
-		<description>
-			<para>
-				By default, BitlBee tries to derive sensible nicknames for all your contacts from their IM handles. In some cases, IM modules (ICQ for example) will provide a nickname suggestion, which will then be used instead. This setting lets you change this behaviour.
-			</para>
-
-			<para>
-				Whenever this setting is set for an account, it will be used for all its contacts. If it's not set, the global value will be used.
-			</para>
-
-			<para>
-				It's easier to describe this setting using a few examples:
-			</para>
-
-			<para>
-				FB-%full_name will make all nicknames start with "FB-", followed by the person's full name. For example you can set this format for your Facebook account so all Facebook contacts are clearly marked.
-			</para>
-
-			<para>
-				[%group]%-@nick will make all nicknames start with the group the contact is in between square brackets, followed by the nickname suggestions from the IM module if available, or otherwise the handle. Because of the "-@" part, everything from the first @ will be stripped.
-			</para>
-
-			<para>
-				See <emphasis>help nick_format</emphasis> for more information.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="nick_source" type="string" scope="account">
-		<default>handle</default>
-		<possible-values>handle, full_name, first_name</possible-values>
-
-		<description>
-			<para>
-				By default, BitlBee generates a nickname for every contact by taking its handle and chopping off everything after the @. In some cases, this gives very inconvenient nicknames. Some servers use internal identifiers, which are often just numbers.
-			</para>
-
-			<para>
-				With this setting set to <emphasis>full_name</emphasis>, the person's full name is used to generate a nickname. Or if you don't like long nicknames, set this setting to <emphasis>first_name</emphasis> instead and only the first word will be used. Note that the full name can be full of non-ASCII characters which will be stripped off.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="nick_lowercase" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				If enabled, all nicknames are turned into lower case.
-			</para>
-
-			<para>
-				See also the <emphasis>nick_underscores</emphasis> setting. This setting was previously known as <emphasis>lcnicks</emphasis>.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="nick_underscores" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				If enabled, spaces in nicknames are turned into underscores instead of being stripped.
-			</para>
-
-			<para>
-				See also the <emphasis>nick_lowercase</emphasis> setting.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="oauth" type="boolean" scope="account">
-		<default>true</default>
-
-		<description>
-			<para>
-				This enables OAuth authentication for an IM account; right now the Twitter (working for Twitter only) and Jabber (for Google Talk only) module support it.
-			</para>
-
-			<para>
-				With OAuth enabled, you shouldn't tell BitlBee your account password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with the service. If this succeeds, you will get a PIN code which you can give back to BitlBee to finish the process.
-			</para>
-
-			<para>
-				The resulting access token will be saved permanently, so you have to do this only once. If for any reason you want to/have to reauthenticate, you can use <emphasis>account set</emphasis> to reset the account password to something random.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="anonymous" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				This enables SASL ANONYMOUS login for jabber accounts, as specified by XEP-0175.
-			</para>
-
-			<para>
-				With this setting enabled, if the server allows this method, a password isn't required and the username part of the JID is ignored (you can use anonymous@jabber.example.com). Servers will usually assign you a random numeric username instead.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="ops" type="string" scope="global">
-		<default>both</default>
-		<possible-values>both, root, user, none</possible-values>
-
-		<description>
-			<para>
-				Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can change these states using this setting.
-			</para>
-
-			<para>
-				The value "both" means both user and root get ops. "root" means, well, just root. "user" means just the user. "none" means nobody will get operator status.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="otr_policy" type="string" scope="global">
-		<default>opportunistic</default>
-		<possible-values>never, opportunistic, manual, always</possible-values>
-
-		<description>
-			<para>
-				This setting controls the policy for establishing Off-the-Record connections.
-			</para>
-			<para>
-				A value of "never" effectively disables the OTR subsystem. In "opportunistic" mode, a magic whitespace pattern will be appended to the first message sent to any user. If the peer is also running opportunistic OTR, an encrypted connection will be set up automatically. On "manual", on the other hand, OTR connections must be established explicitly using <emphasis>otr connect</emphasis>. Finally, the setting "always" enforces encrypted communication by causing BitlBee to refuse to send any cleartext messages at all.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="password" type="string" scope="account,global">
-		<description>
-			<para>
-				Use this global setting to change your "NickServ" password.
-			</para>
-			
-			<para>
-				This setting is also available for all IM accounts to change the password BitlBee uses to connect to the service.
-			</para>
-			
-			<para>
-				Note that BitlBee will always say this setting is empty. This doesn't mean there is no password, it just means that, for security reasons, BitlBee stores passwords somewhere else so they can't just be retrieved in plain text.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="paste_buffer" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				By default, when you send a message to someone, BitlBee forwards this message to the user immediately. When you paste a large number of lines, the lines will be sent in separate messages, which might not be very nice to read. If you enable this setting, BitlBee will buffer your messages and wait for more data.
-			</para>
-
-			<para>
-				Using the <emphasis>paste_buffer_delay</emphasis> setting you can specify the number of seconds BitlBee should wait for more data before the complete message is sent.
-			</para>
-
-			<para>
-				Please note that if you remove a buddy from your list (or if the connection to that user drops) and there's still data in the buffer, this data will be lost. BitlBee will not try to send the message to the user in those cases.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="paste_buffer_delay" type="integer" scope="global">
-		<default>200</default>
-
-		<description>
-
-			<para>
-				Tell BitlBee after how many (mili)seconds a buffered message should be sent. Values greater than 5 will be interpreted as miliseconds, 5 and lower as seconds.
-			</para>
-
-			<para>
-				See also the <emphasis>paste_buffer</emphasis> setting.
-			</para>
-		</description>
-	</bitlbee-setting>
-	
-	<bitlbee-setting name="port" type="integer" scope="account">
-		<description>
-			<para>
-				Currently only available for Jabber connections. Specifies the port number to connect to. Usually this should be set to 5222, or 5223 for SSL-connections.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="priority" type="integer" scope="account">
-		<default>0</default>
-
-		<description>
-			<para>
-				Can be set for Jabber connections. When connecting to one account from multiple places, this priority value will help the server to determine where to deliver incoming messages (that aren't addressed to a specific resource already).
-			</para>
-
-			<para>
-				According to RFC 3921 servers will always deliver messages to the server with the highest priority value. Mmessages will not be delivered to resources with a negative priority setting (and should be saved as an off-line message if all available resources have a negative priority value).
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="private" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				If value is true, messages from users will appear in separate query windows. If false, messages from users will appear in a control channel.
-			</para>
-
-			<para>
-				This setting is remembered (during one session) per-user, this setting only changes the default state. This option takes effect as soon as you reconnect.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="protocol" type="string" scope="channel">
-
-		<description>
-			<para>
-				For control channels with <emphasis>fill_by</emphasis> set to <emphasis>protocol</emphasis>: Set this setting to the name of the IM protocol of all contacts you want to see in this channel.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="proxy" type="string" scope="account">
-		<default>&lt;local&gt;&lt;auto&gt;</default>
-
-		<description>
-			<para>
-				A list of <emphasis>file transfer proxies</emphasis> for jabber. This isn't the connection proxy. Sorry, look in bitlbee.conf for those.
-			</para>
-
-			<para>
-				It's a semicolon-separated list of items that can be either <emphasis>JID,HOST,PORT</emphasis> or two special values, <emphasis>&lt;local&gt;</emphasis> (to try a direct connection first) and <emphasis>&lt;auto&gt;</emphasis> (to try to discover a proxy). For example, "&lt;local&gt;;proxy.somewhere.org,123.123.123.123,7777".
-			</para>
-			<para>
-				The address should point to a SOCKS5 bytestreams server, usually provided by jabber servers. This is only used for sending files. Note that the host address might not match what DNS tells you, and the port isn't always the same.
-			</para>
-			<para>
-				The correct way to get a socks proxy host/port is a mystery, and the file transfer might fail anyway. Maybe just try using dropbox instead.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="query_order" type="string" scope="global">
+				With this value set to <emphasis>root</emphasis>, lines written in the control channel without any nickname in front of them will be interpreted as commands. If you want BitlBee to send those lines to the last person you addressed in the control channel, set this to <emphasis>last</emphasis>.
+			</para>
+		</description>
+
+	</bitlbee-setting>
+
+	<bitlbee-setting name="display_namechanges" type="boolean">
+		<default>False</default>
+
+		<para>
+			With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name".
+		</para>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="password" type="string">
+		<description>
+			<para>
+				Use this setting to change your "NickServ" password.
+			</para>
+		</description>
+	</bitlbee-setting>
+
+	<bitlbee-setting name="query_order" type="string">
 		<default>lifo</default>
 		<possible-values>lifo, fifo</possible-values>
@@ -1366,373 +518,13 @@
 	</bitlbee-setting>
 
-	<bitlbee-setting name="resource" type="string" scope="account">
-		<default>BitlBee</default>
-
-		<description>
-			<para>
-				Can be set for Jabber connections. You can use this to connect to your Jabber account from multiple clients at once, with every client using a different resource string.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="resource_select" type="string" scope="account">
-		<default>activity</default>
-		<possible-values>priority, activity</possible-values>
-
-		<description>
-			<para>
-				Because the IRC interface makes it pretty hard to specify the resource to talk to (when a buddy is online through different resources), this setting was added.
-			</para>
-
-			<para>
-				Normally it's set to <emphasis>priority</emphasis> which means messages will always be delivered to the buddy's resource with the highest priority. If the setting is set to <emphasis>activity</emphasis>, messages will be delivered to the resource that was last used to send you a message (or the resource that most recently connected).
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="root_nick" type="string" scope="global">
-		<default>root</default>
-
-		<description>
-			<para>
-				Normally the "bot" that takes all your BitlBee commands is called "root". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="save_on_quit" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				If enabled causes BitlBee to save all current settings and account details when user disconnects. This is enabled by default, and these days there's not really a reason to have it disabled anymore.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="self_messages" type="string" scope="global">
-		<default>true</default>
-		<possible-values>true, false, prefix, prefix_notice</possible-values>
-
-		<description>
-			<para>
-				Change this setting to customize how (or whether) to show self-messages, which are messages sent by yourself from other locations (for example, mobile clients), for IM protocols that support it.
-			</para>
-
-			<para>
-				When this is set to "true", it will send those messages in the "standard" way, which is a PRIVMSG with source and target fields swapped.
-			</para>
-			
-			<para>
-				Since this isn't very well supported by some clients (the messages might appear in the wrong window), you can set it to "prefix" to show them as a normal message prefixed with "-> ", or use "prefix_notice" which is the same thing but with a NOTICE instead.
-			</para>
-
-			<para>
-				You can also set it to "false" to disable these messages completely.
-			</para>
-
-			<para>
-				This setting only applies to private messages. Self messages in groupchats are always shown, since they haven't caused issues in any clients so far.
-			</para>
-
-			<para>
-				More information: <emphasis>https://wiki.bitlbee.org/SelfMessages</emphasis>
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="server" type="string" scope="account">
-		<description>
-			<para>
-				Can be set for Jabber-connections. You might have to set this if the servername isn't equal to the part after the @ in the Jabber handle.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="show_ids" type="boolean" scope="account">
-		<default>true</default>
-
-		<description>
-			<para>
-				Enable this setting on a Twitter account to have BitlBee include a two-digit "id" in front of every message. This id can then be used for replies and retweets.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="show_offline" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				If enabled causes BitlBee to also show offline users in Channel. Online-users will get op, away-users voice and offline users none of both. This option takes effect as soon as you reconnect.
-			</para>
-			
-			<para>
-				Replaced with the <emphasis>show_users</emphasis> setting. See <emphasis>help show_users</emphasis>.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="show_users" type="string" scope="channel">
-		<default>online+,special%,away</default>
-
-		<description>
-			<para>
-				Comma-separated list of statuses of users you want in the channel,
-				and any modes they should have. The following statuses are currently
-				recognised: <emphasis>online</emphasis> (i.e. available, not
-				away), <emphasis>special</emphasis> (specific to the protocol), 
-				<emphasis>away</emphasis>, and <emphasis>offline</emphasis>.
-			</para>
-			
-			<para>
-				If a status is followed by a valid channel mode character
-				(@, % or +), it will be given to users with that status.
-				For example, <emphasis>online@,special%,away+,offline</emphasis> 
-				will show all users in the channel. Online people will
-				have +o, people who are online but away will have +v,
-				and others will have no special modes.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="simulate_netsplit" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				Some IRC clients parse quit messages sent by the IRC server to see if someone really left or just disappeared because of a netsplit. By default, BitlBee tries to simulate netsplit-like quit messages to keep the control channels window clean. If you don't like this (or if your IRC client doesn't support this) you can disable this setting.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="ssl" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				Currently only available for Jabber connections. Set this to true if you want to connect to the server on an SSL-enabled port (usually 5223).
-			</para>
-
-			<para>
-				Please note that this method of establishing a secure connection to the server has long been deprecated. You are encouraged to look at the <emphasis>tls</emphasis> setting instead.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="status" type="string" scope="account,global">
-		<description>
-			<para>
-				Most IM protocols support status messages, similar to away messages. They can be used to indicate things like your location or activity, without showing up as away/busy.
-			</para>
-
-			<para>
-				This setting can be used to set such a message. It will be available as a per-account setting for protocols that support it, and also as a global setting (which will then automatically be used for all protocols that support it).
-			</para>
-
-			<para>
-				Away states set using <emphasis>/away</emphasis> or the <emphasis>away</emphasis> setting will override this setting. To clear the setting, use <emphasis>set -del status</emphasis>.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="strip_html" type="boolean" scope="global">
-		<default>true</default>
-
-		<description>
-			<para>
-				Determines what BitlBee should do with HTML in messages. Normally this is turned on and HTML will be stripped from messages, if BitlBee thinks there is HTML.
-			</para>
-			<para>
-				If BitlBee fails to detect this sometimes (most likely in AIM messages over an ICQ connection), you can set this setting to <emphasis>always</emphasis>, but this might sometimes accidentally strip non-HTML things too.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="strip_newlines" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				Turn on this flag to prevent tweets from spanning over multiple lines.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="show_old_mentions" type="integer" scope="account">
-		<default>20</default>
-
-		<description>
-			<para>
-				This setting specifies the number of old mentions to fetch on connection. Must be less or equal to 200. Setting it to 0 disables this feature.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="tag" type="string" scope="account">
-		<description>
-			<para>
-				For every account you have, you can set a tag you can use to uniquely identify that account. This tag can be used instead of the account number (or protocol name, or part of the screenname) when using commands like <emphasis>account</emphasis>, <emphasis>add</emphasis>, etc. You can't have two accounts with one and the same account tag.
-			</para>
-
-			<para>
-				By default, it will be set to the name of the IM protocol. Once you add a second account on an IM network, a numeric suffix will be added, starting with 2.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="timezone" type="string" scope="global">
-		<default>local</default>
-		<possible-values>local, utc, gmt, timezone-spec</possible-values>
-
-		<description>
-			<para>
-				If message timestamps are available for offline messages or chatroom backlogs, BitlBee will display them as part of the message. By default it will use the local timezone. If you're not in the same timezone as the BitlBee server, you can adjust the timestamps using this setting.
-			</para>
-
-			<para>
-				Values local/utc/gmt should be self-explanatory. timezone-spec is a time offset in hours:minutes, for example: -8 for Pacific Standard Time, +2 for Central European Summer Time, +5:30 for Indian Standard Time.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="tls" type="boolean" scope="account">
-		<default>true</default>
-
-		<description>
-			<para>
-				By default (with this setting enabled), BitlBee will require Jabber servers to offer encryption via StartTLS and refuse to connect if they don't.
-			</para>
-
-			<para>
-				If you set this to "try", BitlBee will use StartTLS only if it's offered. With the setting disabled, StartTLS support will be ignored and avoided entirely.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="tls_verify" type="boolean" scope="account">
-		<default>true</default>
-
-		<description>
-			<para>
-				Currently only available for Jabber connections in combination with the <emphasis>tls</emphasis> setting. Set this to <emphasis>true</emphasis> if you want BitlBee to strictly verify the server's certificate against a list of trusted certificate authorities.
-			</para>
-
-			<para>
-				The hostname used in the certificate verification is the value of the <emphasis>server</emphasis> setting if the latter is nonempty and the domain of the username else. If you get a hostname related error when connecting to Google Talk with a username from the gmail.com or googlemail.com domain, please try to empty the <emphasis>server</emphasis> setting.
-			</para>
-
-			<para>
-				Please note that no certificate verification is performed when the <emphasis>ssl</emphasis> setting is used, or when the <emphasis>CAfile</emphasis> setting in <emphasis>bitlbee.conf</emphasis> is not set.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="to_char" type="string" scope="global">
-		<default>": "</default>
-
-		<description>
-			<para>
-				It's customary that messages meant for one specific person on an IRC channel are prepended by his/her alias followed by a colon ':'. BitlBee does this by default. If you prefer a different character, you can set it using <emphasis>set to_char</emphasis>.
-			</para>
-
-			<para>
-				Please note that this setting is only used for incoming messages. For outgoing messages you can use ':' (colon) or ',' to separate the destination nick from the message, and this is not configurable.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="translate_to_nicks" type="boolean" scope="channel">
-		<default>true</default>
-
-		<description>
-			<para>
-				IRC's nickname namespace is quite limited compared to most IM protocols. Not any non-ASCII characters are allowed, in fact nicknames have to be mostly alpha-numeric. Also, BitlBee has to add underscores sometimes to avoid nickname collisions.
-			</para>
-
-			<para>
-				While normally the BitlBee user is the only one seeing these names, they may be exposed to other chatroom participants for example when addressing someone in the channel (with or without tab completion). By default BitlBee will translate these stripped nicknames back to the original nick. If you don't want this, disable this setting.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="type" type="string" scope="channel">
-		<default>control</default>
-		<possible-values>control, chat</possible-values>
-
-		<description>
-			<para>
-				BitlBee supports two kinds of channels: control channels (usually with a name starting with a &amp;) and chatroom channels (name usually starts with a #).
-			</para>
-
-			<para>
-				See <emphasis>help channels</emphasis> for a full description of channel types in BitlBee.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="typing_notice" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				Sends you a /notice when a user starts typing a message (if supported by the IM protocol and the user's client). To use this, you most likely want to use a script in your IRC client to show this information in a more sensible way.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="user_agent" type="string" scope="account">
-		<default>BitlBee</default>
-
-		<description>
-			<para>
-				Some Jabber servers are configured to only allow a few (or even just one) kinds of XMPP clients to connect to them.
-			</para>
-			
-			<para>
-				You can change this setting to make BitlBee present itself as a different client, so that you can still connect to these servers.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="utf8_nicks" type="boolean" scope="global">
-		<default>false</default>
-
-		<description>
-			<para>
-				Officially, IRC nicknames are restricted to ASCII. Recently some clients and servers started supporting Unicode nicknames though. To enable UTF-8 nickname support (contacts only) in BitlBee, enable this setting.
-			</para>
-			
-			<para>
-				To avoid confusing old clients, this setting is disabled by default. Be careful when you try it, and be prepared to be locked out of your BitlBee in case your client interacts poorly with UTF-8 nicknames.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="web_aware" type="string" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				ICQ allows people to see if you're on-line via a CGI-script. (http://status.icq.com/online.gif?icq=UIN) This can be nice to put on your website, but it seems that spammers also use it to see if you're online without having to add you to their contact list. So to prevent ICQ spamming, recent versions of BitlBee disable this feature by default.
-			</para>
-
-			<para>
-				Unless you really intend to use this feature somewhere (on forums or maybe a website), it's probably better to keep this setting disabled.
-			</para>
-		</description>
-	</bitlbee-setting>
-
-	<bitlbee-setting name="xmlconsole" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				The Jabber module allows you to add a buddy <emphasis>xmlconsole</emphasis> to your contact list, which will then show you the raw XMPP stream between you and the server. You can also send XMPP packets to this buddy, which will then be sent to the server.
-			</para>
-			<para>
-				If you want to enable this XML console permanently (and at login time already), you can set this setting.
-			</para>
-		</description>
+	<bitlbee-setting name="lcnicks" type="boolean">
+		<default>True</default>
+
+		<description>
+			<para>
+				Hereby you can change whether you want all lower case nick names or leave the case as it intended by your peer.
+			</para>
+		</description>
+
 	</bitlbee-setting>
 
@@ -1740,13 +532,8 @@
 		<short-description>Rename (renick) a buddy</short-description>
 		<syntax>rename &lt;oldnick&gt; &lt;newnick&gt;</syntax>
-		<syntax>rename -del &lt;nick&gt;</syntax>
 
 		<description>
 			<para>
 				Renick a user in your buddy list. Very useful, in fact just very important, if you got a lot of people with stupid account names (or hard ICQ numbers).
-			</para>
-			
-			<para>
-				<emphasis>rename -del</emphasis> can be used to erase your manually set nickname for a contact and reset it to what was automatically generated.
 			</para>
 		</description>
@@ -1769,5 +556,5 @@
 
 			<para>
-				By default, this answers the last unanswered question (as defined by the <emphasis>query_order</emphasis> setting, which defaults to <emphasis>lifo</emphasis>). You can also specify a different question as an argument. You can use the <emphasis>qlist</emphasis> command for a list of questions.
+				By default, this answers the first unanswered question. You can also specify a different question as an argument. You can use the <emphasis>qlist</emphasis> command for a list of questions.
 			</para>
 		</description>
@@ -1785,23 +572,7 @@
 
 			<para>
-				By default, this answers the last unanswered question (as defined by the <emphasis>query_order</emphasis> setting, which defaults to <emphasis>lifo</emphasis>). You can also specify a different question as an argument. You can use the <emphasis>qlist</emphasis> command for a list of questions.
-			</para>
-		</description>
-	</bitlbee-command>
-
-	<bitlbee-command name="plugins">
-		<short-description>List all the external plugins and protocols</short-description>
-		<syntax>plugins [info &lt;name&gt;]</syntax>
-
-		<description>
-			<para>
-				This gives you a list of all the external plugins and protocols.
-			</para>
-
-			<para>
-				Use the <emphasis>info</emphasis> subcommand to get more details about a plugin.
-			</para>
-		</description>
-
+				By default, this answers the first unanswered question. You can also specify a different question as an argument. You can use the <emphasis>qlist</emphasis> command for a list of questions.
+			</para>
+		</description>
 	</bitlbee-command>
 
@@ -1820,5 +591,5 @@
 	<bitlbee-command name="register">
 		<short-description>Register yourself</short-description>
-		<syntax>register [&lt;password&gt;]</syntax>
+		<syntax>register &lt;password&gt;</syntax>
 
 		<description>
@@ -1832,9 +603,5 @@
 
 			<para>
-				To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command. To change your password later, you can use the <emphasis>set password</emphasis> command.
-			</para>
-
-			<para>
-				You can omit the password and enter it separately using the IRC /OPER command. This lets you enter your password without your IRC client echoing it on screen or recording it in logs.
+				To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command.
 			</para>
 		</description>
@@ -1843,5 +610,5 @@
 
 	<bitlbee-command name="identify">
-		<syntax>identify [-noload|-force] [&lt;password&gt;]</syntax>
+		<syntax>identify &lt;password&gt;</syntax>
 		<short-description>Identify yourself with your password</short-description>
 
@@ -1853,16 +620,4 @@
 			<para>
 				Once you're registered, you can change your password using <emphasis>set password &lt;password&gt;</emphasis>.
-			</para>
-
-			<para>
-				The <emphasis>-noload</emphasis> and <emphasis>-force</emphasis> flags can be used to identify when you're logged into some IM accounts already. <emphasis>-force</emphasis> will let you identify yourself and load all saved accounts (and keep the accounts you're logged into already).
-			</para>
-			
-			<para>
-				<emphasis>-noload</emphasis> will log you in but not load any accounts and settings saved under your current nickname. These will be overwritten once you save your settings (i.e. when you disconnect).
-			</para>
-
-			<para>
-				You can omit the password and enter it separately using the IRC /OPER command. This lets you enter your password without your IRC client echoing it on screen or recording it in logs.
 			</para>
 		</description>
@@ -1881,79 +636,55 @@
 
 	<bitlbee-command name="blist">
-		<syntax>blist [all|online|offline|away] [&lt;pattern&gt;]</syntax>
-		<short-description>List all the buddies in the current channel</short-description>
-
-		<description>
-			<para>
-				You can get a more readable buddy list using the <emphasis>blist</emphasis> command. If you want a complete list (including the offline users) you can use the <emphasis>all</emphasis> argument.
-			</para>
-
-			<para>
-				A perl-compatible regular expression can be supplied as <emphasis>pattern</emphasis> to filter the results (case-insensitive).
-			</para>
-		</description>
-
-	</bitlbee-command>
-
-	<bitlbee-command name="group">
-		<short-description>Contact group management</short-description>
-		<syntax>group [ list | info &lt;group&gt; ]</syntax>
-
-		<description>
-			<para>
-				The <emphasis>group list</emphasis> command shows a list of all groups defined so far.
-			</para>
-			
-			<para>
-				The <emphasis>group info</emphasis> command shows a list of all members of a the group &lt;group&gt;.
-			</para>
-			
-			<para>
-				If you want to move contacts between groups, you can use the IRC <emphasis>/invite</emphasis> command. Also, if you use the <emphasis>add</emphasis> command in a control channel configured to show just one group, the new contact will automatically be added to that group.
-			</para>
-		</description>
-	</bitlbee-command>
-	
-	<bitlbee-command name="transfer">
-		<short-description>Monitor, cancel, or reject file transfers</short-description>
-		<syntax>transfer [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
-		
-		<description>
-			<para>
-				Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfer &lt;action&gt;</emphasis> for more information.
-			</para>
-
-			<ircexample>
-				<ircline nick="ulim">transfer</ircline>
-			</ircexample>
-		</description>
-		
-		<bitlbee-command name="cancel">
-			<short-description>Cancels the file transfer with the given id</short-description>
-			<syntax>transfer &lt;cancel&gt; id</syntax>
-
-			<description>
-				<para>Cancels the file transfer with the given id</para>
-			</description>
-
-			<ircexample>
-				<ircline nick="ulim">transfer cancel 1</ircline>
-				<ircline nick="root">Canceling file transfer for test</ircline>
-			</ircexample>
-		</bitlbee-command>
-
-		<bitlbee-command name="reject">
-			<short-description>Rejects all incoming transfers</short-description>
-			<syntax>transfer &lt;reject&gt;</syntax>
-
-			<description>
-				<para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is necessary. Or is it?</para>
-			</description>
-
-			<ircexample>
-				<ircline nick="ulim">transfer reject</ircline>
-			</ircexample>
-		</bitlbee-command>
-	</bitlbee-command>
-	
+		<syntax>blist [all|online|offline|away]</syntax>
+		<short-description>List all the buddies in your contact list</short-description>
+
+		<description>
+			<para>
+				You can get a better readable buddy list using the <emphasis>blist</emphasis> command. If you want a complete list (including the offline users) you can use the <emphasis>all</emphasis> argument.
+			</para>
+		</description>
+
+	</bitlbee-command>
+
+	<bitlbee-command name="nick">
+		<short-description>Change friendly name, nick</short-description>
+		<syntax>nick &lt;connection&gt; [&lt;new nick&gt;]</syntax>
+		<syntax>nick</syntax>
+
+		<description>
+			<para>
+				This command allows to set the friendly name of an im account. If no new name is specified the command will report the current name. When the name contains spaces, don't forget to quote the whole nick in double quotes. Currently this command is only supported by the MSN protocol.
+			</para>
+		</description>
+
+		<ircexample>
+			<ircline nick="wouter">nick 1 "Wouter Paesen"</ircline>
+			<ircline nick="root">Setting your name on connection 1 to `Wouter Paesen'</ircline>
+		</ircexample>
+
+	</bitlbee-command>
+
+	<bitlbee-command name="import_buddies">
+		<short-description>Copy local buddy list to server (normally only needed when upgrading)</short-description>
+		<syntax>import_buddies &lt;connection&gt; [clear]</syntax>
+
+		<description>
+			<para>
+				This command copies the locally stored buddy list to the server. This command exists for upgrading purposes. Previous versions of BitlBee didn't support server-side buddy lists for ICQ, so the list was stored locally.
+			</para>
+
+			<para>
+				Since version 0.91 however, server-side contact lists are supported for all protocols, so the local list is now ignored. When upgrading from an older BitlBee to version 0.91, you might need this command to get your buddy list back.
+			</para>
+
+			<para>
+				The only argument this command needs is your ICQ account identification. If your serverside buddy list contains some old buddies you don't want anymore, you can pass <emphasis>clear</emphasis> as a second argument.
+			</para>
+
+			<para>
+				After giving this command, you have to wait for a while before all the adds are handled, because of ICQ's rate limiting. If your buddy list is very large and the ICQ server starts complaining, you might have to reconnect and enter this command again.
+			</para>
+		</description>
+
+	</bitlbee-command>
 </chapter>
Index: doc/user-guide/docbook.xsl
===================================================================
--- doc/user-guide/docbook.xsl	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/docbook.xsl	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -19,5 +19,5 @@
 
 	<xsl:template match="ircaction">
-		<xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
+		<xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
 	</xsl:template>
 
@@ -83,5 +83,4 @@
 
 	<xsl:template name="cmd">
-		<xsl:param name="prefix"/>
 		<xsl:variable name="thiscmd"><xsl:value-of select="$prefix"/><xsl:value-of select="@name"/></xsl:variable>
 		<xsl:attribute name="id">
Index: doc/user-guide/genhelp.py
===================================================================
--- doc/user-guide/genhelp.py	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ 	(revision )
@@ -1,240 +1,0 @@
-#!/usr/bin/env python
-
-# Usage: python genhelp.py input.xml output.txt
-# (Both python2 (>=2.5) or python3 work)
-#
-# The shebang above isn't used, set the PYTHON environment variable
-# before running ./configure instead
-
-# This program 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
-# of the License, or (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301, USA.
-
-
-import os
-import re
-import sys
-import xml.etree.ElementTree as ET
-
-NORMALIZE_RE = re.compile(r"([^<>\s\t])[\s\t]+([^<>\s\t])")
-
-# Helpers
-
-def normalize(x):
-    """Normalize whitespace of a string.
-
-    The regexp turns any sequence of whitespace into a single space if it's in
-    the middle of the tag text, and then all newlines and tabs are removed,
-    keeping spaces.
-    """
-
-    x = NORMALIZE_RE.sub(r"\1 \2", x or '')
-    return x.replace("\n", "").replace("\t", "")
-
-def join(list):
-    """Turns any iterator into a string"""
-    return ''.join([str(x) for x in list])
-
-def fix_tree(tag, debug=False, lvl=''):
-    """Walks the XML tree and modifies it in-place fixing various details"""
-
-    # The include tags have an ugly namespace in the tag name. Simplify that.
-    if tag.tag.count("XInclude"):
-        tag.tag = 'include'
-
-    # Print a pretty tree-like representation of the processed tags
-    if debug:
-        print("%s<%s>%r" % (lvl, tag.tag, [tag.text, normalize(tag.text)]))
-
-    for subtag in tag:
-        fix_tree(subtag, debug, lvl + "  ")
-
-    if debug:
-        print("%s</%s>%r" % (lvl, tag.tag, [tag.tail, normalize(tag.tail)]))
-
-    # Actually normalize whitespace
-    if 'pre' not in tag.attrib:
-        tag.text = normalize(tag.text)
-    tag.tail = normalize(tag.tail)
-
-
-# Main logic
-
-def process_file(filename, parent=None):
-    try:
-        tree = ET.parse(open(filename)).getroot()
-    except:
-        sys.stderr.write("\nException while processing %s\n" % filename)
-        raise
-    fix_tree(tree)
-    return parse_tag(tree, parent)
-
-def parse_tag(tag, parent):
-    """Calls a tag_... function based on the tag name"""
-
-    fun = globals()["tag_%s" % tag.tag.replace("-", "_")]
-    return join(fun(tag, parent))
-
-def parse_subtags(tag, parent=None):
-    yield tag.text
-
-    for subtag in tag:
-        yield parse_tag(subtag, tag)
-
-    yield tag.tail
-
-
-# Main tag handlers
-
-def handle_subject(tag, parent):
-    """Tag handler for preface, chapter, sect1 and sect2 (aliased below)"""
-
-    yield '?%s\n' % tag.attrib['id']
-
-    first = True
-    for element in tag:
-        if element.tag in ["para", "variablelist", "simplelist",
-                           "command-list", "ircexample"]:
-            if not first:
-                # Spaces between paragraphs
-                yield "\n"
-            first = False
-
-            if element.attrib.get('title', ''):
-                yield element.attrib['title']
-                yield "\n"
-            yield join(parse_tag(element, tag)).rstrip("\n")
-            yield "\n"
-
-    yield "%\n"
-
-    for element in tag:
-        if element.tag in ["sect1", "sect2"]:
-            yield join(handle_subject(element, tag))
-
-    for element in tag.findall("bitlbee-command"):
-        yield join(handle_command(element))
-
-    for element in tag.findall("bitlbee-setting"):
-        yield join(handle_setting(element))
-
-def handle_command(tag, prefix=''):
-    """Tag handler for <bitlbee-command> (called from handle_subject)"""
-
-    this_cmd = prefix + tag.attrib['name']
-
-    yield "?%s\n" % this_cmd
-    for syntax in tag.findall("syntax"):
-        yield '\x02Syntax:\x02 %s\n' % syntax.text
-
-    yield "\n"
-    yield join(parse_subtags(tag.find("description"))).rstrip()
-    yield "\n"
-
-    for example in tag.findall("ircexample"):
-        yield "\n\x02Example:\x02\n"
-        yield join(parse_subtags(example)).rstrip()
-        yield "\n"
-
-    yield "%\n"
-
-    for element in tag.findall("bitlbee-command"):
-        yield join(handle_command(element, this_cmd + " "))
-
-def handle_setting(tag):
-    """Tag handler for <bitlbee-setting> (called from handle_subject)"""
-
-    yield "?set %s\n" % tag.attrib['name']
-    yield "\x02Type:\x02 %s\n" % tag.attrib["type"]
-    yield "\x02Scope:\x02 %s\n" % tag.attrib["scope"]
-
-    if tag.find("default") is not None:
-        yield "\x02Default:\x02 %s\n" % tag.findtext("default")
-
-    if tag.find("possible-values") is not None:
-        yield "\x02Possible Values:\x02 %s\n" % tag.findtext("possible-values")
-
-    yield "\n"
-    yield join(parse_subtags(tag.find("description"))).rstrip()
-    yield "\n%\n"
-
-
-# Aliases for tags that behave like subjects
-tag_preface = handle_subject
-tag_chapter = handle_subject
-tag_sect1 = handle_subject
-tag_sect2 = handle_subject
-
-# Aliases for tags that don't have any special behavior
-tag_ulink = parse_subtags
-tag_note = parse_subtags
-tag_book = parse_subtags
-tag_ircexample = parse_subtags
-
-
-# Handlers for specific tags
-
-def tag_include(tag, parent):
-    return process_file(tag.attrib['href'], tag)
-
-def tag_para(tag, parent):
-    return join(parse_subtags(tag)) + "\n\n"
-
-def tag_emphasis(tag, parent):
-    return "\x02%s\x02%s" % (tag.text, tag.tail)
-
-def tag_ircline(tag, parent):
-    return "\x02<%s>\x02 %s\n" % (tag.attrib['nick'], join(parse_subtags(tag)))
-
-def tag_ircaction(tag, parent):
-    return "\x02* %s\x02 %s\n" % (tag.attrib['nick'], join(parse_subtags(tag)))
-
-def tag_command_list(tag, parent):
-    yield "These are all root commands. See \x02help <command name>\x02 " \
-          "for more details on each command.\n\n"
-
-    for subtag in parent.findall("bitlbee-command"):
-        yield " * \x02%s\x02 - %s\n" % \
-            (subtag.attrib['name'],
-             subtag.findtext("short-description"))
-
-    yield "\nMost commands can be shortened. For example instead of " \
-          "\x02account list\x02, try \x02ac l\x02.\n\n"
-
-def tag_variablelist(tag, parent):
-    for subtag in tag:
-        yield " \x02%s\x02 - %s\n" % \
-            (subtag.findtext("term"),
-             join(parse_subtags(subtag.find("listitem/para"))))
-    yield '\n'
-
-def tag_simplelist(tag, parent):
-    for subtag in tag:
-        yield " - %s\n" % join(parse_subtags(subtag))
-    yield '\n'
-
-
-def main():
-    if len(sys.argv) != 3:
-        print("Usage: python genhelp.py input.xml output.txt")
-        return
-
-    # ensure that we really are in the same directory as the input file
-    os.chdir(os.path.dirname(os.path.abspath(sys.argv[1])))
-
-    txt = process_file(sys.argv[1])
-    open(sys.argv[2], "w").write(txt)
-
-if __name__ == '__main__':
-    main()
Index: doc/user-guide/help.txt
===================================================================
--- doc/user-guide/help.txt	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ doc/user-guide/help.txt	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,554 @@
+?
+These are the available help subjects:
+
+ quickstart - A short introduction into BitlBee
+ commands - All available commands and settings
+ away - About setting away states
+ smileys - A summary of some non-standard smileys you might find and fail to understand
+ groupchats - How to work with groupchats on BitlBee
+
+You can read more about them with help <subject>
+
+BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bug reports and other kinds of feedback can be sent by e-mail to wilmer@gaast.net. (There is no BitlBee mailing list)
+
+Or just join #BitlBee on OFTC (irc.oftc.net) (OFTC, *not* FreeNode! Some people accidentally joined #BitlBee on FreeNode already, which is just an empty channel) and flame us right in the face. :-)
+%
+?index
+These are the available help subjects:
+
+ quickstart - A short introduction into BitlBee
+ commands - All available commands and settings
+ away - About setting away states
+ smileys - A summary of some non-standard smileys you might find and fail to understand
+ groupchats - How to work with groupchats on BitlBee
+
+You can read more about them with help <subject>
+%
+?quickstart
+Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant Messaging Systems.
+
+The center of BitlBee is the control channel, #bitlbee. Two users will always be there, you (where "you" is the nickname you are using) and the system user, root.
+
+You need register so that all your IM settings (passwords, contacts, etc) can be saved on the BitlBee server. It's important that you pick a good password so no one else can access your account. Register with this password using the register command: register <password> (without the brackets!).
+
+Be sure to remember your password. The next time you connect to the BitlBee server you will need to identify <password> so that you will be recognised and logged in to all the IM services automatically.
+
+When finished, type help quickstart2 to continue.
+%
+?quickstart2
+Step Two: Add and Connect To your IM Account(s).
+
+To add an account to the account list you will need to use the account add command: account add <protocol> <username> <password> [<server>].
+
+For instance, suppose you have an ICQ account with UIN 72696705 with password QuickStart, you would:
+
+<you> account add oscar 72696705 QuickStart login.icq.com
+<root> Account successfully added
+
+Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is login.oscar.aol.com. For ICQ, the server name is login.icq.com.
+
+When you are finished adding your account(s) use the account on command to enable all your accounts, type help quickstart3 to continue.
+%
+?quickstart3
+Step Three: Managing Contact Lists: Rename
+
+For most protocols (currently MSN, Jabber, Yahoo and AOL) BitlBee can download the contact list automatically from the IM server and all the on-line users should appear in the control channel when you log in.
+
+BitlBee will convert names into irc-friendly form (for instance: tux@example.com will be given the nickname tux). If you have more than one person who would have the same name by this logic (for instance: tux@example.com and tux@bitlbee.org) the second one to log on will be tux_. The same is true if you have a tux log on to AOL and a tux log on from Yahoo.
+
+It would be easy to get these two mixed up, so BitlBee has a rename command to change the nickname into something more suitable: rename <oldnick> <newnick>
+
+<you> rename tux_ bitlbeetux
+* tux_ is now known as bitlbeetux
+<root> Nick successfully changed
+
+When finished, type help quickstart4 to continue.
+%
+?quickstart4
+Step Four: Managing Contact Lists: Add and Remove.
+
+Now you might want to add some contacts, to do this we will use the add command. It needs two arguments: a connection ID (which can be a number (try account list), protocol name or (part of) the screenname) and the user's handle. It is used in the following way: add <connection> <handle>
+
+<you> add 0 r2d2@example.com
+* r2d2  has joined #bitlbee
+
+In this case r2d2 is online, since he/she joins the channel immediately. If the user is not online you will not see them join until they log on.
+
+Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the remove command: remove <nick>
+
+When finished, type help quickstart5 to continue.
+%
+?quickstart5
+Step Five: Chatting.
+
+First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, help groupchats for more). If someone not on your contact list sends you a message, simply add them to the proper account with the add command. Once they are on your list and online, you can chat with them in #bitlbee:
+
+<you> tux: hey, how's the weather down there?
+<tux>  you: a bit chilly!
+
+If you'd rather chat with them in a separate window use the /msg or /query command, just like you would for a private message in IRC. If you want to have messages automatically come up in private messages rather than in the #bitlbee channel, use the set private command: set private true (set private false to change back).
+
+You know the basics. If you want to get to know more about BitlBee, please type help quickstart6.
+%
+?quickstart6
+So you want more than just chatting? Or maybe you're just looking for a feature?
+
+You can type help set to learn more about the possible BitlBee user settings. Among these user settings you will find options for common issues, such as changing the charset, HTML stripping and automatic connecting (simply type set to see current user settings).
+
+For more subjects (like groupchats and away states), please type help index.
+
+If you're still looking for something, please visit us in #bitlbee on the OFTC network (you can connect via irc.bitlbee.org), or mail us your problem/suggestion. Good luck and enjoy the Bee!
+%
+?commands
+ * account - IM-account list maintenance
+ * add - Add a buddy to your contact list
+ * info - Request user information
+ * remove - Remove a buddy from your contact list
+ * block - Block someone
+ * allow - Unblock someone
+ * set - Miscellaneous settings
+ * help - BitlBee help system
+ * save - Save your account data
+ * rename - Rename (renick) a buddy
+ * yes - Accept a request
+ * no - Deny a request
+ * qlist - List all the unanswered questions root asked
+ * register - Register yourself
+ * identify - Identify yourself with your password
+ * drop - Drop your account
+ * blist - List all the buddies in your contact list
+ * nick - Change friendly name, nick
+ * import_buddies - Copy local buddy list to server (normally only needed when upgrading)
+%
+?account
+Syntax: account <action> [<arguments>]
+
+Available actions: add, del, list, on, off. See help account <action> for more information.
+%
+?account add
+Syntax: account add <protocol> <username> <password> [<server>]
+
+Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ) and Yahoo. For more information about adding an account, see help account add <protocol>.
+%
+?account add jabber
+Syntax: account add jabber <handle> <password> [<servertag>]
+
+Note that the servertag argument is optional. You only have to use it if the part after the @ in your handle isn't the hostname of your Jabber server, or if you want to use SSL/connect to a non-standard port number. The format is simple: [<servername>[:<portnumber>][:ssl]]. For example, this is how you can connect to Google Talk:
+
+Note that Google talk is SSL-only, but officially reachable over both port 5222 and 5223. However, for some people only port 5222 works, for some people only 5223. This is something you'll have to try out.
+
+Example:
+<wilmer> account add jabber example@gmail.com hobbelmeeuw talk.google.com:5223:ssl
+<root> Account successfully added
+%
+?account add msn
+Syntax: account add msn <handle> <password>
+
+For MSN connections there are no special arguments.
+%
+?account add oscar
+Syntax: account add oscar <handle> <password> [<servername>]
+
+Specifying a server is required for OSCAR, since OSCAR can be used for both ICQ- and AIM-connections. Although these days it's supposed to be possible to connect to ICQ via AIM-servers and vice versa, we like to stick with this separation for now. For ICQ connections, the servername is login.icq.com, for AIM connections it's login.oscar.aol.com.
+
+Example:
+<wilmer> account add oscar 72696705 hobbelmeeuw login.icq.com
+<root> Account successfully added
+%
+?account add yahoo
+Syntax: account add yahoo <handle> <password>
+
+For Yahoo! connections there are no special arguments.
+%
+?account del
+Syntax: account del <account id>
+
+This commands deletes an account from your account list. You should signoff the account before deleting it.
+
+The account ID can be a number (see account list), the protocol name or (part of) the screenname, as long as it matches only one connection.
+%
+?account on
+Syntax: account on [<account id>]
+
+This command will try to log into the specified account. If no account is specified, BitlBee will log into all the accounts. (Including accounts awaiting a reconnection)
+
+The account ID can be a number (see account list), the protocol name or (part of) the screenname, as long as it matches only one connection.
+%
+?account off
+Syntax: account off [<account id>]
+
+This command disconnects the connection for the specified account. If no account is specified, BitlBee will deactivate all active accounts. (Including accounts awaiting a reconnection)
+
+The account ID can be a number (see account list), the protocol name or (part of) the screenname, as long as it matches only one connection.
+%
+?account list
+Syntax: account list
+
+This command gives you a list of all the accounts known by BitlBee, including the numbers you'll need for most account commands.
+%
+?add
+Syntax: add <connection> <handle> [<nick>]
+
+Adds the given buddy at the specified connection to your buddy list. The account ID can be a number (see account list), the protocol name or (part of) the screenname, as long as it matches only one connection.
+
+If you want, you can also tell BitlBee what nick to give the new contact. Of course you can also use the rename command for that, but sometimes this might be more convenient.
+
+Example:
+<ctrlsoft> add 3 gryp@jabber.org grijp
+* grijp has joined #bitlbee
+%
+?info
+Syntax: info <connection> <handle>
+Syntax: info <nick>
+
+Requests IM-network-specific information about the specified user. The amount of information you'll get differs per protocol. For some protocols (ATM Yahoo! and MSN) it'll give you an URL which you can visit with a normal web browser to get the information.
+
+Example:
+<ctrlsoft> info 0 72696705
+<root> User info - UIN: 72696705   Nick: Lintux   First/Last name: Wilmer van der Gaast   E-mail: lintux@lintux.cx
+%
+?remove
+Syntax: remove <nick>
+
+Removes the specified nick from your buddy list.
+
+Example:
+<ctrlsoft> remove gryp
+* gryp has quit [Leaving...]
+%
+?block
+Syntax: block <nick>
+Syntax: block <connection> <handle>
+
+Puts the specified user on your ignore list. Either specify the user's nick when you have him/her in your contact list or a connection number and a user handle.
+%
+?allow
+Syntax: allow <nick>
+Syntax: allow <connection> <handle>
+
+Reverse of block. Unignores the specified user or user handle on specified connection.
+%
+?set
+Syntax: set [<variable> [<value>]]
+
+Without any arguments, this command lists all the set variables. You can also specify a single argument, a variable name, to get that variable's value. To change this value, specify the new value as the second argument.
+
+To get more help information about a setting, try:
+
+Example:
+<ctrlsoft> help set private
+%
+?help
+Syntax: help [subject]
+
+This command gives you the help information you're reading right now. If you don't give any arguments, it'll give a short help index.
+%
+?save
+Syntax: save
+
+This command saves all your nicks and accounts immediately. Handy if you have the autosave functionality disabled, or if you don't trust the program's stability... ;-)
+%
+?rename
+Syntax: rename <oldnick> <newnick>
+
+Renick a user in your buddy list. Very useful, in fact just very important, if you got a lot of people with stupid account names (or hard ICQ numbers).
+
+Example:
+<itsme> rename itsme_ you
+* itsme_ is now known as you
+%
+?yes
+Syntax: yes [<number>]
+
+Sometimes an IM-module might want to ask you a question. (Accept this user as your buddy or not?) To accept a question, use the yes command.
+
+By default, this answers the first unanswered question. You can also specify a different question as an argument. You can use the qlist command for a list of questions.
+%
+?no
+Syntax: no [<number>]
+
+Sometimes an IM-module might want to ask you a question. (Accept this user as your buddy or not?) To reject a question, use the no command.
+
+By default, this answers the first unanswered question. You can also specify a different question as an argument. You can use the qlist command for a list of questions.
+%
+?qlist
+Syntax: qlist
+
+This gives you a list of all the unanswered questions from root.
+%
+?register
+Syntax: register <password>
+
+BitlBee can save your settings so you won't have to enter all your IM passwords every time you log in. If you want the Bee to save your settings, use the register command.
+
+Please do pick a secure password, don't just use your nick as your password. Please note that IRC is not an encrypted protocol, so the passwords still go over the network in plaintext. Evil people with evil sniffers will read it all. (So don't use your root password.. ;-)
+
+To identify yourself in later sessions, you can use the identify command.
+%
+?identify
+Syntax: identify <password>
+
+BitlBee saves all your settings (contacts, accounts, passwords) on-server. To prevent other users from just logging in as you and getting this information, you'll have to identify yourself with your password. You can register this password using the register command.
+
+Once you're registered, you can change your password using set password <password>.
+%
+?drop
+Syntax: drop <password>
+
+Drop your BitlBee registration. Your account files will be removed and your password will be forgotten. For obvious security reasons, you have to specify your NickServ password to make this command work.
+%
+?blist
+Syntax: blist [all|online|offline|away]
+
+You can get a better readable buddy list using the blist command. If you want a complete list (including the offline users) you can use the all argument.
+%
+?nick
+Syntax: nick <connection> [<new nick>]
+Syntax: nick
+
+This command allows to set the friendly name of an im account. If no new name is specified the command will report the current name. When the name contains spaces, don't forget to quote the whole nick in double quotes. Currently this command is only supported by the MSN protocol.
+
+Example:
+<wouter> nick 1 "Wouter Paesen"
+<root> Setting your name on connection 1 to `Wouter Paesen'
+%
+?import_buddies
+Syntax: import_buddies <connection> [clear]
+
+This command copies the locally stored buddy list to the server. This command exists for upgrading purposes. Previous versions of BitlBee didn't support server-side buddy lists for ICQ, so the list was stored locally.
+
+Since version 0.91 however, server-side contact lists are supported for all protocols, so the local list is now ignored. When upgrading from an older BitlBee to version 0.91, you might need this command to get your buddy list back.
+
+The only argument this command needs is your ICQ account identification. If your serverside buddy list contains some old buddies you don't want anymore, you can pass clear as a second argument.
+
+After giving this command, you have to wait for a while before all the adds are handled, because of ICQ's rate limiting. If your buddy list is very large and the ICQ server starts complaining, you might have to reconnect and enter this command again.
+%
+?set charset
+Type: string
+Default: iso8859-1
+Possible Values: you can get a list of all possible values by doing 'iconv -l' in a shell
+
+The charset setting enables you to use different character sets in BitlBee. These get converted to UTF-8 before sending and from UTF-8 when receiving.
+
+If you don't know what's the best value for this, at least iso8859-1 is the best choice for most Western countries. You can try to find what works best for you on http://czyborra.com/charsets/iso8859.html
+%
+?set private
+Type: boolean
+Default: True
+
+If value is true, messages from users will appear in separate query windows. If false, messages from users will appear in the control channel.
+
+This setting is remembered (during one session) per-user, this setting only changes the default state. This option takes effect as soon as you reconnect.
+%
+?set save_on_quit
+Type: boolean
+Default: True
+
+If enabled causes BitlBee to save all current settings and account details when user disconnects. This is enabled by default, and these days there's not really a reason to have it disabled anymore.
+%
+?set html
+Type: string
+Default: nostrip
+Possible Values: strip, nostrip
+
+Determines what BitlBee should do with HTML in messages. If set to nostrip, HTML in messages will not be touched. If set to strip, all HTML will be stripped from messages. Unfortunately this sometimes strips too much.
+%
+?set debug
+Type: boolean
+Default: False
+
+Some debugging messages can be sent to the control channel if you wish. They're probably not really useful for you, unless you're doing some development on BitlBee.
+%
+?set to_char
+Type: string
+Default: ": "
+
+It's customary that messages meant for one specific person on an IRC channel are prepended by his/her alias followed by a colon ':'. BitlBee does this by default. If you prefer a different character, you can set it using set to_char.
+
+Please note that this setting is only used for incoming messages. For outgoing messages you can use ':' (colon) or ',' to separate the destination nick from the message, and this is not configurable.
+%
+?set typing_notice
+Type: boolean
+Default: False
+
+Sends you a /notice when a user starts typing a message (if the protocol supports it, MSN for example). This is a bug, not a feature. (But please don't report it.. ;-) You don't want to use it. Really. In fact the typing-notification is just one of the least useful 'innovations' ever. It's just there because some guy will probably ask me about it anyway. ;-)
+%
+?set ops
+Type: string
+Default: both
+Possible Values: both, root, user, none
+
+Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting.
+
+The value "both" means both user and root get ops. "root" means, well, just root. "user" means just the user. "none" means nobody will get operator status.
+%
+?set away_devoice
+Type: boolean
+Default: True
+
+With this option enabled, the root user devoices people when they go away (just away, not offline) and gives the voice back when they come back. You might dislike the voice-floods you'll get if your contact list is huge, so this option can be disabled.
+%
+?set handle_unknown
+Type: string
+Default: root
+Possible Values: root, add, add_private, add_channel, ignore
+
+Messages from unknown users are echoed like this by default:
+
+<root> Unknown message from handle 3137137:
+<root> j0000! 1 4m l33t h4x0r! kill me!
+
+If you want this lame user to be added automatically, you can set this setting to "add". If you prefer to ignore messages from people you don't know, you can set this one to "ignore". "add_private" and "add_channel" are like add, but you can use them to make messages from unknown buddies appear in the channel instead of a query window.
+
+Auto-added users aren't added to your real contact list. This is because you don't want the user to get authorization requests. So when you restart BitlBee, the auto-added user will be gone. If you want to keep the person in your buddy-list, you have to fixate the add using the add command.
+%
+?set auto_connect
+Type: boolean
+Default: True
+
+With this option enabled, when you identify BitlBee will automatically connect to your accounts, with this disabled it will not do this.
+%
+?set auto_reconnect
+Type: boolean
+Default: False
+
+If an IM-connections breaks, you're supposed to bring it back up yourself. Having BitlBee do this automatically might not always be a good idea, for several reasons. If you want the connections to be restored automatically, you can enable this setting.
+
+See also the auto_reconnect_delay setting.
+%
+?set auto_reconnect_delay
+Type: integer
+Default: 300
+
+Tell BitlBee after how many seconds it should attempt to bring an IM-connection back up after a crash. It's not a good idea to set this value very low, it will cause too much useless traffic when an IM-server is down for a few hours.
+
+See also the auto_reconnect setting.
+%
+?set buddy_sendbuffer
+Type: boolean
+Default: False
+
+By default, when you send a message to someone, BitlBee forwards this message to the user immediately. When you paste a large number of lines, the lines will be sent in separate messages, which might not be very nice to read. If you enable this setting, BitlBee will buffer your messages and wait for more data.
+
+Using the buddy_sendbuffer_delay setting you can specify the number of seconds BitlBee should wait for more data before the complete message is sent.
+
+Please note that if you remove a buddy from your list (or if the connection to that user drops) and there's still data in the buffer, this data will be lost. BitlBee will not try to send the message to the user in those cases.
+%
+?set buddy_sendbuffer_delay
+Type: integer
+Default: 
+
+Tell BitlBee after how many seconds a buffered message should be sent.
+
+See also the buddy_sendbuffer setting.
+%
+?set default_target
+Type: string
+Default: root
+Possible Values: root, last
+
+With this value set to root, lines written in the control channel without any nickname in front of them will be interpreted as commands. If you want BitlBee to send those lines to the last person you addressed in the control channel, set this to last.
+%
+?set display_namechanges
+Type: boolean
+Default: False
+%
+?set password
+Type: string
+Default: 
+
+Use this setting to change your "NickServ" password.
+%
+?set query_order
+Type: string
+Default: lifo
+Possible Values: lifo, fifo
+
+This changes the order in which the questions from root (usually authorization requests from buddies) should be answered. When set to lifo, BitlBee immediately displays all new questions and they should be answered in reverse order. When this is set to fifo, BitlBee displays the first question which comes in and caches all the others until you answer the first one.
+
+Although the fifo setting might sound more logical (and used to be the default behaviour in older BitlBee versions), it turned out not to be very convenient for many users when they missed the first question (and never received the next ones).
+%
+?set lcnicks
+Type: boolean
+Default: True
+
+Hereby you can change whether you want all lower case nick names or leave the case as it intended by your peer.
+%
+?misc
+%
+?smileys
+All MSN smileys (except one) are case insensitive and work without the nose too.
+
+ (Y) - Thumbs up
+ (N) - Thumbs down
+ (B) - Beer mug
+ (D) - Martini glass
+ (X) - Girl
+ (Z) - Boy
+ (6) - Devil smiley
+ :-[ - Vampire bat
+ (}) - Right hug
+ ({) - Left hug
+ (M) - MSN Messenger or Windows Messenger icon (think a BitlBee logo here ;)
+ :-S - Crooked smiley (Confused smiley)
+ :-$ - Embarrassed smiley
+ (H) - Smiley with sunglasses
+ :-@ - Angry smiley
+ (A) - Angel smiley
+ (L) - Red heart (Love)
+ (U) - Broken heart
+ (K) - Red lips (Kiss)
+ (G) - Gift with bow
+ (F) - Red rose
+ (W) - Wilted rose
+ (P) - Camera
+ (~) - Film strip
+ (T) - Telephone receiver
+ (@) - Cat face
+ (&) - Dog's head
+ (C) - Coffee cup
+ (I) - Light bulb
+ (S) - Half-moon (Case sensitive!)
+ (*) - Star
+ (8) - Musical eighth note
+ (E) - Envelope
+ (^) - Birthday cake
+ (O) - Clock
+
+This list was extracted from http://help.msn.com/!data/en_us/data/messengerv50.its51/$content$/EMOTICONS.HTM?H_APP=.
+%
+?groupchats
+Since version 0.8x, BitlBee supports groupchats on the MSN and Yahoo! networks. This text will try to explain you how they work.
+
+As soon as someone invites you into a groupchat, you will be force-joined or invited (depending on the protocol) into a new virtual channel with all the people in there. You can leave the channel at any time, just like you would close the window in regular IM clients. Please note that root-commands don't work in groupchat channels, they only work in the control channel (or to root directly).
+
+Of course you can also create your own groupchats. Type help groupchats2 to see how.
+%
+?groupchats2
+If you want to start a groupchat with the person jim_msn in it, just join the channel #jim_msn. BitlBee will refuse to join you to the channel with that name, but it will create a new virtual channel with root, you and jim_msn in it.
+
+Of course a channel with only two people isn't really exciting yet. So the next step is to invite some other people to the channel. For this, you can use the /invite command of your IRC client. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
+
+This is all you'll probably need to know. If you have any problems, please read help groupchats3.
+%
+?groupchats3
+Obviously the (numbered) channel names don't make a lot of sense. Problem is that groupchats usually don't have names at all in the IM-world, while IRC insists on a name. So BitlBee just generates something random, just don't pay attention to it. :-)
+
+Please also note that BitlBee doesn't support groupchats for all protocols yet. BitlBee will tell you so. Support for other protocols will hopefully come later.
+%
+?away
+As you might've expected, you can just use the /away command in your IRC client to set an away-state. BitlBee supports most away-states supported by the protocols.
+
+Not all away states are supported by all protocols, and some protocols have different names for them. BitlBee will try to pick the best available alias from this list for every connection:
+
+ - Away from computer, Away, Extended away
+ - NA, N/A, Not available
+ - Busy, Do not disturb, DND, Occupied
+ - Be right back, BRB
+ - On the phone, Phone, On phone
+ - Out to lunch, Lunch, Food
+
+So /away Food will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" or "Away from computer" will be chosen.
+
+You can also add more information to your away message. Setting it to "Busy - Fixing BitlBee bugs" will set your IM-away-states to Busy, but your away message will be more descriptive for people on IRC. Protocols like Yahoo! and Jabber will also show this complete away message to your buddies.
+%
Index: doc/user-guide/help.xml
===================================================================
--- doc/user-guide/help.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/help.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
@@ -14,9 +14,7 @@
   <varlistentry><term>quickstart</term><listitem><para>A short introduction into BitlBee</para></listitem></varlistentry>
   <varlistentry><term>commands</term><listitem><para>All available commands and settings</para></listitem></varlistentry>
-  <varlistentry><term>channels</term><listitem><para>About creating and customizing channels</para></listitem></varlistentry>
   <varlistentry><term>away</term><listitem><para>About setting away states</para></listitem></varlistentry>
+  <varlistentry><term>smileys</term><listitem><para>A summary of some non-standard smileys you might find and fail to understand</para></listitem></varlistentry>
   <varlistentry><term>groupchats</term><listitem><para>How to work with groupchats on BitlBee</para></listitem></varlistentry>
-  <varlistentry><term>nick_changes</term><listitem><para>Changing your nickname without losing any settings</para></listitem></varlistentry>
-  <varlistentry><term>identify_methods</term><listitem><para>A list of ways to (auto-)identify to your account</para></listitem></varlistentry>
 </variablelist>
 
@@ -26,9 +24,9 @@
 
 <para>
-Some more help can be found on <ulink link="https://wiki.bitlbee.org/">https://wiki.bitlbee.org/</ulink>. Bugs can be reported at <ulink link="https://bugs.bitlbee.org/">https://bugs.bitlbee.org/</ulink>.
+BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bug reports and other kinds of feedback can be sent by e-mail to <emphasis>wilmer@gaast.net</emphasis>. (There is no BitlBee mailing list)
 </para>
 
 <para>
-For other things than bug reports, you can join <emphasis>#BitlBee</emphasis> on OFTC (<emphasis>irc.oftc.net</emphasis>) (OFTC, *not* freenode!) and flame us right in the face. :-)
+Or just join <emphasis>#BitlBee</emphasis> on OFTC (<emphasis>irc.oftc.net</emphasis>) (OFTC, *not* FreeNode! Some people accidentally joined #BitlBee on FreeNode already, which is just an empty channel) and flame us right in the face. :-)
 </para>
 
@@ -45,9 +43,7 @@
   <varlistentry><term>quickstart</term><listitem><para>A short introduction into BitlBee</para></listitem></varlistentry>
   <varlistentry><term>commands</term><listitem><para>All available commands and settings</para></listitem></varlistentry>
-  <varlistentry><term>channels</term><listitem><para>About creating and customizing channels</para></listitem></varlistentry>
   <varlistentry><term>away</term><listitem><para>About setting away states</para></listitem></varlistentry>
+  <varlistentry><term>smileys</term><listitem><para>A summary of some non-standard smileys you might find and fail to understand</para></listitem></varlistentry>
   <varlistentry><term>groupchats</term><listitem><para>How to work with groupchats on BitlBee</para></listitem></varlistentry>
-  <varlistentry><term>nick_changes</term><listitem><para>Changing your nickname without losing any settings</para></listitem></varlistentry>
-  <varlistentry><term>identify_methods</term><listitem><para>A list of ways to (auto-)identify to your account</para></listitem></varlistentry>
 </variablelist>
 
@@ -60,5 +56,4 @@
 <xi:include href="quickstart.xml"/>
 <xi:include href="commands.xml"/>
-<xi:include href="twitter.xml"/>
 <xi:include href="misc.xml"/>
 
Index: doc/user-guide/help.xsl
===================================================================
--- doc/user-guide/help.xsl	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/help.xsl	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -7,5 +7,5 @@
 	version="1.1">
 
-	<xsl:output method="text" encoding="utf-8" standalone="yes"/>
+	<xsl:output method="text" encoding="iso-8859-1" standalone="yes"/>
 	<xsl:strip-space elements="*"/>
 
@@ -31,5 +31,4 @@
 
 	<xsl:template name="subject">
-		<xsl:param name="id"/>
 		<xsl:message><xsl:text>Processing: </xsl:text><xsl:value-of select="$id"/></xsl:message>
 		<xsl:text>?</xsl:text><xsl:value-of select="$id"/><xsl:text>&#10;</xsl:text>
@@ -59,8 +58,5 @@
 			<xsl:text>?set </xsl:text><xsl:value-of select="@name"/><xsl:text>&#10;</xsl:text>
 			<xsl:text>_b_Type:_b_ </xsl:text><xsl:value-of select="@type"/><xsl:text>&#10;</xsl:text>
-			<xsl:text>_b_Scope:_b_ </xsl:text><xsl:value-of select="@scope"/><xsl:text>&#10;</xsl:text>
-			<xsl:if test="default">
-				<xsl:text>_b_Default:_b_ </xsl:text><xsl:value-of select="default"/><xsl:text>&#10;</xsl:text>
-			</xsl:if>
+			<xsl:text>_b_Default:_b_ </xsl:text><xsl:value-of select="default"/><xsl:text>&#10;</xsl:text>
 			<xsl:if test="possible-values">
 				<xsl:text>_b_Possible Values:_b_ </xsl:text><xsl:value-of select="possible-values"/><xsl:text>&#10;</xsl:text>
@@ -73,9 +69,7 @@
 
 	<xsl:template match="command-list">
-		<xsl:text>These are all root commands. See _b_help &lt;command name&gt;_b_ for more details on each command.&#10;&#10;</xsl:text>
 		<xsl:for-each select="../bitlbee-command">
 			<xsl:text> * _b_</xsl:text><xsl:value-of select="@name"/><xsl:text>_b_ - </xsl:text><xsl:value-of select="short-description"/><xsl:text>&#10;</xsl:text>
 		</xsl:for-each>
-		<xsl:text>&#10;Most commands can be shortened. For example instead of _b_account list_b_, try _b_ac l_b_.&#10;</xsl:text>
 		<xsl:text>&#10;</xsl:text>
 	</xsl:template>
@@ -125,5 +119,4 @@
 
 	<xsl:template name="cmd">
-		<xsl:param name="prefix"/>
 		<xsl:variable name="thiscmd"><xsl:value-of select="$prefix"/><xsl:value-of select="@name"/></xsl:variable>
 		<xsl:message><xsl:text>Processing command '</xsl:text><xsl:value-of select="$thiscmd"/><xsl:text>'</xsl:text></xsl:message>
Index: doc/user-guide/misc.xml
===================================================================
--- doc/user-guide/misc.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/misc.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,13 +1,64 @@
 <chapter id="misc">
 <title>Misc Stuff</title>
+
+<sect1 id="smileys">
+<title>Smileys</title>
+
+<para>
+All MSN smileys (except one) are case insensitive and work without the nose too.
+</para>
+
+<variablelist>
+	<varlistentry><term>(Y)</term><listitem><para>Thumbs up</para></listitem></varlistentry>
+	<varlistentry><term>(N)</term><listitem><para>Thumbs down</para></listitem></varlistentry>
+	<varlistentry><term>(B)</term><listitem><para>Beer mug</para></listitem></varlistentry>
+	<varlistentry><term>(D)</term><listitem><para>Martini glass</para></listitem></varlistentry>
+	<varlistentry><term>(X)</term><listitem><para>Girl</para></listitem></varlistentry>
+	<varlistentry><term>(Z)</term><listitem><para>Boy</para></listitem></varlistentry>
+	<varlistentry><term>(6)</term><listitem><para>Devil smiley</para></listitem></varlistentry>
+	<varlistentry><term>:-[</term><listitem><para>Vampire bat</para></listitem></varlistentry>
+	<varlistentry><term>(})</term><listitem><para>Right hug</para></listitem></varlistentry>
+	<varlistentry><term>({)</term><listitem><para>Left hug</para></listitem></varlistentry>
+	<varlistentry><term>(M)</term><listitem><para>MSN Messenger or Windows Messenger icon (think a BitlBee logo here ;)</para></listitem></varlistentry>
+	<varlistentry><term>:-S</term><listitem><para>Crooked smiley (Confused smiley)</para></listitem></varlistentry>
+	<varlistentry><term>:-$</term><listitem><para>Embarrassed smiley</para></listitem></varlistentry>
+	<varlistentry><term>(H)</term><listitem><para>Smiley with sunglasses</para></listitem></varlistentry>
+	<varlistentry><term>:-@</term><listitem><para>Angry smiley</para></listitem></varlistentry>
+	<varlistentry><term>(A)</term><listitem><para>Angel smiley</para></listitem></varlistentry>
+	<varlistentry><term>(L)</term><listitem><para>Red heart (Love)</para></listitem></varlistentry>
+	<varlistentry><term>(U)</term><listitem><para>Broken heart</para></listitem></varlistentry>
+	<varlistentry><term>(K)</term><listitem><para>Red lips (Kiss)</para></listitem></varlistentry>
+	<varlistentry><term>(G)</term><listitem><para>Gift with bow</para></listitem></varlistentry>
+	<varlistentry><term>(F)</term><listitem><para>Red rose</para></listitem></varlistentry>
+	<varlistentry><term>(W)</term><listitem><para>Wilted rose</para></listitem></varlistentry>
+	<varlistentry><term>(P)</term><listitem><para>Camera</para></listitem></varlistentry>
+	<varlistentry><term>(~)</term><listitem><para>Film strip</para></listitem></varlistentry>
+	<varlistentry><term>(T)</term><listitem><para>Telephone receiver</para></listitem></varlistentry>
+	<varlistentry><term>(@)</term><listitem><para>Cat face</para></listitem></varlistentry>
+	<varlistentry><term>(&amp;)</term><listitem><para>Dog's head</para></listitem></varlistentry>
+	<varlistentry><term>(C)</term><listitem><para>Coffee cup</para></listitem></varlistentry>
+	<varlistentry><term>(I)</term><listitem><para>Light bulb</para></listitem></varlistentry>
+	<varlistentry><term>(S)</term><listitem><para>Half-moon (Case sensitive!)</para></listitem></varlistentry>
+	<varlistentry><term>(*)</term><listitem><para>Star</para></listitem></varlistentry>
+	<varlistentry><term>(8)</term><listitem><para>Musical eighth note</para></listitem></varlistentry>
+	<varlistentry><term>(E)</term><listitem><para>Envelope</para></listitem></varlistentry>
+	<varlistentry><term>(^)</term><listitem><para>Birthday cake</para></listitem></varlistentry>
+	<varlistentry><term>(O)</term><listitem><para>Clock</para></listitem></varlistentry>
+</variablelist>
+
+<para>
+This list was extracted from <ulink url="http://help.msn.com/!data/en_us/data/messengerv50.its51/$content$/EMOTICONS.HTM?H_APP=">http://help.msn.com/!data/en_us/data/messengerv50.its51/$content$/EMOTICONS.HTM?H_APP=</ulink>.
+</para>
+
+</sect1>
 
 <sect1 id="groupchats">
 <title>Groupchats</title>
 <para>
-BitlBee now supports groupchats on all IM networks. This text will try to explain you how they work.
+Since version 0.8x, BitlBee supports groupchats on the MSN and Yahoo! networks. This text will try to explain you how they work.
 </para>
 
 <para>
-As soon as someone invites you into a groupchat, you will be force-joined or invited (depending on the protocol) into a new virtual channel with all the people in there. You can leave the channel at any time, just like you would close the window in regular IM clients. Please note that root-commands don't work in groupchat channels, they only work in control channels (or to root directly).
+As soon as someone invites you into a groupchat, you will be force-joined or invited (depending on the protocol) into a new virtual channel with all the people in there. You can leave the channel at any time, just like you would close the window in regular IM clients. Please note that root-commands don't work in groupchat channels, they only work in the control channel (or to root directly).
 </para>
 
@@ -22,18 +73,28 @@
 
 <para>
-To open a groupchat, use the <emphasis>chat with</emphasis> command. For example,  to start a groupchat with the person <emphasis>lisa_msn</emphasis> in it, just type <emphasis>chat with lisa_msn</emphasis>. BitlBee will create a new virtual channel with root, you and lisa_msn in it.
+If you want to start a groupchat with the person <emphasis>jim_msn</emphasis> in it, just join the channel <emphasis>#jim_msn</emphasis>. BitlBee will refuse to join you to the channel with that name, but it will create a new virtual channel with root, you and jim_msn in it.
 </para>
 
 <para>
-Then, just use the ordinary IRC <emphasis>/invite</emphasis> command to invite more people. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
+Of course a channel with only two people isn't really exciting yet. So the next step is to invite some other people to the channel. For this, you can use the <emphasis>/invite</emphasis> command of your IRC client. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
 </para>
 
 <para>
-Some protocols (like Jabber) also support named groupchats. BitlBee supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat add</emphasis> for more information.
+This is all you'll probably need to know. If you have any problems, please read <emphasis>help groupchats3</emphasis>.
+</para>
+
+</sect1>
+
+<sect1 id="groupchats3">
+<title>Groupchat channel names</title>
+
+<para>
+Obviously the (numbered) channel names don't make a lot of sense. Problem is that groupchats usually don't have names at all in the IM-world, while IRC insists on a name. So BitlBee just generates something random, just don't pay attention to it. :-)
 </para>
 
 <para>
-If you don't know the name of a named groupchat, you can try the <emphasis>chat list</emphasis> command to get a list of chatrooms from a server. See <emphasis>help chat list</emphasis> for usage instructions.
+Please also note that BitlBee doesn't support groupchats for all protocols yet. BitlBee will tell you so. Support for other protocols will hopefully come later.
 </para>
+
 </sect1>
 
@@ -42,446 +103,29 @@
 
 <para>
-To mark yourself as away, you can just use the <emphasis>/away</emphasis> command in your IRC client. BitlBee supports most away-states supported by the protocols.
+As you might've expected, you can just use the <emphasis>/away</emphasis> command in your IRC client to set an away-state. BitlBee supports most away-states supported by the protocols.
 </para>
 
 <para>
-Away states have different names across different protocols. BitlBee will try to pick the best available option for every connection:
+Not all away states are supported by all protocols, and some protocols have different names for them. BitlBee will try to pick the best available alias from this list for every connection:
 </para>
 
 <simplelist>
-	<member>Away</member>
-	<member>NA</member>
-	<member>Busy, DND</member>
-	<member>BRB</member>
-	<member>Phone</member>
-	<member>Lunch, Food</member>
-	<member>Invisible, Hidden</member>
+	<member>Away from computer, Away, Extended away</member>
+	<member>NA, N/A, Not available</member>
+	<member>Busy, Do not disturb, DND, Occupied</member>
+	<member>Be right back, BRB</member>
+	<member>On the phone, Phone, On phone</member>
+	<member>Out to lunch, Lunch, Food</member>
 </simplelist>
 
 <para>
-So <emphasis>/away Food</emphasis> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" will be chosen.
+So <emphasis>/away Food</emphasis> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" or "Away from computer" will be chosen.
 </para>
 
 <para>
-You can also add more information to your away message. Setting it to "Busy - Fixing BitlBee bugs" will set your IM-away-states to Busy, but your away message will be more descriptive for people on IRC. Most IM-protocols can also show this additional information to your buddies.
-</para>
-
-<para>
-If you want to set an away state for only one of your connections, you can use the per-account <emphasis>away</emphasis> setting. See <emphasis>help set away</emphasis>.
+You can also add more information to your away message. Setting it to "Busy - Fixing BitlBee bugs" will set your IM-away-states to Busy, but your away message will be more descriptive for people on IRC. Protocols like Yahoo! and Jabber will also show this complete away message to your buddies.
 </para>
 
 </sect1>
 
-<sect1 id="nick_changes">
-<title>Changing your nickname</title>
-
-<para>
-BitlBee now allows you to change your nickname. So far this was not possible because it made managing saved accounts more complicated.
-</para>
-
-<para>
-The restriction no longer exists now though. When you change your nick (just using the <emphasis>/nick</emphasis> command), your logged-in status will be reset, which means any changes made to your settings/accounts will not be saved.
-</para>
-
-<para>
-To restore your logged-in status, you need to either use the <emphasis>register</emphasis> command to create an account under the new nickname, or use <emphasis>identify -noload</emphasis> to re-identify yourself under the new nickname. The <emphasis>-noload</emphasis> flag tells the command to verify your password and log you in, but not load any new settings. See <emphasis>help identify</emphasis> for more information.
-</para>
-
-</sect1>
-
-<sect1 id="channels">
-<title>Dealing with channels</title>
-
-<para>
-You can have as many channels in BitlBee as you want. You maintain your channel list using the <emphasis>channel</emphasis> command. You can create new channels by just joining them, like on regular IRC networks.
-</para>
-
-<para>
-You can create two kinds of channels. Control channels, and groupchat channels. By default, BitlBee will set up new channels as control channels if their name starts with an &amp;, and as chat channels if it starts with a #.
-</para>
-
-<para>
-Control channels are where you see your contacts. By default, you will have one control channel called &amp;bitlbee, containing all your contacts. But you can create more, if you want, and divide your contact list across several channels.
-</para>
-
-<para>
-For example, you can have one channel with all contacts from your jabber account in it. Or all contacts from the group called "Work".
-</para>
-
-<para>
-Type <emphasis>help channels2</emphasis> to read more.
-</para>
-
-</sect1>
-
-<sect1 id="channels2">
-<title>Creating a channel</title>
-
-<para>
-When you create a new channel, BitlBee will try to guess from its name which contacts to fill it with. For example, if the channel name (excluding the &amp;) matches the name of a group in which you have one or more contacts, the channel will contain all those contacts.
-</para>
-
-<para>
-Any valid account ID (so a number, protocol name or part of screenname, as long as it's unique) can also be used as a channel name. So if you just join &amp;jabber, it will contain all your jabber contacts. And if you have a Facebook account set up, you can see its contacts by just joining &amp;facebook.
-</para>
-
-<para>
-To start a simple group chat, you simply join a channel which a name starting with #, and invite people into it. All people you invite have to be on the same IM network and contact list.
-</para>
-
-<para>
-If you want to configure your own channels, you can use the <emphasis>channel set</emphasis> command. See <emphasis>help channels3</emphasis> for more information.
-</para>
-
-</sect1>
-
-<sect1 id="channels3">
-<title>Configuring a control channel</title>
-
-<para>
-The most important setting for a control channel is <emphasis>fill_by</emphasis>. It
-tells BitlBee what information should be used to decide if someone should be shown
-in the channel or not. After setting this setting to, for example, <emphasis>account</emphasis>, you
-also have to set the <emphasis>account</emphasis> setting. Example:
-</para>
-
-<ircexample>
-	<ircline nick="wilmer">chan &amp;wlm set fill_by account</ircline>
-	<ircline nick="root">fill_by = `account'</ircline>
-	<ircline nick="wilmer">chan &amp;wlm set account msn</ircline>
-	<ircline nick="root">account = `msn'</ircline>
-</ircexample>
-
-<para>
-Also, each channel has a <emphasis>show_users</emphasis> setting which lets you
-choose, for example, if you want to see only online contacts in a channel, or
-also/just offline contacts. Example:
-</para>
-
-<ircexample>
-	<ircline nick="wilmer">chan &amp;offline set show_users offline</ircline>
-	<ircline nick="root">show_users = `offline'</ircline>
-</ircexample>
-
-<para>
-See the help information for all these settings for more information.
-</para>
-
-</sect1>
-
-<sect1 id="nick_format">
-<title>Nickname formatting</title>
-
-<para>
-The <emphasis>nick_format</emphasis> setting can be set globally using
-the <emphasis>set</emphasis> command, or per account using <emphasis>account
-set</emphasis> (so that you can set a per-account suffix/prefix or have 
-nicknames generated from full names for certain accounts).
-</para>
-
-<para>
-The setting is basically some kind of format string. It can contain normal
-text that will be copied to the nick, combined with several variables:
-</para>
-
-<variablelist>
-	<varlistentry><term>%nick</term><listitem><para>Nickname suggested for this contact by the IM protocol, or just the handle if no nickname was suggested.</para></listitem></varlistentry>
-	<varlistentry><term>%handle</term><listitem><para>The handle/screenname of the contact.</para></listitem></varlistentry>
-	<varlistentry><term>%full_name</term><listitem><para>The full name of the contact.</para></listitem></varlistentry>
-	<varlistentry><term>%first_name</term><listitem><para>The first name of the contact (the full name up to the first space).</para></listitem></varlistentry>
-	<varlistentry><term>%group</term><listitem><para>The name of the group this contact is a member of</para></listitem></varlistentry>
-	<varlistentry><term>%account</term><listitem><para>Account tag of the contact</para></listitem></varlistentry>
-</variablelist>
-
-<para>
-Invalid characters (like spaces) will always be stripped. Depending on your
-locale settings, characters with accents will be converted to ASCII.
-</para>
-
-<para>
-See <emphasis>help nick_format2</emphasis> for some more information.
-</para>
-
-</sect1>
-
-<sect1 id="nick_format2">
-<title>Nickname formatting - modifiers</title>
-
-<para>
-Two modifiers are currently available: You can include only the first few
-characters of a variable by putting a number right after the %. For
-example, <emphasis>[%3group]%-@nick</emphasis> will include only the first
-three characters of the group name in the nick.
-</para>
-
-<para>
-Also, you can truncate variables from a certain character using
-the <emphasis>-</emphasis> modifier. For example, you may want to leave out
-everything after the @. <emphasis>%-@handle</emphasis> will expand to
-everything in the handle up to the first @.
-</para>
-
-</sect1>
-
-<sect1 id="identify_methods">
-<title>Identifying to your BitlBee account</title>
-
-<para>There are several methods to identify (log in) to your registered BitlBee account. All of these are equivalent:</para>
-
-<variablelist>
-	<varlistentry>
-		<term>The 'identify' command</term>
-		<listitem><para>sent to &amp;bitlbee or root. See <emphasis>help identify</emphasis> for details.</para></listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>/msg nickserv identify</term>
-		<listitem><para>Same as above, but sent to NickServ. Useful with some auto-identify scripts.</para></listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>/nickserv or /ns</term>
-		<listitem><para>Same as above, but using the command aliases to NickServ.</para></listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>Server password</term>
-		<listitem><para>A field in the server connection settings of your irc client.</para></listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>SASL PLAIN</term>
-		<listitem><para>A newer method, good choice if your client supports it. (Note: "SASL" is <emphasis>not</emphasis> related to "SSL")</para></listitem>
-	</varlistentry>
-</variablelist>
-
-<para>To configure your client to auto-identify, the last two methods are recommended. SASL if you have it, but server password is often the easiest.</para>
-
-<para>Note: If you changed bitlbee.conf to have <emphasis>AuthMode = Closed</emphasis>, server password will be used for that instead. If you have never heard of that setting before, you can ignore it and just use it.</para>
-
-</sect1>
-
-<sect1 id="whatsnew010206">
-<title>New stuff in BitlBee 1.2.6</title>
-
-<para>
-Twitter support. See <emphasis>help account add twitter</emphasis>.
-</para>
-</sect1>
-
-<sect1 id="whatsnew010300">
-<title>New stuff in BitlBee 1.3dev</title>
-
-<para>
-Support for multiple configurable control channels, each with a subset of
-your contact list. See <emphasis>help channels</emphasis> for more
-information.
-</para>
-
-<para>
-File transfer support for some protocols (more if you use libpurple). Just
-/DCC SEND stuff. Incoming files also become DCC transfers.
-</para>
-
-<para>
-Only if you run your own BitlBee instance: You can build a BitlBee that uses
-libpurple for connecting to IM networks instead of its own code, adding
-support for some of the more obscure IM protocols and features.
-</para>
-
-<para>
-Many more things, briefly described in <emphasis>help news1.3</emphasis>.
-</para>
-</sect1>
-
-<sect1 id="whatsnew030000">
-<title>New stuff in BitlBee 3.0</title>
-
-<para>
-BitlBee can be compiled with support for OTR message encryption (not available
-on public servers since encryption should be end-to-end).
-</para>
-
-<para>
-The MSN module was heavily updated to support features added to MSN Messenger
-over the recent years. You can now see/set status messages, send offline
-messages, and many strange issues caused by Microsoft breaking old-protocol
-compatibility should now be resolved.
-</para>
-
-<para>
-Twitter extended: IRC-style replies ("BitlBee:") now get converted to proper
-Twitter replies ("@BitlBee") and get a reference to the original message
-(see <emphasis>help set auto_reply_timeout</emphasis>). Retweets and some
-other stuff is also supported now (see <emphasis>help set commands</emphasis>).
-</para>
-</sect1>
-
-<sect1 id="news1.3">
-<title>New stuff in BitlBee 1.3dev (details)</title>
-
-<para>
-Most of the core of BitlBee was rewritten since the last release. This entry
-should sum up the majority of the changes.
-</para>
-
-<para>
-First of all, you can now have as many control channels as you want. Or you
-can have none, it's finally possible to leave &amp;bitlbee and still talk to
-all your contacts. Or you can have a &amp;work with all your work-related
-contacts, or a &amp;msn with all your MSN Messenger contacts. See <emphasis>help
-channels</emphasis> for more information about this.
-</para>
-
-<para>
-Also, you can change how nicknames are generated for your contacts. Like
-automatically adding a [fb] tag to the nicks of all your Facebook contacts.
-See <emphasis>help nick_format</emphasis>.
-</para>
-
-<para>
-When you're already connected to a BitlBee server and you connect from
-elsewhere, you can take over the old session.
-</para>
-
-<para>
-Instead of account numbers, accounts now also get tags. These are
-automatically generated but can be changed (<emphasis>help set
-tag</emphasis>). You can now use them instead of accounts numbers.
-(Example: <emphasis>acc gtalk on</emphasis>)
-</para>
-
-<para>
-Last of all: You can finally change your nickname and
-shorten root commands (try <emphasis>acc li</emphasis> instead
-of <emphasis>account list</emphasis>).
-</para>
-
-</sect1>
-
-<sect1 id="whatsnew030005">
-<title>New stuff in BitlBee 3.0.5</title>
-
-<para>
-OAuth2 support in Jabber module (see <emphasis>help set oauth</emphasis>).
-For better password security when using Google Talk, Facebook XMPP, or for
-using MSN Messenger via XMPP. Especially recommended on public servers.
-</para>
-
-<para>
-Starting quick groupchats on Jabber is easier now (using the <emphasis>chat
-with</emphasis> command, or <emphasis>/join</emphasis> + <emphasis>/invite</emphasis>).
-</para>
-
-<para>
-SSL certificate verification. Works only with GnuTLS, and needs to be enabled
-by updating your <emphasis>bitlbee.conf</emphasis>.
-</para>
-</sect1>
-
-<sect1 id="whatsnew030200">
-<title>New stuff in BitlBee 3.2</title>
-
-<para>
-Upgradeed to Twitter API version 1.1. This is necessary because previous
-versions will stop working from March 2013. At the same time, BitlBee now
-supports the streaming API and incoming direct messages.
-</para>
-</sect1>
-
-<sect1 id="whatsnew030202">
-<title>New stuff in BitlBee 3.2.2</title>
-
-<para>
-The OTR plugin now uses libotr 4.0 (AKA libotr5 in debian based distros)
-</para>
-
-<para>
-A few minor fixes/additions, like being able to use /oper to change
-passwords with <emphasis>account tag set -del password</emphasis>
-</para>
-</sect1>
-
-<sect1 id="whatsnew030400">
-<title>New stuff in BitlBee 3.4</title>
-
-<para>
-Lots of bugfixes! <emphasis>Important:</emphasis> Recompiling third party plugins such as bitlbee-steam or bitlbee-facebook is <emphasis>required</emphasis>!
-</para>
-
-<simplelist>
-	<member><emphasis>twitter:</emphasis> Filter channels - Search by keyword/hashtag or a list of users. See the <emphasis>HowtoTwitter</emphasis> wiki page for more details!</member>
-	<member><emphasis>twitter:</emphasis> Add "rawreply" command, like reply but bitlbee won't add @mention. Also add "favorite" / "fav" command aliases.</member>
-	<member><emphasis>twitter:</emphasis> Start stream from last tweet on connect/reconnect to avoid showing duplicate tweets</member>
-	<member><emphasis>jabber:</emphasis> Fixed crashes with file transfers (they still fail at bypassing NATs, but at least they fail without crashing)</member>
-	<member><emphasis>purple:</emphasis> Improved support for gadugadu, whatsapp and telegram.</member>
-	<member><emphasis>msn:</emphasis> disabled in this release since the protocol we used (MSNP18) stopped working.</member>
-	<member>Add a 'pattern' parameter to the blist command, to filter it.</member>
-	<member>The <emphasis>utf8_nicks</emphasis> setting should be more reliable now.</member>
-</simplelist>
-
-<para>
-See the full changelog for details!
-</para>
-
-</sect1>
-
-<sect1 id="whatsnew030401">
-<title>New stuff in BitlBee 3.4.1</title>
-
-<simplelist>
-	<member><emphasis>msn:</emphasis> Upgraded protocol version to MSNP21, works again</member>
-	<member><emphasis>jabber:</emphasis> Add "hipchat" protocol, for smoother login. Takes the same username as the official client. Note that unlike the 'hip-cat' branch, this doesn't preload channels. See the <emphasis>HowtoHipchat</emphasis> wiki page for details</member>
-	<member><emphasis>jabber:</emphasis> Gmail notifications support</member>
-	<member><emphasis>twitter:</emphasis> Show quoted tweets inline. Added "url" command, can be used to quote tweets.</member>
-</simplelist>
-
-</sect1>
-
-<sect1 id="whatsnew030402">
-<title>New stuff in BitlBee 3.4.2</title>
-
-<simplelist>
-	<member><emphasis>irc:</emphasis> Self-messages (messages sent by yourself from other IM clients), see <emphasis>help set self_messages</emphasis>. IRCv3.1 support and part of 3.2. Many important groupchat related bugfixes.</member>
-	<member><emphasis>jabber:</emphasis> Carbons, see <emphasis>help set carbons</emphasis>. Removed facebook XMPP, use bitlbee-facebook instead. SASL ANONYMOUS login, see <emphasis>help set anonymous</emphasis>.</member>
-	<member><emphasis>hipchat:</emphasis> Channels can now be added with <emphasis>chat add hipchat "channel name"</emphasis> which tries to guess the channel JID.</member>
-	<member><emphasis>skype:</emphasis> Show all messages as groupchats since we can't tell which ones are private. This plugin is mostly-deprecated and mostly-broken, use the skypeweb purple plugin or msn instead.</member>
-	<member><emphasis>purple:</emphasis> Fix problems remembering SSL certificates as trusted. Groupchat related fixes. Better error reporting. Fixed setting jabber away states.</member>
-</simplelist>
-
-<para>
-	And lots of bugfixes / stability improvements. See the full changelog for details!
-</para>
-
-</sect1>
-
-<sect1 id="whatsnew030500">
-<title>New stuff in BitlBee 3.5</title>
-
-<simplelist>
-	<member>New commands: <emphasis>chat list</emphasis> and <emphasis>plugins</emphasis>. New settings: <emphasis>nick_lowercase</emphasis>, <emphasis>nick_underscores</emphasis></member>
-	<member><emphasis>twitter:</emphasis> Hide muted tweets / no-retweets, add mute/unmute commands. Show full version of extended tweets.</member>
-	<member><emphasis>jabber:</emphasis> <emphasis>always_use_nicks</emphasis> channel setting. Don't send parts in a chat if someone is still connected from other devices. Personal oauth token login for hipchat.</member>
-	<member><emphasis>purple:</emphasis> Setting /topic. Fixes for SIPE and LINE. Don't ask for password if not needed (hangouts, telegram). Set nicks to %full_name for a few protocols (hangouts, funyahoo, icq, line)</member>
-</simplelist>
-
-<para>
-See the full changelog for details!
-</para>
-
-
-<sect1 id="whatsnew030600">
-<title>New stuff in BitlBee 3.6</title>
-
-<simplelist>
-	<member>Removed msn, skype, yahoo, oscar. Use the skypeweb and icyque purple plugins.</member>
-	<member>Fix twitter (disable stream setting, set tweet length to 280)</member>
-	<member>Add server-time IRCv3 capability</member>
-	<member>Large performance improvements for large contact lists</member>
-</simplelist>
-
-<para>
-See the full changelog for details!
-</para>
-
-</sect1>
-
-</sect1>
-
 </chapter>
Index: doc/user-guide/quickstart.xml
===================================================================
--- doc/user-guide/quickstart.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/quickstart.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -3,13 +3,13 @@
 
 <para>
-Welcome to BitlBee, your IRC gateway to other instant messaging protocols.
+Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant Messaging Systems.
 </para>
 
 <para>
-The center of BitlBee is the control channel, <emphasis>&amp;bitlbee</emphasis>. Two users will always be there, <emphasis>you</emphasis> (where "you" is the nickname you are using) and the system user, <emphasis>root</emphasis>.
+The center of BitlBee is the control channel, <emphasis>#bitlbee</emphasis>. Two users will always be there, <emphasis>you</emphasis> (where "you" is the nickname you are using) and the system user, <emphasis>root</emphasis>.
 </para>
 
 <para>
-You need to register so that all your IM settings (passwords, contacts, etc) can be saved on the BitlBee server. It's important that you pick a good password so no one else can access your account. Register with this password using the <emphasis>register</emphasis> command: <emphasis>register &lt;password&gt;</emphasis> (without the brackets!).
+You need register so that all your IM settings (passwords, contacts, etc) can be saved on the BitlBee server. It's important that you pick a good password so no one else can access your account. Register with this password using the <emphasis>register</emphasis> command: <emphasis>register &lt;password&gt;</emphasis> (without the brackets!).
 </para>
 
@@ -34,18 +34,14 @@
 
 <para>
-For instance, suppose you have a Jabber account at jabber.org with handle <emphasis>bitlbee@jabber.org</emphasis> with password <emphasis>QuickStart</emphasis>, you would:
+For instance, suppose you have an ICQ account with UIN <emphasis>72696705</emphasis> with password <emphasis>QuickStart</emphasis>, you would:
 </para>
 
 <ircexample>
-	<ircline nick="you">account add jabber bitlbee@jabber.org QuickStart</ircline>
+	<ircline nick="you">account add oscar 72696705 QuickStart login.icq.com</ircline>
 	<ircline nick="root">Account successfully added</ircline>
 </ircexample>
 
 <para>
-The other built-in IM protocol is twitter. Some protocols may be available as plugins that you can install, such as facebook, steam, discord and omegle. And you can get even more protocols by using the libpurple variant of BitlBee.
-</para>
-
-<para>
-For a list of currently supported protocols, use the <emphasis>plugins</emphasis> command. For more information about the <emphasis>account add</emphasis> command, see <emphasis>help account add</emphasis>.
+Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is <emphasis>login.oscar.aol.com</emphasis>. For ICQ, the server name is <emphasis>login.icq.com</emphasis>.
 </para>
 
@@ -57,26 +53,28 @@
 
 <sect1 id="quickstart3">
-<title>Step Four: Managing Contact Lists: Add, Remove and Rename</title>
+<title>Managing Contact Lists: Rename</title>
+
+<!--quickstart3-->
+<para>
+<emphasis>Step Three: Managing Contact Lists: Rename</emphasis>
+</para>
 
 <para>
-Now you might want to add some contacts, to do this we will use the <emphasis>add</emphasis> command. It needs two arguments: a connection ID (which can be a number (try <emphasis>account list</emphasis>), protocol name or (part of) the screenname) and the user's handle. It is used in the following way: <emphasis>add &lt;connection&gt; &lt;handle&gt;</emphasis>
+For most protocols (currently MSN, Jabber, Yahoo and AOL) BitlBee can download the contact list automatically from the IM server and all the on-line users should appear in the control channel when you log in.
+</para>
+
+<para>
+BitlBee will convert names into irc-friendly form (for instance: tux@example.com will be given the nickname tux). If you have more than one person who would have the same name by this logic (for instance: tux@example.com and tux@bitlbee.org) the second one to log on will be tux_. The same is true if you have a tux log on to AOL and a tux log on from Yahoo.
+</para>
+
+<para>
+It would be easy to get these two mixed up, so BitlBee has a <emphasis>rename</emphasis> command to change the nickname into something more suitable: <emphasis>rename &lt;oldnick&gt; &lt;newnick&gt;</emphasis>
 </para>
 
 <ircexample>
-	<ircline nick="you">add 0 r2d2@example.com</ircline>
-	<ircaction nick="r2d2"> has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
+	<ircline nick="you">rename tux_ bitlbeetux</ircline>
+	<ircaction nick="tux_">is now known as <emphasis>bitlbeetux</emphasis></ircaction>
+	<ircline nick="root">Nick successfully changed</ircline>
 </ircexample>
-
-<para>
-In this case r2d2 is online, since he/she joins the channel immediately. If the user is not online you will not see them join until they log on.
-</para>
-
-<para>
-Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <emphasis>remove</emphasis> command: <emphasis>remove r2d3</emphasis>
-</para>
-
-<para>
-Finally, if you have multiple users with similar names you may use the <emphasis>rename</emphasis> command to make it easier to remember: <emphasis>rename r2d2_ r2d2_aim</emphasis>
-</para>
 
 <para>
@@ -87,4 +85,34 @@
 
 <sect1 id="quickstart4">
+<title>Step Four: Managing Contact Lists: Add and Remove.</title>
+
+<para>
+<emphasis>Step Four: Managing Contact Lists: Add and Remove.</emphasis>
+</para>
+
+<para>
+Now you might want to add some contacts, to do this we will use the <emphasis>add</emphasis> command. It needs two arguments: a connection ID (which can be a number (try <emphasis>account list</emphasis>), protocol name or (part of) the screenname) and the user's handle. It is used in the following way: <emphasis>add &lt;connection&gt; &lt;handle&gt;</emphasis>
+</para>
+
+<ircexample>
+	<ircline nick="you">add 0 r2d2@example.com</ircline>
+	<ircaction nick="r2d2"> has joined <emphasis>#bitlbee</emphasis></ircaction>
+</ircexample>
+
+<para>
+In this case r2d2 is online, since he/she joins the channel immediately. If the user is not online you will not see them join until they log on.
+</para>
+
+<para>
+Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <emphasis>remove</emphasis> command: <emphasis>remove &lt;nick&gt;</emphasis>
+</para>
+
+<para>
+When finished, type <emphasis>help quickstart5</emphasis> to continue.
+</para>
+
+</sect1>
+
+<sect1 id="quickstart5">
 <title>Chatting</title>
 
@@ -94,39 +122,27 @@
 
 <para>
-First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <emphasis>help groupchats</emphasis> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <emphasis>add</emphasis> command. Once they are on your list and online, you can chat with them in &amp;bitlbee:
+First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <emphasis>help groupchats</emphasis> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <emphasis>add</emphasis> command. Once they are on your list and online, you can chat with them in #bitlbee:
 </para>
 
 <ircexample>
 	<ircline nick="you">tux: hey, how's the weather down there?</ircline>
-	<ircline nick="tux">you: a bit chilly!</ircline>
+	<ircline nick="tux"> you: a bit chilly!</ircline>
 </ircexample>
 
 <para>
-Note that, although all contacts are in the &amp;bitlbee channel, only tux will actually receive this message. The &amp;bitlbee channel shouldn't be confused with a real IRC channel.
+If you'd rather chat with them in a separate window use the <emphasis>/msg</emphasis> or <emphasis>/query</emphasis> command, just like you would for a private message in IRC.  If you want to have messages automatically come up in private messages rather than in the #bitlbee channel, use the <emphasis>set private</emphasis> command: <emphasis>set private true</emphasis> (<emphasis>set private false</emphasis> to change back).
 </para>
 
 <para>
-If you prefer chatting in a separate window, use the <emphasis>/msg</emphasis> or <emphasis>/query</emphasis> command, just like on real IRC. BitlBee will remember how you talk to someone and show his/her responses the same way. If you want to change the default behaviour (for people you haven't talked to yet), see <emphasis>help set private</emphasis>.
-</para>
-
-<para>
-You know the basics. If you want to know about some of the neat features BitlBee offers, please type <emphasis>help quickstart5</emphasis>.
+You know the basics. If you want to get to know more about BitlBee, please type <emphasis>help quickstart6</emphasis>.
 </para>
 
 </sect1>
 
-<sect1 id="quickstart5">
+<sect1 id="quickstart6">
 <title>Further Resources</title>
 
 <para>
-<emphasis>So you want more than just chatting? Or maybe you're just looking for more features?</emphasis>
-</para>
-
-<para>
-With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &amp;jabber</emphasis> you will join a channel that only contains your jabber contacts.
-</para>
-
-<para>
-Account tagging allows you to use the given account name rather than a number when referencing your account. If you wish to turn off your gtalk account, you may <emphasis>account gtalk off</emphasis> rather than <emphasis>account 3 off</emphasis> where "3" is the account number.
+<emphasis>So you want more than just chatting? Or maybe you're just looking for a feature?</emphasis>
 </para>
 
@@ -140,5 +156,5 @@
 
 <para>
-If you're still looking for something, please visit us in #bitlbee on the OFTC network (irc.oftc.net). Good luck and enjoy the Bee!
+If you're still looking for something, please visit us in #bitlbee on the OFTC network (you can connect via irc.bitlbee.org), or mail us your problem/suggestion. Good luck and enjoy the Bee!
 </para>
 
Index: doc/user-guide/twitter.xml
===================================================================
--- doc/user-guide/twitter.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<chapter id="twitter">
-<title>Twitter</title>
-
-<para>
-Twitter allows you to use a set of commands in the Twitter channel/query. See <emphasis>help set commands</emphasis>.
-</para>
-
-<para>
-Anything that doesn't look like a command will be treated as a new message. Watch out for typos, or to avoid this behaviour, set the <emphasis>commands</emphasis> setting to <emphasis>strict</emphasis>, which causes the <emphasis>post</emphasis> command to become mandatory for posting. See <emphasis>help set commands</emphasis>.
-</para>
-
-<para>
-Here is a short description of the commands available:
-<variablelist>
-<varlistentry><term>undo [&lt;#id&gt;]</term><listitem><para>Delete your last message (or one with the given ID)</para></listitem></varlistentry>
-<varlistentry><term>rt &lt;screenname|#id&gt;</term><listitem><para>Retweet someone's last message (or one with the given ID)</para></listitem></varlistentry>
-<varlistentry><term>reply &lt;screenname|#id&gt;</term><listitem><para>Reply to a message (with a reply-to reference, mentions only one user)</para></listitem></varlistentry>
-<varlistentry><term>rawreply &lt;screenname|#id&gt;</term><listitem><para>Reply to a message (with no reply-to reference)</para></listitem></varlistentry>
-<varlistentry><term>greply &lt;screenname|#id&gt;</term><listitem><para>Group reply to a message (with reply-to, mentions every user in the conversation)</para></listitem></varlistentry>
-<varlistentry><term>report &lt;screenname|#id&gt;</term><listitem><para>Report the given user (or the user who posted the message with the given ID) for sending spam. This will also block them.</para></listitem></varlistentry>
-<varlistentry><term>follow &lt;screenname&gt;</term><listitem><para>Start following a person</para></listitem></varlistentry>
-<varlistentry><term>unfollow &lt;screenname&gt;</term><listitem><para>Stop following a person</para></listitem></varlistentry>
-<varlistentry><term>favourite &lt;screenname|#id&gt;</term><listitem><para>Favo<emphasis>u</emphasis>rite the given user's most recent message, or the given ID.</para></listitem></varlistentry>
-<varlistentry><term>post &lt;message&gt;</term><listitem><para>Post a message</para></listitem></varlistentry>
-<varlistentry><term>url &lt;screenname|#id&gt;</term><listitem><para>Show URL for a message to open it in a browser (and see context)</para></listitem></varlistentry>
-</variablelist>
-</para>
-
-</chapter>
Index: doc/user-guide/user-guide.html
===================================================================
--- doc/user-guide/user-guide.html	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ doc/user-guide/user-guide.html	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,446 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>BitlBee User Guide</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="BitlBee-User-Guide"></a>BitlBee User Guide</h1></div><div><div class="author"><h3 class="author"><span class="firstname">Jelmer</span> <span class="surname">Vernooij</span></h3></div></div><div><div class="author"><h3 class="author"><span class="firstname">Wilmer</span> <span class="surname">van der Gaast</span></h3></div></div><div><div class="author"><h3 class="author"><span class="firstname">Sjoerd</span> <span class="surname">Hemminga</span></h3></div></div><div><p class="releaseinfo">
+   		This is the initial release of the BitlBee User Guide.
+   </p></div><div><div class="legalnotice"><a name="legalnotice"></a><p>
+         Permission is granted to copy, distribute and/or modify this 
+         document under the terms of the <a href="gnome-help:fdl" target="_top"><em class="citetitle">GNU Free Documentation 
+         License</em></a>, Version 1.1 or any later version 
+         published by the Free Software Foundation with no Invariant 
+         Sections, no Front-Cover Texts, and no Back-Cover Texts. You 
+         may obtain a copy of the <em class="citetitle">GNU Free Documentation 
+         License</em> from the Free Software Foundation by 
+         visiting <a href="http://www.fsf.org" target="_top">their 
+         Web site</a> or by writing to: Free Software Foundation, 
+         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+         USA.
+       </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#Installation">1. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683446">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id4683474">Compiling</a></span></dt><dt><span class="sect1"><a href="#id4683726">Configuration</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Usage">2. Usage</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683835">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id4683848">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id4683867">Talking to people</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Support">3. Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683912">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id4683926">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id4683931">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id4683948">IRC</a></span></dt><dt><span class="sect2"><a href="#id4683960">Mailinglists</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#quickstart">4. Quickstart</a></span></dt><dd><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></dd><dt><span class="chapter"><a href="#commands">5. Bitlbee commands</a></span></dt><dd><dl><dt><span class="sect1"><a href="#cmd_account">account - IM-account list maintenance</a></span></dt><dd><dl><dt><span class="sect2"><a href="#cmd_account_add">account add</a></span></dt><dt><span class="sect2"><a href="#cmd_account_del">account del</a></span></dt><dt><span class="sect2"><a href="#cmd_account_on">account on</a></span></dt><dt><span class="sect2"><a href="#cmd_account_off">account off</a></span></dt><dt><span class="sect2"><a href="#cmd_account_list">account list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#cmd_add">add - Add a buddy to your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_info">info - Request user information</a></span></dt><dt><span class="sect1"><a href="#cmd_remove">remove - Remove a buddy from your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_block">block - Block someone</a></span></dt><dt><span class="sect1"><a href="#cmd_allow">allow - Unblock someone</a></span></dt><dt><span class="sect1"><a href="#cmd_set">set - Miscellaneous settings</a></span></dt><dt><span class="sect1"><a href="#cmd_help">help - BitlBee help system</a></span></dt><dt><span class="sect1"><a href="#cmd_save">save - Save your account data</a></span></dt><dt><span class="sect1"><a href="#set_charset">charset</a></span></dt><dt><span class="sect1"><a href="#set_private">private</a></span></dt><dt><span class="sect1"><a href="#set_save_on_quit">save_on_quit</a></span></dt><dt><span class="sect1"><a href="#set_html">html</a></span></dt><dt><span class="sect1"><a href="#set_debug">debug</a></span></dt><dt><span class="sect1"><a href="#set_to_char">to_char</a></span></dt><dt><span class="sect1"><a href="#set_typing_notice">typing_notice</a></span></dt><dt><span class="sect1"><a href="#set_ops">ops</a></span></dt><dt><span class="sect1"><a href="#set_away_devoice">away_devoice</a></span></dt><dt><span class="sect1"><a href="#set_handle_unknown">handle_unknown</a></span></dt><dt><span class="sect1"><a href="#set_auto_connect">auto_connect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect">auto_reconnect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect_delay">auto_reconnect_delay</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer">buddy_sendbuffer</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer_delay">buddy_sendbuffer_delay</a></span></dt><dt><span class="sect1"><a href="#set_default_target">default_target</a></span></dt><dt><span class="sect1"><a href="#set_display_namechanges">display_namechanges</a></span></dt><dt><span class="sect1"><a href="#set_password">password</a></span></dt><dt><span class="sect1"><a href="#set_query_order">query_order</a></span></dt><dt><span class="sect1"><a href="#set_lcnicks">lcnicks</a></span></dt><dt><span class="sect1"><a href="#cmd_rename">rename - Rename (renick) a buddy</a></span></dt><dt><span class="sect1"><a href="#cmd_yes">yes - Accept a request</a></span></dt><dt><span class="sect1"><a href="#cmd_no">no - Deny a request</a></span></dt><dt><span class="sect1"><a href="#cmd_qlist">qlist - List all the unanswered questions root asked</a></span></dt><dt><span class="sect1"><a href="#cmd_register">register - Register yourself</a></span></dt><dt><span class="sect1"><a href="#cmd_identify">identify - Identify yourself with your password</a></span></dt><dt><span class="sect1"><a href="#cmd_drop">drop - Drop your account</a></span></dt><dt><span class="sect1"><a href="#cmd_blist">blist - List all the buddies in your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_nick">nick - Change friendly name, nick</a></span></dt><dt><span class="sect1"><a href="#cmd_import_buddies">import_buddies - Copy local buddy list to server (normally only needed when upgrading)</a></span></dt></dl></dd><dt><span class="chapter"><a href="#misc">6. Misc Stuff</a></span></dt><dd><dl><dt><span class="sect1"><a href="#smileys">Smileys</a></span></dt><dt><span class="sect1"><a href="#groupchats">Groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats2">Creating groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats3">Groupchat channel names</a></span></dt><dt><span class="sect1"><a href="#away">Away states</a></span></dt></dl></dd></dl></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Installation"></a>Chapter 1. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683446">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id4683474">Compiling</a></span></dt><dt><span class="sect1"><a href="#id4683726">Configuration</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683446"></a>Downloading the package</h2></div></div></div><p>
+The latest BitlBee release is always available from <a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a>.
+Download the package with your favorite program and unpack it: <span><strong class="command">tar
+xvfz bitlbee-&lt;version&gt;.tar.gz</strong></span> where &lt;version&gt; is to be
+replaced by the version number of the BitlBee you downloaded (e.g. 0.91).
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683474"></a>Compiling</h2></div></div></div><p>
+BitlBee's build system has to be configured before compiling. The
+<code class="filename">configure</code> script will do this for you. Just run
+it, it'll set up with nice and hopefully well-working defaults. If you
+want to change some settings, just try
+<span><strong class="command">./configure --help</strong></span> and see what you can do.
+</p><p>Some variables that might be of interest to the normal user:</p><div class="itemizedlist"><ul type="disc"><li><p>prefix, bindir, etcdir, mandir, datadir - The place where
+all the BitlBee program files will be put. There's usually no reason to
+specify them all separately, just specifying prefix (or keeping the default
+<code class="filename">/usr/local/</code>) should be okay.</p></li><li><p>config - The place where BitlBee will save all the per-user
+settings and buddy information. <code class="filename">/var/lib/bitlbee/</code>
+is the default value.</p></li><li><p>msn, jabber, oscar, yahoo - By default, support for all
+these IM-protocols (OSCAR is the protocol used by both ICQ and AIM) will
+be compiled in. To make the binary a bit smaller, you can use these options
+to leave out support for protocols you're not planning to use.</p></li><li><p>debug - Generate an unoptimized binary with debugging symbols,
+mainly useful if you want to do some debugging or help us to track down a
+problem.</p></li><li><p>strip - By default, unnecessary parts of the generated binary
+will be stripped out to make it as small as possible. If you don't want this
+(because it might cause problems on some platforms), set this to 0.
+</p></li><li><p>flood - To secure your BitlBee server against flooding attacks,
+you can use this option. It's not compiled in by default because it needs
+more testing first.</p></li><li><p>ssl - The MSN and Jabber modules require an SSL library for
+some of their tasks. BitlBee can use three different SSL libraries: GnuTLS,
+mozilla-nss and OpenSSL. (OpenSSL is, however, a bit troublesome because of
+licensing issues, so don't forget to read the information configure will
+give you when you try to use OpenSSL!) By default, configure will try to
+detect GnuTLS or mozilla-nss. If none of them can be found, it'll give up.
+If you want BitlBee to use OpenSSL, you have to explicitly specify that.
+</p></li></ul></div><p>
+After running <code class="filename">configure</code>, you should run
+<span><strong class="command">make</strong></span>. After that, run <span><strong class="command">make install</strong></span> as 
+root.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683726"></a>Configuration</h2></div></div></div><p>
+By default, BitlBee runs as the user nobody. You might want 
+to run it as a seperate user (some computers run named or apache as nobody). 
+</p><p>
+Since BitlBee uses inetd, you should add the following line to <code class="filename">/etc/inetd.conf</code>:
+</p><p>
+        </p><pre class="programlisting">
+6667    stream  tcp     nowait nobody /usr/local/sbin/bitlbee bitlbee
+</pre><p>
+      </p><p>
+Inetd has to be restarted after changing the configuration. Either
+<span><strong class="command">killall -HUP inetd</strong></span> or 
+<span><strong class="command">/etc/init.d/inetd restart</strong></span> should do the job on most systems.
+</p><p>
+You might be one of the.. ehr, lucky people running an xinetd-powered distro.
+<span><strong class="command">xinetd</strong></span> is quite different and they seem to be proud of that.. ;-)
+Anyway, if you want BitlBee to work with <span><strong class="command">xinetd</strong></span>, just copy the
+bitlbee.xinetd file to your /etc/xinetd.d/ directory (and probably edit it to suit
+your needs).
+</p><p>
+You should create a directory where BitlBee can store it's data files. This 
+should be the directory named after the value 'CONFIG' in Makefile.settings. 
+The default is <code class="filename">/var/lib/bitlbee</code>, which can be created 
+with the command <span><strong class="command">mkdir -p /var/lib/bitlbee</strong></span>. This 
+directory has to be owned by the user that runs bitlbee. To make 
+'nobody' owner of this directory, run <span><strong class="command">chown nobody /var/lib/bitlbee</strong></span>.
+Because things like passwords are saved in this directory, it's probably
+a good idea to make this directory owner-read-/writable only.
+</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Usage"></a>Chapter 2. Usage</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683835">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id4683848">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id4683867">Talking to people</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683835"></a>Connecting to the server</h2></div></div></div><p>
+Since BitlBee acts just like any other irc daemon, you can connect to 
+it with your favorite irc client. Launch it and connect to localhost port 6667
+(or whatever host/port you are running bitlbee on).
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683848"></a>The #bitlbee control channel</h2></div></div></div><p>
+Once you are connected to the BitlBee server, you are automatically joined
+to #bitlbee on that server. This channel acts like the 'buddy list' you have
+on the various other chat networks.
+</p><p>
+The user 'root' always hangs around in #bitlbee and acts as your interface 
+to bitlbee. All commands you give on #bitlbee are 'answered' by root.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683867"></a>Talking to people</h2></div></div></div><p>
+You can talk to by starting a query with them. In most irc clients, 
+this can be done with either <span><strong class="command">/msg &lt;nick&gt; &lt;text&gt;</strong></span>
+or <span><strong class="command">/query &lt;nick&gt;</strong></span>.
+</p><p>
+To keep the number of open query windows limited, you can also talk to people
+in the control channel, like <span><strong class="command">&lt;nick&gt;: &lt;text&gt;</strong></span>.
+</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Support"></a>Chapter 3. Support</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683912">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id4683926">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id4683931">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id4683948">IRC</a></span></dt><dt><span class="sect2"><a href="#id4683960">Mailinglists</a></span></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683912"></a>BitlBee is beta software</h2></div></div></div><p>
+Although BitlBee has quite some functionality it is still beta. That means it 
+can crash at any time, corrupt your data or whatever. Don't use it in 
+any production environment and don't rely on it.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683926"></a>Support channels</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683931"></a>The World Wide Web</h3></div></div></div><p><a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a> 
+is the homepage of bitlbee and contains the most recent news on bitlbee and 
+the latest releases.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683948"></a>IRC</h3></div></div></div><p>
+BitlBee is discussed on #bitlbee on the OFTC IRC network (server: irc.oftc.net).
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683960"></a>Mailinglists</h3></div></div></div><p>
+BitlBee doesn't have any mailinglists.
+</p></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="quickstart"></a>Chapter 4. Quickstart</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></div><p>
+Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant Messaging Systems.
+</p><p>
+The center of BitlBee is the control channel, <span class="emphasis"><em>#bitlbee</em></span>. Two users will always be there, <span class="emphasis"><em>you</em></span> (where "you" is the nickname you are using) and the system user, <span class="emphasis"><em>root</em></span>.
+</p><p>
+You need register so that all your IM settings (passwords, contacts, etc) can be saved on the BitlBee server. It's important that you pick a good password so no one else can access your account. Register with this password using the <span class="emphasis"><em>register</em></span> command: <span class="emphasis"><em>register &lt;password&gt;</em></span> (without the brackets!).
+</p><p>
+Be sure to remember your password. The next time you connect to the BitlBee server you will need to <span class="emphasis"><em>identify &lt;password&gt;</em></span> so that you will be recognised and logged in to all the IM services automatically.
+</p><p>
+When finished, type <span class="emphasis"><em>help quickstart2</em></span> to continue.
+</p><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quickstart2"></a>Add and Connect To your IM Account(s)</h2></div></div></div><p>
+        <span class="emphasis"><em>Step Two: Add and Connect To your IM Account(s).</em></span>
+      </p><p>
+To add an account to the account list you will need to use the <span class="emphasis"><em>account add</em></span> command: <span class="emphasis"><em>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt; [&lt;server&gt;]</em></span>.
+</p><p>
+For instance, suppose you have an ICQ account with UIN <span class="emphasis"><em>72696705</em></span> with password <span class="emphasis"><em>QuickStart</em></span>, you would:
+</p><pre class="screen"><code class="prompt">&lt; you&gt; </code><strong class="userinput"><code>account add oscar 72696705 QuickStart login.icq.com</code></strong>
+<code class="prompt">&lt; root&gt; </code><strong class="userinput"><code>Account successfully added</code></strong>
+</pre><p>
+Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is <span class="emphasis"><em>login.oscar.aol.com</em></span>. For ICQ, the server name is <span class="emphasis"><em>login.icq.com</em></span>.
+</p><p>
+When you are finished adding your account(s) use the <span class="emphasis"><em>account on</em></span> command to enable all your accounts, type <span class="emphasis"><em>help quickstart3</em></span> to continue.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quickstart3"></a>Managing Contact Lists: Rename</h2></div></div></div><p>
+        <span class="emphasis"><em>Step Three: Managing Contact Lists: Rename</em></span>
+      </p><p>
+For most protocols (currently MSN, Jabber, Yahoo and AOL) BitlBee can download the contact list automatically from the IM server and all the on-line users should appear in the control channel when you log in.
+</p><p>
+BitlBee will convert names into irc-friendly form (for instance: tux@example.com will be given the nickname tux). If you have more than one person who would have the same name by this logic (for instance: tux@example.com and tux@bitlbee.org) the second one to log on will be tux_. The same is true if you have a tux log on to AOL and a tux log on from Yahoo.
+</p><p>
+It would be easy to get these two mixed up, so BitlBee has a <span class="emphasis"><em>rename</em></span> command to change the nickname into something more suitable: <span class="emphasis"><em>rename &lt;oldnick&gt; &lt;newnick&gt;</em></span></p><pre class="screen"><code class="prompt">&lt; you&gt; </code><strong class="userinput"><code>rename tux_ bitlbeetux</code></strong>
+ * tux_is now known as bitlbeetux
+<code class="prompt">&lt; root&gt; </code><strong class="userinput"><code>Nick successfully changed</code></strong>
+</pre><p>
+When finished, type <span class="emphasis"><em>help quickstart4</em></span> to continue.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quickstart4"></a>Step Four: Managing Contact Lists: Add and Remove.</h2></div></div></div><p>
+        <span class="emphasis"><em>Step Four: Managing Contact Lists: Add and Remove.</em></span>
+      </p><p>
+Now you might want to add some contacts, to do this we will use the <span class="emphasis"><em>add</em></span> command. It needs two arguments: a connection ID (which can be a number (try <span class="emphasis"><em>account list</em></span>), protocol name or (part of) the screenname) and the user's handle. It is used in the following way: <span class="emphasis"><em>add &lt;connection&gt; &lt;handle&gt;</em></span></p><pre class="screen"><code class="prompt">&lt; you&gt; </code><strong class="userinput"><code>add 0 r2d2@example.com</code></strong>
+ * r2d2has joined #bitlbee
+</pre><p>
+In this case r2d2 is online, since he/she joins the channel immediately. If the user is not online you will not see them join until they log on.
+</p><p>
+Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <span class="emphasis"><em>remove</em></span> command: <span class="emphasis"><em>remove &lt;nick&gt;</em></span></p><p>
+When finished, type <span class="emphasis"><em>help quickstart5</em></span> to continue.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quickstart5"></a>Chatting</h2></div></div></div><p>
+        <span class="emphasis"><em>Step Five: Chatting.</em></span>
+      </p><p>
+First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <span class="emphasis"><em>help groupchats</em></span> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <span class="emphasis"><em>add</em></span> command. Once they are on your list and online, you can chat with them in #bitlbee:
+</p><pre class="screen"><code class="prompt">&lt; you&gt; </code><strong class="userinput"><code>tux: hey, how's the weather down there?</code></strong>
+<code class="prompt">&lt; tux&gt; </code><strong class="userinput"><code>you: a bit chilly!</code></strong>
+</pre><p>
+If you'd rather chat with them in a separate window use the <span class="emphasis"><em>/msg</em></span> or <span class="emphasis"><em>/query</em></span> command, just like you would for a private message in IRC.  If you want to have messages automatically come up in private messages rather than in the #bitlbee channel, use the <span class="emphasis"><em>set private</em></span> command: <span class="emphasis"><em>set private true</em></span> (<span class="emphasis"><em>set private false</em></span> to change back).
+</p><p>
+You know the basics. If you want to get to know more about BitlBee, please type <span class="emphasis"><em>help quickstart6</em></span>.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="quickstart6"></a>Further Resources</h2></div></div></div><p>
+        <span class="emphasis"><em>So you want more than just chatting? Or maybe you're just looking for a feature?</em></span>
+      </p><p>
+You can type <span class="emphasis"><em>help set</em></span> to learn more about the possible BitlBee user settings. Among these user settings you will find options for common issues, such as changing the charset, HTML stripping and automatic connecting (simply type <span class="emphasis"><em>set</em></span> to see current user settings).
+</p><p>
+For more subjects (like groupchats and away states), please type <span class="emphasis"><em>help index</em></span>.
+</p><p>
+If you're still looking for something, please visit us in #bitlbee on the OFTC network (you can connect via irc.bitlbee.org), or mail us your problem/suggestion. Good luck and enjoy the Bee!
+</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="commands"></a>Chapter 5. Bitlbee commands</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#cmd_account">account - IM-account list maintenance</a></span></dt><dd><dl><dt><span class="sect2"><a href="#cmd_account_add">account add</a></span></dt><dt><span class="sect2"><a href="#cmd_account_del">account del</a></span></dt><dt><span class="sect2"><a href="#cmd_account_on">account on</a></span></dt><dt><span class="sect2"><a href="#cmd_account_off">account off</a></span></dt><dt><span class="sect2"><a href="#cmd_account_list">account list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#cmd_add">add - Add a buddy to your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_info">info - Request user information</a></span></dt><dt><span class="sect1"><a href="#cmd_remove">remove - Remove a buddy from your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_block">block - Block someone</a></span></dt><dt><span class="sect1"><a href="#cmd_allow">allow - Unblock someone</a></span></dt><dt><span class="sect1"><a href="#cmd_set">set - Miscellaneous settings</a></span></dt><dt><span class="sect1"><a href="#cmd_help">help - BitlBee help system</a></span></dt><dt><span class="sect1"><a href="#cmd_save">save - Save your account data</a></span></dt><dt><span class="sect1"><a href="#set_charset">charset</a></span></dt><dt><span class="sect1"><a href="#set_private">private</a></span></dt><dt><span class="sect1"><a href="#set_save_on_quit">save_on_quit</a></span></dt><dt><span class="sect1"><a href="#set_html">html</a></span></dt><dt><span class="sect1"><a href="#set_debug">debug</a></span></dt><dt><span class="sect1"><a href="#set_to_char">to_char</a></span></dt><dt><span class="sect1"><a href="#set_typing_notice">typing_notice</a></span></dt><dt><span class="sect1"><a href="#set_ops">ops</a></span></dt><dt><span class="sect1"><a href="#set_away_devoice">away_devoice</a></span></dt><dt><span class="sect1"><a href="#set_handle_unknown">handle_unknown</a></span></dt><dt><span class="sect1"><a href="#set_auto_connect">auto_connect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect">auto_reconnect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect_delay">auto_reconnect_delay</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer">buddy_sendbuffer</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer_delay">buddy_sendbuffer_delay</a></span></dt><dt><span class="sect1"><a href="#set_default_target">default_target</a></span></dt><dt><span class="sect1"><a href="#set_display_namechanges">display_namechanges</a></span></dt><dt><span class="sect1"><a href="#set_password">password</a></span></dt><dt><span class="sect1"><a href="#set_query_order">query_order</a></span></dt><dt><span class="sect1"><a href="#set_lcnicks">lcnicks</a></span></dt><dt><span class="sect1"><a href="#cmd_rename">rename - Rename (renick) a buddy</a></span></dt><dt><span class="sect1"><a href="#cmd_yes">yes - Accept a request</a></span></dt><dt><span class="sect1"><a href="#cmd_no">no - Deny a request</a></span></dt><dt><span class="sect1"><a href="#cmd_qlist">qlist - List all the unanswered questions root asked</a></span></dt><dt><span class="sect1"><a href="#cmd_register">register - Register yourself</a></span></dt><dt><span class="sect1"><a href="#cmd_identify">identify - Identify yourself with your password</a></span></dt><dt><span class="sect1"><a href="#cmd_drop">drop - Drop your account</a></span></dt><dt><span class="sect1"><a href="#cmd_blist">blist - List all the buddies in your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_nick">nick - Change friendly name, nick</a></span></dt><dt><span class="sect1"><a href="#cmd_import_buddies">import_buddies - Copy local buddy list to server (normally only needed when upgrading)</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_account"></a>account - IM-account list maintenance</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">account &lt;action&gt; [&lt;arguments&gt;]
+</pre><p>
+        </p><p>
+				Available actions: add, del, list, on, off. See <span class="emphasis"><em>help account &lt;action&gt;</em></span> for more information.
+			</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_add"></a>account add</h3></div></div></div><p><b>Syntax: </b>
+            </p><pre class="programlisting">account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt; [&lt;server&gt;]
+</pre><p>
+          </p><p>
+					Adds an account on the given server with the specified protocol, username and password to the account list. Supported protocols right now are: Jabber, MSN, OSCAR (AIM/ICQ) and Yahoo. For more information about adding an account, see <span class="emphasis"><em>help account add &lt;protocol&gt;</em></span>.
+				</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_add_jabber"></a>account add jabber</h3></div></div></div><p><b>Syntax: </b>
+              </p><pre class="programlisting">account add jabber &lt;handle&gt; &lt;password&gt; [&lt;servertag&gt;]
+</pre><p>
+            </p><p>
+						Note that the servertag argument is optional. You only have to use it if the part after the @ in your handle isn't the hostname of your Jabber server, or if you want to use SSL/connect to a non-standard port number. The format is simple: [&lt;servername&gt;[:&lt;portnumber&gt;][:ssl]]. For example, this is how you can connect to Google Talk:
+					</p><p>
+						Note that Google talk is SSL-only, but officially reachable over both port 5222 and 5223. However, for some people only port 5222 works, for some people only 5223. This is something you'll have to try out.
+					</p><pre class="screen"><code class="prompt">&lt; wilmer&gt; </code><strong class="userinput"><code>account add jabber example@gmail.com hobbelmeeuw talk.google.com:5223:ssl</code></strong>
+<code class="prompt">&lt; root&gt; </code><strong class="userinput"><code>Account successfully added</code></strong>
+</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_add_msn"></a>account add msn</h3></div></div></div><p><b>Syntax: </b>
+              </p><pre class="programlisting">account add msn &lt;handle&gt; &lt;password&gt;
+</pre><p>
+            </p><p>
+						For MSN connections there are no special arguments.
+					</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_add_oscar"></a>account add oscar</h3></div></div></div><p><b>Syntax: </b>
+              </p><pre class="programlisting">account add oscar &lt;handle&gt; &lt;password&gt; [&lt;servername&gt;]
+</pre><p>
+            </p><p>
+						Specifying a server is required for OSCAR, since OSCAR can be used for both ICQ- and AIM-connections. Although these days it's supposed to be possible to connect to ICQ via AIM-servers and vice versa, we like to stick with this separation for now. For ICQ connections, the servername is <span class="emphasis"><em>login.icq.com</em></span>, for AIM connections it's <span class="emphasis"><em>login.oscar.aol.com</em></span>.
+					</p><pre class="screen"><code class="prompt">&lt; wilmer&gt; </code><strong class="userinput"><code>account add oscar 72696705 hobbelmeeuw login.icq.com</code></strong>
+<code class="prompt">&lt; root&gt; </code><strong class="userinput"><code>Account successfully added</code></strong>
+</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_add_yahoo"></a>account add yahoo</h3></div></div></div><p><b>Syntax: </b>
+              </p><pre class="programlisting">account add yahoo &lt;handle&gt; &lt;password&gt;
+</pre><p>
+            </p><p>
+						For Yahoo! connections there are no special arguments.
+					</p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_del"></a>account del</h3></div></div></div><p><b>Syntax: </b>
+            </p><pre class="programlisting">account del &lt;account id&gt;
+</pre><p>
+          </p><p>
+					This commands deletes an account from your account list. You should signoff the account before deleting it.
+				</p><p>
+					The account ID can be a number (see <span class="emphasis"><em>account list</em></span>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+				</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_on"></a>account on</h3></div></div></div><p><b>Syntax: </b>
+            </p><pre class="programlisting">account on [&lt;account id&gt;]
+</pre><p>
+          </p><p>
+					This command will try to log into the specified account. If no account is specified, BitlBee will log into all the accounts. (Including accounts awaiting a reconnection)
+				</p><p>
+					The account ID can be a number (see <span class="emphasis"><em>account list</em></span>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+				</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_off"></a>account off</h3></div></div></div><p><b>Syntax: </b>
+            </p><pre class="programlisting">account off [&lt;account id&gt;]
+</pre><p>
+          </p><p>
+					This command disconnects the connection for the specified account. If no account is specified, BitlBee will deactivate all active accounts. (Including accounts awaiting a reconnection)
+				</p><p>
+					The account ID can be a number (see <span class="emphasis"><em>account list</em></span>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+				</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="cmd_account_list"></a>account list</h3></div></div></div><p><b>Syntax: </b>
+            </p><pre class="programlisting">account list
+</pre><p>
+          </p><p>
+					This command gives you a list of all the accounts known by BitlBee, including the numbers you'll need for most account commands.
+				</p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_add"></a>add - Add a buddy to your contact list</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">add &lt;connection&gt; &lt;handle&gt; [&lt;nick&gt;]
+</pre><p>
+        </p><p>
+				Adds the given buddy at the specified connection to your buddy list. The account ID can be a number (see <span class="emphasis"><em>account list</em></span>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+			</p><p>
+				If you want, you can also tell BitlBee what nick to give the new contact. Of course you can also use the <span class="emphasis"><em>rename</em></span> command for that, but sometimes this might be more convenient.
+			</p><pre class="screen"><code class="prompt">&lt; ctrlsoft&gt; </code><strong class="userinput"><code>add 3 gryp@jabber.org grijp</code></strong>
+ * grijphas joined #bitlbee
+</pre></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_info"></a>info - Request user information</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">info &lt;connection&gt; &lt;handle&gt;
+info &lt;nick&gt;
+</pre><p>
+        </p><p>
+				Requests IM-network-specific information about the specified user. The amount of information you'll get differs per protocol. For some protocols (ATM Yahoo! and MSN) it'll give you an URL which you can visit with a normal web browser to get the information.
+			</p><pre class="screen"><code class="prompt">&lt; ctrlsoft&gt; </code><strong class="userinput"><code>info 0 72696705</code></strong>
+<code class="prompt">&lt; root&gt; </code><strong class="userinput"><code>User info - UIN: 72696705 Nick: Lintux First/Last name: Wilmer van der Gaast E-mail: lintux@lintux.cx</code></strong>
+</pre></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_remove"></a>remove - Remove a buddy from your contact list</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">remove &lt;nick&gt;
+</pre><p>
+        </p><p>
+				Removes the specified nick from your buddy list. 
+			</p><pre class="screen"><code class="prompt">&lt; ctrlsoft&gt; </code><strong class="userinput"><code>remove gryp</code></strong>
+ * gryphas quit [Leaving...]
+</pre></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_block"></a>block - Block someone</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">block &lt;nick&gt;
+block &lt;connection&gt; &lt;handle&gt;
+</pre><p>
+        </p><p>
+				Puts the specified user on your ignore list. Either specify the user's nick when you have him/her in your contact list or a connection number and a user handle.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_allow"></a>allow - Unblock someone</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">allow &lt;nick&gt;
+allow &lt;connection&gt; &lt;handle&gt;
+</pre><p>
+        </p><p>
+				Reverse of block. Unignores the specified user or user handle on specified connection.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_set"></a>set - Miscellaneous settings</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">set [&lt;variable&gt; [&lt;value&gt;]]
+</pre><p>
+        </p><p>
+				Without any arguments, this command lists all the set variables. You can also specify a single argument, a variable name, to get that variable's value. To change this value, specify the new value as the second argument.
+			</p><p>
+				To get more help information about a setting, try:
+			</p><pre class="screen"><code class="prompt">&lt; ctrlsoft&gt; </code><strong class="userinput"><code>help set private</code></strong>
+</pre></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_help"></a>help - BitlBee help system</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">help [subject]
+</pre><p>
+        </p><p>
+				This command gives you the help information you're reading right now. If you don't give any arguments, it'll give a short help index.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_save"></a>save - Save your account data</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">save
+</pre><p>
+        </p><p>
+				This command saves all your nicks and accounts immediately. Handy if you have the autosave functionality disabled, or if you don't trust the program's stability... ;-)
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_charset"></a>charset</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				The charset setting enables you to use different character sets in BitlBee. These get converted to UTF-8 before sending and from UTF-8 when receiving.
+			</p><p>
+				If you don't know what's the best value for this, at least iso8859-1 is the best choice for most Western countries. You can try to find what works best for you on http://czyborra.com/charsets/iso8859.html
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_private"></a>private</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				If value is true, messages from users will appear in separate query windows. If false, messages from users will appear in the control channel.
+			</p><p>
+				This setting is remembered (during one session) per-user, this setting only changes the default state. This option takes effect as soon as you reconnect.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_save_on_quit"></a>save_on_quit</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				If enabled causes BitlBee to save all current settings and account details when user disconnects. This is enabled by default, and these days there's not really a reason to have it disabled anymore.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_html"></a>html</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				Determines what BitlBee should do with HTML in messages. If set to nostrip, HTML in messages will not be touched. If set to strip, all HTML will be stripped from messages. Unfortunately this sometimes strips too much.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_debug"></a>debug</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				Some debugging messages can be sent to the control channel if you wish. They're probably not really useful for you, unless you're doing some development on BitlBee.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_to_char"></a>to_char</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				It's customary that messages meant for one specific person on an IRC channel are prepended by his/her alias followed by a colon ':'. BitlBee does this by default. If you prefer a different character, you can set it using <span class="emphasis"><em>set to_char</em></span>.
+			</p><p>
+				Please note that this setting is only used for incoming messages. For outgoing messages you can use ':' (colon) or ',' to separate the destination nick from the message, and this is not configurable.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_typing_notice"></a>typing_notice</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				Sends you a /notice when a user starts typing a message (if the protocol supports it, MSN for example). This is a bug, not a feature. (But please don't report it.. ;-) You don't want to use it. Really. In fact the typing-notification is just one of the least useful 'innovations' ever. It's just there because some guy will probably ask me about it anyway. ;-)
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_ops"></a>ops</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting.
+			</p><p>
+				The value "both" means both user and root get ops. "root" means, well, just root. "user" means just the user. "none" means nobody will get operator status.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_away_devoice"></a>away_devoice</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				With this option enabled, the root user devoices people when they go away (just away, not offline) and gives the voice back when they come back. You might dislike the voice-floods you'll get if your contact list is huge, so this option can be disabled.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_handle_unknown"></a>handle_unknown</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				Messages from unknown users are echoed like this by default:
+			</p><p>
+				If you want this lame user to be added automatically, you can set this setting to "add". If you prefer to ignore messages from people you don't know, you can set this one to "ignore". "add_private" and "add_channel" are like add, but you can use them to make messages from unknown buddies appear in the channel instead of a query window.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_auto_connect"></a>auto_connect</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				With this option enabled, when you identify BitlBee will automatically connect to your accounts, with this disabled it will not do this.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_auto_reconnect"></a>auto_reconnect</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				If an IM-connections breaks, you're supposed to bring it back up yourself. Having BitlBee do this automatically might not always be a good idea, for several reasons. If you want the connections to be restored automatically, you can enable this setting.
+			</p><p>
+				See also the <span class="emphasis"><em>auto_reconnect_delay</em></span> setting.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_auto_reconnect_delay"></a>auto_reconnect_delay</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: integer</td></tr></table><p>
+				Tell BitlBee after how many seconds it should attempt to bring an IM-connection back up after a crash. It's not a good idea to set this value very low, it will cause too much useless traffic when an IM-server is down for a few hours.
+			</p><p>
+				See also the <span class="emphasis"><em>auto_reconnect</em></span> setting.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_buddy_sendbuffer"></a>buddy_sendbuffer</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				By default, when you send a message to someone, BitlBee forwards this message to the user immediately. When you paste a large number of lines, the lines will be sent in separate messages, which might not be very nice to read. If you enable this setting, BitlBee will buffer your messages and wait for more data.
+			</p><p>
+				Using the <span class="emphasis"><em>buddy_sendbuffer_delay</em></span> setting you can specify the number of seconds BitlBee should wait for more data before the complete message is sent.
+			</p><p>
+				Please note that if you remove a buddy from your list (or if the connection to that user drops) and there's still data in the buffer, this data will be lost. BitlBee will not try to send the message to the user in those cases.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_buddy_sendbuffer_delay"></a>buddy_sendbuffer_delay</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: integer</td></tr></table><p>
+				Tell BitlBee after how many seconds a buffered message should be sent.
+			</p><p>
+				See also the <span class="emphasis"><em>buddy_sendbuffer</em></span> setting.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_default_target"></a>default_target</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				With this value set to <span class="emphasis"><em>root</em></span>, lines written in the control channel without any nickname in front of them will be interpreted as commands. If you want BitlBee to send those lines to the last person you addressed in the control channel, set this to <span class="emphasis"><em>last</em></span>.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_display_namechanges"></a>display_namechanges</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_password"></a>password</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				Use this setting to change your "NickServ" password.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_query_order"></a>query_order</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: string</td></tr></table><p>
+				This changes the order in which the questions from root (usually authorization requests from buddies) should be answered. When set to <span class="emphasis"><em>lifo</em></span>, BitlBee immediately displays all new questions and they should be answered in reverse order. When this is set to <span class="emphasis"><em>fifo</em></span>, BitlBee displays the first question which comes in and caches all the others until you answer the first one.
+			</p><p>
+				Although the <span class="emphasis"><em>fifo</em></span> setting might sound more logical (and used to be the default behaviour in older BitlBee versions), it turned out not to be very convenient for many users when they missed the first question (and never received the next ones).
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="set_lcnicks"></a>lcnicks</h2></div></div></div><table class="simplelist" border="0" summary="Simple list"><tr><td>Type: boolean</td></tr></table><p>
+				Hereby you can change whether you want all lower case nick names or leave the case as it intended by your peer.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_rename"></a>rename - Rename (renick) a buddy</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">rename &lt;oldnick&gt; &lt;newnick&gt;
+</pre><p>
+        </p><p>
+				Renick a user in your buddy list. Very useful, in fact just very important, if you got a lot of people with stupid account names (or hard ICQ numbers).
+			</p><pre class="screen"><code class="prompt">&lt; itsme&gt; </code><strong class="userinput"><code>rename itsme_ you</code></strong>
+ * itsme_is now known as you
+</pre></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_yes"></a>yes - Accept a request</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">yes [&lt;number&gt;]
+</pre><p>
+        </p><p>
+				Sometimes an IM-module might want to ask you a question. (Accept this user as your buddy or not?) To accept a question, use the <span class="emphasis"><em>yes</em></span> command.
+			</p><p>
+				By default, this answers the first unanswered question. You can also specify a different question as an argument. You can use the <span class="emphasis"><em>qlist</em></span> command for a list of questions.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_no"></a>no - Deny a request</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">no [&lt;number&gt;]
+</pre><p>
+        </p><p>
+				Sometimes an IM-module might want to ask you a question. (Accept this user as your buddy or not?) To reject a question, use the <span class="emphasis"><em>no</em></span> command.
+			</p><p>
+				By default, this answers the first unanswered question. You can also specify a different question as an argument. You can use the <span class="emphasis"><em>qlist</em></span> command for a list of questions.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_qlist"></a>qlist - List all the unanswered questions root asked</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">qlist
+</pre><p>
+        </p><p>
+				This gives you a list of all the unanswered questions from root.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_register"></a>register - Register yourself</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">register &lt;password&gt;
+</pre><p>
+        </p><p>
+				BitlBee can save your settings so you won't have to enter all your IM passwords every time you log in. If you want the Bee to save your settings, use the <span class="emphasis"><em>register</em></span> command.
+			</p><p>
+				Please do pick a secure password, don't just use your nick as your password. Please note that IRC is not an encrypted protocol, so the passwords still go over the network in plaintext. Evil people with evil sniffers will read it all. (So don't use your root password.. ;-)
+			</p><p>
+				To identify yourself in later sessions, you can use the <span class="emphasis"><em>identify</em></span> command.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_identify"></a>identify - Identify yourself with your password</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">identify &lt;password&gt;
+</pre><p>
+        </p><p>
+				BitlBee saves all your settings (contacts, accounts, passwords) on-server. To prevent other users from just logging in as you and getting this information, you'll have to identify yourself with your password. You can register this password using the <span class="emphasis"><em>register</em></span> command.
+			</p><p>
+				Once you're registered, you can change your password using <span class="emphasis"><em>set password &lt;password&gt;</em></span>.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_drop"></a>drop - Drop your account</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">drop &lt;password&gt;
+</pre><p>
+        </p><p>
+				Drop your BitlBee registration. Your account files will be removed and your password will be forgotten. For obvious security reasons, you have to specify your NickServ password to make this command work.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_blist"></a>blist - List all the buddies in your contact list</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">blist [all|online|offline|away]
+</pre><p>
+        </p><p>
+				You can get a better readable buddy list using the <span class="emphasis"><em>blist</em></span> command. If you want a complete list (including the offline users) you can use the <span class="emphasis"><em>all</em></span> argument.
+			</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_nick"></a>nick - Change friendly name, nick</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">nick &lt;connection&gt; [&lt;new nick&gt;]
+nick
+</pre><p>
+        </p><p>
+				This command allows to set the friendly name of an im account. If no new name is specified the command will report the current name. When the name contains spaces, don't forget to quote the whole nick in double quotes. Currently this command is only supported by the MSN protocol.
+			</p><pre class="screen"><code class="prompt">&lt; wouter&gt; </code><strong class="userinput"><code>nick 1 "Wouter Paesen"</code></strong>
+<code class="prompt">&lt; root&gt; </code><strong class="userinput"><code>Setting your name on connection 1 to `Wouter Paesen'</code></strong>
+</pre></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="cmd_import_buddies"></a>import_buddies - Copy local buddy list to server (normally only needed when upgrading)</h2></div></div></div><p><b>Syntax: </b>
+          </p><pre class="programlisting">import_buddies &lt;connection&gt; [clear]
+</pre><p>
+        </p><p>
+				This command copies the locally stored buddy list to the server. This command exists for upgrading purposes. Previous versions of BitlBee didn't support server-side buddy lists for ICQ, so the list was stored locally.
+			</p><p>
+				Since version 0.91 however, server-side contact lists are supported for all protocols, so the local list is now ignored. When upgrading from an older BitlBee to version 0.91, you might need this command to get your buddy list back.
+			</p><p>
+				The only argument this command needs is your ICQ account identification. If your serverside buddy list contains some old buddies you don't want anymore, you can pass <span class="emphasis"><em>clear</em></span> as a second argument.
+			</p><p>
+				After giving this command, you have to wait for a while before all the adds are handled, because of ICQ's rate limiting. If your buddy list is very large and the ICQ server starts complaining, you might have to reconnect and enter this command again.
+			</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="misc"></a>Chapter 6. Misc Stuff</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#smileys">Smileys</a></span></dt><dt><span class="sect1"><a href="#groupchats">Groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats2">Creating groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats3">Groupchat channel names</a></span></dt><dt><span class="sect1"><a href="#away">Away states</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="smileys"></a>Smileys</h2></div></div></div><p>
+All MSN smileys (except one) are case insensitive and work without the nose too.
+</p><div class="variablelist"><dl><dt><span class="term">(Y)</span></dt><dd><p>Thumbs up</p></dd><dt><span class="term">(N)</span></dt><dd><p>Thumbs down</p></dd><dt><span class="term">(B)</span></dt><dd><p>Beer mug</p></dd><dt><span class="term">(D)</span></dt><dd><p>Martini glass</p></dd><dt><span class="term">(X)</span></dt><dd><p>Girl</p></dd><dt><span class="term">(Z)</span></dt><dd><p>Boy</p></dd><dt><span class="term">(6)</span></dt><dd><p>Devil smiley</p></dd><dt><span class="term">:-[</span></dt><dd><p>Vampire bat</p></dd><dt><span class="term">(})</span></dt><dd><p>Right hug</p></dd><dt><span class="term">({)</span></dt><dd><p>Left hug</p></dd><dt><span class="term">(M)</span></dt><dd><p>MSN Messenger or Windows Messenger icon (think a BitlBee logo here ;)</p></dd><dt><span class="term">:-S</span></dt><dd><p>Crooked smiley (Confused smiley)</p></dd><dt><span class="term">:-$</span></dt><dd><p>Embarrassed smiley</p></dd><dt><span class="term">(H)</span></dt><dd><p>Smiley with sunglasses</p></dd><dt><span class="term">:-@</span></dt><dd><p>Angry smiley</p></dd><dt><span class="term">(A)</span></dt><dd><p>Angel smiley</p></dd><dt><span class="term">(L)</span></dt><dd><p>Red heart (Love)</p></dd><dt><span class="term">(U)</span></dt><dd><p>Broken heart</p></dd><dt><span class="term">(K)</span></dt><dd><p>Red lips (Kiss)</p></dd><dt><span class="term">(G)</span></dt><dd><p>Gift with bow</p></dd><dt><span class="term">(F)</span></dt><dd><p>Red rose</p></dd><dt><span class="term">(W)</span></dt><dd><p>Wilted rose</p></dd><dt><span class="term">(P)</span></dt><dd><p>Camera</p></dd><dt><span class="term">(~)</span></dt><dd><p>Film strip</p></dd><dt><span class="term">(T)</span></dt><dd><p>Telephone receiver</p></dd><dt><span class="term">(@)</span></dt><dd><p>Cat face</p></dd><dt><span class="term">(&amp;)</span></dt><dd><p>Dog's head</p></dd><dt><span class="term">(C)</span></dt><dd><p>Coffee cup</p></dd><dt><span class="term">(I)</span></dt><dd><p>Light bulb</p></dd><dt><span class="term">(S)</span></dt><dd><p>Half-moon (Case sensitive!)</p></dd><dt><span class="term">(*)</span></dt><dd><p>Star</p></dd><dt><span class="term">(8)</span></dt><dd><p>Musical eighth note</p></dd><dt><span class="term">(E)</span></dt><dd><p>Envelope</p></dd><dt><span class="term">(^)</span></dt><dd><p>Birthday cake</p></dd><dt><span class="term">(O)</span></dt><dd><p>Clock</p></dd></dl></div><p>
+This list was extracted from <a href="http://help.msn.com/!data/en_us/data/messengerv50.its51/%24content%24/EMOTICONS.HTM?H_APP=" target="_top">http://help.msn.com/!data/en_us/data/messengerv50.its51/$content$/EMOTICONS.HTM?H_APP=</a>.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="groupchats"></a>Groupchats</h2></div></div></div><p>
+Since version 0.8x, BitlBee supports groupchats on the MSN and Yahoo! networks. This text will try to explain you how they work.
+</p><p>
+As soon as someone invites you into a groupchat, you will be force-joined or invited (depending on the protocol) into a new virtual channel with all the people in there. You can leave the channel at any time, just like you would close the window in regular IM clients. Please note that root-commands don't work in groupchat channels, they only work in the control channel (or to root directly).
+</p><p>
+Of course you can also create your own groupchats. Type <span class="emphasis"><em>help groupchats2</em></span> to see how.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="groupchats2"></a>Creating groupchats</h2></div></div></div><p>
+If you want to start a groupchat with the person <span class="emphasis"><em>jim_msn</em></span> in it, just join the channel <span class="emphasis"><em>#jim_msn</em></span>. BitlBee will refuse to join you to the channel with that name, but it will create a new virtual channel with root, you and jim_msn in it.
+</p><p>
+Of course a channel with only two people isn't really exciting yet. So the next step is to invite some other people to the channel. For this, you can use the <span class="emphasis"><em>/invite</em></span> command of your IRC client. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
+</p><p>
+This is all you'll probably need to know. If you have any problems, please read <span class="emphasis"><em>help groupchats3</em></span>.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="groupchats3"></a>Groupchat channel names</h2></div></div></div><p>
+Obviously the (numbered) channel names don't make a lot of sense. Problem is that groupchats usually don't have names at all in the IM-world, while IRC insists on a name. So BitlBee just generates something random, just don't pay attention to it. :-)
+</p><p>
+Please also note that BitlBee doesn't support groupchats for all protocols yet. BitlBee will tell you so. Support for other protocols will hopefully come later.
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="away"></a>Away states</h2></div></div></div><p>
+As you might've expected, you can just use the <span class="emphasis"><em>/away</em></span> command in your IRC client to set an away-state. BitlBee supports most away-states supported by the protocols.
+</p><p>
+Not all away states are supported by all protocols, and some protocols have different names for them. BitlBee will try to pick the best available alias from this list for every connection:
+</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Away from computer, Away, Extended away</td></tr><tr><td>NA, N/A, Not available</td></tr><tr><td>Busy, Do not disturb, DND, Occupied</td></tr><tr><td>Be right back, BRB</td></tr><tr><td>On the phone, Phone, On phone</td></tr><tr><td>Out to lunch, Lunch, Food</td></tr></table><p>
+So <span class="emphasis"><em>/away Food</em></span> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" or "Away from computer" will be chosen.
+</p><p>
+You can also add more information to your away message. Setting it to "Busy - Fixing BitlBee bugs" will set your IM-away-states to Busy, but your away message will be more descriptive for people on IRC. Protocols like Yahoo! and Jabber will also show this complete away message to your buddies.
+</p></div></div></div></body></html>
Index: doc/user-guide/user-guide.txt
===================================================================
--- doc/user-guide/user-guide.txt	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
+++ doc/user-guide/user-guide.txt	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -0,0 +1,1209 @@
+BitlBee User Guide
+
+Jelmer Vernooij
+
+Wilmer van der Gaast
+
+Sjoerd Hemminga
+
+This is the initial release of the BitlBee User Guide.
+
+Permission is granted to copy, distribute and/or modify this document under the
+terms of the GNU Free Documentation License, Version 1.1 or any later version
+published by the Free Software Foundation with no Invariant Sections, no
+Front-Cover Texts, and no Back-Cover Texts. You may obtain a copy of the GNU
+Free Documentation License from the Free Software Foundation by visiting their
+Web site or by writing to: Free Software Foundation, Inc., 59 Temple Place -
+Suite 330, Boston, MA 02111-1307, USA.
+
+-------------------------------------------------------------------------------
+
+Table of Contents
+
+1. Installation
+
+    Downloading the package
+    Compiling
+    Configuration
+
+2. Usage
+
+    Connecting to the server
+    The #bitlbee control channel
+    Talking to people
+
+3. Support
+
+    BitlBee is beta software
+    Support channels
+
+        The World Wide Web
+        IRC
+        Mailinglists
+
+4. Quickstart
+
+    Add and Connect To your IM Account(s)
+    Managing Contact Lists: Rename
+    Step Four: Managing Contact Lists: Add and Remove.
+    Chatting
+    Further Resources
+
+5. Bitlbee commands
+
+    account - IM-account list maintenance
+
+        account add
+        account del
+        account on
+        account off
+        account list
+
+    add - Add a buddy to your contact list
+    info - Request user information
+    remove - Remove a buddy from your contact list
+    block - Block someone
+    allow - Unblock someone
+    set - Miscellaneous settings
+    help - BitlBee help system
+    save - Save your account data
+    charset
+    private
+    save_on_quit
+    html
+    debug
+    to_char
+    typing_notice
+    ops
+    away_devoice
+    handle_unknown
+    auto_connect
+    auto_reconnect
+    auto_reconnect_delay
+    buddy_sendbuffer
+    buddy_sendbuffer_delay
+    default_target
+    display_namechanges
+    password
+    query_order
+    lcnicks
+    rename - Rename (renick) a buddy
+    yes - Accept a request
+    no - Deny a request
+    qlist - List all the unanswered questions root asked
+    register - Register yourself
+    identify - Identify yourself with your password
+    drop - Drop your account
+    blist - List all the buddies in your contact list
+    nick - Change friendly name, nick
+    import_buddies - Copy local buddy list to server (normally only needed when
+        upgrading)
+
+6. Misc Stuff
+
+    Smileys
+    Groupchats
+    Creating groupchats
+    Groupchat channel names
+    Away states
+
+Chapter 1. Installation
+
+Table of Contents
+
+Downloading the package
+Compiling
+Configuration
+
+Downloading the package
+
+The latest BitlBee release is always available from http://www.bitlbee.org/.
+Download the package with your favorite program and unpack it: tar xvfz
+bitlbee-<version>.tar.gz where <version> is to be replaced by the version
+number of the BitlBee you downloaded (e.g. 0.91).
+
+Compiling
+
+BitlBee's build system has to be configured before compiling. The configure
+script will do this for you. Just run it, it'll set up with nice and hopefully
+well-working defaults. If you want to change some settings, just try ./
+configure --help and see what you can do.
+
+Some variables that might be of interest to the normal user:
+
+  * prefix, bindir, etcdir, mandir, datadir - The place where all the BitlBee
+    program files will be put. There's usually no reason to specify them all
+    separately, just specifying prefix (or keeping the default /usr/local/)
+    should be okay.
+
+  * config - The place where BitlBee will save all the per-user settings and
+    buddy information. /var/lib/bitlbee/ is the default value.
+
+  * msn, jabber, oscar, yahoo - By default, support for all these IM-protocols
+    (OSCAR is the protocol used by both ICQ and AIM) will be compiled in. To
+    make the binary a bit smaller, you can use these options to leave out
+    support for protocols you're not planning to use.
+
+  * debug - Generate an unoptimized binary with debugging symbols, mainly
+    useful if you want to do some debugging or help us to track down a problem.
+
+  * strip - By default, unnecessary parts of the generated binary will be
+    stripped out to make it as small as possible. If you don't want this
+    (because it might cause problems on some platforms), set this to 0.
+
+  * flood - To secure your BitlBee server against flooding attacks, you can use
+    this option. It's not compiled in by default because it needs more testing
+    first.
+
+  * ssl - The MSN and Jabber modules require an SSL library for some of their
+    tasks. BitlBee can use three different SSL libraries: GnuTLS, mozilla-nss
+    and OpenSSL. (OpenSSL is, however, a bit troublesome because of licensing
+    issues, so don't forget to read the information configure will give you
+    when you try to use OpenSSL!) By default, configure will try to detect
+    GnuTLS or mozilla-nss. If none of them can be found, it'll give up. If you
+    want BitlBee to use OpenSSL, you have to explicitly specify that.
+
+After running configure, you should run make. After that, run make install as
+root.
+
+Configuration
+
+By default, BitlBee runs as the user nobody. You might want to run it as a
+seperate user (some computers run named or apache as nobody).
+
+Since BitlBee uses inetd, you should add the following line to /etc/inetd.conf:
+
+6667    stream  tcp     nowait nobody /usr/local/sbin/bitlbee bitlbee
+
+Inetd has to be restarted after changing the configuration. Either killall -HUP
+inetd or /etc/init.d/inetd restart should do the job on most systems.
+
+You might be one of the.. ehr, lucky people running an xinetd-powered distro.
+xinetd is quite different and they seem to be proud of that.. ;-) Anyway, if
+you want BitlBee to work with xinetd, just copy the bitlbee.xinetd file to your
+/etc/xinetd.d/ directory (and probably edit it to suit your needs).
+
+You should create a directory where BitlBee can store it's data files. This
+should be the directory named after the value 'CONFIG' in Makefile.settings.
+The default is /var/lib/bitlbee, which can be created with the command mkdir -p
+/var/lib/bitlbee. This directory has to be owned by the user that runs bitlbee.
+To make 'nobody' owner of this directory, run chown nobody /var/lib/bitlbee.
+Because things like passwords are saved in this directory, it's probably a good
+idea to make this directory owner-read-/writable only.
+
+Chapter 2. Usage
+
+Table of Contents
+
+Connecting to the server
+The #bitlbee control channel
+Talking to people
+
+Connecting to the server
+
+Since BitlBee acts just like any other irc daemon, you can connect to it with
+your favorite irc client. Launch it and connect to localhost port 6667 (or
+whatever host/port you are running bitlbee on).
+
+The #bitlbee control channel
+
+Once you are connected to the BitlBee server, you are automatically joined to #
+bitlbee on that server. This channel acts like the 'buddy list' you have on the
+various other chat networks.
+
+The user 'root' always hangs around in #bitlbee and acts as your interface to
+bitlbee. All commands you give on #bitlbee are 'answered' by root.
+
+Talking to people
+
+You can talk to by starting a query with them. In most irc clients, this can be
+done with either /msg <nick> <text> or /query <nick>.
+
+To keep the number of open query windows limited, you can also talk to people
+in the control channel, like <nick>: <text>.
+
+Chapter 3. Support
+
+Table of Contents
+
+BitlBee is beta software
+Support channels
+
+    The World Wide Web
+    IRC
+    Mailinglists
+
+BitlBee is beta software
+
+Although BitlBee has quite some functionality it is still beta. That means it
+can crash at any time, corrupt your data or whatever. Don't use it in any
+production environment and don't rely on it.
+
+Support channels
+
+The World Wide Web
+
+http://www.bitlbee.org/ is the homepage of bitlbee and contains the most recent
+news on bitlbee and the latest releases.
+
+IRC
+
+BitlBee is discussed on #bitlbee on the OFTC IRC network (server:
+irc.oftc.net).
+
+Mailinglists
+
+BitlBee doesn't have any mailinglists.
+
+Chapter 4. Quickstart
+
+Table of Contents
+
+Add and Connect To your IM Account(s)
+Managing Contact Lists: Rename
+Step Four: Managing Contact Lists: Add and Remove.
+Chatting
+Further Resources
+
+Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant
+Messaging Systems.
+
+The center of BitlBee is the control channel, #bitlbee. Two users will always
+be there, you (where "you" is the nickname you are using) and the system user,
+root.
+
+You need register so that all your IM settings (passwords, contacts, etc) can
+be saved on the BitlBee server. It's important that you pick a good password so
+no one else can access your account. Register with this password using the
+register command: register <password> (without the brackets!).
+
+Be sure to remember your password. The next time you connect to the BitlBee
+server you will need to identify <password> so that you will be recognised and
+logged in to all the IM services automatically.
+
+When finished, type help quickstart2 to continue.
+
+Add and Connect To your IM Account(s)
+
+Step Two: Add and Connect To your IM Account(s).
+
+To add an account to the account list you will need to use the account add
+command: account add <protocol> <username> <password> [<server>].
+
+For instance, suppose you have an ICQ account with UIN 72696705 with password
+QuickStart, you would:
+
+< you> account add oscar 72696705 QuickStart login.icq.com
+< root> Account successfully added
+
+Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol
+used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth
+argument (for msn and yahoo there is no fourth argument). For AOL Instant
+Messenger, the server name is login.oscar.aol.com. For ICQ, the server name is
+login.icq.com.
+
+When you are finished adding your account(s) use the account on command to
+enable all your accounts, type help quickstart3 to continue.
+
+Managing Contact Lists: Rename
+
+Step Three: Managing Contact Lists: Rename
+
+For most protocols (currently MSN, Jabber, Yahoo and AOL) BitlBee can download
+the contact list automatically from the IM server and all the on-line users
+should appear in the control channel when you log in.
+
+BitlBee will convert names into irc-friendly form (for instance:
+tux@example.com will be given the nickname tux). If you have more than one
+person who would have the same name by this logic (for instance:
+tux@example.com and tux@bitlbee.org) the second one to log on will be tux_. The
+same is true if you have a tux log on to AOL and a tux log on from Yahoo.
+
+It would be easy to get these two mixed up, so BitlBee has a rename command to
+change the nickname into something more suitable: rename <oldnick> <newnick>
+
+< you> rename tux_ bitlbeetux
+ * tux_is now known as bitlbeetux
+< root> Nick successfully changed
+
+When finished, type help quickstart4 to continue.
+
+Step Four: Managing Contact Lists: Add and Remove.
+
+Step Four: Managing Contact Lists: Add and Remove.
+
+Now you might want to add some contacts, to do this we will use the add
+command. It needs two arguments: a connection ID (which can be a number (try
+account list), protocol name or (part of) the screenname) and the user's
+handle. It is used in the following way: add <connection> <handle>
+
+< you> add 0 r2d2@example.com
+ * r2d2has joined #bitlbee
+
+In this case r2d2 is online, since he/she joins the channel immediately. If the
+user is not online you will not see them join until they log on.
+
+Lets say you accidentally added r2d3@example.com rather than r2d2@example.com,
+or maybe you just want to remove a user from your list because you never talk
+to them. To remove a name you will want to use the remove command: remove
+<nick>
+
+When finished, type help quickstart5 to continue.
+
+Chatting
+
+Step Five: Chatting.
+
+First of all, a person must be on your contact list for you to chat with them
+(unless it's a group chat, help groupchats for more). If someone not on your
+contact list sends you a message, simply add them to the proper account with
+the add command. Once they are on your list and online, you can chat with them
+in #bitlbee:
+
+< you> tux: hey, how's the weather down there?
+< tux> you: a bit chilly!
+
+If you'd rather chat with them in a separate window use the /msg or /query
+command, just like you would for a private message in IRC. If you want to have
+messages automatically come up in private messages rather than in the #bitlbee
+channel, use the set private command: set private true (set private false to
+change back).
+
+You know the basics. If you want to get to know more about BitlBee, please type
+help quickstart6.
+
+Further Resources
+
+So you want more than just chatting? Or maybe you're just looking for a
+feature?
+
+You can type help set to learn more about the possible BitlBee user settings.
+Among these user settings you will find options for common issues, such as
+changing the charset, HTML stripping and automatic connecting (simply type set
+to see current user settings).
+
+For more subjects (like groupchats and away states), please type help index.
+
+If you're still looking for something, please visit us in #bitlbee on the OFTC
+network (you can connect via irc.bitlbee.org), or mail us your problem/
+suggestion. Good luck and enjoy the Bee!
+
+Chapter 5. Bitlbee commands
+
+Table of Contents
+
+account - IM-account list maintenance
+
+    account add
+    account del
+    account on
+    account off
+    account list
+
+add - Add a buddy to your contact list
+info - Request user information
+remove - Remove a buddy from your contact list
+block - Block someone
+allow - Unblock someone
+set - Miscellaneous settings
+help - BitlBee help system
+save - Save your account data
+charset
+private
+save_on_quit
+html
+debug
+to_char
+typing_notice
+ops
+away_devoice
+handle_unknown
+auto_connect
+auto_reconnect
+auto_reconnect_delay
+buddy_sendbuffer
+buddy_sendbuffer_delay
+default_target
+display_namechanges
+password
+query_order
+lcnicks
+rename - Rename (renick) a buddy
+yes - Accept a request
+no - Deny a request
+qlist - List all the unanswered questions root asked
+register - Register yourself
+identify - Identify yourself with your password
+drop - Drop your account
+blist - List all the buddies in your contact list
+nick - Change friendly name, nick
+import_buddies - Copy local buddy list to server (normally only needed when
+    upgrading)
+
+account - IM-account list maintenance
+
+Syntax: 
+
+account <action> [<arguments>]
+
+Available actions: add, del, list, on, off. See help account <action> for more
+information.
+
+account add
+
+Syntax: 
+
+account add <protocol> <username> <password> [<server>]
+
+Adds an account on the given server with the specified protocol, username and
+password to the account list. Supported protocols right now are: Jabber, MSN,
+OSCAR (AIM/ICQ) and Yahoo. For more information about adding an account, see
+help account add <protocol>.
+
+account add jabber
+
+Syntax: 
+
+account add jabber <handle> <password> [<servertag>]
+
+Note that the servertag argument is optional. You only have to use it if the
+part after the @ in your handle isn't the hostname of your Jabber server, or if
+you want to use SSL/connect to a non-standard port number. The format is
+simple: [<servername>[:<portnumber>][:ssl]]. For example, this is how you can
+connect to Google Talk:
+
+Note that Google talk is SSL-only, but officially reachable over both port 5222
+and 5223. However, for some people only port 5222 works, for some people only
+5223. This is something you'll have to try out.
+
+< wilmer> account add jabber example@gmail.com hobbelmeeuw talk.google.com:5223:ssl
+< root> Account successfully added
+
+account add msn
+
+Syntax: 
+
+account add msn <handle> <password>
+
+For MSN connections there are no special arguments.
+
+account add oscar
+
+Syntax: 
+
+account add oscar <handle> <password> [<servername>]
+
+Specifying a server is required for OSCAR, since OSCAR can be used for both
+ICQ- and AIM-connections. Although these days it's supposed to be possible to
+connect to ICQ via AIM-servers and vice versa, we like to stick with this
+separation for now. For ICQ connections, the servername is login.icq.com, for
+AIM connections it's login.oscar.aol.com.
+
+< wilmer> account add oscar 72696705 hobbelmeeuw login.icq.com
+< root> Account successfully added
+
+account add yahoo
+
+Syntax: 
+
+account add yahoo <handle> <password>
+
+For Yahoo! connections there are no special arguments.
+
+account del
+
+Syntax: 
+
+account del <account id>
+
+This commands deletes an account from your account list. You should signoff the
+account before deleting it.
+
+The account ID can be a number (see account list), the protocol name or (part
+of) the screenname, as long as it matches only one connection.
+
+account on
+
+Syntax: 
+
+account on [<account id>]
+
+This command will try to log into the specified account. If no account is
+specified, BitlBee will log into all the accounts. (Including accounts awaiting
+a reconnection)
+
+The account ID can be a number (see account list), the protocol name or (part
+of) the screenname, as long as it matches only one connection.
+
+account off
+
+Syntax: 
+
+account off [<account id>]
+
+This command disconnects the connection for the specified account. If no
+account is specified, BitlBee will deactivate all active accounts. (Including
+accounts awaiting a reconnection)
+
+The account ID can be a number (see account list), the protocol name or (part
+of) the screenname, as long as it matches only one connection.
+
+account list
+
+Syntax: 
+
+account list
+
+This command gives you a list of all the accounts known by BitlBee, including
+the numbers you'll need for most account commands.
+
+add - Add a buddy to your contact list
+
+Syntax: 
+
+add <connection> <handle> [<nick>]
+
+Adds the given buddy at the specified connection to your buddy list. The
+account ID can be a number (see account list), the protocol name or (part of)
+the screenname, as long as it matches only one connection.
+
+If you want, you can also tell BitlBee what nick to give the new contact. Of
+course you can also use the rename command for that, but sometimes this might
+be more convenient.
+
+< ctrlsoft> add 3 gryp@jabber.org grijp
+ * grijphas joined #bitlbee
+
+info - Request user information
+
+Syntax: 
+
+info <connection> <handle>
+info <nick>
+
+Requests IM-network-specific information about the specified user. The amount
+of information you'll get differs per protocol. For some protocols (ATM Yahoo!
+and MSN) it'll give you an URL which you can visit with a normal web browser to
+get the information.
+
+< ctrlsoft> info 0 72696705
+< root> User info - UIN: 72696705 Nick: Lintux First/Last name: Wilmer van der Gaast E-mail: lintux@lintux.cx
+
+remove - Remove a buddy from your contact list
+
+Syntax: 
+
+remove <nick>
+
+Removes the specified nick from your buddy list.
+
+< ctrlsoft> remove gryp
+ * gryphas quit [Leaving...]
+
+block - Block someone
+
+Syntax: 
+
+block <nick>
+block <connection> <handle>
+
+Puts the specified user on your ignore list. Either specify the user's nick
+when you have him/her in your contact list or a connection number and a user
+handle.
+
+allow - Unblock someone
+
+Syntax: 
+
+allow <nick>
+allow <connection> <handle>
+
+Reverse of block. Unignores the specified user or user handle on specified
+connection.
+
+set - Miscellaneous settings
+
+Syntax: 
+
+set [<variable> [<value>]]
+
+Without any arguments, this command lists all the set variables. You can also
+specify a single argument, a variable name, to get that variable's value. To
+change this value, specify the new value as the second argument.
+
+To get more help information about a setting, try:
+
+< ctrlsoft> help set private
+
+help - BitlBee help system
+
+Syntax: 
+
+help [subject]
+
+This command gives you the help information you're reading right now. If you
+don't give any arguments, it'll give a short help index.
+
+save - Save your account data
+
+Syntax: 
+
+save
+
+This command saves all your nicks and accounts immediately. Handy if you have
+the autosave functionality disabled, or if you don't trust the program's
+stability... ;-)
+
+charset
+
+Type: string
+
+The charset setting enables you to use different character sets in BitlBee.
+These get converted to UTF-8 before sending and from UTF-8 when receiving.
+
+If you don't know what's the best value for this, at least iso8859-1 is the
+best choice for most Western countries. You can try to find what works best for
+you on http://czyborra.com/charsets/iso8859.html
+
+private
+
+Type: boolean
+
+If value is true, messages from users will appear in separate query windows. If
+false, messages from users will appear in the control channel.
+
+This setting is remembered (during one session) per-user, this setting only
+changes the default state. This option takes effect as soon as you reconnect.
+
+save_on_quit
+
+Type: boolean
+
+If enabled causes BitlBee to save all current settings and account details when
+user disconnects. This is enabled by default, and these days there's not really
+a reason to have it disabled anymore.
+
+html
+
+Type: string
+
+Determines what BitlBee should do with HTML in messages. If set to nostrip,
+HTML in messages will not be touched. If set to strip, all HTML will be
+stripped from messages. Unfortunately this sometimes strips too much.
+
+debug
+
+Type: boolean
+
+Some debugging messages can be sent to the control channel if you wish. They're
+probably not really useful for you, unless you're doing some development on
+BitlBee.
+
+to_char
+
+Type: string
+
+It's customary that messages meant for one specific person on an IRC channel
+are prepended by his/her alias followed by a colon ':'. BitlBee does this by
+default. If you prefer a different character, you can set it using set to_char.
+
+Please note that this setting is only used for incoming messages. For outgoing
+messages you can use ':' (colon) or ',' to separate the destination nick from
+the message, and this is not configurable.
+
+typing_notice
+
+Type: boolean
+
+Sends you a /notice when a user starts typing a message (if the protocol
+supports it, MSN for example). This is a bug, not a feature. (But please don't
+report it.. ;-) You don't want to use it. Really. In fact the
+typing-notification is just one of the least useful 'innovations' ever. It's
+just there because some guy will probably ask me about it anyway. ;-)
+
+ops
+
+Type: string
+
+Some people prefer themself and root to have operator status in #bitlbee, other
+people don't. You can change these states using this setting.
+
+The value "both" means both user and root get ops. "root" means, well, just
+root. "user" means just the user. "none" means nobody will get operator status.
+
+away_devoice
+
+Type: boolean
+
+With this option enabled, the root user devoices people when they go away (just
+away, not offline) and gives the voice back when they come back. You might
+dislike the voice-floods you'll get if your contact list is huge, so this
+option can be disabled.
+
+handle_unknown
+
+Type: string
+
+Messages from unknown users are echoed like this by default:
+
+If you want this lame user to be added automatically, you can set this setting
+to "add". If you prefer to ignore messages from people you don't know, you can
+set this one to "ignore". "add_private" and "add_channel" are like add, but you
+can use them to make messages from unknown buddies appear in the channel
+instead of a query window.
+
+auto_connect
+
+Type: boolean
+
+With this option enabled, when you identify BitlBee will automatically connect
+to your accounts, with this disabled it will not do this.
+
+auto_reconnect
+
+Type: boolean
+
+If an IM-connections breaks, you're supposed to bring it back up yourself.
+Having BitlBee do this automatically might not always be a good idea, for
+several reasons. If you want the connections to be restored automatically, you
+can enable this setting.
+
+See also the auto_reconnect_delay setting.
+
+auto_reconnect_delay
+
+Type: integer
+
+Tell BitlBee after how many seconds it should attempt to bring an IM-connection
+back up after a crash. It's not a good idea to set this value very low, it will
+cause too much useless traffic when an IM-server is down for a few hours.
+
+See also the auto_reconnect setting.
+
+buddy_sendbuffer
+
+Type: boolean
+
+By default, when you send a message to someone, BitlBee forwards this message
+to the user immediately. When you paste a large number of lines, the lines will
+be sent in separate messages, which might not be very nice to read. If you
+enable this setting, BitlBee will buffer your messages and wait for more data.
+
+Using the buddy_sendbuffer_delay setting you can specify the number of seconds
+BitlBee should wait for more data before the complete message is sent.
+
+Please note that if you remove a buddy from your list (or if the connection to
+that user drops) and there's still data in the buffer, this data will be lost.
+BitlBee will not try to send the message to the user in those cases.
+
+buddy_sendbuffer_delay
+
+Type: integer
+
+Tell BitlBee after how many seconds a buffered message should be sent.
+
+See also the buddy_sendbuffer setting.
+
+default_target
+
+Type: string
+
+With this value set to root, lines written in the control channel without any
+nickname in front of them will be interpreted as commands. If you want BitlBee
+to send those lines to the last person you addressed in the control channel,
+set this to last.
+
+display_namechanges
+
+Type: boolean
+
+password
+
+Type: string
+
+Use this setting to change your "NickServ" password.
+
+query_order
+
+Type: string
+
+This changes the order in which the questions from root (usually authorization
+requests from buddies) should be answered. When set to lifo, BitlBee
+immediately displays all new questions and they should be answered in reverse
+order. When this is set to fifo, BitlBee displays the first question which
+comes in and caches all the others until you answer the first one.
+
+Although the fifo setting might sound more logical (and used to be the default
+behaviour in older BitlBee versions), it turned out not to be very convenient
+for many users when they missed the first question (and never received the next
+ones).
+
+lcnicks
+
+Type: boolean
+
+Hereby you can change whether you want all lower case nick names or leave the
+case as it intended by your peer.
+
+rename - Rename (renick) a buddy
+
+Syntax: 
+
+rename <oldnick> <newnick>
+
+Renick a user in your buddy list. Very useful, in fact just very important, if
+you got a lot of people with stupid account names (or hard ICQ numbers).
+
+< itsme> rename itsme_ you
+ * itsme_is now known as you
+
+yes - Accept a request
+
+Syntax: 
+
+yes [<number>]
+
+Sometimes an IM-module might want to ask you a question. (Accept this user as
+your buddy or not?) To accept a question, use the yes command.
+
+By default, this answers the first unanswered question. You can also specify a
+different question as an argument. You can use the qlist command for a list of
+questions.
+
+no - Deny a request
+
+Syntax: 
+
+no [<number>]
+
+Sometimes an IM-module might want to ask you a question. (Accept this user as
+your buddy or not?) To reject a question, use the no command.
+
+By default, this answers the first unanswered question. You can also specify a
+different question as an argument. You can use the qlist command for a list of
+questions.
+
+qlist - List all the unanswered questions root asked
+
+Syntax: 
+
+qlist
+
+This gives you a list of all the unanswered questions from root.
+
+register - Register yourself
+
+Syntax: 
+
+register <password>
+
+BitlBee can save your settings so you won't have to enter all your IM passwords
+every time you log in. If you want the Bee to save your settings, use the
+register command.
+
+Please do pick a secure password, don't just use your nick as your password.
+Please note that IRC is not an encrypted protocol, so the passwords still go
+over the network in plaintext. Evil people with evil sniffers will read it all.
+(So don't use your root password.. ;-)
+
+To identify yourself in later sessions, you can use the identify command.
+
+identify - Identify yourself with your password
+
+Syntax: 
+
+identify <password>
+
+BitlBee saves all your settings (contacts, accounts, passwords) on-server. To
+prevent other users from just logging in as you and getting this information,
+you'll have to identify yourself with your password. You can register this
+password using the register command.
+
+Once you're registered, you can change your password using set password
+<password>.
+
+drop - Drop your account
+
+Syntax: 
+
+drop <password>
+
+Drop your BitlBee registration. Your account files will be removed and your
+password will be forgotten. For obvious security reasons, you have to specify
+your NickServ password to make this command work.
+
+blist - List all the buddies in your contact list
+
+Syntax: 
+
+blist [all|online|offline|away]
+
+You can get a better readable buddy list using the blist command. If you want a
+complete list (including the offline users) you can use the all argument.
+
+nick - Change friendly name, nick
+
+Syntax: 
+
+nick <connection> [<new nick>]
+nick
+
+This command allows to set the friendly name of an im account. If no new name
+is specified the command will report the current name. When the name contains
+spaces, don't forget to quote the whole nick in double quotes. Currently this
+command is only supported by the MSN protocol.
+
+< wouter> nick 1 "Wouter Paesen"
+< root> Setting your name on connection 1 to `Wouter Paesen'
+
+import_buddies - Copy local buddy list to server (normally only needed when
+upgrading)
+
+Syntax: 
+
+import_buddies <connection> [clear]
+
+This command copies the locally stored buddy list to the server. This command
+exists for upgrading purposes. Previous versions of BitlBee didn't support
+server-side buddy lists for ICQ, so the list was stored locally.
+
+Since version 0.91 however, server-side contact lists are supported for all
+protocols, so the local list is now ignored. When upgrading from an older
+BitlBee to version 0.91, you might need this command to get your buddy list
+back.
+
+The only argument this command needs is your ICQ account identification. If
+your serverside buddy list contains some old buddies you don't want anymore,
+you can pass clear as a second argument.
+
+After giving this command, you have to wait for a while before all the adds are
+handled, because of ICQ's rate limiting. If your buddy list is very large and
+the ICQ server starts complaining, you might have to reconnect and enter this
+command again.
+
+Chapter 6. Misc Stuff
+
+Table of Contents
+
+Smileys
+Groupchats
+Creating groupchats
+Groupchat channel names
+Away states
+
+Smileys
+
+All MSN smileys (except one) are case insensitive and work without the nose
+too.
+
+(Y)
+
+    Thumbs up
+
+(N)
+
+    Thumbs down
+
+(B)
+
+    Beer mug
+
+(D)
+
+    Martini glass
+
+(X)
+
+    Girl
+
+(Z)
+
+    Boy
+
+(6)
+
+    Devil smiley
+
+:-[
+
+    Vampire bat
+
+(})
+
+    Right hug
+
+({)
+
+    Left hug
+
+(M)
+
+    MSN Messenger or Windows Messenger icon (think a BitlBee logo here ;)
+
+:-S
+
+    Crooked smiley (Confused smiley)
+
+:-$
+
+    Embarrassed smiley
+
+(H)
+
+    Smiley with sunglasses
+
+:-@
+
+    Angry smiley
+
+(A)
+
+    Angel smiley
+
+(L)
+
+    Red heart (Love)
+
+(U)
+
+    Broken heart
+
+(K)
+
+    Red lips (Kiss)
+
+(G)
+
+    Gift with bow
+
+(F)
+
+    Red rose
+
+(W)
+
+    Wilted rose
+
+(P)
+
+    Camera
+
+(~)
+
+    Film strip
+
+(T)
+
+    Telephone receiver
+
+(@)
+
+    Cat face
+
+(&)
+
+    Dog's head
+
+(C)
+
+    Coffee cup
+
+(I)
+
+    Light bulb
+
+(S)
+
+    Half-moon (Case sensitive!)
+
+(*)
+
+    Star
+
+(8)
+
+    Musical eighth note
+
+(E)
+
+    Envelope
+
+(^)
+
+    Birthday cake
+
+(O)
+
+    Clock
+
+This list was extracted from http://help.msn.com/!data/en_us/data/
+messengerv50.its51/$content$/EMOTICONS.HTM?H_APP=.
+
+Groupchats
+
+Since version 0.8x, BitlBee supports groupchats on the MSN and Yahoo! networks.
+This text will try to explain you how they work.
+
+As soon as someone invites you into a groupchat, you will be force-joined or
+invited (depending on the protocol) into a new virtual channel with all the
+people in there. You can leave the channel at any time, just like you would
+close the window in regular IM clients. Please note that root-commands don't
+work in groupchat channels, they only work in the control channel (or to root
+directly).
+
+Of course you can also create your own groupchats. Type help groupchats2 to see
+how.
+
+Creating groupchats
+
+If you want to start a groupchat with the person jim_msn in it, just join the
+channel #jim_msn. BitlBee will refuse to join you to the channel with that
+name, but it will create a new virtual channel with root, you and jim_msn in
+it.
+
+Of course a channel with only two people isn't really exciting yet. So the next
+step is to invite some other people to the channel. For this, you can use the /
+invite command of your IRC client. Please do keep in mind that all the people
+have to be on the same network and contact list! You can't invite Yahoo!
+buddies into an MSN groupchat.
+
+This is all you'll probably need to know. If you have any problems, please read
+help groupchats3.
+
+Groupchat channel names
+
+Obviously the (numbered) channel names don't make a lot of sense. Problem is
+that groupchats usually don't have names at all in the IM-world, while IRC
+insists on a name. So BitlBee just generates something random, just don't pay
+attention to it. :-)
+
+Please also note that BitlBee doesn't support groupchats for all protocols yet.
+BitlBee will tell you so. Support for other protocols will hopefully come
+later.
+
+Away states
+
+As you might've expected, you can just use the /away command in your IRC client
+to set an away-state. BitlBee supports most away-states supported by the
+protocols.
+
+Not all away states are supported by all protocols, and some protocols have
+different names for them. BitlBee will try to pick the best available alias
+from this list for every connection:
+
+Away from computer, Away, Extended away
+NA, N/A, Not available
+Busy, Do not disturb, DND, Occupied
+Be right back, BRB
+On the phone, Phone, On phone
+Out to lunch, Lunch, Food
+
+So /away Food will set your state to "Out to lunch" on your MSN connection, and
+for most other connections the default, "Away" or "Away from computer" will be
+chosen.
+
+You can also add more information to your away message. Setting it to "Busy -
+Fixing BitlBee bugs" will set your IM-away-states to Busy, but your away
+message will be more descriptive for people on IRC. Protocols like Yahoo! and
+Jabber will also show this complete away message to your buddies.
+
Index: doc/user-guide/user-guide.xml
===================================================================
--- doc/user-guide/user-guide.xml	(revision 210d1d9cf4366d9933c02383300175e4b573be61)
+++ doc/user-guide/user-guide.xml	(revision b7d3cc34f68dab7b8f7d0777711317b334fc2219)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
@@ -21,11 +21,22 @@
 
 	<legalnotice id="legalnotice">
+     <para>
+         Permission is granted to copy, distribute and/or modify this 
+         document under the terms of the <ulink type="help"
+         url="gnome-help:fdl"><citetitle>GNU Free Documentation 
+         License</citetitle></ulink>, Version 1.1 or any later version 
+         published by the Free Software Foundation with no Invariant 
+         Sections, no Front-Cover Texts, and no Back-Cover Texts. You 
+         may obtain a copy of the <citetitle>GNU Free Documentation 
+         License</citetitle> from the Free Software Foundation by 
+         visiting <ulink type="http" url="http://www.fsf.org">their 
+         Web site</ulink> or by writing to: Free Software Foundation, 
+         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+         USA.
+       </para>
     </legalnotice>
 
    <releaseinfo>
-   		This is the BitlBee User Guide. For now, the on-line help is
-		the most up-to-date documentation. Although this document shares
-		some parts with the on-line help system, other parts might be
-		very outdated.
+   		This is the initial release of the BitlBee User Guide.
    </releaseinfo>
 
@@ -37,5 +48,4 @@
   <xi:include href="quickstart.xml"/>
   <xi:include href="commands.xml"/>
-  <xi:include href="twitter.xml"/>
   <xi:include href="misc.xml"/>
 
