secure-testing-master -> testing-security

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

18 files changed, 36 insertions, 36 deletions

diff --git a/bin/checklist b/bin/checklist
index a8bd6c1f20..d880a28885 100755
--- a/bin/checklist
+++ b/bin/checklist
@@ -91,7 +91,7 @@ sub record {
 		$condition=~s{bug #(\d+)}{<a href="http://bugs.debian.org/$1">bug #$1</a>}g;
 		$condition=~s{unfixed}{<b>unfixed</b>}g;
 		$item=~s#(CVE-\d+-\d+)#<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=$1">$1</a>#g;
-		$item=~s#(DTSA-\d+-\d+)#<a href="http://secure-testing-master.debian.net/DTSA/$1.html">$1</a>#g;
+		$item=~s#(DTSA-\d+-\d+)#<a href="http://testing-security.debian.net/DTSA/$1.html">$1</a>#g;
 	}
 
 	push @{$data{$package}{$condition}}, {item => $item, urgency => $urgency};
@@ -327,7 +327,7 @@ if ($html) {
 	print OUT "<br>\n";
 	print OUT "Total number of kernel image packages not up to date: $need_rebuild<br>\n";
 	print OUT "Number of TODO lines in <a href=\"http://svn.debian.org/wsvn/secure-testing/data/?rev=0&sc=0\">records</a>: $todos<br>\n";
-	print OUT "Maintained by the <a href=\"http://secure-testing-master.debian.net/\">testing security team</a><br>\n";
+	print OUT "Maintained by the <a href=\"http://testing-security.debian.net/\">testing security team</a><br>\n";
 	print OUT "Last update: ".`date`."<br>\n";
 	print OUT "</html>\n";
 }
diff --git a/data/DTSA/dtsa b/data/DTSA/dtsa
index e30edd2073..55977e28d6 100755
--- a/data/DTSA/dtsa
+++ b/data/DTSA/dtsa
@@ -190,7 +190,7 @@ def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_
 	ascii.write("--------------------------------------------------------------------------\n")
 	ascii.write("Debian Testing Security Advisory "+ id + ((41-len(id)-len(date))*" ") + date + "\n")
 	ascii.write("secure-testing-team@lists.alioth.debian.org " + ((30-len(author))*" ") + author + "\n") 
-	ascii.write("http://secure-testing-master.debian.net/\n")
+	ascii.write("http://testing-security.debian.net/\n")
 	ascii.write("--------------------------------------------------------------------------\n")
 	ascii.write("\n")
 	ascii.write("Package        : " + src + "\n")
@@ -251,7 +251,7 @@ def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_
 	ascii.write("\n")
   
 	ascii.write("For further information about the Debian testing security team, please refer\n")
-	ascii.write("to http://secure-testing-master.debian.net/\n")
+	ascii.write("to http://testing-security.debian.net/\n")
 
 	# FIXME, use python-crypto for inclusion of SHA-1 checksums
 
diff --git a/data/DTSA/hints/README b/data/DTSA/hints/README
index 9ac07f965c..5fcc46e504 100644
--- a/data/DTSA/hints/README
+++ b/data/DTSA/hints/README
@@ -1,5 +1,5 @@
 This directory contains hint files that are used by the dtsasync program
-on secure-testing-master to control use of the archive there.
+on testing-security to control use of the archive there.
 
 sync package/version
 	Causes all available builds of that package and version to be
diff --git a/doc/announce.2 b/doc/announce.2
index d027585892..d1f1caee4c 100644
--- a/doc/announce.2
+++ b/doc/announce.2
@@ -3,7 +3,7 @@ Subject: announcing the beginning of security support for testing
 ---------------------------------------------------------------------------
 Debian Testing Security Team                            September 9th, 2005
 secure-testing-team@lists.alioth.debian.org
-http://secure-testing-master.debian.net/
+http://testing-security.debian.net/
 ---------------------------------------------------------------------------
 
 Security support for testing
@@ -79,20 +79,20 @@ feedback about ways to do better. You can reach the testing security team
 at secure-testing-team@lists.alioth.debian.org.
 
 If you want to become a mirror, please see
-http://secure-testing-master.debian.net/mirroring.html
+http://testing-security.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/>.
+<http://testing-security.debian.net/>.
 
 ----------------------------------------------------------------------------
 
 The archive signing key that is used to sign the apt repository is
 included below and can also be downloaded from
-http://secure-testing-master.debian.net/ziyi-2005-7.asc
+http://testing-security.debian.net/ziyi-2005-7.asc
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.1 (GNU/Linux)
diff --git a/doc/announce.3 b/doc/announce.3
index eeceeb0ab4..008d91911d 100644
--- a/doc/announce.3
+++ b/doc/announce.3
@@ -4,7 +4,7 @@ Subject: Testing security archive move
 ---------------------------------------------------------------------------
 Debian Testing Security Team                                 May 12th, 2006
 secure-testing-team@lists.alioth.debian.org
-http://secure-testing-master.debian.net/
+http://testing-security.debian.net/
 ---------------------------------------------------------------------------
 
 Testing security archive move
@@ -43,4 +43,4 @@ feedback about ways to do better. You can reach the testing security team
 at secure-testing-team@lists.alioth.debian.org.
 
 For more information about the testing security team, see our web site.
-<http://secure-testing-master.debian.net/>.
+<http://testing-security.debian.net/>.
diff --git a/doc/bits_2007_10_x b/doc/bits_2007_10_x
index 73b4b27f6e..1162bb73a9 100644
--- a/doc/bits_2007_10_x
+++ b/doc/bits_2007_10_x
@@ -148,11 +148,11 @@ Yours,
 Testing Security team
 
 
-[0]: http://secure-testing-master.debian.net/
+[0]: http://testing-security.debian.net/
 [1]: http://lists.alioth.debian.org/mailman/listinfo/secure-testing-announce
 [2]: http://security-tracker.debian.net/tracker/
 [3]: http://security-tracker.debian.net/tracker/status/release/unstable
-[4]: http://secure-testing-master.debian.net/uploading.html
+[4]: http://testing-security.debian.net/uploading.html
 [5]: http://security-tracker.debian.net/tracker/status/release/testing
 [6]: http://svn.debian.org/wsvn/secure-testing/data/embedded-code-copies?op=file&rev=0&sc=0
-[7]: http://secure-testing-master.debian.net/helping.html
+[7]: http://testing-security.debian.net/helping.html
diff --git a/website/DTSA/DTSA-1-1.html b/website/DTSA/DTSA-1-1.html
index 2724222ab2..44e2a4ea39 100644
--- a/website/DTSA/DTSA-1-1.html
+++ b/website/DTSA/DTSA-1-1.html
@@ -84,11 +84,11 @@ unknown impact via unprintable characters in the SSID.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-10-1.html b/website/DTSA/DTSA-10-1.html
index 6b407910a2..cbf4d44c27 100644
--- a/website/DTSA/DTSA-10-1.html
+++ b/website/DTSA/DTSA-10-1.html
@@ -81,11 +81,11 @@ run this command before you upgrade:</dt>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-11-1.html b/website/DTSA/DTSA-11-1.html
index 5486746965..5d0d3b72e0 100644
--- a/website/DTSA/DTSA-11-1.html
+++ b/website/DTSA/DTSA-11-1.html
@@ -75,7 +75,7 @@ group.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
 
diff --git a/website/DTSA/DTSA-2-1.html b/website/DTSA/DTSA-2-1.html
index e1dac9da40..9f0b119b62 100644
--- a/website/DTSA/DTSA-2-1.html
+++ b/website/DTSA/DTSA-2-1.html
@@ -98,11 +98,11 @@ allows local users to overwrite arbitrary files via a symlink attack.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-3-1.html b/website/DTSA/DTSA-3-1.html
index f494a64038..0458683b6d 100644
--- a/website/DTSA/DTSA-3-1.html
+++ b/website/DTSA/DTSA-3-1.html
@@ -108,11 +108,11 @@ attackers to gain privileges via a crafted e-mail message.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-4-1.html b/website/DTSA/DTSA-4-1.html
index 283635034a..1488534ab3 100644
--- a/website/DTSA/DTSA-4-1.html
+++ b/website/DTSA/DTSA-4-1.html
@@ -104,11 +104,11 @@ big-endian systems.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-5-1.html b/website/DTSA/DTSA-5-1.html
index 3885305bdb..fa5d25b6a1 100644
--- a/website/DTSA/DTSA-5-1.html
+++ b/website/DTSA/DTSA-5-1.html
@@ -93,11 +93,11 @@ strings, such as %t or %n.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-6-1.html b/website/DTSA/DTSA-6-1.html
index 2b93aeab02..5c2e506446 100644
--- a/website/DTSA/DTSA-6-1.html
+++ b/website/DTSA/DTSA-6-1.html
@@ -90,11 +90,11 @@ potentially sensible information.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-7-1.html b/website/DTSA/DTSA-7-1.html
index d3ceb489be..d8aba9b365 100644
--- a/website/DTSA/DTSA-7-1.html
+++ b/website/DTSA/DTSA-7-1.html
@@ -79,11 +79,11 @@ Note that this is the same security fix put into stable in DSA-777.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-8-2.html b/website/DTSA/DTSA-8-2.html
index c0ad8cfe5a..c42ecb8e4b 100644
--- a/website/DTSA/DTSA-8-2.html
+++ b/website/DTSA/DTSA-8-2.html
@@ -157,11 +157,11 @@ DSA-775 and DSA-779, and updated in DSA-779-2.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/DTSA/DTSA-9-1.html b/website/DTSA/DTSA-9-1.html
index 0eee2ec625..565d8b85b1 100644
--- a/website/DTSA/DTSA-9-1.html
+++ b/website/DTSA/DTSA-9-1.html
@@ -74,11 +74,11 @@ helper.&nbsp;<br>
 <dd>deb-src http://secure-testing.debian.net/debian-secure-testing etch/security-updates main contrib non-free</dd>
 <br>
 <dt>The archive signing key can be downloaded from<dt>
-<dd><a href='http://secure-testing-master.debian.net/ziyi-2005-7.asc'>http://secure-testing-master.debian.net/ziyi-2005-7.asc</a><dd>
+<dd><a href='http://testing-security.debian.net/ziyi-2005-7.asc'>http://testing-security.debian.net/ziyi-2005-7.asc</a><dd>
 
 <br>
   
-<dt>For further information about the Debian testing security team, please refer to <a href='http://secure-testing-master.debian.net/'>http://secure-testing-master.debian.net/</a></dt>
+<dt>For further information about the Debian testing security team, please refer to <a href='http://testing-security.debian.net/'>http://testing-security.debian.net/</a></dt>
 
 <!-- footer -->
 <hr>
diff --git a/website/mirroring.html b/website/mirroring.html
index e24892ac2a..68934ba188 100644
--- a/website/mirroring.html
+++ b/website/mirroring.html
@@ -50,7 +50,7 @@ Please speak with ftpmaster (at) secure-testing.debian.net after you added the k
 your mirror.
 <li>Please provide the mirror at http://your-site/debian-secure-testing and, if you also support rsync, also
 at your-site::debian-secure-testing.
-<li>If possible, please redirect requests for http://secure-testing.debian.net/ to http://secure-testing-master.debian.net/
+<li>If possible, please redirect requests for http://secure-testing.debian.net/ to http://testing-security.debian.net/
 </ul>
 
 </body></html>