From 3f76a3c70a121d4eb4b4430fac9e1dbab4b84b05 Mon Sep 17 00:00:00 2001
From: jcristau <jcristau@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Tue, 14 May 2013 20:51:27 +0000
Subject: [PATCH] Advise to use codename-security instead of stable-security
 (closes: #708290)

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@10137 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 debian/changelog |  2 ++
 pkgs.dbk         | 23 +++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 142734e..fa694db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ developers-reference (3.4.10) UNRELEASED; urgency=low
 
   [ Thijs Kinkhorst ]
   * Update versioning advice for uploads to stable/testing (closes: #685646).
+  * Advise to use codename-security instead of stable-security (closes:
+    #708290)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Mon, 17 Sep 2012 17:20:49 +0200
 
diff --git a/pkgs.dbk b/pkgs.dbk
index 03a6919..9922576 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -290,9 +290,9 @@ There are several possible values for this field: <literal>stable</literal>,
 <literal>unstable</literal>.
 </para>
 <para>
-Actually, there are two other possible distributions: <literal>stable-security</literal>
-and <literal>testing-security</literal>, but read
-<xref linkend="bug-security"/> for more information on those.
+Actually, there are other possible distributions:
+<replaceable>codename</replaceable><literal>-security</literal>,
+but read <xref linkend="bug-security"/> for more information on those.
 </para>
 <para>
 It is not possible to upload a package into several distributions at the same
@@ -443,8 +443,8 @@ parameter to put the package into one of the queues.
 <title>Security uploads</title>
 <para>
 Do <emphasis role="strong">NOT</emphasis> upload a package to the security
-upload queue (<literal>oldstable-security</literal>, <literal>stable-security</literal>,
-etc.) without prior authorization from the security team.  If the
+upload queue (on <literal>security-master.debian.org</literal>)
+without prior authorization from the security team.  If the
 package does not exactly meet the team's requirements, it will cause many
 problems and delays in dealing with the unwanted upload.  For details, please
 see <xref linkend="bug-security"/>.
@@ -1122,11 +1122,10 @@ Be sure to verify the following items:
 <listitem>
 <para>
 <emphasis role="strong">Target the right distribution</emphasis>
-in your <filename>debian/changelog</filename>.
-For <literal>stable</literal> this is <literal>stable-security</literal> and
-for <literal>testing</literal> this is <literal>testing-security</literal>, and for the previous
-stable release, this is <literal>oldstable-security</literal>.  Do not target
-<replaceable>distribution</replaceable><literal>-proposed-updates</literal> or
+in your <filename>debian/changelog</filename>:
+<replaceable>codename</replaceable><literal>-security</literal>
+(e.g. <literal>wheezy-security</literal>).
+Do not target <replaceable>distribution</replaceable><literal>-proposed-updates</literal> or
 <literal>stable</literal>!
 </para>
 </listitem>
@@ -1194,8 +1193,8 @@ have such a system yourself, you can use a debian.org machine (see
 <title>Uploading the fixed package</title>
 <para>
 Do <emphasis role="strong">NOT</emphasis> upload a package to the security
-upload queue (<literal>oldstable-security</literal>, <literal>stable-security</literal>,
-etc.) without prior authorization from the security team.  If the
+upload queue (on <literal>security-master.debian.org</literal>)
+without prior authorization from the security team.  If the
 package does not exactly meet the team's requirements, it will cause many
 problems and delays in dealing with the unwanted upload.
 </para>
-- 
2.30.2