Added references to the BTS to the documentation.

5 files changed, 50 insertions, 51 deletions

diff --git a/doc/bitlbee.8 b/doc/bitlbee.8
index ccce2135..27819a4e 100644
--- a/doc/bitlbee.8
+++ b/doc/bitlbee.8
@@ -97,9 +97,8 @@ command in the #bitlbee channel.
 For more information on using BitlBee, once connected, you should use
 the on-line help system.
 .SH BUGS
-Of course there are bugs. If you find some, please report them by e-mail
-to \fBwilmer@gaast.net\fP, or join \fB#bitlbee\fP on the OFTC network.
-(\fBirc.bitlbee.org\fP)
+Of course there are bugs. If you find some, please report them at
+\fBhttp://bugs.bitlbee.org/\fP.
 .SH LICENSE
 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
diff --git a/doc/user-guide/help.txt b/doc/user-guide/help.txt
index a14e3a99..b6c88da3 100644
--- a/doc/user-guide/help.txt
+++ b/doc/user-guide/help.txt
@@ -9,9 +9,9 @@ These are the available help subjects:
 
 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)
+BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at http://bugs.bitlbee.org/.
 
-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. :-)
+For other things than bug reports, you can join #BitlBee on OFTC (irc.oftc.net) (OFTC, *not* FreeNode!) and flame us right in the face. :-)
 %
 ?index
 These are the available help subjects:
diff --git a/doc/user-guide/help.xml b/doc/user-guide/help.xml
index 9de4fbad..34fdb9e2 100644
--- a/doc/user-guide/help.xml
+++ b/doc/user-guide/help.xml
@@ -23,11 +23,11 @@ You can read more about them with <emphasis>help &lt;subject&gt;</emphasis>
 </para>
 
 <para>
-BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. 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)
+BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
 </para>
 
 <para>
-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. :-)
+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. :-)
 </para>
 
 </preface>
diff --git a/doc/user-guide/user-guide.html b/doc/user-guide/user-guide.html
index 5d1fb46a..8bd7f716 100644
--- a/doc/user-guide/user-guide.html
+++ b/doc/user-guide/user-guide.html
@@ -12,12 +12,12 @@
          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>
+       </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="#id2488359">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id2449756">Compiling</a></span></dt><dt><span class="sect1"><a href="#id2449897">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="#id2450201">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id2450215">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id2450234">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="#id2450279">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id2450293">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2450298">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id2450315">IRC</a></span></dt><dt><span class="sect2"><a href="#id2450326">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="#id2488359">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id2449756">Compiling</a></span></dt><dt><span class="sect1"><a href="#id2449897">Configuration</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2488359"></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>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2449756"></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
@@ -49,7 +49,7 @@ If you want BitlBee to use OpenSSL, you have to explicitly specify that.
 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>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2449897"></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>
@@ -77,34 +77,34 @@ 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>
+</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="#id2450201">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id2450215">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id2450234">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="id2450201"></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>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450215"></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>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450234"></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>
+</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="#id2450279">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id2450293">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2450298">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id2450315">IRC</a></span></dt><dt><span class="sect2"><a href="#id2450326">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="id2450279"></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> 
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450293"></a>Support channels</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450298"></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>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450315"></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>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450326"></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.
diff --git a/doc/user-guide/user-guide.txt b/doc/user-guide/user-guide.txt
index b8854f7a..449dd4de 100644
--- a/doc/user-guide/user-guide.txt
+++ b/doc/user-guide/user-guide.txt
@@ -107,7 +107,7 @@ Table of Contents
     Groupchat channel names
     Away states
 
-Chapter 1. Installation
+Chapter 1. Installation
 
 Table of Contents
 
@@ -191,7 +191,7 @@ 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
+Chapter 2. Usage
 
 Table of Contents
 
@@ -222,7 +222,7 @@ 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
+Chapter 3. Support
 
 Table of Contents
 
@@ -255,7 +255,7 @@ Mailinglists
 
 BitlBee doesn't have any mailinglists.
 
-Chapter 4. Quickstart
+Chapter 4. Quickstart
 
 Table of Contents
 
@@ -388,7 +388,7 @@ 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
+Chapter 5. Bitlbee commands
 
 Table of Contents
 
