From 1409c40d00f83c94f8ed3825390300a8d580eeca Mon Sep 17 00:00:00 2001
From: Raphael Geissert <geissert@debian.org>
Date: Mon, 19 Sep 2011 22:40:30 +0000
Subject: Update, more or less, the uploading doc for testing-sec

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@17261 e39458fd-73e7-0310-bf30-c45bca0a0e42
---
 website/uploading.html | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'website')

diff --git a/website/uploading.html b/website/uploading.html
index b08398e999..2f2f09e15a 100644
--- a/website/uploading.html
+++ b/website/uploading.html
@@ -59,10 +59,12 @@
 		For example, if the fix is in a new upstream version 1.0-1 in unstable,
 		upload version 1.0-1~lenny1 to testing-security. If the current version
 		in testing is 1.2-3 and the fix is backported to this version, upload
-		version 1.2-3+lenny1 to testing-security.</li>
+		version 1.2-3+lenny1 to testing-security. Make sure
+		that the version you used has <strong>never</strong>
+		been used before in any release.</li>
 		
-		<li>Use <em>testing-security</em> as the distribution in the
-		changelog.</li>
+		<li>Use <em>CODENAME-security</em> as the distribution in the
+		changelog (e.g. wheezey-security).</li>
 		
 		<li>Build the package in a testing chroot using pbuilder
 		so that all the dependencies are ok. <strong>Be sure to build with
@@ -78,30 +80,17 @@
 		
 		<li>Upload to <tt>security-master.debian.org</tt>.
 		<h2>Public security issues</h2>
-		For security issues that are already public use the following dput.cf snippet to upload the package.
-		<pre>
-		[testing-security]
-		fqdn = security-master.debian.org
-		method = ftp
-		incoming = /pub/OpenSecurityUploadQueue/
-		login = anonymous
-		</pre>
-		Note that this is <em>not</em> the same queue as usually used for stable security.
+		For security issues that are already <strong>public</strong>
+		use the <em>security-master-unembargoed</em> dput target.
 		<h2>Embargoed security issues</h2>
-		To upload fixed packages for embargoed (non-public) security issues use the following dput.cf snippet:
-		<pre>
-		[testing-security-embargoed]
-		fqdn = security-master.debian.org
-		method = ftp
-		incoming = /pub/SecurityUploadQueue/
-		login = anonymous
-		</pre>
+		To upload fixed packages for embargoed (non-public) security
+		issues use the <em>security-master</em> dput target.
 		</li>
 	</ol>
 
 
 	<p>Information about releasing the packages can be found in the
-	<a href="http://svn.debian.org/wsvn/secure-testing/doc/how-to-DTSA?op=file&rev=0&sc=0">howto-DTSA
+	<a href="http://svn.debian.org/wsvn/secure-testing/doc/how-to-DTSA?revision=&view=co">howto-DTSA
 	file</a> in the SVN repository.
 	
 
-- 
cgit v1.2.3