-<!entity www-debian-org "www.debian.org">
-<!entity ftp-debian-org "ftp.debian.org">
-<!entity ftp-host "&ftp-debian-org;">
-<!entity www-host "&www-debian-org;">
-<!entity lists-host "lists.debian.org">
-<!entity archive-host "archive.debian.org">
-<!entity keyserver-host "keyring.debian.org">
-<!entity packages-host "packages.debian.org">
-<!entity bugs-host "bugs.debian.org">
-<!entity pts-host "packages.qa.debian.org">
-<!entity ftp-master-host "ftp-master.debian.org">
-<!entity non-us-host "non-us.debian.org">
-<!entity upload-queue "<ftppath>/pub/UploadQueue/</ftppath>">
-
-<!entity url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
-<!entity url-perl-policy "http://&www-debian-org;/doc/packaging-manuals/perl-policy/">
-<!entity url-emacs-policy "http://&www-debian-org;/doc/packaging-manuals/debian-emacs-policy">
-<!entity url-java-policy "http://www.debian.org/doc/packaging-manuals/java-policy/">
-<!entity url-libpkg-guide "http://www.netfort.gr.jp/~dancer/column/libpkg-guide/">
-
-<!entity url-social-contract "http://&www-debian-org;/social_contract">
-<!entity url-constitution "http://&www-debian-org;/devel/constitution">
-<!entity url-dfsg "&url-social-contract;#guidelines">
-<!entity url-debian-lists "http://&www-debian-org;/MailingLists/">
-<!entity url-debian-lists-txt "http://&ftp-debian-org;/debian/doc/mailing-lists.txt">
-<!entity url-debian-lists-subscribe "http://&www-debian-org;/MailingLists/subscribe">
-<!entity url-lists-archives "http://&lists-host;/">
-<!entity url-bts "http://&www-debian-org;/Bugs/">
-<!entity url-bts-devel "&url-bts;Developer">
-<!entity url-bts-control "&url-bts;server-control">
-<!entity url-debian-mirrors "http://&www-debian-org;/distrib/ftplist">
-<!entity url-debian-mirroring "http://&www-debian-org;/mirror/">
-<!entity url-debian-ports "http://&www-debian-org;/ports/">
-<!entity url-wnpp "http://&www-debian-org;/devel/wnpp/">
-<!entity url-devel-docs "http://&www-debian-org;/devel/">
-<!entity url-vote "http://&www-debian-org;/vote/">
-<!entity url-cvsweb "http://cvs.debian.org/">
-<!entity url-devel-machines "http://db.debian.org/machines.cgi">
-<!entity url-buildd "http://buildd.debian.org/">
-<!entity url-lintian "http://lintian.debian.org/">
-<!entity url-debian-qa "http://qa.debian.org/">
-<!entity url-debian-db "https://db.debian.org/">
-<!entity url-debian-db-mail-gw "http://db.debian.org/doc-mail.html">
-<!entity url-debian-db-doc "http://db.debian.org/doc-general.html">
-<!entity url-newmaint "http://&www-debian-org;/devel/join/newmaint">
-<!entity url-newmaint-checklist "http://&www-debian-org;/devel/join/nm-checklist">
-<!entity url-newmaint-db "http://nm.debian.org/">
-<!entity url-newmaint-advocate "http://&www-debian-org;/devel/join/nm-advocate">
-<!entity url-newmaint-amchecklist "http://&www-debian-org;/devel/join/nm-amchecklist">
-<!entity url-newmaint-apply "http://nm.debian.org/newnm.php">
-<!entity url-newmaint-id "http://&www-debian-org;/devel/join/nm-step2">
-<!entity url-newmaint-guide "http://&www-debian-org;/doc/maint-guide/">
-<!entity url-gpg-coord "http://nm.debian.org/gpg.php">
-<!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 master-host "master.debian.org">
+<!ENTITY www-debian-org "www.debian.org">
+<!ENTITY ftp-debian-org "ftp.debian.org">
+<!ENTITY release-debian-org "release.debian.org">
+<!ENTITY snap-debian-org "snapshot.debian.org">
+<!ENTITY lists-host "lists.debian.org">
+<!ENTITY archive-host "archive.debian.org">
+<!ENTITY keyserver-host "keyring.debian.org">
+<!ENTITY packages-host "packages.debian.org">
+<!ENTITY bugs-host "bugs.debian.org">
+<!ENTITY pts-host "packages.qa.debian.org">
+<!ENTITY ftp-master-host "ftp-master.debian.org">
+<!ENTITY ftp-upload-host "ftp.upload.debian.org">
+<!ENTITY ftp-eu-upload-host "ftp.eu.upload.debian.org">
+<!ENTITY ssh-upload-host "ssh.upload.debian.org">
+<!ENTITY ftp-master-mirror "ries.debian.org">
+<!ENTITY upload-queue "/pub/UploadQueue/">
+
+<!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
+<!ENTITY url-perl-policy "http://&www-debian-org;/doc/packaging-manuals/perl-policy/">
+<!ENTITY url-emacs-policy "http://&www-debian-org;/doc/packaging-manuals/debian-emacs-policy">
+<!ENTITY url-java-policy "http://&www-debian-org;/doc/packaging-manuals/java-policy/">
+<!ENTITY url-libpkg-guide "http://www.netfort.gr.jp/~dancer/column/libpkg-guide/">