Changeset c511365

Timestamp:

2007-10-18T16:07:30Z (17 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:

• doc/user-guide/commands.xml (modified) (1 diff)

doc/user-guide/commands.xml

@@ -823 +823 @@
         <bitlbee-command name="join_chat">
                 <short-description>Join a named groupchat/conference room</short-description>
-                <syntax>import_buddies &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
+                <syntax>join_chat &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
 
                 <description>