Remove more unnecessary if condinations from old release notes, and fix it on trixie

2 files changed, 3 insertions, 24 deletions

diff --git a/english/releases/trixie/index.wml b/english/releases/trixie/index.wml
index 7d6dbf49ba6..0500711ec13 100644
--- a/english/releases/trixie/index.wml
+++ b/english/releases/trixie/index.wml
@@ -114,12 +114,3 @@ to the <a href="https://lists.debian.org/debian-devel-announce/">\
 debian-devel-announce mailing list</a>.</p>
 
 </if-stable-release>
-
-<if-stable-release release="bullseye">
-
-<p>The code name for the next major Debian release after <a
-href="../bookworm/">bookworm</a> is <q>trixie</q>. Currently,
-<q>bookworm</q> is not released yet. So <q>trixie</q> is still
-far away.</p>
-
-</if-stable-release>
diff --git a/english/releases/trixie/installmanual.wml b/english/releases/trixie/installmanual.wml
index 14f7c33f77a..8d7ca100f9c 100644
--- a/english/releases/trixie/installmanual.wml
+++ b/english/releases/trixie/installmanual.wml
@@ -4,25 +4,13 @@
 #include "$(ENGLISHDIR)/releases/arches.data"
 #include "$(ENGLISHDIR)/releases/trixie/release.data"
 
-<if-stable-release release="buster">
-<p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-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
-10, codename buster</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>
-</if-stable-release>
-
-<if-stable-release release="bullseye">
+<if-stable-release release="bookworm">
 <p>This is a <strong>beta version</strong> of the Installation Guide for Debian
 13, codename trixie, 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
-11, codename bullseye</a>, which is the latest released version of
+<a href="../bookworm/installmanual">Installation Guide for Debian
+12, codename bookworm</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>