Hi Martin please would you consider this revised patch (attached, against r5518). Tobias has taken a look and seems content with it.
Cheers Vince
Index: en/upgrading.dbk =================================================================== --- en/upgrading.dbk (revision 5518) +++ en/upgrading.dbk (working copy) @@ -328,6 +328,16 @@ </para> </section> +<section id="proposed-updates"> +<title>The proposed-updates section</title> +<para> +If you have listed the <literal>proposed-updates</literal> section +in your <filename>/etc/apt/sources.list</filename> file, you should remove +it from that file before attempting to upgrade your system. +This is a precaution to reduce the likelihood of conflicts. +</para> +</section> + <section id="userbackports"> <title>Unofficial sources and backports</title> <para> Index: en/whats-new.dbk =================================================================== --- en/whats-new.dbk (revision 5518) +++ en/whats-new.dbk (working copy) @@ -340,6 +340,46 @@ </section> +<section id="proposed-updates"> +<title>The proposed-updates section</title> +<para> +All changes to the released, stable (and oldstable) distribution go +through an extended testing period before they are accepted into the +archives. +Each such update of the stable (oldstable) release is called a point +release. Preparation of point releases is done through the +<literal>proposed-updates</literal> mechanism. +</para> +<para> +Packages can enter <literal>proposed-updates</literal> in two ways. +Firstly, security-patched packages added to security.debian.org are +automatically added to <literal>proposed-updates</literal> as well. +Secondly, &debian; developers may upload new packages directly to +<literal>proposed-updates</literal>. The current list of packages +can be seen at <ulink url="&url-ftpmaster;/proposed-updates.html">&url-ftpmaster;/proposed-updates.html</ulink>. +</para> +<para> +If you wish to help test updates to packages before they are formally +added to a point release, you can do this by adding the +<literal>proposed-updates</literal> section to your +<filename>sources.list</filename>: +</para> +<screen> +deb &url-debian-mirror-eg;/debian &releasename;-proposed-updates main contrib +deb-src &url-debian-mirror-eg;/debian &releasename;-proposed-updates main contrib +</screen> +<para> +The next time you run <command>aptitude update</command>, the system +will become aware of the packages in the +<literal>proposed-updates</literal> section and will consider them +when looking for packages to upgrade. +</para> +<para> +This is not strictly a new feature of Debian, but one that has not +been given much exposure before. +</para> +</section> + <section id="backports.org" condition="fixme"> <title>backports.org/backports.debian.org</title> <para >TODO: write about probability backports.org becoming official</para> Index: release-notes.ent =================================================================== --- release-notes.ent (revision 5510) +++ release-notes.ent (working copy) @@ -39,6 +39,7 @@ <!ENTITY url-d-i-i18n "http://d-i.alioth.debian.org/i18n-doc/languages.html";> <!ENTITY url-debian-list-archives "http://lists.debian.org/";> <!ENTITY url-debian-mirrors "http://www.debian.org/distrib/ftplist";> +<!ENTITY url-debian-ftpmaster "http://ftp-master.debian.org/";> <!-- an example mirror w/o trailing slash --> <!ENTITY url-debian-mirror-eg "http://mirrors.kernel.org/debian";> <!ENTITY opn-irc-server "irc.openprojects.net">
