3 files changed, 34 insertions, 0 deletions
diff --git a/doc/de/includes/autogen_api_completions.de.adoc b/doc/de/includes/autogen_api_completions.de.adoc
index a82d97969..929608ab1 100644
--- a/doc/de/includes/autogen_api_completions.de.adoc
+++ b/doc/de/includes/autogen_api_completions.de.adoc
@@ -26,6 +26,8 @@
 
 | irc | irc_channels | Kanäle auf allen IRC Servern
 
+| irc | irc_channels_autojoin | channels automatically joined on the current server (option "autojoin")
+
 | irc | irc_ignores_numbers | Anzahl für festgelegte Ignorierungen
 
 | irc | irc_modelist_masks | Modelist Maske für aktuellen IRC Kanal; benötigtes Argument: modelist mode
diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc
index f41f6544c..57bcb5a78 100644
--- a/doc/de/includes/autogen_user_commands.de.adoc
+++ b/doc/de/includes/autogen_user_commands.de.adoc
@@ -123,6 +123,32 @@ Beispiele:
     /auth user2 ${weechat_config_dir}/ecdsa2.pem
 ----
 
+[[command_irc_autojoin]]
+* `+autojoin+`: configure the "autojoin" server option
+
+----
+/autojoin  add [<channel1> [<channel2>...]]
+           addraw <channel1>[,<channel2>...] [<key1>[,<key2>...]]
+           del [<channel1> [<channel2>...]]
+           save
+
+    add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel
+ addraw: use the IRC raw format (same as /join command): all channels separated by commas, optional keys separated by commas
+    del: delete current channel or a list of channels from the autojoin option
+channel: channel name
+    key: key for the channel
+   save: save currently joined channels in the autojoin option
+
+Examples:
+  /autojoin add
+  /autojoin add #test
+  /autojoin add #chan1 #chan2
+  /autojoin addraw #chan1,#chan2,#chan3 key1,key2
+  /autojoin del
+  /autojoin del #chan1
+  /autojoin save
+----
+
 [[command_irc_ban]]
 * `+ban+`: Nicknamen oder Hosts sperren/verbannen
 
diff --git a/doc/de/includes/autogen_user_options.de.adoc b/doc/de/includes/autogen_user_options.de.adoc
index cf91c0c45..3f5e3fffe 100644
--- a/doc/de/includes/autogen_user_options.de.adoc
+++ b/doc/de/includes/autogen_user_options.de.adoc
@@ -2690,6 +2690,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
 
+* [[option_irc.server_default.autojoin_dynamic]] *irc.server_default.autojoin_dynamic*
+** Beschreibung: pass:none[set automatically the "autojoin" option according to the channels you manually join and part with commands /join and /part]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+off+`
+
 * [[option_irc.server_default.autoreconnect]] *irc.server_default.autoreconnect*
 ** Beschreibung: pass:none[Nach einer Trennung vom Server die Verbindung automatisch wiederherstellen]
 ** Typ: boolesch