@@ -442,7 +442,7 @@ import_buddies - Copy local buddy list to server (normally only needed when
 
 account - IM-account list maintenance
 
-Syntax: 
+Syntax: 
 
 account <action> [<arguments>]
 
@@ -451,7 +451,7 @@ information.
 
 account add
 
-Syntax: 
+Syntax: 
 
 account add <protocol> <username> <password> [<server>]
 
@@ -462,7 +462,7 @@ help account add <protocol>.
 
 account add jabber
 
-Syntax: 
+Syntax: 
 
 account add jabber <handle> <password> [<servertag>]
 
@@ -481,7 +481,7 @@ and 5223. However, for some people only port 5222 works, for some people only
 
 account add msn
 
-Syntax: 
+Syntax: 
 
 account add msn <handle> <password>
 
@@ -489,7 +489,7 @@ For MSN connections there are no special arguments.
 
 account add oscar
 
-Syntax: 
+Syntax: 
 
 account add oscar <handle> <password> [<servername>]
 
@@ -504,7 +504,7 @@ AIM connections it's login.oscar.aol.com.
 
 account add yahoo
 
-Syntax: 
+Syntax: 
 
 account add yahoo <handle> <password>
 
@@ -512,7 +512,7 @@ For Yahoo! connections there are no special arguments.
 
 account del
 
-Syntax: 
+Syntax: 
 
 account del <account id>
 
@@ -524,7 +524,7 @@ of) the screenname, as long as it matches only one connection.
 
 account on
 
-Syntax: 
+Syntax: 
 
 account on [<account id>]
 
@@ -537,7 +537,7 @@ of) the screenname, as long as it matches only one connection.
 
 account off
 
-Syntax: 
+Syntax: 
 
 account off [<account id>]
 
@@ -550,7 +550,7 @@ of) the screenname, as long as it matches only one connection.
 
 account list
 
-Syntax: 
+Syntax: 
 
 account list
 
@@ -559,7 +559,7 @@ the numbers you'll need for most account commands.
 
 add - Add a buddy to your contact list
 
-Syntax: 
+Syntax: 
 
 add <connection> <handle> [<nick>]
 
@@ -576,7 +576,7 @@ be more convenient.
 
 info - Request user information
 
-Syntax: 
+Syntax: 
 
 info <connection> <handle>
 info <nick>
@@ -591,7 +591,7 @@ get the information.
 
 remove - Remove a buddy from your contact list
 
-Syntax: 
+Syntax: 
 
 remove <nick>
 
@@ -602,7 +602,7 @@ Removes the specified nick from your buddy list.
 
 block - Block someone
 
-Syntax: 
+Syntax: 
 
 block <nick>
 block <connection> <handle>
@@ -613,7 +613,7 @@ handle.
 
 allow - Unblock someone
 
-Syntax: 
+Syntax: 
 
 allow <nick>
 allow <connection> <handle>
@@ -623,7 +623,7 @@ connection.
 
 set - Miscellaneous settings
 
-Syntax: 
+Syntax: 
 
 set [<variable> [<value>]]
 
@@ -637,7 +637,7 @@ To get more help information about a setting, try:
 
 help - BitlBee help system
 
-Syntax: 
+Syntax: 
 
 help [subject]
 
@@ -646,7 +646,7 @@ don't give any arguments, it'll give a short help index.
 
 save - Save your account data
 
-Syntax: 
+Syntax: 
 
 save
 
@@ -847,7 +847,7 @@ case as it intended by your peer.
 
 rename - Rename (renick) a buddy
 
-Syntax: 
+Syntax: 
 
 rename <oldnick> <newnick>
 
@@ -859,7 +859,7 @@ you got a lot of people with stupid account names (or hard ICQ numbers).
 
 yes - Accept a request
 
-Syntax: 
+Syntax: 
 
 yes [<number>]
 
@@ -872,7 +872,7 @@ questions.
 
 no - Deny a request
 
-Syntax: 
+Syntax: 
 
 no [<number>]
 
@@ -885,7 +885,7 @@ questions.
 
 qlist - List all the unanswered questions root asked
 
-Syntax: 
+Syntax: 
 
 qlist
 
@@ -893,7 +893,7 @@ This gives you a list of all the unanswered questions from root.
 
 register - Register yourself
 
-Syntax: 
+Syntax: 
 
 register <password>
 
@@ -910,7 +910,7 @@ To identify yourself in later sessions, you can use the identify command.
 
 identify - Identify yourself with your password
 
-Syntax: 
+Syntax: 
 
 identify <password>
 
@@ -924,7 +924,7 @@ Once you're registered, you can change your password using set password
 
 drop - Drop your account
 
-Syntax: 
+Syntax: 
 
 drop <password>
 
@@ -934,7 +934,7 @@ your NickServ password to make this command work.
 
 blist - List all the buddies in your contact list
 
-Syntax: 
+Syntax: 
 
 blist [all|online|offline|away]
 
@@ -943,7 +943,7 @@ complete list (including the offline users) you can use the all argument.
 
 nick - Change friendly name, nick
 
-Syntax: 
+Syntax: 
 
 nick <connection> [<new nick>]
 nick
@@ -959,7 +959,7 @@ command is only supported by the MSN protocol.
 import_buddies - Copy local buddy list to server (normally only needed when
 upgrading)
 
-Syntax: 
+Syntax: 
 
 import_buddies <connection> [clear]
 
@@ -981,7 +981,7 @@ 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
+Chapter 6. Misc Stuff
 
 Table of Contents