diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc
index 8d6df1cf0..5660d1f5f 100644
--- a/doc/de/weechat_user.de.adoc
+++ b/doc/de/weechat_user.de.adoc
@@ -2909,15 +2909,131 @@ Es ist möglich eine oder mehrere URL von IRC Servern zu übergeben:
 irc[6][s]://[nick[:password]@]irc.example.org[:port][/channel][,channel[...]]
 ----
 
-Beispiel: Anmelden beim Server _irc.libera.chat_ mit dem Nick _nono_ und betreten
-der Channels _#weechat_ und _#toto_ (Standardport (6667) wird genutzt):
+Beispiel: Anmelden beim Server _irc.libera.chat_ mit dem Nick _alice_ und betreten
+der Channels _#weechat_ und _#weechat-fr_ (Standardport (6667) wird genutzt):
 
 ----
-$ weechat irc://nono@irc.libera.chat/#weechat,#toto
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+// TRANSLATION MISSING
+[[irc_servers]]
+==== Servers
+
+[[irc_servers_add]]
+===== Add a server
+
+By default no servers are defined. You can add as many servers as you want with
+the <<command_irc_server,/server>> command.
+
+For example to connect to https://libera.chat/[libera.chat] with SSL (encrypted trafic):
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+You can tell WeeChat to auto-connect to this server on startup:
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+To authenticate, it is recommended to use SASL (if supported on the server),
+with the password stored as secured data (see also chapter on
+<<irc_sasl_authentication,SASL authentication>>):
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+If SASL is not supported, you can use a command to send a message to nickserv:
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+By sending a message to nickserv, you may authenticate after joining channels
+which could be a problem on some channels requiring you to be authenticated
+to join. In this case, you can set a command delay:
+`/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Server options
+
+Server options are named `irc.server.<server>.<option>` where `<server>` is the
+internal name of the server and `<option>` the name of an option. +
+The value of a server option is inherited from `irc.server_default.xxx`
+if the server option has the special value `null`.
+
+For example if you created the _libera_ server with the commands above, you'll
+see this with the command `/fset libera`:
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+For example if you want to automatically connect to all servers you define
+without having to do it on each server, you can do:
+
+----
+/set irc.server_default.autoconnect on
+----
+
+And then you can reset the server option so that it uses the default inherited
+value, which is now `on` instead of the default value `off`:
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== SSL Zertifikate
+===== SSL Zertifikate
 
 Wenn eine Verbindung mittels SSL zu einem IRC Server hergestellt wird dann überprüft
 WeeChat immer ob dieser Verbindung sicher ist.
@@ -2947,7 +3063,7 @@ die Verifizierung sehr streng genommen wird und dadurch vielleicht versagt. Auch
 die Verbindung mit einer vorherigen Version (<0.3.1) funktioniert hat.
 
 [[irc_connect_oftc_with_certificate]]
-===== erstes Beispiel: Verbindung zu oftc und Überprüfung der Zertifikate
+====== erstes Beispiel: Verbindung zu oftc und Überprüfung der Zertifikate
 
 * Importieren Sie die Zertifikate in einer Shell:
 
@@ -2970,7 +3086,7 @@ Es ist möglich mehrere Zertifikate in der Datei CAs.pem zu verwenden.
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== zweites Beispiel: Verbindung zu oftc mittels CertFP
+====== zweites Beispiel: Verbindung zu oftc mittels CertFP
 
 * Erstellen Sie ein Zertifikat in der Shell:
 
@@ -2995,7 +3111,7 @@ das auch beispielsweise `~/.weechat` sein kann.
 Für weiterreichende Informationen lesen Sie bitte: https://www.oftc.net/NickServ/CertFP
 
 [[irc_sasl_authentication]]
-==== SASL Authentifizierung
+===== SASL Authentifizierung
 
 WeeChat unterstützt eine SASL Authentifikation, mittels verschiedener Mechanismen:
 
@@ -3017,7 +3133,7 @@ Optionen für Server sind:
   _ecdsa-nist256p-challenge_ Mechanismus)
 
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE
+====== SASL ECDSA-NIST256P-CHALLENGE
 
 Es muss ein privater Schlüssel erstellt werden um sich mittels des
 ECDSA-NIST256P-CHALLENGE Mechanismus authentifizieren zu können (es wird
@@ -3064,8 +3180,40 @@ Erneut mit dem Server verbinden:
 /reconnect libera
 ----
 
+// TRANSLATION MISSING
+[[irc_servers_connection]]
+===== Connection
+
+You can connect to server with the <<command_irc_connect,/connect>> command:
+
+----
+/connect libera
+----
+
+To disconnect:
+
+----
+/disconnect libera
+----
+
+Or just this if you are on any buffer belonging to _libera_ server (server,
+channel, private):
+
+----
+/disconnect
+----
+
+When you connect to multiple servers at same time, server buffers are merged
+by default and you can switch between them with the kbd:[Ctrl+x] key. +
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+----
+/set irc.look.server_buffer independent
+----
+
 [[irc_tor_sasl]]
-==== Connect with TOR and SASL
+===== Connect with TOR and SASL
 
 Einige Server unterstützen eine Verbindungen mittels TOR (https://www.torproject.org/),
 dies ist ein Netzwerk mit virtueller Tunneln, durch welchen Personen und Gruppen ihre
@@ -3113,6 +3261,64 @@ Abschließend, stellen Sie eine Verbindung zum Server her:
 /connect irc-tor
 ----
 
+// TRANSLATION MISSING
+[[irc_channels]]
+==== Channels
+
+You can join channels with the <<command_irc_join,/join>> command:
+
+----
+/join #channel
+----
+
+Part a channel (keeping the buffer open):
+
+----
+/part [quit message]
+----
+
+The channels you joined are not saved. If you want to join them automatically
+when connecting to the server, you must set the server `autojoin` option:
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Some scripts can help to automatically set this option,
+see `/script search autojoin`.
+
+Be careful, spaces can be used only to separate list of channels from keys,
+for example if `#channel1` requires a key but not `#channel2`:
+
+----
+/set irc.server.libera.autojoin "#channel1,#channel2 key1"
+----
+
+For help on the format, see `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Private messages
+
+You can send a private message with the <<command_irc_query,/query>> command,
+which opens a separate buffer:
+
+----
+/query bob hi, how are you?
+----
+
+Without arguments the command just opens the buffer (or selects it if already open):
+
+----
+/query bob
+----
+
+To close the private buffer, you can do this command on the private buffer:
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== einfacher Filter für join/part/quit Nachrichten
 
@@ -3526,8 +3732,8 @@ Erstellt eine Struktur in folgender Form:
         │   └── #mychan.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #channel1.weechatlog
+        │   └── #channel2.weechatlog
         ...
 ....
 
diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc
index aa88d7a99..c337ddde8 100644
--- a/doc/en/weechat_user.en.adoc
+++ b/doc/en/weechat_user.en.adoc
@@ -2857,15 +2857,130 @@ It is possible to give URL for one or many IRC servers, as follow:
 irc[6][s]://[nick[:password]@]irc.example.org[:port][/channel][,channel[...]]
 ----
 
-Example to join _#weechat_ and _#toto_ on server _irc.libera.chat_ server,
-default port (6667), with nick _nono_:
+Example to join _#weechat_ and _#weechat-fr_ on server _irc.libera.chat_ server,
+default port (6667), with nick _alice_:
 
 ----
-$ weechat irc://nono@irc.libera.chat/#weechat,#toto
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+[[irc_servers]]
+==== Servers
+
+[[irc_servers_add]]
+===== Add a server
+
+By default no servers are defined. You can add as many servers as you want with
+the <<command_irc_server,/server>> command.
+
+For example to connect to https://libera.chat/[libera.chat] with SSL (encrypted trafic):
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+You can tell WeeChat to auto-connect to this server on startup:
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+To authenticate, it is recommended to use SASL (if supported on the server),
+with the password stored as secured data (see also chapter on
+<<irc_sasl_authentication,SASL authentication>>):
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+If SASL is not supported, you can use a command to send a message to nickserv:
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+By sending a message to nickserv, you may authenticate after joining channels
+which could be a problem on some channels requiring you to be authenticated
+to join. In this case, you can set a command delay:
+`/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Server options
+
+Server options are named `irc.server.<server>.<option>` where `<server>` is the
+internal name of the server and `<option>` the name of an option. +
+The value of a server option is inherited from `irc.server_default.xxx`
+if the server option has the special value `null`.
+
+For example if you created the _libera_ server with the commands above, you'll
+see this with the command `/fset libera`:
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+For example if you want to automatically connect to all servers you define
+without having to do it on each server, you can do:
+
+----
+/set irc.server_default.autoconnect on
+----
+
+And then you can reset the server option so that it uses the default inherited
+value, which is now `on` instead of the default value `off`:
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== SSL certificates
+===== SSL certificates
 
 When connecting to IRC server with SSL, WeeChat checks by default that the
 connection is fully trusted.
@@ -2894,7 +3009,7 @@ Option "ssl_verify" is on by default, so verification is strict and may fail,
 even if it was OK with versions prior to 0.3.1.
 
 [[irc_connect_oftc_with_certificate]]
-===== First example: connect to oftc and check certificate
+====== First example: connect to oftc and check certificate
 
 * Import certificate in shell:
 
@@ -2917,7 +3032,7 @@ It is possible to concatenate many certificates in file CAs.pem.
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== Second example: connect to oftc using CertFP
+====== Second example: connect to oftc using CertFP
 
 * Create certificate in shell:
 
@@ -2942,7 +3057,7 @@ which can also be for example `~/.weechat`.
 For more information, look at https://www.oftc.net/NickServ/CertFP
 
 [[irc_sasl_authentication]]
-==== SASL authentication
+===== SASL authentication
 
 WeeChat supports SASL authentication, using different mechanisms:
 
@@ -2964,7 +3079,7 @@ Options in servers are:
   _ecdsa-nist256p-challenge_)
 
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE
+====== SASL ECDSA-NIST256P-CHALLENGE
 
 You must generate a private key in order to authentify with the
 ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
@@ -3009,8 +3124,39 @@ Reconnect to the server:
 /reconnect libera
 ----
 
+[[irc_servers_connection]]
+===== Connection
+
+You can connect to server with the <<command_irc_connect,/connect>> command:
+
+----
+/connect libera
+----
+
+To disconnect:
+
+----
+/disconnect libera
+----
+
+Or just this if you are on any buffer belonging to _libera_ server (server,
+channel, private):
+
+----
+/disconnect
+----
+
+When you connect to multiple servers at same time, server buffers are merged
+by default and you can switch between them with the kbd:[Ctrl+x] key. +
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+----
+/set irc.look.server_buffer independent
+----
+
 [[irc_tor_sasl]]
