summaryrefslogtreecommitdiff
path: root/doc/en
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-12-07 15:18:40 +0100
committerSebastien Helleu <flashcode@flashtux.org>2013-12-07 15:18:40 +0100
commitfaba6aa6c22b3e6112213a613dfb9bdfcce7723b (patch)
tree677af8a63b39aac06f6b727635077b8346448c62 /doc/en
parent4f184b6111c729608fbf26a0adcc00c828f2e00a (diff)
downloadweechat-faba6aa6c22b3e6112213a613dfb9bdfcce7723b.zip
irc: improve /help of command/command_delay/autojoin options in servers
Diffstat (limited to 'doc/en')
-rw-r--r--doc/en/autogen/user/irc_options.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index b5c24e07f..f439b5ae5 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -424,7 +424,7 @@
** values: on, off (default value: `off`)
* [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** description: `comma separated list of channels to join when connected to server; the channels that require a key must be at beginning of the list, and all the keys must be given after the channels (separated by a space) (example: "#channel1,#channel2,#channel3 key1,key2" where #channel1 and #channel2 are protected by key1 and key2) (note: content is evaluated, see /help eval)`
+** description: `comma separated list of channels to join after connection to server (and after executing command + delay if they are set); the channels that require a key must be at beginning of the list, and all the keys must be given after the channels (separated by a space) (example: "#channel1,#channel2,#channel3 key1,key2" where #channel1 and #channel2 are protected by key1 and key2) (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
@@ -464,12 +464,12 @@
** values: any string (default value: `""`)
* [[option_irc.server_default.command]] *irc.server_default.command*
-** description: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
+** description: `command(s) to run after connection to server and before auto-join of channels (many commands can be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
* [[option_irc.server_default.command_delay]] *irc.server_default.command_delay*
-** description: `delay (in seconds) after command was executed (example: give some time for authentication)`
+** description: `delay (in seconds) after execution of command and before auto-join of channels (example: give some time for authentication before joining channels)`
** type: integer
** values: 0 .. 3600 (default value: `0`)