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

9 files changed, 8 insertions, 163 deletions

diff --git a/english/releases/bookworm/debian-installer/index.wml b/english/releases/bookworm/debian-installer/index.wml
index 04183ac6cd5..e77ffdfa306 100644
--- a/english/releases/bookworm/debian-installer/index.wml
+++ b/english/releases/bookworm/debian-installer/index.wml
@@ -12,14 +12,6 @@ you are recommended to install trixie instead.
 </strong></p>
 </if-stable-release>
 
-<if-stable-release release="bullseye">
-<p>
-For installation images and documentation about how to install <q>bookworm</q>
-(which is currently Testing), see
-<a href="$(HOME)/devel/debian-installer/">the Debian-Installer page</a>.
-</if-stable-release>
-
-<if-stable-release release="bookworm">
 <p>
 <strong>To install Debian</strong> <current_release_bookworm>
 (<em>bookworm</em>), download any of the following images (all i386 and amd64
@@ -163,4 +155,3 @@ For details, see
 <a href="$(HOME)/devel/debian-installer/">the Debian-Installer project
 page</a>.
 </p>
-</if-stable-release>
diff --git a/english/releases/bookworm/index.wml b/english/releases/bookworm/index.wml
index a948336262a..51571ae8dc2 100644
--- a/english/releases/bookworm/index.wml
+++ b/english/releases/bookworm/index.wml
@@ -3,8 +3,6 @@
 #include "$(ENGLISHDIR)/releases/bookworm/release.data"
 #include "$(ENGLISHDIR)/releases/arches.data"
 
-<if-stable-release release="bookworm">
-
 <p>Debian <current_release_bookworm> was
 released on <a href="$(HOME)/News/<current_release_newsurl_bookworm/>"><current_release_date_bookworm></a>.
 <ifneq "12.0" "<current_release>"
@@ -62,64 +60,3 @@ release, even though it is declared <em>stable</em>. We've made
 
 <p>Last but not least, we have a list of <a href="credits">people who take
 credit</a> for making this release happen.</p>
-</if-stable-release>
-
-<if-stable-release release="bullseye">
-
-<p>The code name for the next major Debian release after <a
-href="../bullseye/">bullseye</a> is <q>bookworm</q>.</p>
-
-<p>This release started as a copy of bullseye, and is currently in a state
-called <q><a href="$(DOC)/manuals/debian-faq/ftparchives#testing">testing</a></q>.
-This means that things should not break as badly as in unstable or
-experimental distributions, because packages are allowed to enter this
-distribution only after a certain period of time has passed, and when they
-don't have any release-critical bugs filed against them.</p>
-
-<p>Please note that security updates for <q>testing</q> distribution are
-<strong>not</strong> yet managed by the security team. Hence, <q>testing</q> does
-<strong>not</strong> get security updates in a timely manner.
-# For more information please see the
-# <a href="https://lists.debian.org/debian-testing-security-announce/2008/12/msg00019.html">announcement</a>
-# of the Testing Security Team.
-You are encouraged to switch your
-sources.list entries from testing to bullseye for the time being if you
-need security support. See also the entry in the
-<a href="$(HOME)/security/faq#testing">Security Team's FAQ</a> for
-the <q>testing</q> distribution.</p>
-
-<p>There may be a <a href="releasenotes">draft of the release notes available</a>.
-Please also <a href="https://bugs.debian.org/release-notes">check the
-proposed additions to the release notes</a>.</p>
-
-<p>For installation images and documentation about how to install <q>testing</q>,
-see <a href="$(HOME)/devel/debian-installer/">the Debian-Installer page</a>.</p>
-
-<p>To find out more about how the <q>testing</q> distribution works, check
-<a href="$(HOME)/devel/testing">the developers' information about it</a>.</p>
-
-<p>People often ask if there is a single release <q>progress meter</q>.
-Unfortunately there isn't one, but we can refer you to several places
-that describe things needed to be dealt with for the release to happen:</p>
-
-<ul>
-  <li><a href="https://release.debian.org/">Generic release status page</a></li>
-  <li><a href="https://bugs.debian.org/release-critical/">Release-critical bugs</a></li>
-  <li><a href="https://udd.debian.org/bugs.cgi?base=only&amp;rc=1">Base system bugs</a></li>
-  <li><a href="https://udd.debian.org/bugs.cgi?standard=only&amp;rc=1">Bugs in standard and task packages</a></li>
-</ul>
-
-<p>In addition, general status reports are posted by the release manager
-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="buster">
-
-<p>The code name for the next major Debian release after <a
-href="../bullseye /">bullseye</a> is <q>bookworm</q>. Currently,
-<q>bullseye</q> is not released yet. So <q>bookworm</q> is still
-far away.</p>
-
-</if-stable-release>
diff --git a/english/releases/bookworm/installmanual.wml b/english/releases/bookworm/installmanual.wml
index ac4332d46b6..1c04320ac81 100644
--- a/english/releases/bookworm/installmanual.wml
+++ b/english/releases/bookworm/installmanual.wml
@@ -4,30 +4,6 @@
 #include "$(ENGLISHDIR)/releases/arches.data"
 #include "$(ENGLISHDIR)/releases/bookworm/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">
-<p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-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
-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>
-</if-stable-release>
-
 <p>Installation instructions, along with downloadable files, are available
 for each of the supported architectures:</p>
 
diff --git a/english/releases/bullseye/debian-installer/index.wml b/english/releases/bullseye/debian-installer/index.wml
index 31b0d7ce2f2..fad54158e30 100644
--- a/english/releases/bullseye/debian-installer/index.wml
+++ b/english/releases/bullseye/debian-installer/index.wml
@@ -4,13 +4,11 @@
 
 <h1>Installing Debian <current_release_bullseye></h1>
 
-<if-stable-release release="bookworm">
 <p><strong>Debian 11 has been superseded by
 <a href="../../bookworm/">Debian 12 (<q>bookworm</q>)</a>. Some of these
 installation images may no longer be available, or may no longer work, and
 you are recommended to install bookworm instead.
 </strong></p>
-</if-stable-release>
 
 <p>
 <strong>To install Debian</strong> <current_release_bullseye>
diff --git a/english/releases/bullseye/installmanual.wml b/english/releases/bullseye/installmanual.wml
index f8c1f437526..5d9ccc4f368 100644
--- a/english/releases/bullseye/installmanual.wml
+++ b/english/releases/bullseye/installmanual.wml
@@ -4,30 +4,6 @@
 #include "$(ENGLISHDIR)/releases/arches.data"
 #include "$(ENGLISHDIR)/releases/bullseye/release.data"
 
-<if-stable-release release="stretch">
-<p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-10, codename buster, 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="../stretch/installmanual">Installation Guide for Debian
-9, codename stretch</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="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>
-
 <p>Installation instructions, along with downloadable files, are available
 for each of the supported architectures:</p>
 
diff --git a/english/releases/buster/debian-installer/index.wml b/english/releases/buster/debian-installer/index.wml
index 697b79221ac..61a44ea58e1 100644
--- a/english/releases/buster/debian-installer/index.wml
+++ b/english/releases/buster/debian-installer/index.wml
@@ -4,13 +4,13 @@
 
 <h1>Installing Debian <current_release_buster></h1>
 
-<if-stable-release release="bullseye">
+
 <p><strong>Debian 10 has been superseded by
-<a href="../../bullseye/">Debian 11 (<q>bullseye</q>)</a>. Some of these
-installation images may no longer be available, or may no longer work, and
-you are recommended to install bullseye instead.
+<a href="../../bullseye/">Debian 11 (<q>bullseye</q>)</a> and
+<a href="../../bookworm/">Debian 12 (<q>bookworm</q>)</a>.
+Some of these installation images may no longer be available, or may no longer
+work, and you are recommended to install bookworm instead.
 </strong></p>
-</if-stable-release>
 
 <p>
 <strong>To install Debian</strong> <current_release_buster>
diff --git a/english/releases/buster/installmanual.wml b/english/releases/buster/installmanual.wml
index 64a3faded7b..00db4e73134 100644
--- a/english/releases/buster/installmanual.wml
+++ b/english/releases/buster/installmanual.wml
@@ -4,18 +4,6 @@
 #include "$(ENGLISHDIR)/releases/arches.data"
 #include "$(ENGLISHDIR)/releases/buster/release.data"
 
-<if-stable-release release="stretch">
-<p>This is a <strong>beta version</strong> of the Installation Guide for Debian
-10, codename buster, 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="../stretch/installmanual">Installation Guide for Debian
-9, codename stretch</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>
-
 <p>Installation instructions, along with downloadable files, are available
 for each of the supported architectures:</p>
 
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>