Some fixes and improvements regarding the process that is/should be followed for proposed-updates.

CVS version numbers

english/releases/proposed-updates.wml: 1.1 -> 1.2

1 files changed, 37 insertions, 19 deletions

diff --git a/english/releases/proposed-updates.wml b/english/releases/proposed-updates.wml
index af0bc75518a..078918e89d6 100644
--- a/english/releases/proposed-updates.wml
+++ b/english/releases/proposed-updates.wml
@@ -1,17 +1,15 @@
 #use wml::debian::template title="The <q>proposed-updates</q> mechanism"
 #include "$(ENGLISHDIR)/releases/info"
 
-<p>All changes to the released, <q>stable</q> distribution go through
-an extended testing period before they are accepted into the archive.
-Each such update of the stable release is called a <q>point release</q>.</p>
+<p>All changes to the released, <q>stable</q> (and <q>oldstable</q>)
+distribution go through an extended testing period before they are accepted
+into the archive. Each such update of the stable (oldstable) release is called
+a <q>point release</q>.</p>
 
 <p>Preparation of point releases is done through the <q>proposed-updates</q>
 mechanism. Updated packages are uploaded to a separate queue called
-<code><var>codename</var>-proposed-updates</code>, and are made available
-through a separate directory of any Debian archive mirror. For example,
-the proposed-updates directory for <em><current_release_name></em> is called
-<a href="http://ftp.us.debian.org/debian/dists/<current_release_name>-proposed-updates/">\
-<current_release_name>-proposed-updates</a>.</p>
+<code>p-u-new</code> (<code>o-p-u-new</code>), when they are accepted in 
+<q>proposed-updates</q> (<q>oldstable-proposed-updates</q>), they are made 
 
 <p>To use these packages with APT, you can add the following lines to your
 <code>sources.list</code> file:</p>
@@ -21,21 +19,41 @@ the proposed-updates directory for <em><current_release_name></em> is called
   deb http://ftp.us.debian.org/debian <current_release_name>-proposed-updates main contrib non-free
 </pre>
 
-<p>Note that <a href="$(HOME)/mirror/list">any /debian/ mirror</a> will
-have this, it is not necessary to use any particular one, the above choice
+<p>Note that <a href="$(HOME)/mirror/list">the /debian/ mirrors</a> will
+have this, it is not necessary to use this particular one, the above choice
 of ftp.us.debian.org is just an example.</p>
 
 <p>New packages can arrive into proposed-updates when Debian developers
-upload them either to the specific proposed-updates queue, or the
-<q>stable</q> distribution. Debian's Stable Release Managers (SRM)
- regularly review the packages in proposed-updates and decide whether
+upload them either to <q>proposed-updates</q> (<q>oldstable-proposed-updates</q>),
+or to <q>stable</q> (<q>oldstable</q>). Debian's Stable Release Team
+ regularly reviews the packages in p-u-new (o-p-u-new) and decide whether
 to accept or reject them.</p>
 
 <p>It should be noted that packages from
 <a href="$(HOME)/security/">security.debian.org</a> are copied into the
-proposed-updates directory automatically. At the same time, packages
-that are uploaded directly to proposed-updates are not monitored by
-the Debian security team.</p>
-
-<p>The current list of packages that are in the proposed-updates queue
-can be seen at <url "http://ftp-master.debian.org/proposed-updates.html">.</p>
+p-u-new (o-p-u-new) directory automatically. At the same time, packages
+that are uploaded directly to proposed-updates (oldstable-proposed-updates) are
+not monitored by the Debian security team.</p>
+
+<p>The current list of packages that are in the p-u-new (o-p-u-new) queue
+can be seen at <url "http://ftp-master.debian.org/proposed-updates.html">
+(<url "http://ftp-master.debian.org/oldstable-proposed-updates.html">.</p>
+
+<p>Before uploading a package to <q>proposed-updates</q> (<q>oldstable-proposed-updates</q>
+it would be appreciated if one goes through the following checklist:
+<ul>
+<li>bug(s) one wants to fix in the upload is (are) filed in the BTS
+<li>the fixes for the bugs have been thoroughly tested at least in sid
+<li>patches fix
+  <ul>
+  <li>a security issue, or
+  <li>a critical bug, or
+  <li>an installability, an FTBFS bug, or
+  <li>bring architectures back in sync
+  </ul>
+<li>mail is sent to debian-release@lists.debian.org explaining why these bugs
+should be fixed in stable (oldstable) via a point release and include a diff
+against the version in stable/proposed-updates (oldstable/oldstable-proposed-updates)
+</ul>
+In case of doubt or questions, don't hesitate to contact the Stable Release Team,
+your case might always be an exception to the general rules of the above checklist!