-
-<!entity url-debian-keyring "ftp://&ftp-debian-org;/debian/doc/debian-keyring.tar.gz">
-<!entity url-readme-non-us "ftp://&ftp-debian-org;/debian/README.non-US">
-
-<!entity url-testing-maint "http://ftp-master.debian.org/testing/">
-
-<!entity us-upload-dir "/org/ftp.debian.org/incoming/">
-<!entity non-us-upload-dir "/org/non-us.debian.org/incoming/">
+<!entity url-debian-security-advisories "http://&www-debian-org;/security/">
+<!entity url-tech-ctte "http://&www-debian-org;/devel/tech-ctte">
+<!entity url-ddpo "http://qa.debian.org/developer.php">
+
+<!entity url-debian-keyring "http://&ftp-debian-org;/debian/doc/debian-keyring.tar.gz">
+<!entity url-readme-non-us "http://&ftp-debian-org;/debian/README.non-US">
+<!entity url-incoming "http://incoming.debian.org/">
+<!entity url-testing-maint "http://www.debian.org/devel/testing">
+<!-- deprecated -->
+<!entity url-testing-faq "&url-testing-maint;">
+
+<!entity us-upload-dir "<file>/org/ftp.debian.org/incoming/</file>">
+<!entity non-us-upload-dir "<file>/org/non-us.debian.org/incoming/</file>">