Changeset c511365


Ignore:
Timestamp:
2007-10-18T16:07:30Z (13 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
e9b755e
Parents:
764b163d (diff), 3933853 (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 upstream.

File:
1 edited

Legend:

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

    r764b163d rc511365  
    823823        <bitlbee-command name="join_chat">
    824824                <short-description>Join a named groupchat/conference room</short-description>
    825                 <syntax>import_buddies &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
     825                <syntax>join_chat &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
    826826
    827827                <description>
Note: See TracChangeset for help on using the changeset viewer.