-==== Connect with TOR and SASL
+===== Connect with TOR and SASL
 
 Some servers support connections with TOR (https://www.torproject.org/),
 a network of virtual tunnels that allows people and groups to improve their
@@ -3057,6 +3203,63 @@ And finally, connect to the server:
 /connect irc-tor
 ----
 
+[[irc_channels]]
+==== Channels
+
+You can join channels with the <<command_irc_join,/join>> command:
+
+----
+/join #channel
+----
+
+Part a channel (keeping the buffer open):
+
+----
+/part [quit message]
+----
+
+The channels you joined are not saved. If you want to join them automatically
+when connecting to the server, you must set the server `autojoin` option:
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Some scripts can help to automatically set this option,
+see `/script search autojoin`.
+
+Be careful, spaces can be used only to separate list of channels from keys,
+for example if `#channel1` requires a key but not `#channel2`:
+
+----
+/set irc.server.libera.autojoin "#channel1,#channel2 key1"
+----
+
+For help on the format, see `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Private messages
+
+You can send a private message with the <<command_irc_query,/query>> command,
+which opens a separate buffer:
+
+----
+/query bob hi, how are you?
+----
+
+Without arguments the command just opens the buffer (or selects it if already open):
+
+----
+/query bob
+----
+
+To close the private buffer, you can do this command on the private buffer:
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== Smart filter for join/part/quit messages
 
@@ -3459,8 +3662,8 @@ You'll have following files:
         │   └── #mychan.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #channel1.weechatlog
+        │   └── #channel2.weechatlog
         ...
 ....
 
diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc
index bc3ef4a21..eb4b113a3 100644
--- a/doc/fr/weechat_user.fr.adoc
+++ b/doc/fr/weechat_user.fr.adoc
@@ -2957,15 +2957,133 @@ Il est possible de passer une URL pour un ou plusieurs serveurs, comme suit :
 irc[6][s]://[pseudo[:mot_passe]@]irc.example.org[:port][/canal][,canal[...]]
 ----
 
-Exemple pour rejoindre _#weechat_ et _#toto_ sur le serveur _irc.libera.chat_,
-port par défaut (6667), avec le pseudo _nono_ :
+Exemple pour rejoindre _#weechat_ et _#weechat-fr_ sur le serveur
+_irc.libera.chat_, port par défaut (6667), avec le pseudo _alice_ :
 
 ----
-$ weechat irc://nono@irc.libera.chat/#weechat,#toto
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+[[irc_servers]]
+==== Serveurs
+
+[[irc_servers_add]]
+===== Ajout d'un serveur
+
+Par défaut aucun serveur n'est défini. Vous pouvez ajouter autant de serveurs
+que vous le souhaitez avec la commande <<command_irc_server,/server>>.
+
+Par exemple pour vous connecter à https://libera.chat/[libera.chat] avec SSL
+(communications chiffrées) :
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+Vous pouvez demander à WeeChat de se connecter automatiquement à ce serveur
+au démarrage :
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+Pour vous authentifier, il est recommandé d'utiliser SASL (si le serveur le
+supporte), avec le mot de passe stocké sous forme de donnée sécurisée (voir aussi
+le chapitre sur <<irc_sasl_authentication,l'authentification avec SASL>>) :
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+Si SASL n'est pas supporté, vous pouvez utiliser une commande pour envoyer
+un message à nickserv :
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+En envoyant une commande à nickserv, vous pourriez être authentifié après avoir
+rejoint les canaux, ce qui peut être un problème sur certains canaux qui
+vous obligent à être authentifié pour les rejoindre. Dans ce cas, vous pouvez
+définir un délai après la commande : `/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Options du serveur
+
+Les options du serveur sont nommées `irc.server.<serveur>.<option>` où `<serveur>`
+est le nom interne du serveur et `<option>` le nom de l'option. +
+La valeur d'une option de serveur est héritée de `irc.server_default.xxx` si
+l'option de serveur a la valeur spéciale `null`.
+
+Par exemple si vous avez créé le serveur _libera_ avec les commandes ci-dessus,
+vous verrez ceci avec la commande `/fset libera` :
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+Par exemple si vous voulez vous connecter automatiquement à tous les serveurs
+que vous ajoutez sans avoir à le faire sur chaque serveur, vous pouvez faire :
+
+----
+/set irc.server_default.autoconnect on
+----
+
+Et puis vous pouvez réinitialiser l'option du serveur pour qu'elle utilise
+la valeur héritée, qui est maintenant `on` au lieu de la valeur par défaut `off` :
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== Certificats SSL
+===== Certificats SSL
 
 Lors de la connexion à un serveur IRC avec SSL, WeeChat vérifie par défaut que
 la connexion est entièrement de confiance.
@@ -2996,7 +3114,7 @@ et peut échouer, même si cela pouvait être OK dans les versions inférieures
 0.3.1.
 
 [[irc_connect_oftc_with_certificate]]
-===== Premier exemple : se connecter à oftc en vérifiant le certificat
+====== Premier exemple : se connecter à oftc en vérifiant le certificat
 
 * Importer le certificat sous le shell :
 
@@ -3019,7 +3137,7 @@ Il est possible de concaténer plusieurs certificats dans le fichier CAs.pem.
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== Second exemple : se connecter à oftc en utilisant CertFP
+====== Second exemple : se connecter à oftc en utilisant CertFP
 
 * Créer le certificat sous le shell :
 
@@ -3044,7 +3162,7 @@ config WeeChat qui peut aussi être par exemple `~/.weechat`.
 Pour plus d'informations, consulter https://www.oftc.net/NickServ/CertFP
 
 [[irc_sasl_authentication]]
-==== Authentification avec SASL
+===== Authentification avec SASL
 
 WeeChat supporte l'authentification avec SASL, en utilisant différents
 mécanismes :
@@ -3067,7 +3185,7 @@ Les options dans le serveur sont :
   _ecdsa-nist256p-challenge_)
 
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE
+====== SASL ECDSA-NIST256P-CHALLENGE
 
 Vous devez générer une clé privée pour vous authentifier avec le mécanisme
 ECDSA-NIST256P-CHALLENGE (aucun mot de passe n'est requis lors de la
@@ -3113,8 +3231,41 @@ Reconnectez-vous au serveur :
 /reconnect libera
 ----
 
+[[irc_servers_connection]]
+===== Connexion
+
+Vous pouvez vous connecter au serveur avec la commande
+<<command_irc_connect,/connect>> :
+
+----
+/connect libera
+----
+
+Pour vous déconnecter :
+
+----
+/disconnect libera
+----
+
+Ou juste ceci si vous être sur un tampon appartenant au serveur _libera_
+(serveur, canal, privé) :
+
+----
+/disconnect
+----
+
+Lorsque vous vous connectez à plusieurs serveurs à la fois, les tampons des
+serveurs sont mélangés par défaut et vous pouvez basculer entre eux avec
+la touche kbd:[Ctrl+x]. +
+Il est possible de désactiver le mélange des tampons serveurs pour avoir
+un tampon distinct par serveur :
+
+----
+/set irc.look.server_buffer independent
+----
+
 [[irc_tor_sasl]]
-==== Connexion avec TOR et SASL
+===== Connexion avec TOR et SASL
 
 Quelques serveurs acceptent les connexions avec TOR (https://www.torproject.org/),
 un réseau de tunnels virtuels qui permet aux personnes et groupes d'améliorer
@@ -3133,7 +3284,7 @@ et port dépend de votre configuration de TOR) :
 /proxy add tor socks5 127.0.0.1 9050
 ----
 
-Maintenant, ajouter un nouveau serveur (remplacez le nom du serveur "irc-tor" et
+Maintenant, ajoutez un nouveau serveur (remplacez le nom du serveur "irc-tor" et
 l'adresse par une valide) :
 
 ----
@@ -3162,6 +3313,66 @@ Et enfin, connectez-vous au serveur :
 /connect irc-tor
 ----
 
+[[irc_channels]]
+==== Canaux
+
+Vous pouvez rejoindre des canaux avec la commande <<command_irc_join,/join>> :
+
+----
+/join #canal
+----
+
+Quitter un canal (en laissant le tampon ouvert) :
+
+----
+/part [message de fin]
+----
+
+Les canaux que vous rejoignez ne sont pas sauvegardés. Si vous souhaitez les
+rejoindre automatiquement à la connexion au serveur, vous devez définir l'option
+`autojoin` du serveur :
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Certains scripts peuvent aider pour définir automatiquement cette option,
+voir `/script search autojoin`.
+
+Attention, les espaces ne peuvent être utilisés que pour séparer les canaux
+des clés, par exemple si `#canal1` requiert une clé mais pas `#canal2`:
+
+----
+/set irc.server.libera.autojoin "#canal1,#canal2 cle1"
+----
+
+Pour de l'aide sur le format, voir `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Messages privés
+
+Vous pouvez envoyer un message privé avec la commande <<command_irc_query,/query>>,
+qui ouvre un tampon séparé :
+
+----
+/query bob salut, comment vas-tu ?
+----
+
+Sans paramètre la commande ouvre juste le tampon (ou le sélectionne s'il est
+déjà ouvert) :
+
+----
+/query bob
+----
+
+Pour fermer le tampon privé, vous pouvez utiliser cette commande sur le tampon
+privé :
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== Filtre intelligent pour les messages join/part/quit
 
@@ -3567,11 +3778,11 @@ Vous obtiendrez les fichiers suivants :
         ├── libera
         │   ├── libera.weechatlog
         │   ├── #weechat.weechatlog
-        │   └── #mychan.weechatlog
+        │   └── #moncanal.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #canal1.weechatlog
+        │   └── #canal2.weechatlog
         ...
 ....
 
diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc
index c81cd5780..3bc3c7978 100644
--- a/doc/it/weechat_user.it.adoc
+++ b/doc/it/weechat_user.it.adoc
@@ -3079,15 +3079,131 @@ trasferimento file (tramite plugin xfer, consultare <<xfer_plugin,plugin Xfer>>)
 irc[6][s]://[nick[:password]@]irc.esempio.org[:porta][/#canale][,#canale[...]]
 ----
 
-Esempio per entrare in _#weechat_ e _#tizio_ sul server _irc.libera.chat_,
-porta predefinita (6667), con il nick _caio_:
+Esempio per entrare in _#weechat_ e _#weechat-fr_ sul server _irc.libera.chat_,
+porta predefinita (6667), con il nick _alice_:
 
 ----
-$ weechat irc://caio@irc.libera.chat/#weechat,#tizio
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+// TRANSLATION MISSING
+[[irc_servers]]
+==== Servers
+
+[[irc_servers_add]]
+===== Add a server
+
+By default no servers are defined. You can add as many servers as you want with
+the <<command_irc_server,/server>> command.
+
+For example to connect to https://libera.chat/[libera.chat] with SSL (encrypted trafic):
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+You can tell WeeChat to auto-connect to this server on startup:
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+To authenticate, it is recommended to use SASL (if supported on the server),
+with the password stored as secured data (see also chapter on
+<<irc_sasl_authentication,SASL authentication>>):
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+If SASL is not supported, you can use a command to send a message to nickserv:
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+By sending a message to nickserv, you may authenticate after joining channels
+which could be a problem on some channels requiring you to be authenticated
+to join. In this case, you can set a command delay:
+`/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Server options
+
+Server options are named `irc.server.<server>.<option>` where `<server>` is the
+internal name of the server and `<option>` the name of an option. +
+The value of a server option is inherited from `irc.server_default.xxx`
+if the server option has the special value `null`.
+
+For example if you created the _libera_ server with the commands above, you'll
+see this with the command `/fset libera`:
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+For example if you want to automatically connect to all servers you define
+without having to do it on each server, you can do:
+
+----
+/set irc.server_default.autoconnect on
+----
+
+And then you can reset the server option so that it uses the default inherited
+value, which is now `on` instead of the default value `off`:
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== Certificati SSL
+===== Certificati SSL
 
 Al momento della connessione al server IRC con SSL, WeeChat verifica in
 maniera predefinita che la connessione sia completamente fidata.
@@ -3120,7 +3236,7 @@ e potrebbe fallire, anche se funziona senza problemi con versioni precedenti
 la 0.3.1.
 
 [[irc_connect_oftc_with_certificate]]
-===== Primo esempio: connessione a otfc e verifica del certificato
+====== Primo esempio: connessione a otfc e verifica del certificato
 
 * Importare certificati nella shell:
 
@@ -3146,7 +3262,7 @@ E possibile concatenare più certificati nel file CAs.pem.
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== Secondo esempio: connessione a otfc con CertFP
+====== Secondo esempio: connessione a otfc con CertFP
 
 * Creare un certificato nella shell:
 
@@ -3173,7 +3289,7 @@ which can also be for example `~/.weechat`.
 Per maggiori informazioni consultare https://www.oftc.net/NickServ/CertFP
 
 [[irc_sasl_authentication]]
-==== Autenticazione SASL
+===== Autenticazione SASL
 
 // TRANSLATION MISSING
 WeeChat supports SASL authentication, using different mechanisms:
@@ -3205,7 +3321,7 @@ Le opzioni nel server sono:
 
 // TRANSLATION MISSING
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE
+====== SASL ECDSA-NIST256P-CHALLENGE
 
 You must generate a private key in order to authentify with the
 ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
@@ -3250,9 +3366,41 @@ Reconnect to the server:
 /reconnect libera
 ----
 
+// TRANSLATION MISSING
+[[irc_servers_connection]]
+===== Connection
+
+You can connect to server with the <<command_irc_connect,/connect>> command:
+
+----
+/connect libera
+----
+
+To disconnect:
+
+----
+/disconnect libera
+----
+
+Or just this if you are on any buffer belonging to _libera_ server (server,
+channel, private):
+
+----
+/disconnect
+----
+
+When you connect to multiple servers at same time, server buffers are merged
+by default and you can switch between them with the kbd:[Ctrl+x] key. +
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+----
+/set irc.look.server_buffer independent
+----
+
 // TRANSLATION MISSING
 [[irc_tor_sasl]]
-==== Connect with TOR and SASL
+===== Connect with TOR and SASL
 
 // TRANSLATION MISSING
 Some servers support connections with TOR (https://www.torproject.org/),
@@ -3303,6 +3451,64 @@ And finally, connect to the server:
 /connect irc-tor
 ----
 
+// TRANSLATION MISSING
+[[irc_channels]]
+==== Channels
+
+You can join channels with the <<command_irc_join,/join>> command:
+
+----
+/join #channel
+----
+
+Part a channel (keeping the buffer open):
+
+----
+/part [quit message]
+----
+
+The channels you joined are not saved. If you want to join them automatically
+when connecting to the server, you must set the server `autojoin` option:
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Some scripts can help to automatically set this option,
+see `/script search autojoin`.
+
+Be careful, spaces can be used only to separate list of channels from keys,
+for example if `#channel1` requires a key but not `#channel2`:
+
+----
+/set irc.server.libera.autojoin "#channel1,#channel2 key1"
+----
+
+For help on the format, see `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Private messages
+
+You can send a private message with the <<command_irc_query,/query>> command,
+which opens a separate buffer:
+
+----
+/query bob hi, how are you?
+----
+
+Without arguments the command just opens the buffer (or selects it if already open):
+
+----
+/query bob
+----
+
+To close the private buffer, you can do this command on the private buffer:
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== Filtro smart per i messaggi di entrata/uscita/disconnessione
 
@@ -3729,8 +3935,8 @@ Si avranno i seguenti file:
         │   └── #mychan.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #channel1.weechatlog
+        │   └── #channel2.weechatlog
         ...
 ....
 
diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc
index a84b7abfd..50aa448bd 100644
--- a/doc/ja/weechat_user.ja.adoc
+++ b/doc/ja/weechat_user.ja.adoc
@@ -2940,15 +2940,131 @@ IRC プラグインは IRC プロトコルに従って他の人と会話を行
 irc[6][s]://[nick[:password]@]irc.example.org[:port][/channel][,channel[...]]
 ----
 
-_nono_ というニックネームを使って _irc.libera.chat_ ホストのデフォルトポート (6667)
-で稼働中の IRC サーバ上の _#weechat_ と _#toto_ チャンネルに参加する例:
+_alice_ というニックネームを使って _irc.libera.chat_ ホストのデフォルトポート (6667)
+で稼働中の IRC サーバ上の _#weechat_ と _#weechat-fr_ チャンネルに参加する例:
 
 ----
-$ weechat irc://nono@irc.libera.chat/#weechat,#toto
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+// TRANSLATION MISSING
+[[irc_servers]]
+==== Servers
+
+[[irc_servers_add]]
+===== Add a server
+
+By default no servers are defined. You can add as many servers as you want with
+the <<command_irc_server,/server>> command.
+
+For example to connect to https://libera.chat/[libera.chat] with SSL (encrypted trafic):
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+You can tell WeeChat to auto-connect to this server on startup:
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+To authenticate, it is recommended to use SASL (if supported on the server),
+with the password stored as secured data (see also chapter on
+<<irc_sasl_authentication,SASL authentication>>):
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+If SASL is not supported, you can use a command to send a message to nickserv:
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+By sending a message to nickserv, you may authenticate after joining channels
+which could be a problem on some channels requiring you to be authenticated
+to join. In this case, you can set a command delay:
+`/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Server options
+
+Server options are named `irc.server.<server>.<option>` where `<server>` is the
+internal name of the server and `<option>` the name of an option. +
+The value of a server option is inherited from `irc.server_default.xxx`
+if the server option has the special value `null`.
+
+For example if you created the _libera_ server with the commands above, you'll
+see this with the command `/fset libera`:
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+For example if you want to automatically connect to all servers you define
+without having to do it on each server, you can do:
+
+----
+/set irc.server_default.autoconnect on
+----
+
+And then you can reset the server option so that it uses the default inherited
+value, which is now `on` instead of the default value `off`:
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== SSL 証明書
+===== SSL 証明書
 
 SSL を使って IRC サーバに接続する場合、WeeChat
 はデフォルトで接続が完全に信頼できるものかどうかを確認します。
@@ -2979,7 +3095,7 @@ irc.server.xxx.ssl_verify::
 より前のバージョンでは信頼性の確認に成功していたものが失敗する場合もあります。
 
 [[irc_connect_oftc_with_certificate]]
-===== 最初の例: oftc に接続して、証明書を確認
+====== 最初の例: oftc に接続して、証明書を確認
 
 * シェルを使って証明書をインポート:
 
@@ -3003,7 +3119,7 @@ CAs.pem ファイル中で複数の証明書を連結することもできます
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== 2 番目の例: CertFP を使って oftc に接続
+====== 2 番目の例: CertFP を使って oftc に接続
 
 * シェルで証明書を作成:
 
@@ -3029,7 +3145,7 @@ which can also be for example `~/.weechat`.
 より詳しい情報は https://www.oftc.net/NickServ/CertFP を確認してください。
 
 [[irc_sasl_authentication]]
-==== SASL 認証
+===== SASL 認証
 
 WeeChat は SASL 認証をサポートします、以下の認証メカニズムを利用できます:
 
@@ -3054,7 +3170,7 @@ WeeChat は SASL 認証をサポートします、以下の認証メカニズム
   (_ecdsa-nist256p-challenge_ 用)
 
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE 認証
+====== SASL ECDSA-NIST256P-CHALLENGE 認証
 
 ECDSA-NIST256P-CHALLENGE を使って認証を行うためには、秘密鍵を作成してください
 (接続の際にパスワードは不要です)。
@@ -3100,9 +3216,41 @@ $ openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem
 /reconnect libera
 ----
 
+// TRANSLATION MISSING
+[[irc_servers_connection]]
+===== Connection
+
+You can connect to server with the <<command_irc_connect,/connect>> command:
+
+----
+/connect libera
+----
+
+To disconnect:
+
+----
+/disconnect libera
+----
+
+Or just this if you are on any buffer belonging to _libera_ server (server,
+channel, private):
+
+----
+/disconnect
+----
+
+When you connect to multiple servers at same time, server buffers are merged
+by default and you can switch between them with the kbd:[Ctrl+x] key. +
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+----
+/set irc.look.server_buffer independent
+----
+
 // TRANSLATION MISSING
 [[irc_tor_sasl]]
-==== Connect with TOR and SASL
+===== Connect with TOR and SASL
 
 // TRANSLATION MISSING
 Some servers support connections with TOR (https://www.torproject.org/),
@@ -3151,6 +3299,64 @@ And finally, connect to the server:
 /connect irc-tor
 ----
 
+// TRANSLATION MISSING
+[[irc_channels]]
+==== Channels
+
+You can join channels with the <<command_irc_join,/join>> command:
+
+----
+/join #channel
+----
+
+Part a channel (keeping the buffer open):
+
+----
+/part [quit message]
+----
+
+The channels you joined are not saved. If you want to join them automatically
+when connecting to the server, you must set the server `autojoin` option:
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Some scripts can help to automatically set this option,
+see `/script search autojoin`.
+
+Be careful, spaces can be used only to separate list of channels from keys,
+for example if `#channel1` requires a key but not `#channel2`:
+
+----
+/set irc.server.libera.autojoin "#channel1,#channel2 key1"
+----
+
+For help on the format, see `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Private messages
+
+You can send a private message with the <<command_irc_query,/query>> command,
+which opens a separate buffer:
+
+----
+/query bob hi, how are you?
+----
+
+Without arguments the command just opens the buffer (or selects it if already open):
+
+----
+/query bob
+----
+
+To close the private buffer, you can do this command on the private buffer:
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== 参加/退出/終了メッセージに対するスマートフィルタ
 
@@ -3554,8 +3760,8 @@ IRC サーバ名を使ったディレクトリに、チャンネル名を使っ
         │   └── #mychan.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #channel1.weechatlog
+        │   └── #channel2.weechatlog
         ...
 ....
 
diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc
index d90eec738..c25449136 100644
--- a/doc/pl/weechat_user.pl.adoc
+++ b/doc/pl/weechat_user.pl.adoc
@@ -2878,15 +2878,131 @@ Możliwe jest podanie adresu URL do jednego lub wielu serwerów IRC:
 irc[6][s]://[nick[:hasło]@]adres.serwera.irc[:port][/kanał][,kanał[...]]
 ----
 
-Przykład wejścia na kanały _#weechat_ i _#toto_ na serwerze _irc.libera.chat_,
-na domyślnym porcie (6667), z nickiem _nono_:
+Przykład wejścia na kanały _#weechat_ i _#weechat-fr_ na serwerze
+_irc.libera.chat_, na domyślnym porcie (6667), z nickiem _alice_:
 
 ----
-$ weechat irc://nono@irc.libera.chat/#weechat,#toto
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+// TRANSLATION MISSING
+[[irc_servers]]
+==== Servers
+
+[[irc_servers_add]]
+===== Add a server
+
+By default no servers are defined. You can add as many servers as you want with
+the <<command_irc_server,/server>> command.
+
+For example to connect to https://libera.chat/[libera.chat] with SSL (encrypted trafic):
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+You can tell WeeChat to auto-connect to this server on startup:
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+To authenticate, it is recommended to use SASL (if supported on the server),
+with the password stored as secured data (see also chapter on
+<<irc_sasl_authentication,SASL authentication>>):
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+If SASL is not supported, you can use a command to send a message to nickserv:
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+By sending a message to nickserv, you may authenticate after joining channels
+which could be a problem on some channels requiring you to be authenticated
+to join. In this case, you can set a command delay:
+`/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Server options
+
+Server options are named `irc.server.<server>.<option>` where `<server>` is the
+internal name of the server and `<option>` the name of an option. +
+The value of a server option is inherited from `irc.server_default.xxx`
+if the server option has the special value `null`.
+
+For example if you created the _libera_ server with the commands above, you'll
+see this with the command `/fset libera`:
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+For example if you want to automatically connect to all servers you define
+without having to do it on each server, you can do:
+
+----
+/set irc.server_default.autoconnect on
+----
+
+And then you can reset the server option so that it uses the default inherited
+value, which is now `on` instead of the default value `off`:
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== Certyfikaty SSL
+===== Certyfikaty SSL
 
 Podczas łączenia się z serwerem IRC, WeeChat domyślnie sprawdza czy połączenie
 jest w pełni zaufane.
@@ -2914,7 +3030,7 @@ Opcja "ssl_verify" jest domyślnie włączona, weryfikacja jest restrykcyjna i m
 się nie powieść, nawet jeśli wszystko było OK w wersjach przed 0.3.1.
 
 [[irc_connect_oftc_with_certificate]]
-===== Pierwszy przykład: połączenie z oftc i sprawdzenie certyfikatu
+====== Pierwszy przykład: połączenie z oftc i sprawdzenie certyfikatu
 
 * Import certyfikatu w kosoli:
 
@@ -2937,7 +3053,7 @@ Możliwe jest umieszczenie wielu certyfikatów w pliku CAs.pem.
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== Drugi przykład: połączenie z oftc używając CertFP
+====== Drugi przykład: połączenie z oftc używając CertFP
 
 * Tworzenie certyfikatu w konsoli:
 
@@ -2962,7 +3078,7 @@ który może być ustawiony na przykład na `~/.weechat`.
 Więcej informacji można znaleźć pod adresem: https://www.oftc.net/NickServ/CertFP
 
 [[irc_sasl_authentication]]
-==== Uwierzytelnianie SASL
+===== Uwierzytelnianie SASL
 
 WeeChat wspiera uwierzytelnianie SASL, używając różnych mechanizmów:
 
@@ -2984,7 +3100,7 @@ Opcje dla serwerów to:
   _ecdsa-nist256p-challenge_)
 
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE
+====== SASL ECDSA-NIST256P-CHALLENGE
 
 Musisz wygenerować klucz prywatny w celu uwierzytelnienia za pomocą mechanizmu
 ECDSA-NIST256P-CHALLENGE (hasło nie potrzebne do połączenia).
@@ -3029,8 +3145,40 @@ Ponowne połączenie z serwerem:
 /reconnect libera
 ----
 
+// TRANSLATION MISSING
+[[irc_servers_connection]]
+===== Connection
+
+You can connect to server with the <<command_irc_connect,/connect>> command:
+
+----
+/connect libera
+----
+
+To disconnect:
+
+----
+/disconnect libera
+----
+
+Or just this if you are on any buffer belonging to _libera_ server (server,
+channel, private):
+
+----
+/disconnect
+----
+
+When you connect to multiple servers at same time, server buffers are merged
+by default and you can switch between them with the kbd:[Ctrl+x] key. +
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+----
+/set irc.look.server_buffer independent
+----
+
 [[irc_tor_sasl]]
-==== Połączenie za pomocą TORa i SASL
+===== Połączenie za pomocą TORa i SASL
 
 Niekróre serwery wspierają połączenia z sieci TOR (https://www.torproject.org/),
 sieci wirtualnych tuneli, które umożliwają poprawienie swojej prywatności
@@ -3078,6 +3226,64 @@ Teraz pozostaje już się tylko połączyć z serwerem:
 /connect irc-tor
 ----
 
+// TRANSLATION MISSING
+[[irc_channels]]
+==== Channels
+
+You can join channels with the <<command_irc_join,/join>> command:
+
+----
+/join #channel
+----
+
+Part a channel (keeping the buffer open):
+
+----
+/part [quit message]
+----
+
+The channels you joined are not saved. If you want to join them automatically
+when connecting to the server, you must set the server `autojoin` option:
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Some scripts can help to automatically set this option,
+see `/script search autojoin`.
+
+Be careful, spaces can be used only to separate list of channels from keys,
+for example if `#channel1` requires a key but not `#channel2`:
+
+----
+/set irc.server.libera.autojoin "#channel1,#channel2 key1"
+----
+
+For help on the format, see `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Private messages
+
+You can send a private message with the <<command_irc_query,/query>> command,
+which opens a separate buffer:
+
+----
+/query bob hi, how are you?
+----
+
+Without arguments the command just opens the buffer (or selects it if already open):
+
+----
+/query bob
+----
+
+To close the private buffer, you can do this command on the private buffer:
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== Inteligentne filtry dla wiadomości
 
@@ -3484,8 +3690,8 @@ Spowoduje powstanie następującej struktury:
         │   └── #mychan.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #channel1.weechatlog
+        │   └── #channel2.weechatlog
         ...
 ....
 
diff --git a/doc/sr/weechat_user.sr.adoc b/doc/sr/weechat_user.sr.adoc
index ef5533f8e..ecf48601e 100644
--- a/doc/sr/weechat_user.sr.adoc
+++ b/doc/sr/weechat_user.sr.adoc
@@ -2654,14 +2654,130 @@ URL за један или више IRC сервера може да се зад
 irc[6][s]://[надимак[:лозинка]@]irc.пример.org[:порт][/канал][,канал[...]]
 ----
 
-Пример за приступ каналима _#weechat_ и _#toto_ на серверу _irc.libera.chat_,подразумевани порт (6667), користећи надимак _nono_:
+Пример за приступ каналима _#weechat_ и _#weechat-fr_ на серверу _irc.libera.chat_,подразумевани порт (6667), користећи надимак _alice_:
 
 ----
-$ weechat irc://nono@irc.libera.chat/#weechat,#toto
+$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+----
+
+// TRANSLATION MISSING
+[[irc_servers]]
+==== Servers
+
+[[irc_servers_add]]
+===== Add a server
+
+By default no servers are defined. You can add as many servers as you want with
+the <<command_irc_server,/server>> command.
+
+For example to connect to https://libera.chat/[libera.chat] with SSL (encrypted trafic):
+
+----
+/server add libera irc.libera.chat/6697 -ssl
+----
+
+You can tell WeeChat to auto-connect to this server on startup:
+
+----
+/set irc.server.libera.autoconnect on
+----
+
+To authenticate, it is recommended to use SASL (if supported on the server),
+with the password stored as secured data (see also chapter on
+<<irc_sasl_authentication,SASL authentication>>):
+
+----
+/set irc.server.libera.sasl_username "alice"
+/secure set libera_password xxxxxxx
+/set irc.server.libera.sasl_password "${sec.data.libera_password}"
+----
+
+If SASL is not supported, you can use a command to send a message to nickserv:
+
+----
+/set irc.server.libera.command "/msg nickserv identify ${sec.data.libera_password}"
+----
+
+[NOTE]
+By sending a message to nickserv, you may authenticate after joining channels
+which could be a problem on some channels requiring you to be authenticated
+to join. In this case, you can set a command delay:
+`/set irc.server.libera.command_delay 5`.
+
+[[irc_servers_options]]
+===== Server options
+
+Server options are named `irc.server.<server>.<option>` where `<server>` is the
+internal name of the server and `<option>` the name of an option. +
+The value of a server option is inherited from `irc.server_default.xxx`
+if the server option has the special value `null`.
+
+For example if you created the _libera_ server with the commands above, you'll
+see this with the command `/fset libera`:
+
+....
+irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.charset_message       integer  null -> message
+irc.server.libera.command               string   null -> ""
+irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.notify                string   null -> ""
+irc.server.libera.password              string   null -> ""
+irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.realname              string   null -> ""
+irc.server.libera.sasl_fail             integer  null -> reconnect
+irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_mechanism        integer  null -> plain
+irc.server.libera.sasl_password         string   "${sec.data.libera_password}"
+irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.ssl                   boolean  on
+irc.server.libera.ssl_cert              string   null -> ""
+irc.server.libera.ssl_dhkey_size        integer  null -> 2048
+irc.server.libera.ssl_fingerprint       string   null -> ""
+irc.server.libera.ssl_password          string   null -> ""
+irc.server.libera.ssl_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.ssl_verify            boolean  null -> on
+irc.server.libera.usermode              string   null -> ""
+irc.server.libera.username              string   null -> "alice"
+....
+
+For example if you want to automatically connect to all servers you define
+without having to do it on each server, you can do:
+
+----
+/set irc.server_default.autoconnect on
+----
+
+And then you can reset the server option so that it uses the default inherited
+value, which is now `on` instead of the default value `off`:
+
+----
+/unset irc.server.libera.autoconnect
 ----
 
 [[irc_ssl_certificates]]
-==== SSL сертификати
+===== SSL сертификати
 
 Када се са IRC серверима успоставља веза преко SSL, програм WeeChat подразумевано проверава да ли се вези потпуно верује.
 
@@ -2686,7 +2802,7 @@ irc.server.xxx.ssl_verify::
 Опција „ssl_verify” је подразумевано укључена, тако да је верификација стриктна и може да не успе, чак и када је била OK у верзијама пре 0.3.1.
 
 [[irc_connect_oftc_with_certificate]]
-===== Први пример: повезивање на oftc и провера сертификата
+====== Први пример: повезивање на oftc и провера сертификата
 
 * Увоз сертификата у командном окружењу:
 
@@ -2708,7 +2824,7 @@ $ wget -O ~/.config/weechat/ssl/CAs.pem https://www.spi-inc.org/ca/spi-cacert.cr
 ----
 
 [[irc_connect_oftc_with_certfp]]
-===== Други пример: повезивање са oftc употребом CertFP
+====== Други пример: повезивање са oftc употребом CertFP
 
 * Креирајте сертификат у командном окружењу:
 
@@ -2732,7 +2848,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick
 За више информација, погледајте https://www.oftc.net/NickServ/CertFP
 
 [[irc_sasl_authentication]]
-==== SASL аутентификација
+===== SASL аутентификација
 
 Програм WeeChat подржава SASL аутентификацију, употребом различитих механизама:
 
@@ -2753,7 +2869,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick
 * _sasl_key_: фајл са ECC приватним кључем (за механизам _ecdsa-nist256p-challenge_)
 
 [[irc_sasl_ecdsa_nist256p_challenge]]
-===== SASL ECDSA-NIST256P-CHALLENGE
+====== SASL ECDSA-NIST256P-CHALLENGE
 
 Да бисте могли да се аутентификујете ECDSA-NIST256P-CHALLENGE механизмом, морате да генеришете приватни кључ (није потребна лозинка за успостављање везе).
 
@@ -2794,8 +2910,40 @@ $ openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem
 /reconnect libera
 ----
 
+// TRANSLATION MISSING
+[[irc_servers_connection]]
+===== Connection
+
+You can connect to server with the <<command_irc_connect,/connect>> command:
+
+----
+/connect libera
+----
+
+To disconnect:
+
+----
+/disconnect libera
+----
+
+Or just this if you are on any buffer belonging to _libera_ server (server,
+channel, private):
+
+----
+/disconnect
+----
+
+When you connect to multiple servers at same time, server buffers are merged
+by default and you can switch between them with the kbd:[Ctrl+x] key. +
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+----
+/set irc.look.server_buffer independent
+----
+
 [[irc_tor_sasl]]
-==== Повезивање преко TOR и SASL
+===== Повезивање преко TOR и SASL
 
 Неки сервери подржавају и везе са TOR (https://www.torproject.org/), мрежом виртуелних тунела који омогућавају људима и групама да унапреде своју приватност и безбедност на Интернету.
 
@@ -2837,6 +2985,64 @@ $ sudo apt-get install tor
 /connect irc-tor
 ----
 
+// TRANSLATION MISSING
+[[irc_channels]]
+==== Channels
+
+You can join channels with the <<command_irc_join,/join>> command:
+
+----
+/join #channel
+----
+
+Part a channel (keeping the buffer open):
+
+----
+/part [quit message]
+----
+
+The channels you joined are not saved. If you want to join them automatically
+when connecting to the server, you must set the server `autojoin` option:
+
+----
+/set irc.server.libera.autojoin "#weechat,#weechat-fr"
+----
+
+[NOTE]
+Some scripts can help to automatically set this option,
+see `/script search autojoin`.
+
+Be careful, spaces can be used only to separate list of channels from keys,
+for example if `#channel1` requires a key but not `#channel2`:
+
+----
+/set irc.server.libera.autojoin "#channel1,#channel2 key1"
+----
+
+For help on the format, see `/help irc.server.libera.autojoin`.
+
+[[irc_private_messages]]
+==== Private messages
+
+You can send a private message with the <<command_irc_query,/query>> command,
+which opens a separate buffer:
+
+----
+/query bob hi, how are you?
+----
+
+Without arguments the command just opens the buffer (or selects it if already open):
+
+----
+/query bob
+----
+
+To close the private buffer, you can do this command on the private buffer:
+
+----
+/close
+----
+
 [[irc_smart_filter_join_part_quit]]
 ==== Паметни филтер за join/part/quit поруке
 
@@ -3214,8 +3420,8 @@ logger.file.mask
         │   └── #mychan.weechatlog
         ├── oftc
         │   ├── oftc.weechatlog
-        │   ├── #chan1.weechatlog
-        │   └── #chan2.weechatlog
+        │   ├── #channel1.weechatlog
+        │   └── #channel2.weechatlog
         ...
 ....