diff options
Diffstat (limited to 'doc/user-guide')
| -rw-r--r-- | doc/user-guide/commands.xml | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 78e7d685..f2b8f5f8 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -72,7 +72,7 @@ </para> <para> - 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>). + 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>). </para> <para> @@ -969,19 +969,23 @@ <bitlbee-setting name="mode" type="string" scope="account"> <possible-values>one, many, chat</possible-values> - <default>one</default> + <default>chat</default> <description> <para> - 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. + By default, BitlBee will create a separate channel (called #twitter_yourusername) for all your Twitter contacts/messages. + </para> + + <para> + 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). </para> <para> - If you prefer to have all your Twitter things in a separate channel, you can set this setting to "chat". + 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. </para> <para> - 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. + 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. </para> </description> @@ -1636,44 +1640,44 @@ </description> </bitlbee-command> - <bitlbee-command name="transfers"> + <bitlbee-command name="transfer"> <short-description>Monitor, cancel, or reject file transfers</short-description> - <syntax>transfers [<cancel> id | <reject>]</syntax> + <syntax>transfer [<cancel> id | <reject>]</syntax> <description> <para> - 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 <action></emphasis> for more information. + 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 <action></emphasis> for more information. </para> <ircexample> - <ircline nick="ulim">transfers</ircline> + <ircline nick="ulim">transfer</ircline> </ircexample> </description> <bitlbee-command name="cancel"> <short-description>Cancels the file transfer with the given id</short-description> - <syntax>transfers <cancel> id</syntax> + <syntax>transfer <cancel> id</syntax> <description> <para>Cancels the file transfer with the given id</para> </description> <ircexample> - <ircline nick="ulim">transfers cancel 1</ircline> + <ircline nick="ulim">transfer cancel 1</ircline> <ircline nick="root">Canceling file transfer for test</ircline> </ircexample> </bitlbee-command> <bitlbee-command name="reject"> <short-description>Rejects all incoming transfers</short-description> - <syntax>transfers <reject></syntax> + <syntax>transfer <reject></syntax> <description> <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is neccessary. Or is it?</para> </description> <ircexample> - <ircline nick="ulim">transfers reject</ircline> + <ircline nick="ulim">transfer reject</ircline> </ircexample> </bitlbee-command> </bitlbee-command> |