Re: [debian-www] Please add mips64el to stretch and add pages for buster
Emilio Pozuelo Monfort:
> On 05/02/17 20:47, Niels Thykier wrote:
>> Hi,
>>
>> I have made two patches for:
>> * Adding mips64el as a release architecture for stretch
>
> powerpc needs to be commented out.
>
> Cheers,
> Emilio
>
>
Indeed, thanks for catching that.
Here are two updated patches.
Thanks,
~Niels
>From b798fead55a2c20a1850700e7f3f845d0de46bb2 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Sun, 5 Feb 2017 18:33:24 +0000
Subject: [PATCH 1/2] release.data: Add mips64el and remove powerpc
Signed-off-by: Niels Thykier <niels@thykier.net>
---
english/releases/stretch/release.data | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/english/releases/stretch/release.data b/english/releases/stretch/release.data
index b38609155..cbdd31256 100644
--- a/english/releases/stretch/release.data
+++ b/english/releases/stretch/release.data
@@ -5,7 +5,7 @@
amd64,
i386,
armel,
- powerpc,
+# powerpc,
armhf,
# sparc,
# 'kfreebsd-amd64',
@@ -25,6 +25,7 @@
arm64,
ppc64el,
# ppc64,
+ mips64el,
);
# list of languages install manual is translated to
--
2.11.0
>From dc7d73ec9f7089d1768b034bf091e1fca22218b8 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Sun, 5 Feb 2017 18:48:51 +0000
Subject: [PATCH 2/2] Add releases/buster to the website
There are forward links in the releases/stretch websites that activate
when stretch is marked as the stable release.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
english/releases/Makefile | 2 +-
english/releases/buster/Makefile | 21 +++
english/releases/buster/credits.wml | 13 ++
english/releases/buster/debian-installer/Makefile | 13 ++
english/releases/buster/debian-installer/index.wml | 191 +++++++++++++++++++++
english/releases/buster/errata.wml | 74 ++++++++
english/releases/buster/index.wml | 92 ++++++++++
english/releases/buster/installmanual.wml | 44 +++++
english/releases/buster/release.data | 89 ++++++++++
english/releases/buster/releasenotes.wml | 41 +++++
english/releases/buster/reportingbugs.wml | 49 ++++++
english/template/debian/release_info.wml | 4 +
12 files changed, 632 insertions(+), 1 deletion(-)
create mode 100644 english/releases/buster/Makefile
create mode 100644 english/releases/buster/credits.wml
create mode 100644 english/releases/buster/debian-installer/Makefile
create mode 100644 english/releases/buster/debian-installer/index.wml
create mode 100644 english/releases/buster/errata.wml
create mode 100644 english/releases/buster/index.wml
create mode 100644 english/releases/buster/installmanual.wml
create mode 100644 english/releases/buster/release.data
create mode 100644 english/releases/buster/releasenotes.wml
create mode 100644 english/releases/buster/reportingbugs.wml
diff --git a/english/releases/Makefile b/english/releases/Makefile
index 1fb554361..cf022077f 100644
--- a/english/releases/Makefile
+++ b/english/releases/Makefile
@@ -3,7 +3,7 @@
WMLBASE=..
CUR_DIR=releases
-SUBS=hamm slink potato woody sarge etch lenny squeeze wheezy jessie stretch sid
+SUBS=hamm slink potato woody sarge etch lenny squeeze wheezy jessie stretch buster sid
include $(WMLBASE)/Make.lang
diff --git a/english/releases/buster/Makefile b/english/releases/buster/Makefile
new file mode 100644
index 000000000..744ff3b4d
--- /dev/null
+++ b/english/releases/buster/Makefile
@@ -0,0 +1,21 @@
+# If this makefile is not generic enough to support a translation,
+# please contact debian-www.
+
+WMLBASE=../..
+CUR_DIR=releases/buster
+SUBS=debian-installer
+
+include $(WMLBASE)/Make.lang
+
+index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/release.wml \
+ $(ENGLISHDIR)/releases/buster/release.data $(TEMPLDIR)/release_info.wml
+
+releasenotes.$(LANGUAGE).html: releasenotes.wml $(TEMPLDIR)/release.wml \
+ $(ENGLISHDIR)/releases/buster/release.data $(TEMPLDIR)/release_info.wml \
+ $(ENGLISHDIR)/releases/arches.data \
+ $(wildcard $(HTMLDIR)/*/release-notes*)
+
+installmanual.$(LANGUAGE).html: installmanual.wml $(TEMPLDIR)/release.wml \
+ $(ENGLISHDIR)/releases/buster/release.data $(TEMPLDIR)/release_info.wml \
+ $(ENGLISHDIR)/releases/arches.data \
+ $(wildcard $(HTMLDIR)/*/install*)
diff --git a/english/releases/buster/credits.wml b/english/releases/buster/credits.wml
new file mode 100644
index 000000000..aca17b4ac
--- /dev/null
+++ b/english/releases/buster/credits.wml
@@ -0,0 +1,13 @@
+#use wml::debian::template title="Debian 10 -- Credits (or Blame)" BARETITLE=true
+
+<h2>Release management</h2>
+
+<p>This release of Debian was managed by Emilio Pozuelo Monfort and
+Niels Thykier, with the assistance of Adam D. Barratt, Cyril
+Brulebois, Julien Cristau, Mehdi Dogguy, Philipp Kern, Ivo De Decker
+and Jonathan Wiltshire.</p>
+
+<h2>The rest of Debian</h2>
+
+<p>The <a href="$(HOME)/devel/people">developers</a> and everyone else
+who contributed.</p>
diff --git a/english/releases/buster/debian-installer/Makefile b/english/releases/buster/debian-installer/Makefile
new file mode 100644
index 000000000..3c0678b00
--- /dev/null
+++ b/english/releases/buster/debian-installer/Makefile
@@ -0,0 +1,13 @@
+# If this makefile is not generic enough to support a translation,
+# please contact debian-www.
+
+WMLBASE=../../..
+CUR_DIR=releases/stretch/debian-installer
+SUBS=
+
+include $(WMLBASE)/Make.lang
+
+index.$(LANGUAGE).html:: $(ENGLISHDIR)/releases/stretch/release.data \
+ $(TEMPLDIR)/release_images.wml \
+ $(TEMPLDIR)/release_info.wml \
+ $(TEMPLDIR)/installer.wml
diff --git a/english/releases/buster/debian-installer/index.wml b/english/releases/buster/debian-installer/index.wml
new file mode 100644
index 000000000..b871eb218
--- /dev/null
+++ b/english/releases/buster/debian-installer/index.wml
@@ -0,0 +1,191 @@
+#use wml::debian::template title="Debian “buster” Installation Information" NOHEADER="true"
+#include "$(ENGLISHDIR)/releases/info"
+#include "$(ENGLISHDIR)/releases/buster/release.data"
+
+<h1>Installing Debian <current_release_buster></h1>
+
+<if-stable-release release="bullseye">
+<p><strong>Debian 9 has been superseded by
+<a href="../../bullseye/">Debian 10 (<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.
+</strong></p>
+</if-stable-release>
+
+<if-stable-release release="stretch">
+<p>
+For installation images and documentation about how to install <q>buster</q>
+(which is currently Testing), see
+<a href="$(HOME)/devel/debian-installer/">the Debian-Installer page</a>.
+</if-stable-release>
+
+<if-stable-release release="buster">
+<p>
+<strong>To install Debian</strong> <current_release_buster>
+(<em>buster</em>), download any of the following images (all i386 and amd64
+CD/DVD images can be used on USB sticks too):
+</p>
+
+<div class="line">
+<div class="item col50">
+ <p><strong>netinst CD image (generally 150-280 MB)</strong></p>
+ <netinst-images />
+</div>
+
+
+</div>
+
+<div class="line">
+<div class="item col50">
+ <p><strong>full CD sets</strong></p>
+ <full-cd-images />
+</div>
+
+<div class="item col50 lastcol">
+ <p><strong>full DVD sets</strong></p>
+ <full-dvd-images />
+</div>
+
+</div>
+
+<div class="line">
+<div class="item col50">
+<p><strong>CD (via <a href="$(HOME)/CD/torrent-cd">BitTorrent</a>)</strong></p>
+<full-cd-torrent />
+</div>
+
+<div class="item col50 lastcol">
+<p><strong>DVD (via <a href="$(HOME)/CD/torrent-cd">BitTorrent</a>)</strong></p>
+<full-dvd-torrent />
+</div>
+
+</div>
+
+<div class="line">
+<div class="item col50">
+<p><strong>CD (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong></p>
+<full-cd-jigdo />
+</div>
+
+<div class="item col50 lastcol">
+<p><strong>DVD (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong></p>
+<full-dvd-jigdo />
+</div>
+
+
+</div>
+
+<div class="line">
+<div class="item col50">
+<p><strong>Blu-ray (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong></p>
+<full-bluray-jigdo />
+</div>
+
+<div class="item col50 lastcol">
+<p><strong>other images (netboot, flexible usb stick, etc.)</strong></p>
+<other-images />
+</div>
+</div>
+
+<div id="firmware_nonfree" class="warning">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="http://cdimage.debian.org/cdimage/unofficial/non-free/firmware/buster/current/";>\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the Installation Guide (see Documentation below).
+</p>
+<div class="line">
+<div class="item col50">
+<p><strong>netinst (generally 240-290 MB) <strong>non-free</strong>
+CD images <strong>with firmware</strong></strong></p>
+<small-non-free-cd-images />
+</div>
+</div>
+</div>
+
+
+
+<p>
+<strong>Notes</strong>
+</p>
+<ul>
+ <li>
+ For downloading full CD and DVD images the use of BitTorrent or jigdo
+ is recommended.
+ </li><li>
+ For the less common architectures only a limited number of images
+ from the CD and DVD sets is available as ISO file or via BitTorrent.
+ The full sets are only available via jigdo.
+ </li><li>
+ The multi-arch <em>CD</em> images support i386/amd64; the installation is similar to installing
+ from a single architecture netinst image.
+ </li><li>
+ The multi-arch <em>DVD</em> image supports i386/amd64; the
+ installation is similar to installing from a single architecture full
+ CD image; the DVD also includes the source for all included packages.
+ </li><li>
+ For the netinst CD images, <tt>MD5SUMS</tt> and
+ <tt>SHA1SUMS</tt> files are available from the same directory as the
+ images.
+ </li>
+</ul>
+
+
+<h1>Documentation</h1>
+
+<p>
+<strong>If you read only one document</strong> before installing, read our
+<a href="../i386/apa">Installation Howto</a>, a quick
+walkthrough of the installation process. Other useful documentation includes:
+</p>
+
+<ul>
+<li><a href="../installmanual">Buster Installation Guide</a><br />
+detailed installation instructions</li>
+<li><a href="https://wiki.debian.org/DebianInstaller/FAQ";>Debian-Installer FAQ</a>
+and <a href="$(HOME)/CD/faq/">Debian-CD FAQ</a><br />
+common questions and answers</li>
+<li><a href="https://wiki.debian.org/DebianInstaller";>Debian-Installer Wiki</a><br />
+community maintained documentation</li>
+</ul>
+
+<h1 id="errata">Errata</h1>
+
+<p>
+This is a list of known problems in the installer shipped with
+Debian <current_release_buster>. If you have experienced a problem
+installing Debian and do not see your problem listed here, please send us an
+<a href="$(HOME)/releases/stable/i386/ch05s04.html#submit-bug">installation report</a>
+describing the problem or
+<a href="https://wiki.debian.org/DebianInstaller/BrokenThings";>check the wiki</a>
+for other known problems.
+</p>
+
+## Translators: copy/paste from devel/debian-installer/errata
+<h3 id="errata-r0">Errata for release 9.0</h3>
+
+<dl class="gloss">
+
+<!--
+ <dt>Desktop installations may not work using CD#1 alone</dt>
+
+ <dd>Due to space constraints on the first CD, not all of the
+ expected GNOME desktop packages fit on CD#1. For a successful
+ installation, use extra package sources (e.g. a second CD or a
+ network mirror) or use a DVD instead.
+
+ <br /> <b>Status:</b> It is unlikely more efforts can be made to
+ fit more packages on CD#1. </dd>
+-->
+</dl>
+
+<p>
+Improved versions of the installation system are being developed
+for the next Debian release, and can also be used to install buster.
+For details, see
+<a href="$(HOME)/devel/debian-installer/">the Debian-Installer project
+page</a>.
+</p>
+</if-stable-release>
diff --git a/english/releases/buster/errata.wml b/english/releases/buster/errata.wml
new file mode 100644
index 000000000..b7db08d03
--- /dev/null
+++ b/english/releases/buster/errata.wml
@@ -0,0 +1,74 @@
+#use wml::debian::template title="Debian 10 -- Errata" BARETITLE=true
+#use wml::debian::toc
+
+#include "$(ENGLISHDIR)/releases/info"
+
+<toc-display/>
+
+
+# <toc-add-entry name="known_probs">Known problems</toc-add-entry>
+<toc-add-entry name="security">Security issues</toc-add-entry>
+
+<p>Debian security team issues updates to packages in the stable release
+in which they've identified problems related to security. Please consult the
+<a href="$(HOME)/security/">security pages</a> for information about
+any security issues identified in <q>buster</q>.</p>
+
+<p>If you use APT, add the following line to <tt>/etc/apt/sources.list</tt>
+to be able to access the latest security updates:</p>
+
+<pre>
+ deb http://security.debian.org/ buster main contrib non-free
+</pre>
+
+<p>After that, run <kbd>apt-get update</kbd> followed by
+<kbd>apt-get upgrade</kbd>.</p>
+
+
+<toc-add-entry name="pointrelease">Point releases</toc-add-entry>
+
+<p>Sometimes, in the case of several critical problems or security updates, the
+released distribution is updated. Generally, these are indicated as point
+releases.</p>
+
+<!-- <ul>
+ <li>The first point release, 9.1, was released on
+ <a href="$(HOME)/News/2017/FIXME">FIXME</a>.</li>
+</ul> -->
+
+<ifeq <current_release_buster> 10.0 "
+
+<p>There are no point releases for Debian 10 yet.</p>" "
+
+<p>See the <a
+href="http://http.us.debian.org/debian/dists/buster/ChangeLog";>\
+ChangeLog</a>
+for details on changes between 10 and <current_release_buster/>.</p>"/>
+
+
+<p>Fixes to the released stable distribution often go through an
+extended testing period before they are accepted into the archive.
+However, these fixes are available in the
+<a href="http://ftp.debian.org/debian/dists/buster-proposed-updates/";>\
+dists/buster-proposed-updates</a> directory of any Debian archive
+mirror.</p>
+
+<p>If you use APT to update your packages, you can install
+the proposed updates by adding the following line to
+<tt>/etc/apt/sources.list</tt>:</p>
+
+<pre>
+ \# proposed additions for a 10 point release
+ deb http://ftp.us.debian.org/debian buster-proposed-updates main contrib non-free
+</pre>
+
+<p>After that, run <kbd>apt-get update</kbd> followed by
+<kbd>apt-get upgrade</kbd>.</p>
+
+
+<toc-add-entry name="installer">Installation system</toc-add-entry>
+
+<p>
+For information about errata and updates for the installation system, see
+the <a href="debian-installer/">installation information</a> page.
+</p>
diff --git a/english/releases/buster/index.wml b/english/releases/buster/index.wml
new file mode 100644
index 000000000..75ef0faab
--- /dev/null
+++ b/english/releases/buster/index.wml
@@ -0,0 +1,92 @@
+#use wml::debian::template title="Debian “buster” Release Information"
+#include "$(ENGLISHDIR)/releases/info"
+#include "$(ENGLISHDIR)/releases/buster/release.data"
+#include "$(ENGLISHDIR)/releases/arches.data"
+
+<if-stable-release release="buster">
+
+<p>Debian <current_release_buster> was
+released <current_release_date_buster>.
+<ifneq "9.0" "<current_release>"
+ "Debian 9.0 was initially released on <:=spokendate('XXXXXXXX'):>."
+/>
+The release included many major
+changes, described in
+our <a href="$(HOME)/News/XXXX/XXXXXXXX">press release</a> and
+the <a href="releasenotes">Release Notes</a>.</p>
+
+<p>To obtain and install Debian, see
+the <a href="debian-installer/">installation information</a> page and the
+<a href="installmanual">Installation Guide</a>. To upgrade from an older
+Debian release, see the instructions in the
+<a href="releasenotes">Release Notes</a>.</p>
+
+<p>The following computer architectures are supported in this release:</p>
+
+<ul>
+<:
+foreach $arch (@arches) {
+ print "<li><a href=\"$(HOME)/ports/$arch/\">$arches{$arch}</a>\n";
+}
+:>
+</ul>
+
+<p>Contrary to our wishes, there may be some problems that exist in the
+release, even though it is declared <em>stable</em>. We've made
+<a href="errata">a list of the major known problems</a>, and you can always
+<a href="reportingbugs">report other issues</a> to us.</p>
+
+<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="stretch">
+
+<p>The code name for the next major Debian release after <a
+href="../stretch/">stretch</a> is <q>buster</q>.</p>
+
+<p>This release started as a copy of stretch, and is currently in a state
+called <q><a href="$(DOC)/manuals/debian-faq/ch-ftparchives#s-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 stretch 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 is 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&rc=1";>Base system bugs</a></li>
+ <li><a href="https://udd.debian.org/bugs.cgi?standard=only&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>
diff --git a/english/releases/buster/installmanual.wml b/english/releases/buster/installmanual.wml
new file mode 100644
index 000000000..55583d4db
--- /dev/null
+++ b/english/releases/buster/installmanual.wml
@@ -0,0 +1,44 @@
+#use wml::debian::template title="Debian stretch -- Installation Guide" BARETITLE=true
+#use wml::debian::release
+#include "$(ENGLISHDIR)/releases/info"
+#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>
+
+<ul>
+<:= &permute_as_list('', 'Installation Guide'); :>
+</ul>
+
+<p>If you have set your browser's localization
+properly, you can use the above link to get the right HTML version
+automatically — see <a href="$(HOME)/intro/cn">content negotiation</a>.
+Otherwise, pick the exact architecture, language, and format you want
+from the table below.</p>
+
+<div class="centerdiv">
+<table class="reltable">
+<tr>
+ <th align="left"><strong>Architecture</strong></th>
+ <th align="left"><strong>Format</strong></th>
+ <th align="left"><strong>Languages</strong></th>
+</tr>
+<: &permute_as_matrix_new( file => 'install', langs => \%langsinstall,
+ formats => \%formats, arches => \@arches,
+ html_file => 'index', namingscheme => sub {
+ "$_[0].$_[2].$_[1]" } ); :>
+</table>
+</div>
diff --git a/english/releases/buster/release.data b/english/releases/buster/release.data
new file mode 100644
index 000000000..3ba53b16b
--- /dev/null
+++ b/english/releases/buster/release.data
@@ -0,0 +1,89 @@
+<perl>
+
+# list of architectures, ordered by Popularity Contest on 2014-04-26.
+@arches = (
+ amd64,
+ i386,
+ armel,
+ powerpc,
+ armhf,
+# sparc,
+# 'kfreebsd-amd64',
+ mipsel,
+# 'kfreebsd-i386',
+# arm,
+# ia64,
+# 'hurd-i386',
+# hppa,
+# s390,
+# alpha,
+# sh4,
+# m68k,
+# sh4,
+ mips,
+ s390x,
+ arm64,
+ ppc64el,
+# ppc64,
+ mips64el,
+);
+
+# list of languages install manual is translated to
+%langsinstall = (
+ english => "en",
+# catalan => "ca",
+ czech => "cs",
+# danish => "da",
+ german => "de",
+ greek => "el",
+ spanish => "es",
+# basque => "eu,
+# finnish => "fi",
+ french => "fr",
+# hungarian => "hu",
+ italian => "it",
+ japanese => "ja",
+ korean => "ko",
+# dutch => "nl",
+# norwegian_nynorsk => "nn",
+ portuguese => "pt",
+# portuguese_br => "pt-br",
+# romanian => "ro",
+ russian => "ru",
+ swedish => "sv",
+# tagalog => "tl",
+ vietnamese => "vi",
+ chinese_cn => "zh-cn",
+# chinese => "zh-tw",
+);
+
+# list of languages release notes are translated to
+%langsrelnotes = (
+ english => "en",
+ belarusian => "be",
+# catalan => "ca",
+ czech => "cs",
+ danish => "da",
+ german => "de",
+ spanish => "es",
+# finnish => "fi",
+ french => "fr",
+ italian => "it",
+ japanese => "ja",
+ lithuanian => "lt",
+ malayalam => "ml",
+ norwegian_bokmal => "nb",
+ dutch => "nl",
+ polish => "pl",
+ portuguese => "pt",
+ portuguese_br => "pt-br",
+ romanian => "ro",
+ russian => "ru",
+ slovak => "sk",
+ swedish => "sv",
+ vietnamese => "vi",
+ chinese_cn => "zh-cn",
+ chinese => "zh-tw",
+);
+
+</perl>
diff --git a/english/releases/buster/releasenotes.wml b/english/releases/buster/releasenotes.wml
new file mode 100644
index 000000000..7611e7c36
--- /dev/null
+++ b/english/releases/buster/releasenotes.wml
@@ -0,0 +1,41 @@
+#use wml::debian::template title="Debian 10 -- Release Notes" BARETITLE=true
+#use wml::debian::release
+#include "$(ENGLISHDIR)/releases/info"
+#include "$(ENGLISHDIR)/releases/arches.data"
+#include "$(ENGLISHDIR)/releases/buster/release.data"
+
+<if-stable-release release="stretch">
+<p>This is a <strong>work-in-progress version</strong> of the Release Notes
+for Debian 10, codename buster, which isn't released yet. The
+information presented here might be inaccurate and outdated and is most
+likely incomplete.</p>
+</if-stable-release>
+
+<p>To find out what's new in Debian 10, see the Release Notes for your
+architecture:</p>
+
+<ul>
+<:= &permute_as_list('release-notes/', 'Release Notes'); :>
+</ul>
+
+<p>The Release Notes also contain instructions for users who are upgrading from prior
+releases.</p>
+
+<p>If you have set your browser's localization
+properly, you can use the above link to get the right HTML version
+automatically — see <a href="$(HOME)/intro/cn">content negotiation</a>.
+Otherwise, pick the exact architecture, language, and format you want
+from the table below.</p>
+
+<div class="centerdiv">
+<table class="reltable">
+<tr>
+ <th align="left"><strong>Architecture</strong></th>
+ <th align="left"><strong>Format</strong></th>
+ <th align="left"><strong>Languages</strong></th>
+</tr>
+<: &permute_as_matrix_new( file => 'release-notes', langs => \%langsrelnotes,
+ formats => \%formats, arches => \@arches,
+ html_file => 'release-notes/index' ); :>
+</table>
+</div>
diff --git a/english/releases/buster/reportingbugs.wml b/english/releases/buster/reportingbugs.wml
new file mode 100644
index 000000000..a9994b008
--- /dev/null
+++ b/english/releases/buster/reportingbugs.wml
@@ -0,0 +1,49 @@
+#use wml::debian::template title="Debian 10 -- Reporting Problems" BARETITLE=true
+
+# Translators: copy of stretch/reportingbug
+
+<h2><a name="report-release">With the Release Notes</a></h2>
+
+<p>Errors in the <a href="releasenotes">Release Notes</a> should be
+<a href="$(HOME)/Bugs/Reporting">reported as bug</a> against the
+pseudo-package <tt>release-notes</tt>. Discussion of that document is
+coordinated through the debian-doc mailinglist at
+<a href="mailto:debian-doc@lists.debian.org";>\
+<debian-doc@lists.debian.org></a>. If you have issues with the document
+which aren't appropriate for a bug you should probably mail the list instead.
+</p>
+
+<h2><a name="report-installation">With the installation</a></h2>
+
+<p>If you have a problem with the installation system, please report
+bugs against the <tt>installation-reports</tt> package. Fill out the
+<a href="$(HOME)/releases/stable/i386/ch05s04.html#submit-bug">report template</a>
+to ensure you include all the necessary information.</p>
+
+<p>If you have suggestions or corrections for the
+<a href="installmanual">Installation Guide</a>, you should
+<a href="$(HOME)/Bugs/Reporting">file these
+as bugs</a> against <tt>installation-guide</tt>, which is the source package
+in which that documentation is maintained.</p>
+
+<p>If you have issues with the installation system which aren't
+appropriate for a bug (e.g., you're not sure if it's truly a bug or
+not, the offending piece of the system is unclear, etc.) you should
+probably send an email to the mailing list,
+<a href="mailto:debian-boot@lists.debian.org";>\
+<debian-boot@lists.debian.org></a>.</p>
+
+<h2><a name="report-upgrade">With an upgrade</a></h2>
+
+<p>If you have problems when upgrading your system from previous releases,
+please file a bug against the <tt>upgrade-reports</tt> package, which is the
+pseudo-package used to track that information. For more information on
+how to submit upgrade reports, please read the
+<a href="releasenotes">Release Notes</a>.</p>
+
+<h2><a name="report-package">Any other issues</a></h2>
+
+<p>If you have problems with the system after installation, you should
+try to track down the offending package and
+<a href="$(HOME)/Bugs/Reporting">file a bug</a> against that
+package.</p>
diff --git a/english/template/debian/release_info.wml b/english/template/debian/release_info.wml
index a18e21a62..0f3c93dc4 100644
--- a/english/template/debian/release_info.wml
+++ b/english/template/debian/release_info.wml
@@ -26,6 +26,10 @@
<define-tag current_release_date_wheezy><:=spokendate('2016-06-04'):></define-tag>
<define-tag current_release_jessie>8.7</define-tag>
<define-tag current_release_date_jessie><:=spokendate('2017-01-14'):></define-tag>
+<define-tag current_release_stretch>9.0</define-tag>
+<define-tag current_release_date_stretch>TBA</define-tag>
+<define-tag current_release_buster>10.0</define-tag>
+<define-tag current_release_date_buster>TBA</define-tag>
<define-tag current_release_short><: $f = "<current_release/>"; $f =~ s/r\d+$//; $f =~ s/^(\d\.\d)\.\d$/$1/; print $f :></define-tag>
--
2.11.0
Reply to: