aboutsummaryrefslogtreecommitdiffstats
path: root/doc/README
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-10-09 11:41:19 -0700
committerWilmer van der Gaast <wilmer@gaast.net>2010-10-09 11:41:19 -0700
commit619770237590e4a760346f2e12681d7e2220dda4 (patch)
tree8d0d391407280ab74e1fc876d6f272110b474897 /doc/README
parent23b29c67968f3dd39e7d6970acc5669556f4c8b9 (diff)
parent27b407fde1844a0e03f1a9d92d2a1c4a40435f9b (diff)
Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.
Diffstat (limited to 'doc/README')
-rw-r--r--doc/README9
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/README b/doc/README
index d5d4d1c9..5a3bb66e 100644
--- a/doc/README
+++ b/doc/README
@@ -66,6 +66,11 @@ 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 can be included if libotr is available on
+your machine. Pass --otr=1 to configure to build it into BitlBee, or
+--otr=plugin to build it as a separate loadable plugin (mostly meant for
+distro packages).
+
These days, many IM protocols use SSL/TLS connections (for authentication
or for the whole session). BitlBee can use several SSL libraries for this:
GnuTLS, NSS (which comes with Mozilla) and OpenSSL. OpenSSL is not GPL-
@@ -144,8 +149,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