Changeset 704dd38 for doc/user-guide


Ignore:
Timestamp:
2010-06-01T21:51:27Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ad404ab
Parents:
3429b58 (diff), ba3233c (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 head.

Location:
doc/user-guide
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/commands.xml

    r3429b58 r704dd38  
    620620
    621621        <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account">
    622                 <default>true</default>
     622                <default>false</default>
    623623
    624624                <description>
  • doc/user-guide/quickstart.xml

    r3429b58 r704dd38  
    33
    44<para>
    5 Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant Messaging Systems.
     5Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber, Yahoo! and Twitter.
    66</para>
    77
     
    4343
    4444<para>
    45 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>.
     45Other 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>.
    4646</para>
    4747
Note: See TracChangeset for help on using the changeset viewer.