5 files changed, 100 insertions, 0 deletions
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 5dcfdcc7f..2b578c097 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -308,6 +308,21 @@
 ** type: string
 ** values: any string (default value: "")
 
+* *irc.server_default.sasl_mechanism*
+** description: mechanism for SASL authentication
+** type: integer
+** values: plain (default value: plain)
+
+* *irc.server_default.sasl_password*
+** description: password for SASL authentication
+** type: string
+** values: any string (default value: "")
+
+* *irc.server_default.sasl_username*
+** description: username for SASL authentication
+** type: string
+** values: any string (default value: "")
+
 * *irc.server_default.ssl*
 ** description: use SSL for server communication
 ** type: boolean
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index df447f3d8..6c5d3b518 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -1108,6 +1108,33 @@ str = weechat.string_remove_color(string, replacement)
 str = weechat.string_remove_color(my_string, "?")
 ----------------------------------------
 
+weechat_string_encode_base64
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Encode a string in base64.
+
+Prototype:
+
+[source,C]
+----------------------------------------
+void weechat_string_encode_base64 (const char *from, int length, char *to);
+----------------------------------------
+
+Arguments:
+
+* 'from': string to encode
+* 'length': length of string to encode (for example `strlen(from)`)
+* 'to': pointer to string to store result (must be long enough)
+
+Example:
+
+[source,C]
+----------------------------------------
+char *string = "abcdefgh", result[128];
+weechat_string_encode_base64 (string, strlen (string), result);
+/* result == "YWJjZGVmZ2g=" */
+----------------------------------------
+
 [[utf-8]]
 UTF-8
 ~~~~~
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index fb65aa7cf..a43459358 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -308,6 +308,21 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: "")
 
+* *irc.server_default.sasl_mechanism*
+** description: mécanisme pour l'authentification SASL
+** type: entier
+** valeurs: plain (valeur par défaut: plain)
+
+* *irc.server_default.sasl_password*
+** description: mot de passe pour l'authentification SASL
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: "")
+
+* *irc.server_default.sasl_username*
+** description: nom d'utilisateur pour l'authentification SASL
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: "")
+
 * *irc.server_default.ssl*
 ** description: utiliser SSL pour la communication avec le serveur
 ** type: booléen
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index e5e47c402..755f8bf45 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -1122,6 +1122,34 @@ str = weechat.string_remove_color(string, replacement)
 str = weechat.string_remove_color(ma_chaine, "?")
 ----------------------------------------
 
+weechat_string_encode_base64
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Encode une chaîne en base64.
+
+Prototype :
+
+[source,C]
+----------------------------------------
+void weechat_string_encode_base64 (const char *from, int length, char *to);
+----------------------------------------
+
+Paramètres :
+
+* 'from': chaîne à encoder
+* 'length': longueur de chaîne à encoder (par exemple `strlen(from)`)
+* 'to': pointeur vers la chaîne pour stocker le résultat (doit être suffisamment
+  long)
+
+Exemple :
+
+[source,C]
+----------------------------------------
+char *string = "abcdefgh", result[128];
+weechat_string_encode_base64 (string, strlen (string), result);
+/* result == "YWJjZGVmZ2g=" */
+----------------------------------------
+
 [[utf-8]]
 UTF-8
 ~~~~~
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index 22e0547a2..5cc326e69 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -308,6 +308,21 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: "")
 
+* *irc.server_default.sasl_mechanism*
+** descrizione: mechanism for SASL authentication
+** tipo: intero
+** valori: plain (valore predefinito: plain)
+
+* *irc.server_default.sasl_password*
+** descrizione: password for SASL authentication
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: "")
+
+* *irc.server_default.sasl_username*
+** descrizione: username for SASL authentication
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: "")
+
 * *irc.server_default.ssl*
 ** descrizione: utilizza SSL per le comunicazioni col server
 ** tipo: bool