diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-24 00:12:24 +0100 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-24 00:12:24 +0100 |
commit | be999a5385ff4e9ac7416de4cca3288f18cee85c (patch) | |
tree | ddd6a6e256719c378e9748e0d96791e11844f659 /doc/README | |
parent | 237eadd361a7ed1d2a49180056d12b57f6f3cc0a (diff) | |
parent | eb6df6a280c458546ebc57126e63a828674b4cd8 (diff) |
First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).
Diffstat (limited to 'doc/README')
-rw-r--r-- | doc/README | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -66,6 +66,10 @@ DEPENDENCIES BitlBee's only real dependency is GLib. This is available on virtually every platform. Any recent version of GLib (2.4 or higher) will work. +Off-the-Record encryption support will be included by default if the +configure script finds libotr in one of the usual places. You can pass +--otr=1 or --otr=0 to force it on or off, respectively. + These days, MSN Messenger clients have to connect to the MS Passport servers through HTTPS. BitlBee can use several SSL libraries for this: GnuTLS, NSS (which comes with Mozilla) and OpenSSL. OpenSSL is not GPL-compatible in some @@ -144,8 +148,8 @@ More documentation on the Wiki: http://wiki.bitlbee.org/ -A NOTE ON ENCRYPTION -==================== +A NOTE ON PASSWORD ENCRYPTION +============================= There used to be a note here about the simple obfuscation method used to make the passwords in the configuration files unreadable. However, BitlBee |