switch apt lines to use mirror network

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@1783 e39458fd-73e7-0310-bf30-c45bca0a0e42

3 files changed, 15 insertions, 14 deletions

diff --git a/data/DTSA/dtsa b/data/DTSA/dtsa
index 2a817e103f..e3a4f822ac 100755
--- a/data/DTSA/dtsa
+++ b/data/DTSA/dtsa
@@ -159,8 +159,8 @@ def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_
     ascii.write("To use the Debian testing security archive, add the following lines to\n")
     ascii.write("your /etc/apt/sources.list:\n")
     ascii.write("\n")
-    ascii.write("deb http://secure-testing.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free\n")
-    ascii.write("deb-src http://secure-testing.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free\n")
+    ascii.write("deb http://secure-testing-mirrors.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free\n")
+    ascii.write("deb-src http://secure-testing-mirrors.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free\n")
     ascii.write("\n")
     ascii.write("The archive signing key can be downloaded from\n")
     ascii.write("http://secure-testing.debian.net/ziyi-2005-7.asc\n")
diff --git a/doc/announce.2 b/doc/announce.2
index ac55517fba..909b964a09 100644
--- a/doc/announce.2
+++ b/doc/announce.2
@@ -1,12 +1,9 @@
-DRAFT. Slashdot on penalty of death. DRAFT
-
-
 Subject: announcing the beginning of security support for testing
 
 -----------------------------------------------------------------------------
 Debian Testing Security Team                 http://secure-testing.debian.net
 Security support for testing      secure-testing-team@lists.alioth.debian.org
-August 30th, 2005
+September 1st, 2005
 -----------------------------------------------------------------------------
 
 Security support for testing
@@ -29,6 +26,10 @@ available:
 deb http://secure-testing-mirrors.debian.net/debian-security-updates etch/security-updates main contrib non-free
 deb-src http://secure-testing-mirrors.debian.net/debian-security-updates etch/security-updates main contrib non-free
 
+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:
 
@@ -40,6 +41,7 @@ available in the repository. These include:
 [DTSA-6-1] New cgiwrap packages fix multiple vulnerabilities
 [DTSA-7-1] New mozilla packages fix frame injection spoofing
 [DTSA-8-1] New mozilla-firefox packages fix several vulnerabilities
+[DTSA-9-1] New bluez-utils packages fix bad device name escaping
 [DTSA-10-1] New pcre3 packages fix buffer overflow
 [DTSA-11-1] New maildrop packages fix local privilege escalation
 
@@ -48,13 +50,12 @@ an advisory before fixed packages have built for all supported
 architectures. If so, the missing builds will become available as they
 complete.
 
-We are not currently issueing advisories for security fixes that reach
+We are not currently issuing advisories for security fixes that reach
 testing through normal propagation from unstable, but only for security
 fixes that are made available through our repository. So users of testing
 should continue to upgrade their systems on a regular basis to get such
-security fixes. We might be providing information about security issues,
-that have been fixed through regular testing propagation and outstanding
-issues in sid in the future, though.
+security fixes. We might provide information about security issues that
+have been fixed through regular testing propagation in the future, though.
 
 Note that this announcement does not mean that testing is suitable for
 production use. Several security issues are present in unstable, and an
diff --git a/website/index.html b/website/index.html
index 21c215d1ea..1c32a882ae 100644
--- a/website/index.html
+++ b/website/index.html
@@ -41,8 +41,8 @@
 	mailing list, and will be available in the following apt
 	repository:
 	<pre>
-	deb http://secure-testing.debian.net/debian-security-updates etch/security-updates main contrib non-free
-	deb-src http://secure-testing.debian.net/debian-security-updates etch/security-updates main contrib non-free
+	deb http://secure-testing-mirrors.debian.net/debian-security-updates etch/security-updates main contrib non-free
+	deb-src http://secure-testing-mirrors.debian.net/debian-security-updates etch/security-updates main contrib non-free
 	</pre>
 	The archive signing key used for this repository is <a href="ziyi-2005-7.asc">here</a>.
 	</p>
@@ -113,8 +113,8 @@
 		list and, it will become available in this apt repository,
 		including builds for all other architectures:
 		<pre>
-		deb http://secure-testing.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free
-		deb-src http://secure-testing.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free
+		deb http://secure-testing-mirrors.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free
+		deb-src http://secure-testing-mirrors.debian.net/debian-security-updates etch-proposed-updates/security-updates main contrib non-free
 		</pre>
 		Build logs can be found
 		<a href="http://experimental.debian.net/">here</a> with