Merge branch 'master' of salsa.debian.org:webmaster-team/webwml

7 files changed, 32 insertions, 13 deletions

diff --git a/danish/CD/faq/index.wml b/danish/CD/faq/index.wml
index 50058a1afb6..3ec1d5c68a2 100644
--- a/danish/CD/faq/index.wml
+++ b/danish/CD/faq/index.wml
@@ -1,6 +1,6 @@
 #use wml::debian::cdimage title="Ofte stillede spørgsmål om Debians cd'er" NOHEADER=true BARETITLE=true
 #use wml::debian::toc
-#use wml::debian::translation-check translation="306d5786cd154e4a5d2a5773f4784f73c36b13d1"
+#use wml::debian::translation-check translation="27ec10972a634b589826033400c00e03d4c4dafa"
 #include "$(ENGLISHDIR)/releases/info"
 
 <define-tag toc-title-formatting endtag="required" whitespace="delete">
diff --git a/english/devel/debian-installer/images.data b/english/devel/debian-installer/images.data
index 4adb28dafb7..76336da4d23 100644
--- a/english/devel/debian-installer/images.data
+++ b/english/devel/debian-installer/images.data
@@ -53,7 +53,7 @@
 </define-tag>
 
 <define-tag other-images>
-<images-list url="http://ftp.nl.debian.org/debian/dists/testing/main/installer-@ARCH@/current/images/" arch="<strip-arches "<devel-images-arches />" "source" />" />
+<images-list url="https://deb.debian.org/debian/dists/testing/main/installer-@ARCH@/current/images/" arch="<strip-arches "<devel-images-arches />" "source" />" />
 </define-tag>
 
 
diff --git a/english/ports/hurd/hurd-cd.wml b/english/ports/hurd/hurd-cd.wml
index 7582044e77e..4f887ad42f3 100644
--- a/english/ports/hurd/hurd-cd.wml
+++ b/english/ports/hurd/hurd-cd.wml
@@ -14,7 +14,7 @@ part of the GNU project while the Linux kernel is an independent project.</p>
 
 <p>The easiest (and well-tested) method of trying Debian GNU/Hurd is to use a
 virtual machine via KVM. Some pre-installed images are available on
-<url "https://cdimage.debian.org/cdimage/ports/current-hurd-i386/README.txt">, but one can also
+<url "https://cdimage.debian.org/cdimage/ports/stable/hurd-i386/README.txt">, but one can also
 use the Debian Installer to install in KVM or a native machine (but hardware
 support vary, so it is more recommended to give a try with KVM).
 </p>
@@ -22,7 +22,7 @@ support vary, so it is more recommended to give a try with KVM).
 <h2>Using the Debian Installer installation CD-ROM</h2>
 
 <p>A hurd-i386 port of the standard Debian Installer can be
-downloaded from <url "https://cdimage.debian.org/cdimage/ports/current-hurd-i386/"> .
+downloaded from <url "https://cdimage.debian.org/cdimage/ports/stable/hurd-i386/"> .
 Make sure to read the README file available along the iso images.
 It works like the usual Linux port of the Debian Installer, i.e. automatically, except a
 few details:</p>
@@ -49,7 +49,7 @@ document some of the final configuration steps.
 
 <p>Some newer snapshots are available on <url "https://cdimage.debian.org/cdimage/ports/latest/hurd-i386/"></p>
 
-<p>Daily (untested!) snapshots are available on <url "https://people.debian.org/~sthibault/hurd-i386/installer/cdimage/"></p>
+<p>Daily (untested!) snapshots are available on <url "https://people.debian.org/~sthibault/hurd-i386/installer/cdimage/">. Since they are based on the unstable distribution, quite often they cannot actually install a system, due to ongoing transitions in unstable etc. So really rather use the snapshot linked above.</p>
 
 <h2>Making a GRUB boot-disk</h2>
 
diff --git a/english/releases/bookworm/installmanual.wml b/english/releases/bookworm/installmanual.wml
index f533e0b68de..ac4332d46b6 100644
--- a/english/releases/bookworm/installmanual.wml
+++ b/english/releases/bookworm/installmanual.wml
@@ -6,7 +6,7 @@
 
 <if-stable-release release="buster">
 <p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-11, codename bulleye, which isn't released yet. The information
