Ignore:
Timestamp:
2010-08-14T13:44:35Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
e5854a8
Parents:
5848675 (diff), 136c2bb (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

    r5848675 r07874be  
    14321432        <bitlbee-command name="blist">
    14331433                <syntax>blist [all|online|offline|away]</syntax>
    1434                 <short-description>List all the buddies in your contact list</short-description>
    1435 
    1436                 <description>
    1437                         <para>
    1438                                 You can get a better readable buddy list using the <emphasis>blist</emphasis> command. If you want a complete list (including the offline users) you can use the <emphasis>all</emphasis> argument.
     1434                <short-description>List all the buddies in the current channel</short-description>
     1435
     1436                <description>
     1437                        <para>
     1438                                You can get a more readable buddy list using the <emphasis>blist</emphasis> command. If you want a complete list (including the offline users) you can use the <emphasis>all</emphasis> argument.
    14391439                        </para>
    14401440                </description>
Note: See TracChangeset for help on using the changeset viewer.