Changeset f5c0d8e for doc/user-guide


Ignore:
Timestamp:
2010-08-31T20:06:14Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
0c85c08
Parents:
8358691 (diff), 31dbb90a (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:

Merge mainline stuff.

File:
1 edited

Legend:

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

    r8358691 rf5c0d8e  
    7373                                       
    7474                                        <para>
    75                                                 By default all your Twitter contacts will come from a contact called twitter_(yourusername). You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
     75                                                By default all your Twitter contacts will appear in a new channel called #twitter_yourusername. You can change this behaviour using the <emphasis>mode</emphasis> setting (see <emphasis>help set mode</emphasis>).
    7676                                        </para>
    7777                                       
     
    970970        <bitlbee-setting name="mode" type="string" scope="account">
    971971                <possible-values>one, many, chat</possible-values>
    972                 <default>one</default>
    973 
    974                 <description>
    975                         <para>
    976                                 By default, everything from the Twitter module will come from one nick, twitter_(yourusername). If you prefer to have individual nicks for everyone, you can set this setting to "many" instead.
    977                         </para>
    978                        
    979                         <para>
    980                                 If you prefer to have all your Twitter things in a separate channel, you can set this setting to "chat".
    981                         </para>
    982                        
    983                         <para>
    984                                 In the last two modes, you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
     972                <default>chat</default>
     973
     974                <description>
     975                        <para>
     976                                By default, BitlBee will create a separate channel (called #twitter_yourusername) for all your Twitter contacts/messages.
     977                        </para>
     978
     979                        <para>
     980                                If you don't want an extra channel, you can set this setting to "one" (everything will come from one nick, twitter_yourusername), or to "many" (individual nicks for everyone).
     981                        </para>
     982                       
     983                        <para>
     984                                With modes "chat" and "many", you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
     985                        </para>
     986                       
     987                        <para>
     988                                With modes "many" and "one", you can post tweets by /msg'ing the twitter_yourusername contact. In mode "chat", messages posted in the Twitter channel will also be posted as tweets.
    985989                        </para>
    986990                </description>
     
    16371641        </bitlbee-command>
    16381642       
    1639         <bitlbee-command name="transfers">
     1643        <bitlbee-command name="transfer">
    16401644                <short-description>Monitor, cancel, or reject file transfers</short-description>
    1641                 <syntax>transfers [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
     1645                <syntax>transfer [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
    16421646               
    16431647                <description>
    16441648                        <para>
    1645                                 Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfers &lt;action&gt;</emphasis> for more information.
     1649                                Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfer &lt;action&gt;</emphasis> for more information.
    16461650                        </para>
    16471651
    16481652                        <ircexample>
    1649                                 <ircline nick="ulim">transfers</ircline>
     1653                                <ircline nick="ulim">transfer</ircline>
    16501654                        </ircexample>
    16511655                </description>
     
    16531657                <bitlbee-command name="cancel">
    16541658                        <short-description>Cancels the file transfer with the given id</short-description>
    1655                         <syntax>transfers &lt;cancel&gt; id</syntax>
     1659                        <syntax>transfer &lt;cancel&gt; id</syntax>
    16561660
    16571661                        <description>
     
    16601664
    16611665                        <ircexample>
    1662                                 <ircline nick="ulim">transfers cancel 1</ircline>
     1666                                <ircline nick="ulim">transfer cancel 1</ircline>
    16631667                                <ircline nick="root">Canceling file transfer for test</ircline>
    16641668                        </ircexample>
     
    16671671                <bitlbee-command name="reject">
    16681672                        <short-description>Rejects all incoming transfers</short-description>
    1669                         <syntax>transfers &lt;reject&gt;</syntax>
     1673                        <syntax>transfer &lt;reject&gt;</syntax>
    16701674
    16711675                        <description>
     
    16741678
    16751679                        <ircexample>
    1676                                 <ircline nick="ulim">transfers reject</ircline>
     1680                                <ircline nick="ulim">transfer reject</ircline>
    16771681                        </ircexample>
    16781682                </bitlbee-command>
Note: See TracChangeset for help on using the changeset viewer.