diff options
| author | Sven Moritz Hallberg <pesco@khjk.org> | 2010-06-04 00:08:23 +0200 |
|---|---|---|
| committer | Sven Moritz Hallberg <pesco@khjk.org> | 2010-06-04 00:08:23 +0200 |
| commit | 37598495deeb42e1cd216a0a4ba8068e4a6da453 (patch) | |
| tree | 6db6cc0d184dbd1daa4c9c6f153d809d512d3bfe /doc/user-guide | |
| parent | 1dd34701541fb8142402f593dc256ff9b54121bb (diff) | |
| parent | 3dc6d86076dbea16c313bb87aa2f37166f289a8e (diff) | |
merge in bitlbee head
Diffstat (limited to 'doc/user-guide')
| -rw-r--r-- | doc/user-guide/commands.xml | 2 | ||||
| -rw-r--r-- | doc/user-guide/quickstart.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 2ef2840b..9aa99775 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -793,7 +793,7 @@ </bitlbee-setting> <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account"> - <default>true</default> + <default>false</default> <description> <para> diff --git a/doc/user-guide/quickstart.xml b/doc/user-guide/quickstart.xml index 0539a7c7..80c16ffb 100644 --- a/doc/user-guide/quickstart.xml +++ b/doc/user-guide/quickstart.xml @@ -2,7 +2,7 @@ <title>Quickstart</title> <para> -Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant Messaging Systems. +Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber, Yahoo! and Twitter. </para> <para> @@ -42,7 +42,7 @@ For instance, suppose you have a Jabber account at jabber.org with handle <empha </ircexample> <para> -Other available IM protocols are msn, oscar, and yahoo. OSCAR is the protocol used by ICQ and AOL. For more information about the <emphasis>account add</emphasis> command, see <emphasis>help account add</emphasis>. +Other available IM protocols are msn, oscar, yahoo and twitter. OSCAR is the protocol used by ICQ and AOL. For more information about the <emphasis>account add</emphasis> command, see <emphasis>help account add</emphasis>. </para> <para> |