[Secure-testing-commits] r18421 - doc website

[Luk Claes]

Author: luk
Date: 2012-02-11 10:54:21 +0000 (Sat, 11 Feb 2012)
New Revision: 18421

Modified:
   doc/how-to-DTSA
   doc/narrative_introduction
   website/uploading.html
Log:
Don't use etch or lenny in examples

Modified: doc/how-to-DTSA
===================================================================
--- doc/how-to-DTSA	2012-02-10 22:19:04 UTC (rev 18420)
+++ doc/how-to-DTSA	2012-02-11 10:54:21 UTC (rev 18421)
@@ -23,7 +23,7 @@
 The distribution needs to be "testing-security".
 
 If you append something to the version number currently in testing, use something
-like "+lenny1" or ".0lenny1". A simple "lenny1" is not enough because of binNMUs
+like "+wheezy1" or ".0wheezy1". A simple "wheezy1" is not enough because of binNMUs
 adding "+b1".
 
 dcut does not seem to work on security-master.debian.org, but someone
@@ -79,8 +79,8 @@
 dependencies look correct. You can do this by downloading the 
 binary packages from klecker and the compare them, like the following:
 
-         for i in *lenny1*.deb; do
-	     oldpkg=$(echo $i | sed -e 's/+lenny1//')                                       
+         for i in *wheezy1*.deb; do
+	     oldpkg=$(echo $i | sed -e 's/+wheezy1//')                                       
 	     debdiff debian.netcologne.de/debian/pool/main/c/cupsys/$oldpkg $i               
          done|less
 

Modified: doc/narrative_introduction
===================================================================
--- doc/narrative_introduction	2012-02-10 22:19:04 UTC (rev 18420)
+++ doc/narrative_introduction	2012-02-11 10:54:21 UTC (rev 18421)
@@ -497,7 +497,7 @@
 
 There is no need to add anything to CVE/list for a DSA, the DSA
 cross-reference will be added automatically by the cron job. However,
-you do need to add [etch] or [lenny] entries to CVE/list when there
+you do need to add [lenny] or [squeeze] entries to CVE/list when there
 is a 'no-dsa' or 'not-affected' condition.
 
 The bin/dsa2list script can be used to generate a template for a new

Modified: website/uploading.html
===================================================================
--- website/uploading.html	2012-02-10 22:19:04 UTC (rev 18420)
+++ website/uploading.html	2012-02-11 10:54:21 UTC (rev 18421)
@@ -57,14 +57,14 @@
 		number of the fix in unstable, but greater than the version
 		number of the fix in testing (including a possible +b1 for binNMUs).
 		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
+		upload version 1.0-1~wheezy1 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. Make sure
+		version 1.2-3+wheezy1 to testing-security. Make sure
 		that the version you used has <strong>never</strong>
 		been used before in any release.</li>
 		
 		<li>Use <em>CODENAME-security</em> as the distribution in the
-		changelog (e.g. wheezey-security).</li>
+		changelog (e.g. wheezy-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