[Secure-testing-commits] r1884 - doc

[Joey Hess]

Author: joeyh
Date: 2005-09-09 19:14:15 +0000 (Fri, 09 Sep 2005)
New Revision: 1884

Modified:
   doc/announce.2
Log:
Moved some less important bits to end.

Include working apt lines for ez cut-n-paste. Just list the mirrors after.


Modified: doc/announce.2
===================================================================
--- doc/announce.2	2005-09-09 17:17:08 UTC (rev 1883)
+++ doc/announce.2	2005-09-09 19:14:15 UTC (rev 1884)
@@ -19,29 +19,22 @@
 list, which will be used to announce security updates.
 <http://lists.alioth.debian.org/mailman/listinfo/secure-testing-announce>
 
-We also invite you to add the following line to your apt sources.list file,
+We also invite you to add the following lines to your apt sources.list file,
 and run "apt-get update && apt-get upgrade" to make the security updates
 available.
 
-deb http://$mirror/debian-secure-testing etch/security-updates main contrib non-free
-deb-src http://$mirror/debian-secure-testing etch/security-updates main contrib non-free
+deb http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free
+deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free
 
-where $mirror is any of the following mirrors:
-ftp.de.debian.org         (located in Germany)
-ftp.nl.debian.org         (located in the Netherlands)
-the.earth.li              (located in UK)
-ftp2.jp.debian.org        (located in Japan)
-farbror.acc.umu.se        (located in Sweden)
-secure-testing.debian.net (round-robin DNS)
+Alternatively, replace "secure-testing.debian.net" in the above lines with
+a mirror near you:
 
-If you want to become a mirror, please see
-http://secure-testing-master.debian.net/mirroring.html
+	ftp.de.debian.org         (located in Germany)
+	ftp.nl.debian.org         (located in the Netherlands)
+	the.earth.li              (located in UK)
+	ftp2.jp.debian.org        (located in Japan)
+	farbror.acc.umu.se        (located in Sweden)
 
-
-Debian developers who would like to upload fixes for security holes in
-testing to the repository can do so, following the instructions on our web
-site. 
-
 Some initial advisories have already been posted to the list and are already
 available in the repository. These include:
 
@@ -85,6 +78,13 @@
 feedback about ways to do better. You can reach the testing security team
 at secure-testing-team at lists.alioth.debian.org.
 
+If you want to become a mirror, please see
+http://secure-testing-master.debian.net/mirroring.html
+
+Debian developers who would like to upload fixes for security holes in
+testing to the repository can do so, following the instructions on our web
+site. 
+
 For more information about the testing security team, see our web site.
 <http://secure-testing-master.debian.net/>.