diff --git a/CHANGELOG.md b/CHANGELOG.md index c1324a620..a10704658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -708,7 +708,7 @@ _If you are upgrading: please see [UPGRADING.md](UPGRADING.md)._ - irc: fix join of channels in "autojoin" server option on first connection to server if auto reconnection is performed ([#1873](https://github.com/weechat/weechat/issues/1873)) - irc: update autojoin option with redirected channels when autojoin_dynamic is enabled ([#1898](https://github.com/weechat/weechat/issues/1898)) - irc: update secure data when server autojoin option contains `${sec.data.xxx}` and option autojoin_dynamic is enabled ([#1934](https://github.com/weechat/weechat/issues/1934)) -- irc: don't switch to buffer of joined channel if it was not manually joined nor present in server autojoin option +- irc: don't switch to buffer of joined channel if it was neither manually joined nor present in server autojoin option - irc: fix target buffer for commands 432/433 (erroneous nickname/nickname already in use) when the nickname looks like a channel - irc: display command 437 on server buffer when nickname cannot change while banned on channel ([#88](https://github.com/weechat/weechat/issues/88)) - irc: add messages 415 (cannot send message to channel) and 742 (mode cannot be set) diff --git a/src/core/core-command.c b/src/core/core-command.c index 061f698ad..8678f8102 100644 --- a/src/core/core-command.c +++ b/src/core/core-command.c @@ -9502,7 +9502,7 @@ command_init () N_("path_to_binary: path to WeeChat binary (default is current binary)"), N_("raw[-dummy]: do nothing (option used to prevent accidental " "completion with \"-quit\")"), - N_("raw[-save]: only save the session, do not quit nor reload " + N_("raw[-save]: only save the session, neither quit nor reload " "WeeChat; the configuration files are not saved (if needed you can " "use /save before this command)"), N_("raw[-quit]: close *ALL* connections, save session and quit " diff --git a/src/plugins/alias/alias.c b/src/plugins/alias/alias.c index 0aef8e9ec..d865f39a6 100644 --- a/src/plugins/alias/alias.c +++ b/src/plugins/alias/alias.c @@ -635,8 +635,8 @@ alias_update_completion (struct t_alias *alias, const char *completion) } /* - * Checks if an alias name is valid: it must not contain any slashes nor - * any spaces. + * Checks if an alias name is valid: it must contain neither slashes nor + * spaces. * * Returns: * 1: name is valid