Changeset 1fdb0a4 for doc/user-guide

Timestamp:

2010-06-05T23:26:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4aa0f6b, bc49ec2

Parents:

b308cf9 (diff), 3dc6d86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

Location:

doc/user-guide

Files:

• commands.xml (modified) (1 diff)
• quickstart.xml (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -620 +620 @@
 
         <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account">
-                <default>true</default>
+                <default>false</default>
 
                 <description>

doc/user-guide/quickstart.xml

@@ -3 +3 @@
 
 <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>
 
@@ -43 +43 @@
 
 <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>