diff --git a/doc/manual/en/Contribute.raw.wiki b/doc/manual/en/Contribute.raw.wiki
index 7443cde8a..0c2d98f14 100644
--- a/doc/manual/en/Contribute.raw.wiki
+++ b/doc/manual/en/Contribute.raw.wiki
@@ -131,7 +131,7 @@ If you are a user experience designer, you can help !FreedomBox with the followi
 
  * UI experience for the !FreedomBox Service web interface
  * Web design for [[https://freedombox.org|freedombox.org]], [[https://freedomboxfoundation.org|freedomboxfoundation.org]] and the [[FreedomBox|wiki]] pages
- * Logo and branding (we currently have [[https://salsa.debian.org/freedombox-team/freedombox/tree/master/static/themes/default|an identity manual and logos]])
+ * Logo and branding (we currently have [[https://salsa.debian.org/freedombox-team/freedombox/tree/main/static/themes/default|an identity manual and logos]])
  * Possible designs for custom !FreedomBox cases on single board computers
  * [[../Design|User experience design]]
 
diff --git a/doc/manual/en/Download.raw.wiki b/doc/manual/en/Download.raw.wiki
index f9e25ff79..ac9b80379 100644
--- a/doc/manual/en/Download.raw.wiki
+++ b/doc/manual/en/Download.raw.wiki
@@ -223,7 +223,7 @@ cd <source_directory>
 
 === Building Disk Images ===
 
-You can also build !FreedomBox disk images for various hardware platforms using the freedom-maker tool. This is also available as a Debian package and source code for it may be obtained using the above methods. [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/README.md|Build instructions]] for creating disk images are available as part of the source code for freedom-maker package.
+You can also build !FreedomBox disk images for various hardware platforms using the freedom-maker tool. This is also available as a Debian package and source code for it may be obtained using the above methods. [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/README.md|Build instructions]] for creating disk images are available as part of the source code for freedom-maker package.
 
 !FreedomBox disk images are built and uploaded to official servers using automated Continuous Integration infrastructure. This infrastructure is available as [[https://salsa.debian.org/freedombox-team/infrastructure|source code]] too and provides accurate information on how !FreedomBox images are built.
 
diff --git a/doc/manual/en/Maker.raw.wiki b/doc/manual/en/Maker.raw.wiki
index 0699a5087..ecec24067 100644
--- a/doc/manual/en/Maker.raw.wiki
+++ b/doc/manual/en/Maker.raw.wiki
@@ -24,7 +24,7 @@ Freedom Maker is [[https://www.gnu.org/philosophy/|Free Software]] licensed unde
 
 === Building FreedomBox Images ===
 
- * You can get Freedom Maker from its [[https://salsa.debian.org/freedombox-team/freedom-maker.git|Git repository]] and follow the instructions in the README to [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/README.md|build a FreedomBox image]].
+ * You can get Freedom Maker from its [[https://salsa.debian.org/freedombox-team/freedom-maker.git|Git repository]] and follow the instructions in the README to [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/README.md|build a FreedomBox image]].
 
 === Support ===
 
diff --git a/doc/manual/en/PioneerEdition.raw.wiki b/doc/manual/en/PioneerEdition.raw.wiki
index d283a696e..f6926f768 100644
--- a/doc/manual/en/PioneerEdition.raw.wiki
+++ b/doc/manual/en/PioneerEdition.raw.wiki
@@ -145,7 +145,7 @@ cd <source_directory>
 
 ==== Building Disk Images ====
 
-You can also build !FreedomBox disk images for various hardware platforms using the freedom-maker tool. This is also available as a Debian package and source code for it may be obtained using the above methods. [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/README.md|Build instructions]] for creating disk images are available as part of the source code for freedom-maker package.
+You can also build !FreedomBox disk images for various hardware platforms using the freedom-maker tool. This is also available as a Debian package and source code for it may be obtained using the above methods. [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/README.md|Build instructions]] for creating disk images are available as part of the source code for freedom-maker package.
 
 !FreedomBox disk images are built and uploaded to official servers using automated Continuous Integration infrastructure. This infrastructure is available as [[https://salsa.debian.org/freedombox-team/infrastructure|source code]] too and provides accurate information on how !FreedomBox images are built.
 
diff --git a/doc/manual/en/Plinth.raw.wiki b/doc/manual/en/Plinth.raw.wiki
index d74b5b4ce..6d429b3b0 100644
--- a/doc/manual/en/Plinth.raw.wiki
+++ b/doc/manual/en/Plinth.raw.wiki
@@ -14,7 +14,7 @@
 $ sudo apt-get install freedombox
 }}}
 
- * You can also get !FreedomBox Service from its [[https://salsa.debian.org/freedombox-team/freedombox/|Git repository]] and [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/INSTALL.md|install from source]].
+ * You can also get !FreedomBox Service from its [[https://salsa.debian.org/freedombox-team/freedombox/|Git repository]] and [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/INSTALL.md|install from source]].
 
 === Screenshots ===
 
@@ -49,7 +49,7 @@ We are looking for help to improve !FreedomBox Service.  You can contribute to !
 
  * The primary Git repository is hosted at [[https://salsa.debian.org/freedombox-team/freedombox/|FreedomBox Salsa Page]].
 
- * Instructions for [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/INSTALL.md|installing from source]] and [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/HACKING.md|hacking the source]] are available.
+ * Instructions for [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/INSTALL.md|installing from source]] and [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/HACKING.md|hacking the source]] are available.
 
  * List of bugs, TODO items and feature requests are available on the [[https://salsa.debian.org/freedombox-team/freedombox/issues|issue tracker]].
 
diff --git a/doc/manual/en/ReleaseNotes.raw.wiki b/doc/manual/en/ReleaseNotes.raw.wiki
index c1cc0c264..98e9aae47 100644
--- a/doc/manual/en/ReleaseNotes.raw.wiki
+++ b/doc/manual/en/ReleaseNotes.raw.wiki
@@ -2,12 +2,27 @@
 
 Please check as well [[FreedomBox/Contribute|contribution]], [[FreedomBox/ProgressCalls|progress calls]], and [[FreedomBox/TODO|TODOs]] related pages.
 
-For more technical details, see the [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/debian/changelog|FreedomBox changelog]].
+For more technical details, see the [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/debian/changelog|FreedomBox changelog]].
 
 ## BEGIN_INCLUDE
 
 The following are the release notes for each !FreedomBox version.
 
+== FreedomBox 24.18 (2024-08-26) ==
+
+ * *.md, pyproject.toml: Update default branch from 'master' to 'main'
+ * d/control: Don't recommend libnss-gw-name
+ * d/control: Remove haveged as it no longer relevant on latest kernels
+ * debian: Set gbp default branch to main
+ * doc/dev: Fix Django related errors with auto-documentation
+ * doc/dev: Limit table of contents depth to 2 for clarity
+ * doc/dev: Update copyright year
+ * featherwiki, tiddlywiki: Remove redundant </p> in template
+ * locale: Update translations for Albanian, Bulgarian, Chinese (Simplified), Czech, Dutch, Norwegian Bokmål, Spanish, Telugu, Turkish, Ukrainian
+ * plinth: Fix translating app operations
+ * ttrss: Remove unavailable Android client - org.fox.tttrss
+ * upgrades: Add diagnostic for held packages
+
 == FreedomBox 24.17 (2024-08-12) ==
 
 === Highlights ===
diff --git a/doc/manual/en/Tor.raw.wiki b/doc/manual/en/Tor.raw.wiki
index 9f0da3e98..5f717e71a 100644
--- a/doc/manual/en/Tor.raw.wiki
+++ b/doc/manual/en/Tor.raw.wiki
@@ -29,7 +29,7 @@ To enable Tor Onion Service, first navigate to the Anonymity Network (Tor) page.
 
 After a while, the page will refresh and under Status, you will see a table listing the Onion Service .onion address. Copy the entire address (ending in .onion) and paste it into the Tor Browser's address field, and you should be able to access your !FreedomBox. (You may see a certificate warning because !FreedomBox has a self-signed certificate.)
 
-{{attachment:tor_browser_plinth.png|Tor Configuration - FreedomBox|width=800}}
+{{attachment:Tor-OnionService_en_V01.png|Tor Configuration - FreedomBox|width=800}}
 
 Currently only HTTP (port 80), HTTPS (port 443), and SSH (port 22) are accessible through the Tor Onion Service configured on the !FreedomBox.
 
diff --git a/doc/manual/en/TorProxy.raw.wiki b/doc/manual/en/TorProxy.raw.wiki
index 86e2d8f44..3ea7ff8c7 100644
--- a/doc/manual/en/TorProxy.raw.wiki
+++ b/doc/manual/en/TorProxy.raw.wiki
@@ -25,32 +25,29 @@ For using Tor Onion Service, or running a Tor relay, see the [[FreedomBox/Manual
 Tor Browser is the recommended way to browse the web using Tor. You can download the Tor Browser from https://www.torproject.org/projects/torbrowser.html and follow the instructions on that site to install and run it.
 
 === (Advanced) Using Tor Proxy as a SOCKS proxy ===
-!FreedomBox provides a Tor SOCKS port that other applications can connect to, in order to route their traffic over the Tor network. This port is accessible on any interfaces configured in the internal firewall zone. To configure the application, set SOCKS Host to the internal network connection's IP address, and set the SOCKS Port to 9050.
+
+Tor Proxy provides a SOCKS port that other applications can connect to, in order to route their traffic over the Tor network. This port is accessible on any interfaces configured in the internal firewall zone. To configure the application, set SOCKS Host to the internal network connection's IP address, and set the SOCKS Port to 9050.
 
 ==== Example with Firefox ====
 
-Your web browser can be configured to use the Tor network for all of your
-browsing activity. This allows for censorship circumvention and also hides your
-IP address from websites during regular browsing. For anonymity, using tor
-browser is recommended.
+Your web browser can be configured to use the Tor network for all of your browsing activity. This allows for censorship circumvention and also hides your IP address from websites during regular browsing. For anonymity, using Tor Browser is recommended.
 
-Configure your local !FreedomBox IP address and port 9050 as a SOCKS v5 proxy in
-Firefox. There are extensions to allow for easily turning the proxy on and off.
+Configure your local !FreedomBox IP address and port 9050 as a SOCKS v5 proxy in Firefox. There are extensions to allow for easily turning the proxy on and off.
 
 {{attachment:tor-socks-firefox.png|Configuring Firefox with Tor SOCKS proxy|width=800}}
 
-With the SOCKS proxy configured, you can now access any onion URL directly
-from Firefox. !FreedomBox itself has an onion v3 address that you can connect to
+With the SOCKS proxy configured, you can now access any onion URL directly from Firefox. If you have also enabled the [[FreedomBox/Manual/Tor|Tor app]], then !FreedomBox itself has an onion v3 address that you can connect to
 over the Tor network (bookmark this for use in emergency situations).
 
 === Circumventing Tor censorship ===
-If your ISP is trying to block Tor traffic, you can use tor bridge relays to connect to the tor network. 
+
+If your ISP is trying to block Tor traffic, you can use tor bridge relays to connect to the Tor network. 
 
 1. Get the bridge configuration from the [[https://bridges.torproject.org/bridges|Tor BridgeDB]]
 
 {{attachment:tor-bridge-db.png|Tor BridgeDB|width=800}}
 
-2. Add the lines to your !FreedomBox Tor configuration as show below.
+2. Add the lines to your !FreedomBox Tor Proxy configuration as show below.
 
 {{attachment:tor-bridge-configuration.png|Tor Configuration Page|width=800}}
 
@@ -60,9 +57,10 @@ If your ISP is trying to block Tor traffic, you can use tor bridge relays to con
  * Upstream end user documentation: https://support.torproject.org/
 
 ==== Client Apps ====
+
 Links to recommended client apps, where applicable, can be found in !FreedomBox by select the Apps page, selecting the application tile, and clicking the '''> Client Apps''' button.
 
-Tor proxy may be used by configuring a proxy in your web browser. Alternately, you can use the Tor Browser.
+Tor Proxy may be used by configuring a proxy in your web browser. Alternately, you can use the Tor Browser.
 
  * Tor Browser download: https://www.torproject.org/download/
 
diff --git a/doc/manual/en/VirtualBox.raw.wiki b/doc/manual/en/VirtualBox.raw.wiki
index 5e140a3b7..f79b51b17 100644
--- a/doc/manual/en/VirtualBox.raw.wiki
+++ b/doc/manual/en/VirtualBox.raw.wiki
@@ -154,7 +154,7 @@ your virtual machine gets its IP address from the DHCP server of your network, m
 
 If you chose ''host-only adapter'', the IP address is assigned by the DHCP server of your !VirtualBox network. In the !VirtualBox Manager, go to File -> Preferences -> Network -> Host-only Networks. You can see and edit the DHCP address range there, typically you get assigned addresses close to the ''Lower Address Bound''.
 
-Another possibility of finding the IP address is to login via the !VirtualBox Manager (or similar software). The !FreedomBox images do not have any default user accounts, so you need to set an initial user and password using the [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/bin/passwd-in-image|passwd-in-image script]].
+Another possibility of finding the IP address is to login via the !VirtualBox Manager (or similar software). The !FreedomBox images do not have any default user accounts, so you need to set an initial user and password using the [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/freedommaker/passwd_in_image.py|passwd-in-image script]].
 
 See also [[FreedomBox/Manual/QuickStart|QuickStart]] for instructions on how to scan your network to discover the IP of the VM.
 
diff --git a/doc/manual/en/images/Tor-OnionService_en_V01.png b/doc/manual/en/images/Tor-OnionService_en_V01.png
new file mode 100644
index 000000000..74ad7d1c5
Binary files /dev/null and b/doc/manual/en/images/Tor-OnionService_en_V01.png differ
diff --git a/doc/manual/en/images/tor_browser_plinth.png b/doc/manual/en/images/tor_browser_plinth.png
deleted file mode 100644
index cd9649be4..000000000
Binary files a/doc/manual/en/images/tor_browser_plinth.png and /dev/null differ
diff --git a/doc/manual/es/Contribute.raw.wiki b/doc/manual/es/Contribute.raw.wiki
index a045d1627..b8afd2e0a 100644
--- a/doc/manual/es/Contribute.raw.wiki
+++ b/doc/manual/es/Contribute.raw.wiki
@@ -133,7 +133,7 @@ Si eres diseñador de UX, puedes ayudar a !FreedomBox con esto:
 
  * Experiencia de interacción para el interfaz web del Servicio !FreedomBox.
  * Diseño web para los sitios [[https://freedombox.org|freedombox.org]], [[https://freedomboxfoundation.org|freedomboxfoundation.org]] y el [[FreedomBox|wiki]].
- * Logo y marca (actualmente tenemos [[https://salsa.debian.org/freedombox-team/freedombox/tree/master/static/themes/default|un manual de identidad y logos]]).
+ * Logo y marca (actualmente tenemos [[https://salsa.debian.org/freedombox-team/freedombox/tree/main/static/themes/default|un manual de identidad y logos]]).
  * Propuestas de diseño para casos de uso de !FreedomBox sobre SBCs personalizados.
  * [[FreedomBox/Design|Diseño de UX]]
 
diff --git a/doc/manual/es/Download.raw.wiki b/doc/manual/es/Download.raw.wiki
index 0c3621ac2..03b06a1d4 100644
--- a/doc/manual/es/Download.raw.wiki
+++ b/doc/manual/es/Download.raw.wiki
@@ -217,7 +217,7 @@ cd <directorio_fuente>
 
 === Construyendo Imágenes de disco ===
 
-También puedes construír imágenes de disco !FreedomBox para varias platformas de ''hardware'' usando la herramienta '''freedom-maker'''. Esta también está disponible como paquete Debian y su código fuente se puede obtener empleando los métodos anteriores. Hay disponibles [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/README.md|Instrucciones de Construcción]] para generar imágenes de disco incluídas en el código fuente del paquete '''freedom-maker'''.
+También puedes construír imágenes de disco !FreedomBox para varias platformas de ''hardware'' usando la herramienta '''freedom-maker'''. Esta también está disponible como paquete Debian y su código fuente se puede obtener empleando los métodos anteriores. Hay disponibles [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/README.md|Instrucciones de Construcción]] para generar imágenes de disco incluídas en el código fuente del paquete '''freedom-maker'''.
 
 Las imágenes de disco de !FreedomBox se construyen y suben a los servidores oficiales empleando la infraestructura de integración contínua automatizada. Esta infraestructura está disponible también como [[https://salsa.debian.org/freedombox-team/infrastructure|código fuente]] y proporciona información precisa acerca de como se contruyen las imágenes de !FreedomBox.
 
diff --git a/doc/manual/es/Maker.raw.wiki b/doc/manual/es/Maker.raw.wiki
index 19d5b3976..d21ef9e42 100644
--- a/doc/manual/es/Maker.raw.wiki
+++ b/doc/manual/es/Maker.raw.wiki
@@ -24,7 +24,7 @@ Freedom Maker es [[https://www.gnu.org/philosophy/|Software Libre]] licenciado b
 
 === Generar Imágenes FreedomBox ===
 
- * Puedes obtener Freedom Maker desde su [[https://salsa.debian.org/freedombox-team/freedom-maker.git|repositorio Git]] y seguir las instrucciones del fichero README para [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/README.md|generar una imágen FreedomBox]].
+ * Puedes obtener Freedom Maker desde su [[https://salsa.debian.org/freedombox-team/freedom-maker.git|repositorio Git]] y seguir las instrucciones del fichero README para [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/README.md|generar una imágen FreedomBox]].
 
 === Soporte ===
 
diff --git a/doc/manual/es/PioneerEdition.raw.wiki b/doc/manual/es/PioneerEdition.raw.wiki
index 12bac7f86..5a48d75de 100644
--- a/doc/manual/es/PioneerEdition.raw.wiki
+++ b/doc/manual/es/PioneerEdition.raw.wiki
@@ -149,7 +149,7 @@ cd <directorio_fuente>
 
 === Construyendo Imágenes de disco ===
 
-También puedes construír imágenes de disco !FreedomBox para varias platformas de ''hardware'' usando la herramienta '''freedom-maker'''. Esta también está disponible como paquete Debian y su código fuente se puede obtener empleando los métodos anteriores. Hay disponibles [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/README.md|Instrucciones de Construcción]] para generar imágenes de disco incluídas en el código fuente del paquete '''freedom-maker'''.
+También puedes construír imágenes de disco !FreedomBox para varias platformas de ''hardware'' usando la herramienta '''freedom-maker'''. Esta también está disponible como paquete Debian y su código fuente se puede obtener empleando los métodos anteriores. Hay disponibles [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/README.md|Instrucciones de Construcción]] para generar imágenes de disco incluídas en el código fuente del paquete '''freedom-maker'''.
 
 Las imágenes de disco de !FreedomBox se construyen y suben a los servidores oficiales empleando la infraestructura de integración contínua automatizada. Esta infraestructura está disponible también como [[https://salsa.debian.org/freedombox-team/infrastructure|código fuente]] y proporciona información precisa acerca de como se contruyen las imágenes de !FreedomBox.
 
diff --git a/doc/manual/es/Plinth.raw.wiki b/doc/manual/es/Plinth.raw.wiki
index 3a32d93e4..c00b0183d 100644
--- a/doc/manual/es/Plinth.raw.wiki
+++ b/doc/manual/es/Plinth.raw.wiki
@@ -14,7 +14,7 @@ El servicio !FreedomBox es [[https://www.gnu.org/philosophy/|Software Libre]] ba
 $ sudo apt-get install freedombox
 }}}
 
- * También puedes obtener el servicio !FreedomBox en su [[https://salsa.debian.org/freedombox-team/freedombox/|repositorio Git]] o [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/INSTALL.md|instalarlo desde el código fuente]].
+ * También puedes obtener el servicio !FreedomBox en su [[https://salsa.debian.org/freedombox-team/freedombox/|repositorio Git]] o [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/INSTALL.md|instalarlo desde el código fuente]].
 
 === Capturas de pantalla ===
 
@@ -49,7 +49,7 @@ Buscamos ayuda para mejorar el servicio !FreedomBox. Puedes contribuir al servic
 
  * El repositorio Git principal se aloja en la [[https://salsa.debian.org/freedombox-team/freedombox/|página de FreedomBox en Salsa]].
 
- * Hay disponibles instrucciones para [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/INSTALL.md|instalar desde el código fuente]] y [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/HACKING.md|modificarlo]].
+ * Hay disponibles instrucciones para [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/INSTALL.md|instalar desde el código fuente]] y [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/HACKING.md|modificarlo]].
 
  * Las listas de defectos, tareas pendientes y solicitudes de funcionalidad están en el [[https://salsa.debian.org/freedombox-team/freedombox/issues|gestor de incidencias]].
 
diff --git a/doc/manual/es/ReleaseNotes.raw.wiki b/doc/manual/es/ReleaseNotes.raw.wiki
index c1cc0c264..98e9aae47 100644
--- a/doc/manual/es/ReleaseNotes.raw.wiki
+++ b/doc/manual/es/ReleaseNotes.raw.wiki
@@ -2,12 +2,27 @@
 
 Please check as well [[FreedomBox/Contribute|contribution]], [[FreedomBox/ProgressCalls|progress calls]], and [[FreedomBox/TODO|TODOs]] related pages.
 
-For more technical details, see the [[https://salsa.debian.org/freedombox-team/freedombox/blob/master/debian/changelog|FreedomBox changelog]].
+For more technical details, see the [[https://salsa.debian.org/freedombox-team/freedombox/blob/main/debian/changelog|FreedomBox changelog]].
 
 ## BEGIN_INCLUDE
 
 The following are the release notes for each !FreedomBox version.
 
+== FreedomBox 24.18 (2024-08-26) ==
+
+ * *.md, pyproject.toml: Update default branch from 'master' to 'main'
+ * d/control: Don't recommend libnss-gw-name
+ * d/control: Remove haveged as it no longer relevant on latest kernels
+ * debian: Set gbp default branch to main
+ * doc/dev: Fix Django related errors with auto-documentation
+ * doc/dev: Limit table of contents depth to 2 for clarity
+ * doc/dev: Update copyright year
+ * featherwiki, tiddlywiki: Remove redundant </p> in template
+ * locale: Update translations for Albanian, Bulgarian, Chinese (Simplified), Czech, Dutch, Norwegian Bokmål, Spanish, Telugu, Turkish, Ukrainian
+ * plinth: Fix translating app operations
+ * ttrss: Remove unavailable Android client - org.fox.tttrss
+ * upgrades: Add diagnostic for held packages
+
 == FreedomBox 24.17 (2024-08-12) ==
 
 === Highlights ===
diff --git a/doc/manual/es/Tor.raw.wiki b/doc/manual/es/Tor.raw.wiki
index 9fb18dbfc..b82391061 100644
--- a/doc/manual/es/Tor.raw.wiki
+++ b/doc/manual/es/Tor.raw.wiki
@@ -26,7 +26,7 @@ Para habilitar el ''Servicio Tor Onion'' primero navega a la página ''Red para
 
 Transcurrido un rato la página se refrescará bajo ''Estado'' verás la tabla que lista la dirección .onion del servicio. Copia toda la dirección (que termina en .onion) y pégala en el campo dirección de ''Tor Browser''. Deberías poder acceder a tu !FreedomBox. (Quizá veas un aviso de certificado porque !FreedomBox tiene un certificado autofirmado.)
 
-{{attachment:tor_browser_plinth.png|Tor Configuration - FreedomBox|width=800}}
+{{attachment:FreedomBox/Manual/Tor/Tor-OnionService_en_V01.png|Tor Configuration - FreedomBox|width=800}}
  Onion
 Actualmente solo HTTP (puerto 80), HTTPS (puerto 443) y SSH (puerto 22) están accesibles a través del ''Servicio Tor Onion'' configurado en la !FreedomBox.
 
diff --git a/doc/manual/es/TorProxy.raw.wiki b/doc/manual/es/TorProxy.raw.wiki
index 972ea44b9..14f4cd7b6 100644
--- a/doc/manual/es/TorProxy.raw.wiki
+++ b/doc/manual/es/TorProxy.raw.wiki
@@ -25,7 +25,7 @@ El navegador Tor es la manera recomendada de navegar la web usando Tor. Puedes d
 
 === Usar el Proxy Tor como un proxy SOCKS (Avanzado) ===
 
-!FreedomBox proporciona un puerto Tor SOCKS al que se pueden conectar otras aplicaciones para enrutar su tráfico a través de la red Tor. Este puerto está accessible en cualquier interfaz configurado en la zona interna del cortafuegos. Para configurar la aplicación, asigna el anfitrión SOCKS a la dirección IP de la conexión de red interna y pon el puerto SOCKS a 9050.
+El Proxy Tor proporciona un puerto SOCKS al que se pueden conectar otras aplicaciones para enrutar su tráfico a través de la red Tor. Este puerto está accessible en cualquier interfaz configurado en la zona interna del cortafuegos. Para configurar la aplicación, asigna el anfitrión SOCKS a la dirección IP de la conexión de red interna y pon el puerto SOCKS a 9050.
 
 ==== Ejemplo con Firefox ====
 
@@ -37,7 +37,7 @@ Configura la dirección IP local de tu !FreedomBox y el puerto 9050 como proxy S
 {{attachment:FreedomBox/Manual/TorProxy/tor-socks-firefox.png|Configurar Firefox con Tor como proxy SOCKS|width=800}}
 
 Con el proxy SOCKS configurado, puedes acceder a cualquier URL onion directamente desde Firefox.
-!FreedomBox tiene una dirección onion v3 a la que puedes conectarte a tavés de la red Tor (anótala para emergencias).
+Si también habilitas la [[FreedomBox/Manual/Tor|app de Tor]], !FreedomBox tendrá una dirección onion v3 a la que puedes conectarte a tavés de la red Tor (anótala para emergencias).
 
 === Eludir la censura de Tor ===
 Si tu proveedor de internet te bloquea el tráfico a la red Tor puedes usar pasarelas para acceder. 
@@ -46,7 +46,7 @@ Si tu proveedor de internet te bloquea el tráfico a la red Tor puedes usar pasa
 
 {{attachment:FreedomBox/Manual/TorProxy/tor-bridge-db.png|Tor BridgeDB|width=800}}
 
-2. Añade las líneas a la configuración de Tor en !FreedomBox Tor como se muestra a continuación.
+2. Añade las líneas a la configuración del proxy Tor en !FreedomBox como se muestra a continuación.
 
 {{attachment:FreedomBox/Manual/TorProxy/tor-bridge-configuration.png|Página de configuración de Tor|width=800}}
 
@@ -59,7 +59,7 @@ Si tu proveedor de internet te bloquea el tráfico a la red Tor puedes usar pasa
 
 !FreedomBox recomienda algunas aplicaciones cliente. Selecciona su icono en la página de ''Aplicaciones'' y haz clic en el botón> '''Aplicaciones Cliente'''.
 
-El proxy se puede usar configurando el proxy en tu navegador web. O mejor, usando el Navegador Tor
+El proxy Tor se puede usar configurando el proxy en tu navegador web. O mejor, usando el Navegador Tor
 
  * Descargar el navegador Tor: https://www.torproject.org/download/
 
diff --git a/doc/manual/es/VirtualBox.raw.wiki b/doc/manual/es/VirtualBox.raw.wiki
index 5e140a3b7..f79b51b17 100644
--- a/doc/manual/es/VirtualBox.raw.wiki
+++ b/doc/manual/es/VirtualBox.raw.wiki
@@ -154,7 +154,7 @@ your virtual machine gets its IP address from the DHCP server of your network, m
 
 If you chose ''host-only adapter'', the IP address is assigned by the DHCP server of your !VirtualBox network. In the !VirtualBox Manager, go to File -> Preferences -> Network -> Host-only Networks. You can see and edit the DHCP address range there, typically you get assigned addresses close to the ''Lower Address Bound''.
 
-Another possibility of finding the IP address is to login via the !VirtualBox Manager (or similar software). The !FreedomBox images do not have any default user accounts, so you need to set an initial user and password using the [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/master/bin/passwd-in-image|passwd-in-image script]].
+Another possibility of finding the IP address is to login via the !VirtualBox Manager (or similar software). The !FreedomBox images do not have any default user accounts, so you need to set an initial user and password using the [[https://salsa.debian.org/freedombox-team/freedom-maker/blob/main/freedommaker/passwd_in_image.py|passwd-in-image script]].
 
 See also [[FreedomBox/Manual/QuickStart|QuickStart]] for instructions on how to scan your network to discover the IP of the VM.
 
diff --git a/doc/manual/es/images/Tor-OnionService_en_V01.png b/doc/manual/es/images/Tor-OnionService_en_V01.png
new file mode 100644
index 000000000..74ad7d1c5
Binary files /dev/null and b/doc/manual/es/images/Tor-OnionService_en_V01.png differ
diff --git a/doc/manual/es/images/tor_browser_plinth.png b/doc/manual/es/images/tor_browser_plinth.png
deleted file mode 100644
index cd9649be4..000000000
Binary files a/doc/manual/es/images/tor_browser_plinth.png and /dev/null differ