X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=common.ent;h=729ca7a460d12e6ea5c273cfd9df4ff26c94f553;hb=c810acd9e7f3fc00ca080e71fc905d40f8de3b32;hp=1041c6fc43a1e40bb4c343f3258f32c20dc2168f;hpb=6f039f33e2bdb176791f6dca4aaad5eceb9add8b;p=developers-reference.git

diff --git a/common.ent b/common.ent
index 1041c6f..729ca7a 100644
--- a/common.ent
+++ b/common.ent
@@ -26,6 +26,7 @@
 <!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 url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
 <!entity url-pkg-manual "http://&www-debian-org;/doc/packaging-manuals/packaging.html/">
@@ -33,8 +34,7 @@
 <!entity url-dfsg "&url-social-contract;#guidelines">
 <!entity url-debian-lists-subscribe "http://&www-debian-org;/MailingLists/subscribe">
 <!entity url-debian-lists "ftp://&ftp-debian-org;/debian/doc/mailing-lists.txt">
-<!entity url-debian-list-archives "http://&www-debian-org;/Lists-Archives/">
-<!entity url-debian-contacts "http://&www-debian-org;/devel/maintainer_contacts">
+<!entity url-lists-archives "http://&lists-host;/">
 <!entity url-bts "http://&www-debian-org;/Bugs/">
 <!entity url-bts-control "&url-bts;server-control.html">
 <!entity url-debian-mirrors "http://&www-debian-org;/distrib/ftplist">
@@ -48,11 +48,14 @@
 <!entity url-debian-qa "http://qa.debian.org/">
 <!entity url-debian-db "https://db.debian.org/">
 <!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-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 master-upload-dir "/home/Debian/ftp/private/project/Incoming/">
+<!entity us-upload-dir "/org/ftp.debian.org/incoming/">
 <!entity non-us-upload-dir "/org/non-us.debian.org/incoming/">
 <!entity url-chiark-readme "ftp://ftp.chiark.greenend.org.uk/pub/debian/private/project/README.how-to-upload">
 <!entity url-upload-erlangen "ftp://ftp.uni-erlangen.de/pub/Linux/debian/UploadQueue/">
@@ -60,7 +63,7 @@
 <!entity url-upload-jp "ftp://master.debian.or.jp/pub/Incoming/upload/">
 
 <!-- 
-     URLs, non-debbin
+     URLs, non-debian
   -->
 <!entity url-gnu-manifesto "http://www.gnu.org/gnu/manifesto.html">
 <!entity url-gpl "http://www.gnu.org/copyleft/gpl.html">
@@ -112,7 +115,7 @@
 	    </list>">
 
 <!--
-     misc, non-debbin
+     misc, non-debian
   -->
 <!entity pgp-keyserv "<tt>pgp5.ai.mit.edu</tt>">
 <!entity file-keyservs "<file>/usr/doc/pgp/keyserv.doc</file>">