aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/CHANGES24
-rw-r--r--doc/README34
-rw-r--r--doc/bitlbee.schema62
-rw-r--r--doc/user-guide/Makefile2
-rw-r--r--doc/user-guide/commands.xml288
-rw-r--r--doc/user-guide/help.xsl7
6 files changed, 303 insertions, 114 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 7b95e8cb..cd100741 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,27 @@
+Version x.x:
+- Most important change: New file format for user data (accounts, nicks and
+ settings). Migration to the new format should happen transparently,
+ BitlBee will read the old files and once you quit/save it will save in the
+ new format. It is recommended to delete the old files (BitlBee doesn't do
+ this automatically, it will just ignore them) since they won't be used
+ anymore (and since the old file format is a security risk). Some advantages
+ of this file format switch:
+ * Safer format, since the identify-password is now salted before generating
+ a checksum. This way one can't use MD5 reverse lookup databases to crack
+ passwords. Also, the IM-account passwords are encrypted using RC4 instead
+ of the simple obfuscation scheme which BitlBee used so far.
+ * Easier to extend than the previous format (at least the .nicks format was
+ horribly limited).
+ * Nicknames for buddies are now saved per-account instead of per-protocol.
+ So far having one buddy on multiple accounts of the same protocol was a
+ problem because the nicks generated for the two "instances" of this buddy
+ were very unpredictable.
+ NOTE: This also means that "account del" removes not just the account,
+ BUT ALSO ALL NICKNAMES! If you're changing IM accounts and don't want to
+ lose the nicknames, you can now use "account set" to change the username
+ and password for the existing connection.
+ * Per-account settings (see the new "account set" command).
+
Version 1.0:
- Removed some crashy debugging code.
- QUIT command now works before logging in. (Mainly an RFC-compliancy fix.)
diff --git a/doc/README b/doc/README
index c82c9aeb..75988004 100644
--- a/doc/README
+++ b/doc/README
@@ -154,17 +154,27 @@ http://code.bitlbee.org/
A NOTE ON ENCRYPTION
====================
-BitlBee stores the accounts and settings (not your contact list though) in
-some sort of encrypted/obfuscated format.
-
-*** THIS IS NOT A SAFE FORMAT! ***
-
-You should still make sure the rights to the configuration directory and
-files are set so that only root and the BitlBee user can read/write them.
-
-This format is not to prevent malicicous users from running with your
-passwords, but to prevent accidental glimpses of the administrators to cause
-any harm. You have no choice but to trust root though.
+There used to be a note here about the simple obfuscation method used to
+make the passwords in the configuration files unreadable. However, BitlBee
+now uses a better format (and real encryption (salted MD5 and RC4)) to store
+the passwords. This means that people who somehow get their hands on your
+configuration files can't easily extract your passwords from them anymore.
+
+However, once you log into the BitlBee server and send your password, an
+intruder with tcpdump can still read your passwords. This can't really be
+avoided, of course. The new format is a lot more reliable (because it can't
+be cracked with just very basic crypto analysis anymore), but you still have
+to be careful. The main extra protection offered by the new format is that
+the files can only be cracked with some help from the user (by sending the
+password at login time).
+
+So if you run a public server, it's most important that you don't give root
+access to people who like to play with tcpdump. Also, it's a good idea to
+delete all *.nicks/*.accounts files as soon as BitlBee converted them to the
+new format (which happens as soon as the user logs in, it can't be done
+automatically because it needs the password for that account). You won't
+need them anymore (unless you want to switch back to an older BitlBee
+version) and they only make it easier for others to crack your passwords.
LEGAL
@@ -191,5 +201,5 @@ also licensed under the GPL.
BitlBee - An IRC to other chat networks gateway
<http://www.bitlbee.org/>
- Copyright (C) 2002-2005 Wilmer van der Gaast <wilmer@gaast.net>
+ Copyright (C) 2002-2006 Wilmer van der Gaast <wilmer@gaast.net>
and others
diff --git a/doc/bitlbee.schema b/doc/bitlbee.schema
new file mode 100644
index 00000000..3322e057
--- /dev/null
+++ b/doc/bitlbee.schema
@@ -0,0 +1,62 @@
+## LDAP Schema file for BitlBee
+## Copyright (C) 2006 Jelmer Vernooij <jelmer@samba.org>
+##
+## We need the following object classes and related attributes:
+##
+## bitlBeeBuddy:
+## - nick
+## - handle
+
+## each bitlBeeNick has zero or more bitlBeeAccount subentries
+## and bitlBeeAccount entries contain zero or more bitlBeeBuddy entries
+
+## The admin needs to setup the LDAP server to:
+## - allow anonymous users to auth against bitlBeeNick objects on the
+## password field
+## - allow anonymous users to create new objects that start with nick=
+## - allow read/write for a user that is authenticated only to his/her own
+## object and subentries
+
+## - userid
+## - userPassword
+## - setting (multiple values)
+## depends: top, account
+
+attributetype ( 1.3.6.1.4.1.25873.2.1.1 NAME 'bitlBeeAutoConnect'
+ DESC 'Autoconnect setting'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.25873.2.1.2 NAME 'bitlBeeAccountNo'
+ DESC 'Account number'
+ EQUALITY integerMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+objectclass ( 1.3.6.1.4.1.25873.2.2.3 NAME 'bitlBeeAccount' SUP account STRUCTURAL
+ DESC 'BitlBee User Account '
+ MUST ( userid, userPassword )
+ MAY ( ) )
+
+## bitlBeeAccount:
+## - accountNo 1.3.6.1.4.1.1466.115.121.1.27
+## - protocol (msn, oscar, jabber, yahoo, ...)
+## - username
+## - password
+## - server name
+## - autoconnect (true/false) 1.3.6.1.4.1.1466.115.121.1.7
+## depends: top
+
+objectclass ( 1.3.6.1.4.1.25873.2.2.1 NAME 'bitlBeeIMAccount' SUP account STRUCTURAL
+ DESC 'BitlBee IM Account '
+ MUST ( bitlBeeAccountNo, userid, userPassword )
+ MAY ( host, bitlBeeAutoconnect ) )
+
+objectclass ( 1.3.6.1.4.1.25873.2.2.2 NAME 'bitlBeeSetting' SUP top STRUCTURAL
+ DESC 'BitlBee Configuration Setting'
+ MUST ( bitlBeeSettingName )
+ MAY ( bitlBeeSettingValue ) )
+
+objectclass ( 1.3.6.1.4.1.25873.2.2.3 NAME 'bitlBeeBuddy' SUP top STRUCTURAL
+ DESC 'BitlBee Nick Mapping'
+ MUST ( bitlBeeBuddyHandle )
+ MAY ( ircNick ) )
diff --git a/doc/user-guide/Makefile b/doc/user-guide/Makefile
index 98c4e99f..eb31fc0f 100644
--- a/doc/user-guide/Makefile
+++ b/doc/user-guide/Makefile
@@ -27,7 +27,7 @@ help.xml: commands.xml
%.db.xml: %.xml docbook.xsl
xsltproc --xinclude --output $@ docbook.xsl $<
-help.txt: help.xml help.xsl
+help.txt: help.xml help.xsl commands.xml misc.xml quickstart.xml
xsltproc --stringparam extraparanewline "$(EXTRAPARANEWLINE)" --xinclude help.xsl $< | perl -0077 -pe 's/\n\n%/\n%/s; s/_b_/\002/g;' > $@
clean:
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 44a9882f..790e89f6 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -10,7 +10,7 @@
<description>
<para>
- Available actions: add, del, list, on, off. See <emphasis>help account &lt;action&gt;</emphasis> for more information.
+ Available actions: add, del, list, on, off and set. See <emphasis>help account &lt;action&gt;</emphasis> for more information.
</para>
</description>
@@ -25,28 +25,28 @@
</description>
<bitlbee-command name="jabber">
- <syntax>account add jabber &lt;handle&gt; &lt;password&gt; [&lt;servertag&gt;]</syntax>
+ <syntax>account add jabber &lt;handle@server.tld&gt; &lt;password&gt; [&lt;servertag&gt;]</syntax>
<description>
<para>
- 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:
+ 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]].
</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>
- 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.
+ Google Talk uses the Jabber protocol. Please note that Google talk is SSL-only, but officially reachable over both port 5222 and 5223. Usually BitlBee users have to connect via port 5223, for example like this:
</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>
</bitlbee-command>
<bitlbee-command name="msn">
- <syntax>account add msn &lt;handle&gt; &lt;password&gt;</syntax>
+ <syntax>account add msn &lt;handle@server.tld&gt; &lt;password&gt;</syntax>
<description>
<para>
@@ -102,7 +102,7 @@
<description>
<para>
- 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)
+ 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>
@@ -117,7 +117,7 @@
<description>
<para>
- 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)
+ 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>
@@ -135,6 +135,26 @@
</para>
</description>
</bitlbee-command>
+
+ <bitlbee-command name="set">
+ <syntax>account set &lt;account id&gt;</syntax>
+ <syntax>account set &lt;account id&gt;/&lt;setting&gt;</syntax>
+ <syntax>account set &lt;account id&gt;/&lt;setting&gt; &lt;value&gt;</syntax>
+
+ <description>
+ <para>
+ This account 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 set &lt;account id&gt;</emphasis>.
+ </para>
+
+ <para>
+ For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
+ </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>
+ </bitlbee-command>
</bitlbee-command>
<bitlbee-command name="add">
@@ -275,121 +295,149 @@
</description>
</bitlbee-command>
- <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>
+ <bitlbee-setting name="auto_connect" type="boolean" scope="both">
+ <default>true</default>
<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.
+ With this option enabled, when you identify BitlBee will automatically connect to your accounts, with this disabled it will not do this.
</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
+ 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="private" type="boolean">
- <default>True</default>
+ <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
+ <default>false</default>
<description>
+ <para>
+ 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.
+ </para>
<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.
+ See also the <emphasis>auto_reconnect_delay</emphasis> setting.
</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.
+ 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="save_on_quit" type="boolean">
- <default>True</default>
+ <bitlbee-setting name="auto_reconnect_delay" type="integer" scope="global">
+ <default>300</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.
+ 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>
+
+ <para>
+ See also the <emphasis>auto_reconnect</emphasis> setting.
</para>
</description>
</bitlbee-setting>
- <bitlbee-setting name="strip_html" type="boolean">
- <default>True</default>
+ <bitlbee-setting name="away_devoice" 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.
+ 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="debug" type="boolean">
- <default>False</default>
+ <bitlbee-setting name="buddy_sendbuffer" type="boolean" scope="global">
+ <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.
+ 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="to_char" type="string">
- <default>": "</default>
+ <bitlbee-setting name="buddy_sendbuffer_delay" type="integer" scope="global">
+ <default>200</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>.
+ 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>
- 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.
+ See also the <emphasis>buddy_sendbuffer</emphasis> setting.
</para>
</description>
</bitlbee-setting>
- <bitlbee-setting name="typing_notice" type="boolean">
- <default>False</default>
+ <bitlbee-setting name="charset" type="string" scope="global">
+ <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>
- 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. ;-)
+ 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="ops" type="string">
- <default>both</default>
- <possible-values>both, root, user, none</possible-values>
+ <bitlbee-setting name="debug" type="boolean" scope="global">
+ <default>false</default>
<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.
+ 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="default_target" type="string" scope="global">
+ <default>root</default>
+ <possible-values>root, last</possible-values>
+
+ <description>
<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.
+ 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="away_devoice" type="boolean">
- <default>True</default>
-
+ <bitlbee-setting name="display_name" type="string" scope="account">
<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.
+ Currently only available for MSN connections. This setting allows you to read and change your "friendly name" for this connection. Since this is a server-side setting, it can't be changed when the account is off-line.
</para>
</description>
</bitlbee-setting>
- <bitlbee-setting name="handle_unknown" type="string">
+ <bitlbee-setting name="display_namechanges" type="boolean" scope="global">
+ <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="handle_unknown" type="string" scope="global">
<default>root</default>
<possible-values>root, add, add_private, add_channel, ignore</possible-values>
@@ -416,134 +464,172 @@
</bitlbee-setting>
- <bitlbee-setting name="auto_connect" type="boolean">
- <default>True</default>
+ <bitlbee-setting name="lcnicks" type="boolean" scope="global">
+ <default>true</default>
<description>
<para>
- With this option enabled, when you identify BitlBee will automatically connect to your accounts, with this disabled it will not do this.
+ 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>
- <bitlbee-setting name="auto_reconnect" type="boolean">
- <default>False</default>
+ <bitlbee-setting name="ops" type="string" scope="global">
+ <default>both</default>
+ <possible-values>both, root, user, none</possible-values>
<description>
<para>
- 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.
+ 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>
- See also the <emphasis>auto_reconnect_delay</emphasis> 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.
</para>
</description>
+ </bitlbee-setting>
+ <bitlbee-setting name="password" type="string" scope="both">
+ <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="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="auto_reconnect_delay" type="integer">
- <default>300</default>
+ <bitlbee-setting name="private" type="boolean" scope="global">
+ <default>true</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.
+ 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>
- See also the <emphasis>auto_reconnect</emphasis> setting.
+ 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="buddy_sendbuffer" type="boolean">
- <default>False</default>
+ <bitlbee-setting name="query_order" type="string" scope="global">
+ <default>lifo</default>
+ <possible-values>lifo, fifo</possible-values>
<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.
+ This changes the order in which the questions from root (usually authorization requests from buddies) should be answered. When set to <emphasis>lifo</emphasis>, BitlBee immediately displays all new questions and they should be answered in reverse order. When this is set to <emphasis>fifo</emphasis>, BitlBee displays the first question which comes in and caches all the others until you answer the first one.
</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.
+ Although the <emphasis>fifo</emphasis> 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).
</para>
+ </description>
+ </bitlbee-setting>
+ <bitlbee-setting name="resource" type="string" scope="account">
+ <default>BitlBee</default>
+
+ <description>
<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.
+ 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="buddy_sendbuffer_delay" type="integer">
- <default>200</default>
+ <bitlbee-setting name="save_on_quit" type="boolean" scope="global">
+ <default>true</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.
+ 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="server" type="string" scope="account">
+ <description>
<para>
- See also the <emphasis>buddy_sendbuffer</emphasis> setting.
+ Can be set for Jabber- and OSCAR-connections. For OSCAR, this must be set to <emphasis>login.icq.com</emphasis> if it's an ICQ connection, or <emphasis>login.oscar.aol.com</emphasis> if it's an AIM connection. For Jabber, you 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="default_target" type="string">
- <default>root</default>
- <possible-values>root, last</possible-values>
+ <bitlbee-setting name="ssl" type="boolean" scope="account">
+ <default>false</default>
<description>
<para>
- 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>.
+ Currently only available for Jabber connections. Set this to true if the server accepts SSL connections.
</para>
</description>
-
</bitlbee-setting>
- <bitlbee-setting name="display_namechanges" type="boolean">
- <default>False</default>
+ <bitlbee-setting name="strip_html" type="boolean" scope="global">
+ <default>true</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.
+ 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="query_order" type="string">
- <default>lifo</default>
- <possible-values>lifo, fifo</possible-values>
+ <bitlbee-setting name="to_char" type="string" scope="global">
+ <default>": "</default>
<description>
<para>
- This changes the order in which the questions from root (usually authorization requests from buddies) should be answered. When set to <emphasis>lifo</emphasis>, BitlBee immediately displays all new questions and they should be answered in reverse order. When this is set to <emphasis>fifo</emphasis>, BitlBee displays the first question which comes in and caches all the others until you answer the first one.
+ 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>
- Although the <emphasis>fifo</emphasis> 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).
+ 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="lcnicks" type="boolean">
- <default>True</default>
+ <bitlbee-setting name="typing_notice" type="boolean" scope="global">
+ <default>false</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.
+ 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="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-command name="rename">
@@ -673,6 +759,10 @@
<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>
+
+ <para>
+ It is recommended to use the per-account <emphasis>display_name</emphasis> setting to read and change this information. The <emphasis>nick</emphasis> command is deprecated.
+ </para>
</description>
<ircexample>
diff --git a/doc/user-guide/help.xsl b/doc/user-guide/help.xsl
index 0eb1a88b..dec6a671 100644
--- a/doc/user-guide/help.xsl
+++ b/doc/user-guide/help.xsl
@@ -6,7 +6,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.1">
- <xsl:output method="text" encoding="iso-8859-1" standalone="yes"/>
+ <xsl:output method="text" encoding="utf-8" standalone="yes"/>
<xsl:strip-space elements="*"/>
<xsl:template match="text()">
@@ -57,7 +57,10 @@
<xsl:message><xsl:text>Processing setting '</xsl:text><xsl:value-of select="@name"/><xsl:text>'</xsl:text></xsl:message>
<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_Default:_b_ </xsl:text><xsl:value-of select="default"/><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:if test="possible-values">
<xsl:text>_b_Possible Values:_b_ </xsl:text><xsl:value-of select="possible-values"/><xsl:text>&#10;</xsl:text>
</xsl:if>