diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 15:15:19 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 15:15:19 +0000 |
| commit | e8c8d00ea43c204ee276bde7fb663a0f0249790f (patch) | |
| tree | a98fdef3c5885eb2eac2ba047e244b3fd3c0f800 /bitlbee.conf | |
| parent | 1c3008ac0b2b29f7e14ec9b874af3277c511c7a4 (diff) | |
| parent | f9928cb319c2879a56b7280f09723b26035982d0 (diff) | |
Merging mainline.
Diffstat (limited to 'bitlbee.conf')
| -rw-r--r-- | bitlbee.conf | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bitlbee.conf b/bitlbee.conf index 5fce2820..c5dafd9f 100644 --- a/bitlbee.conf +++ b/bitlbee.conf @@ -54,9 +54,8 @@ ## AuthPassword ## ## Password the user should enter when logging into a closed BitlBee server. -## You can also have an MD5-encrypted password here. Format: "md5:", followed -## by a hash as generated for the <user password=""> attribute in a BitlBee -## XML file (for now there's no easier way to generate the hash). +## You can also have a BitlBee-style MD5 hash here. Format: "md5:", followed +## by a hash as generated by "bitlbee -x hash <password>". ## # AuthPassword = ItllBeBitlBee ## Heh.. Our slogan. ;-) ## or @@ -120,6 +119,14 @@ ## Proxy = socks4://socksproxy.localnet.com ## Proxy = socks5://socksproxy.localnet.com +## Protocols offered by bitlbee +## +## As recompiling may be quite unpractical for some people, this option +## allows to remove the support of protocol, even if compiled in. If +## nothing is given, there are no restrictions. +## +## Protocols = jabber yahoo + [defaults] |