+11, codename bullseye, which isn't released yet. The information
 presented here might be outdated and/or incorrect because of changes to
 the installer. You might be interested in the
 <a href="../buster/installmanual">Installation Guide for Debian
@@ -18,11 +18,11 @@ of this document.</p>
 
 <if-stable-release release="bullseye">
 <p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-13, codename bookworm, which isn't released yet. The information
+12, codename bookworm, which isn't released yet. The information
 presented here might be outdated and/or incorrect because of changes to
 the installer. You might be interested in the
 <a href="../bullseye/installmanual">Installation Guide for Debian
-12, codename bullseye</a>, which is the latest released version of
+11, codename bullseye</a>, which is the latest released version of
 Debian; or in the <a href="https://d-i.debian.org/manual/">Development
 version of the Installation Guide</a>, which is the most up-to-date version
 of this document.</p>
diff --git a/greek/intro/philosophy.wml b/greek/intro/philosophy.wml
index 9d585122c96..f591f263c38 100644
--- a/greek/intro/philosophy.wml
+++ b/greek/intro/philosophy.wml
@@ -1,5 +1,4 @@
-#use wml::debian::template title="Η φιλοσοφία μας: γιατί το κάνουμε και πώς 
-το κάνουμε"
+#use wml::debian::template title="Η φιλοσοφία μας: γιατί το κάνουμε και πώς το κάνουμε"
 #include "$(ENGLISHDIR)/releases/info"
 #use wml::debian::translation-check translation="8d625100deb403dba223e3cecbac44a283fe02ff" maintainer="galaxico"
 
diff --git a/spanish/releases/bullseye/credits.wml b/spanish/releases/bullseye/credits.wml
index cefee59dc81..d0e23849f62 100644
--- a/spanish/releases/bullseye/credits.wml
+++ b/spanish/releases/bullseye/credits.wml
@@ -1,11 +1,11 @@
 #use wml::debian::template title="Debian 11 -- Créditos (o culpas)" BARETITLE=true
-#use wml::debian::translation-check translation="50c3511d042e01d78c681129d654dec8dbb0316b"
+#use wml::debian::translation-check translation="f7ffaae488745c07a75add29a7f70a7ddc5441cb"
 
 <h2>Dirección de la versión</h2>
 
 <p>Esta publicación fue dirigida por Adam D. Barratt, Cyril Brulebois,
-Emilio Pozuelo Monfort, Ivo De Decker, Jonathan Wiltshire, Mehdi Dogguy, Niels
-Thykier, Paul Gevers y Philipp Kern.</p>
+Emilio Pozuelo Monfort, Graham Inggs, Ivo De Decker, Jonathan Wiltshire,
+Julien Cristau, Paul Gevers y Sebastian Ramacher.</p>
 
 <h2>El resto de Debian</h2>
 
diff --git a/spanish/security/2021/dsa-4834.wml b/spanish/security/2021/dsa-4834.wml
new file mode 100644
index 00000000000..a90222e2634
--- /dev/null
+++ b/spanish/security/2021/dsa-4834.wml
@@ -0,0 +1,20 @@
+#use wml::debian::translation-check translation="13bfa3423af65169b2f2d0d153f852ba4103dd3c"
+<define-tag description>actualización de seguridad</define-tag>
+<define-tag moreinfo>
+<p>Se descubrieron varias vulnerabilidades en el reproductor multimedia VLC que
+podrían dar lugar a ejecución de código arbitrario o a denegación de servicio si
+se abre un fichero de video mal construido.</p>
+
+<p>Para la distribución «estable» (buster), estos problemas se han corregido en
+la versión 3.0.12-0+deb10u1.</p>
+
+<p>Le recomendamos que actualice los paquetes de vlc.</p>
+
+<p>Para información detallada sobre el estado de seguridad de vlc, consulte
+su página en el sistema de seguimiento de problemas de seguridad:
+<a href="https://security-tracker.debian.org/tracker/vlc">\
+https://security-tracker.debian.org/tracker/vlc</a></p>
+</define-tag>
+
+# do not modify the following line
+#include "$(ENGLISHDIR)/security/2021/dsa-4834.data"