diff --git a/doc/manual/en/GettingHelp.raw.wiki b/doc/manual/en/GettingHelp.raw.wiki
index 788312338..f8f77c939 100644
--- a/doc/manual/en/GettingHelp.raw.wiki
+++ b/doc/manual/en/GettingHelp.raw.wiki
@@ -1,7 +1,7 @@
 #language en
 
 ##TAG:TRANSLATION-HEADER-START
-~-[[FreedomBox/Manual/GettingHelp|English]] - [[es/FreedomBox/Manual/GettingHelp|Español]] - [[fr/FreedomBox/Manuel/ObtenirAide|Français]] - [[DebianWiki/EditorGuide#translation|(+)]]-~
+~-[[FreedomBox/Manual/GettingHelp|English]] - [[es/FreedomBox/Manual/GettingHelp|Español]] - [[fr/FreedomBox/Manual/GettingHelp|Français]] - [[DebianWiki/EditorGuide#translation|(+)]]-~
 ##TAG:TRANSLATION-HEADER-END
 
 ## BEGIN_INCLUDE
diff --git a/doc/manual/en/QuickStart.raw.wiki b/doc/manual/en/QuickStart.raw.wiki
index f986a3617..3bb049329 100644
--- a/doc/manual/en/QuickStart.raw.wiki
+++ b/doc/manual/en/QuickStart.raw.wiki
@@ -1,6 +1,9 @@
 #language en
 #pragma section-numbers 2
-~- [[DebianWiki/EditorGuide#translation|Translation(s)]]: [[de/FreedomBox/Handbuch/Schnelleinstieg|Deutsch]] - English - [[es/FreedomBox/Manual/QuickStart|Español]] -~
+
+##TAG:TRANSLATION-HEADER-START
+~-[[de/FreedomBox/Manual/QuickStart|Deutsch]] - [[FreedomBox/Manual/QuickStart|English]] - [[es/FreedomBox/Manual/QuickStart|Español]] - [[fr/FreedomBox/Manual/QuickStart|Français]] - [[ru/FreedomBox/Manual/QuickStart|Русский]] - [[DebianWiki/EditorGuide#translation|(+)]]-~
+##TAG:TRANSLATION-HEADER-END
 
 ## BEGIN_INCLUDE
 = Quick Start =
diff --git a/doc/manual/en/ReleaseNotes.raw.wiki b/doc/manual/en/ReleaseNotes.raw.wiki
index 9238a6646..c080e51fd 100644
--- a/doc/manual/en/ReleaseNotes.raw.wiki
+++ b/doc/manual/en/ReleaseNotes.raw.wiki
@@ -10,6 +10,23 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f
 
 The following are the release notes for each !FreedomBox version.
 
+== FreedomBox 20.21 (2020-12-28) ==
+
+=== Highlights ===
+
+ * apache: Create snake oil certificate if not exists
+   * Fixes an issue when installing !FreedomBox on Hetzner Cloud's Debian image
+ * calibre: Fix link to manual page
+
+=== Other Changes ===
+
+ * deluge: Require user to be in bit-torrent group to access
+ * locale: Update translations for German, Hungarian, Polish, Russian, Spanish, Swedish
+ * security: Fix access denied for user daemon from cron
+ * upgrades: Allow grub-pc upgrade without reinstalling grub
+ * upgrades: Update searx search engines during dist upgrade
+ * users: Remove timeout when creating Samba user
+
 == FreedomBox 20.20.1 (2020-12-19) ==
 
 === Highlights ===
diff --git a/doc/manual/en/bepasty.raw.wiki b/doc/manual/en/bepasty.raw.wiki
index 01f518215..bf8ce3638 100644
--- a/doc/manual/en/bepasty.raw.wiki
+++ b/doc/manual/en/bepasty.raw.wiki
@@ -1,6 +1,8 @@
 #language en
 
-~- [[DebianWiki/EditorGuide#translation|Translation(s)]]: English - [[es/FreedomBox/Manual/bepasty|Español]] -~
+##TAG:TRANSLATION-HEADER-START
+~- [[de/FreedomBox/Manual/bepasty|Deutsch]] - [[FreedomBox/Manual/bepasty|English]] - [[es/FreedomBox/Manual/bepasty|Español]] - [[DebianWiki/EditorGuide#translation|(+)]] -~
+##TAG:TRANSLATION-HEADER-END
 
 <<TableOfContents()>>
 
diff --git a/doc/manual/en/freedombox-manual.raw.wiki b/doc/manual/en/freedombox-manual.raw.wiki
index f10fbb732..f4f661634 100644
--- a/doc/manual/en/freedombox-manual.raw.wiki
+++ b/doc/manual/en/freedombox-manual.raw.wiki
@@ -1,6 +1,8 @@
 #language en
 
-~- [[DebianWiki/EditorGuide#translation|Translation(s)]]: English - [[es/FreedomBox/Manual|Español]] -~
+##TAG:TRANSLATION-HEADER-START
+~-[[de/FreedomBox/Manual|Deutsch]] - [[FreedomBox/Manual|English]] - [[es/FreedomBox/Manual|Español]] - [[fr/FreedomBox/Manual|Français]] - [[DebianWiki/EditorGuide#translation|(+)]]-~
+##TAG:TRANSLATION-HEADER-END
 
 ## BEGIN_INCLUDE
 
diff --git a/doc/manual/es/Hardware.raw.wiki b/doc/manual/es/Hardware.raw.wiki
index 51218aea3..7f5924317 100644
--- a/doc/manual/es/Hardware.raw.wiki
+++ b/doc/manual/es/Hardware.raw.wiki
@@ -15,7 +15,7 @@ El 22 de Abril de 2019, la ''!FreedomBox Foundation'' anunció que los kits ''Pi
 
 El kit incluye todo el hardware necesario para arrancar un servidor casero !FreedomBox sobre una placa ''Olimex A20-OLinuXino-LIME2''. Este producto proporciona la combinación perfecta de hardware de fuentes abiertas y software libre. Al comprar este producto, soportas también los esfuerzos de la ''!FreedomBox Foundation'' para crear y promover su software de servidor libre.
 
-||<style="text-align: center;"> [[es/FreedomBox/Hardware/PioneerEdition|{{attachment:FreedomBox/Hardware/pioneer-edition_thumb.jpg|Kits de Servidor Casero FreedomBox Pioneer Edition|width=320,height=257}}]]<<BR>> [[es/FreedomBox/Hardware/PioneerEdition|Kits de Servidor Casero FreedomBox Pioneer Edition]] ||
+||<style="text-align: center;"> [[es/FreedomBox/Hardware/PioneerEdition|{{attachment:FreedomBox/Hardware/pioneer-edition_thumb.jpg|Kits de servidor doméstico FreedomBox edición Pioneer|width=320,height=257}}]]<<BR>> [[es/FreedomBox/Hardware/PioneerEdition|Kits de servidor doméstico FreedomBox edición Pioneer]] ||
 
 == Hardware Soportado ==
 
diff --git a/doc/manual/es/Manual.raw.wiki b/doc/manual/es/Manual.raw.wiki
new file mode 100644
index 000000000..f4f661634
--- /dev/null
+++ b/doc/manual/es/Manual.raw.wiki
@@ -0,0 +1,135 @@
+#language en
+
+##TAG:TRANSLATION-HEADER-START
+~-[[de/FreedomBox/Manual|Deutsch]] - [[FreedomBox/Manual|English]] - [[es/FreedomBox/Manual|Español]] - [[fr/FreedomBox/Manual|Français]] - [[DebianWiki/EditorGuide#translation|(+)]]-~
+##TAG:TRANSLATION-HEADER-END
+
+## BEGIN_INCLUDE
+
+<<TableOfContents(2)>>
+
+
+<<Include(FreedomBox/Introduction,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/QuickStart,  , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/GettingHelp, , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Download,           , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+
+= Apps =
+/* Add entries here sorted after the level 2 heading inside the page to keep the list alphabetically sorted */
+<<Include(FreedomBox/Manual/bepasty,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Calibre,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Coturn,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Deluge,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/ejabberd,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/GitWeb,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/I2P,            , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Ikiwiki,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Infinoted,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/JSXC,           , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/MatrixSynapse,  , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/MediaWiki,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Minetest,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/MiniDLNA,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/MLDonkey,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Mumble,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/OpenVPN,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Privoxy,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Quassel,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Radicale,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Roundcube,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Samba,          , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Searx,          , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Shadowsocks,    , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Sharing,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Syncthing,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/TinyTinyRSS,    , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Tor,            , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Transmission,   , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Apache_userdir, , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/WireGuard,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+
+= System =
+<<Include(FreedomBox/Manual/Backups,          , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Bind,             , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Cockpit,          , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Configure,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/DateTime,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Diagnostics,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/DynamicDNS,       , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Firewall,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/LetsEncrypt,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Monkeysphere,     , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/NameServices,     , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Networks,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/PageKite,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Performance,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Power,            , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/SecureShell,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Security,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/ServiceDiscovery, , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Storage,          , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Snapshots,        , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Upgrades,         , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Manual/Users,            , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+
+= Hardware =
+<<Include(FreedomBox/Hardware,                     , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/PioneerEdition,      , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/A20-OLinuXino-Lime2,                          , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/A20-OLinuXino-MICRO,                          , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/APU,                                          , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/Cubietruck,                                   , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/Cubieboard2,                                  , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/BeagleBone,                                   , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/pcDuino3,                                     , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/Debian,              , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/VirtualBox,                                   , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/PineA64+,                                     , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/BananaPro,                                    , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/OrangePiZero,                                 , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/RockPro64,                                    , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/Rock64,                                       , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/RaspberryPi2,                                 , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/RaspberryPi3B,                                , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/RaspberryPi3B+,                               , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/RaspberryPi4B,                                , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Hardware/USBWiFi,                                      , to="## END_INCLUDE")>>
+
+<<Include(FreedomBox/ReleaseNotes, , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+
+= Contributing =
+
+<<Include(FreedomBox/Contribute, , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+
+= Developer Guide =
+
+<<Include(FreedomBox/Manual/Developer, , from="## BEGIN_INCLUDE", to="## END_INCLUDE")>>
+
+= Hacking =
+
+!FreedomBox consists of two main projects:
+
+ * !FreedomBox Service (Plinth), the web interface
+ * Freedom Maker, a script to build disk images for various hardware
+
+<<Include(FreedomBox/Plinth, , to="## END_INCLUDE")>>
+<<Include(FreedomBox/Maker,  , to="## END_INCLUDE")>>
+
+= Tell people around you =
+
+ * [[https://freedombox.org/|FreedomBox]]
+ * [[../Press|FreedomBox in the Press]]
+ * [[../Conferences|Conferences]]
+ * [[../TalksAndPresentations|Talks and presentations]]
+  * [[../TalksAndPresentations/AvailableMaterial|Available Material]] Slides and other raw material
+ * [[http://www.facebook.com/freedomboxfoundation|Facebook]]
+ * [[http://twitter.com/#!/FreedomBoxFndn|Twitter]]
+ * [[https://mastodon.social/@freedomboxfndn|Mastodon]]
+ * [[http://meetings-archive.debian.net/pub/debian-meetings/2011/debconf11/low/|Debconf11 Videos]]
+
+## END_INCLUDE
+
+<<Include(FreedomBox/Portal)>>
+
+----
+CategoryFreedomBox
diff --git a/doc/manual/es/QuickStart.raw.wiki b/doc/manual/es/QuickStart.raw.wiki
index 859f5eb74..e3c4f5c40 100644
--- a/doc/manual/es/QuickStart.raw.wiki
+++ b/doc/manual/es/QuickStart.raw.wiki
@@ -1,6 +1,6 @@
 #language es
 #pragma section-numbers 2
-~-[[DebianWiki/EditorGuide#translation|Translation(s)]]: [[de/FreedomBox/Handbuch/Schnelleinstieg|Deutsch]] - [[FreedomBox/Manual/QuickStart|English]] - Español -~
+<<Include(FreedomBox/Manual/QuickStart, ,from="^##TAG:TRANSLATION-HEADER-START",to="^##TAG:TRANSLATION-HEADER-END")>>
 
 ## BEGIN_INCLUDE
 = Guía de Inicio Rápido =
@@ -64,7 +64,7 @@ Alternativamente podrías optar por montarlo tu mismo reuniendo todas las piezas
      * Nota: El usuario que creas aquí tendrá privilegios de ``Admin`` y también podrá [[es/FreedomBox/Manual/SecureShell|entrar por SSH]]. Por mayor seguridad deberías emplear para tareas administrativas una cuenta diferente de la de uso habitual. Luego puedes añadir más usuarios, entre ellos el tuyo de uso habitual.
      . {{attachment:ui_firstboot_account-es.png|Cuenta|width=500}}
   1. Tras completar el formulario estarás en el interfaz web de !FreedomBox y podrás acceder a las apps y a la configuración mediante el interfaz web.
-     . {{attachment:ui_firstboot_complete-es.png|Completado|width=500}}mayor 
+     . {{attachment:ui_firstboot_complete-es.png|Completado|width=500}} 
 Ahora puedes probar [[es/FreedomBox/Features|cualquier App]] disponible en !FreedomBox.
 
 == Orientándote ==
diff --git a/doc/manual/es/ReleaseNotes.raw.wiki b/doc/manual/es/ReleaseNotes.raw.wiki
index 9238a6646..c080e51fd 100644
--- a/doc/manual/es/ReleaseNotes.raw.wiki
+++ b/doc/manual/es/ReleaseNotes.raw.wiki
@@ -10,6 +10,23 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f
 
 The following are the release notes for each !FreedomBox version.
 
+== FreedomBox 20.21 (2020-12-28) ==
+
+=== Highlights ===
+
+ * apache: Create snake oil certificate if not exists
+   * Fixes an issue when installing !FreedomBox on Hetzner Cloud's Debian image
+ * calibre: Fix link to manual page
+
+=== Other Changes ===
+
+ * deluge: Require user to be in bit-torrent group to access
+ * locale: Update translations for German, Hungarian, Polish, Russian, Spanish, Swedish
+ * security: Fix access denied for user daemon from cron
+ * upgrades: Allow grub-pc upgrade without reinstalling grub
+ * upgrades: Update searx search engines during dist upgrade
+ * users: Remove timeout when creating Samba user
+
 == FreedomBox 20.20.1 (2020-12-19) ==
 
 === Highlights ===
diff --git a/doc/manual/es/bepasty.raw.wiki b/doc/manual/es/bepasty.raw.wiki
index a0c5695e7..3644bc517 100644
--- a/doc/manual/es/bepasty.raw.wiki
+++ b/doc/manual/es/bepasty.raw.wiki
@@ -1,6 +1,6 @@
 #language es
 
-~- [[DebianWiki/EditorGuide#translation|Translation(s)]]: [[FreedomBox/Manual/bepasty|English]] - Español -~
+<<Include(FreedomBox/Manual/bepasty, ,from="^##TAG:TRANSLATION-HEADER-START",to="^##TAG:TRANSLATION-HEADER-END")>>
 
 <<TableOfContents()>>
 
diff --git a/doc/manual/es/freedombox-manual.raw.wiki b/doc/manual/es/freedombox-manual.raw.wiki
index b8169cf01..519b689ae 100644
--- a/doc/manual/es/freedombox-manual.raw.wiki
+++ b/doc/manual/es/freedombox-manual.raw.wiki
@@ -1,6 +1,6 @@
 #language es
 
-~- [[DebianWiki/EditorGuide#translation|Translation(s)]]: [[FreedomBox/Manual|English]] - Español -~
+<<Include(FreedomBox/Manual, ,from="^##TAG:TRANSLATION-HEADER-START",to="^##TAG:TRANSLATION-HEADER-END")>>
 
 ## BEGIN_INCLUDE