aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-18 18:07:30 +0200
committerJelmer Vernooij <jelmer@samba.org>2007-10-18 18:07:30 +0200
commitc511365ddc57359ab3020ccbd3f20e23b55ba5ca (patch)
treef07c9a91e1ad1642adc21affb0bc2a59e4ed3027
parent764b163d6bc0587498c14de8023d70aea076e646 (diff)
parent3933853e12f9f4271c33e68425c3cc4d0aa53728 (diff)
Merge upstream.
-rw-r--r--doc/user-guide/commands.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index cf40782f..b7af2027 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -822,7 +822,7 @@
<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>
<para>