diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-06 00:26:07 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-06 00:26:07 +0100 |
| commit | 1fdb0a48438d6dc4a4795d195737890ed3e46a96 (patch) | |
| tree | 8a50bf83b78ee1c0e516e8ae6e9f9a079a3fe6df /doc/user-guide | |
| parent | b308cf9bafbdf76da73a57607b65c4763aa3057b (diff) | |
| parent | 3dc6d86076dbea16c313bb87aa2f37166f289a8e (diff) | |
Merging mainline.
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 f3633971..4746e2c3 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -619,7 +619,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> |