X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.ent;h=b3fe9016baa33022cbed647d94e0522e2df3de44;hb=c0e2a26f7817b5396ee5267d2e678c4f95593b76;hp=e9b3b5014f0755327c9c0f522bfea7a27df3d00b;hpb=45d17a893f2c09f2377d32841f204d9a6aff366e;p=developers-reference.git

diff --git a/common.ent b/common.ent
index e9b3b50..b3fe901 100644
--- a/common.ent
+++ b/common.ent
@@ -24,6 +24,7 @@
 <!--
      URLs, Debian
   -->
+<!ENTITY master-host "master.debian.org">
 <!ENTITY www-debian-org "www.debian.org">
 <!ENTITY ftp-debian-org "ftp.debian.org">
 <!ENTITY lists-host "lists.debian.org">
@@ -34,7 +35,6 @@
 <!ENTITY pts-host "packages.qa.debian.org">
 <!ENTITY ftp-master-host "ftp-master.debian.org">
 <!ENTITY ftp-master-mirror "merkel.debian.org">
-<!ENTITY non-us-host "non-us.debian.org">
 <!ENTITY upload-queue "/pub/UploadQueue/">
 
 <!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
@@ -81,6 +81,7 @@
 <!ENTITY url-ddpo "http://qa.debian.org/developer.php">
 <!ENTITY url-dcg "http://people.debian.org/~enrico/dcg/">
 <!ENTITY url-rt "https://rt.debian.org/">
+<!ENTITY url-wiki-dm "http://wiki.debian.org/Maintainers">
 
 <!ENTITY url-incoming "http://incoming.debian.org/">
 <!ENTITY url-testing-maint "http://www.debian.org/devel/testing">
@@ -98,6 +99,9 @@
 <!ENTITY url-eg-desc-upstream-info "http://&packages-host;/unstable/web/wml">
 
 <!ENTITY url-alioth "http://alioth.debian.org/">
+<!ENTITY url-alioth-pkg "http://wiki.debian.org/Alioth/PackagingProject">
+<!ENTITY url-alioth-wiki "http://wiki.debian.org/Alioth">
+<!ENTITY url-alioth-faq "http://wiki.debian.org/Alioth/FAQ">
 
 <!-- 
      URLs, non-debian
@@ -131,7 +135,6 @@
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 <!ENTITY email-mia "<email>mia@qa.debian.org</email>">
 
-<!ENTITY email-debian-admin "<email>debian-admin@debian.org</email>">
 <!ENTITY email-rt-dsa "<email>admin@rt.debian.org</email>">
 <!ENTITY email-ftpmaster "<email>ftpmaster@debian.org</email>">
 <!ENTITY email-override "<email>override-change@debian.org</email>">