X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.ent;h=86d92108a8124ccb4b747a7e4721d8e9785f5bef;hb=ff9d221294cb704230148c5e9b2084bbdea7f336;hp=2d4e4cd287e869fc4f8386eccd764f1b0931c7fe;hpb=cdfe8d781e504566f443d9b05487e32f44f769bf;p=developers-reference.git

diff --git a/common.ent b/common.ent
index 2d4e4cd..86d9210 100644
--- a/common.ent
+++ b/common.ent
@@ -35,19 +35,24 @@
 <!entity pts-host "packages.qa.debian.org">
 <!entity ftp-master-host "ftp-master.debian.org">
 <!entity non-us-host "non-us.debian.org">
-<!entity master-host "master.debian.org">
 <!entity upload-queue "<ftppath>/pub/UploadQueue/</ftppath>">
 
 <!entity url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
-<!-- deprecate, this is dead
-  <!entity url-pkg-manual "http://&www-debian-org;/doc/packaging-manuals/packaging.html/"> -->
+<!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-debian-lists "ftp://&ftp-debian-org;/debian/doc/mailing-lists.txt">
 <!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-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/">
@@ -60,6 +65,7 @@
 <!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">
@@ -70,13 +76,16 @@
 <!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 "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 url-testing-faq "http://people.debian.org/~jules/testingfaq.html">
-<!entity url-incoming "http://incoming.debian.org">
+<!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>">
@@ -87,6 +96,12 @@
 
 <!entity url-sponsors "http://www.internatif.org/bortzmeyer/debian/sponsor/">
 
+<!entity url-rules-files "http://people.debian.org/~srivasta/rules/">
+
+<!entity url-debconf-l10n-help "http://&www-debian-org;/intl/l10n/templates/hints">
+
+<!entity url-dmup "http://&www-debian-org;/devel/dmup">
+
 <!-- 
      URLs, non-debian
   -->
@@ -96,6 +111,7 @@
 <!entity url-rfc2440 "http://www.gnupg.org/rfc2440.html">
 <!entity url-u.s.-export "http://www.bxa.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html">
 <!entity url-notification-of-export "http://www.bxa.doc.gov/Encryption/">
+<!entity url-openprojects "http://www.freenode.net/">
 
 <!-- Debian email addresses -->
 <!entity email-listmaster "<email>listmaster@&lists-host;</email>">
@@ -107,12 +123,16 @@
 <!entity email-debian-devel-req "<email>debian-devel-REQUEST@&lists-host;</email>">
 <!entity email-debian-mentors "<email>debian-mentors@&lists-host;</email>">
 <!entity email-debian-private "<email>debian-private@&lists-host;</email>">
+<!entity email-debian-project "<email>debian-project@&lists-host;</email>">
 <!entity email-debian-policy "<email>debian-policy@&lists-host;</email>">
 <!entity email-debian-user "<email>debian-user@&lists-host;</email>">
 <!entity orphan-address "&lt;packages@qa.debian.org&gt;">
 <!entity email-debian-qa "<email>debian-qa@&lists-host;</email>">
 <!entity email-debian-release "<email>debian-release@&lists-host;</email>">
 <!entity email-debian-email "<email>debian-email@&lists-host;</email>">
+<!entity email-debian-vote "<email>debian-vote@&lists-host;</email>">
+<!entity email-debian-security-announce "<email>debian-security-announce@&lists-host;</email>">
+<!entity email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 
 <!entity email-new-maintainer "<email>new-maintainer@debian.org</email>">
 <!entity email-debian-keyring "<email>keyring-maint@debian.org</email>">
@@ -121,12 +141,18 @@
 <!entity email-override "<email>override-change@debian.org</email>">
 <!entity email-wnpp "<email>wnpp@debian.org</email>">
 <!entity email-bts-control "<email>control@bugs.debian.org</email>">
+<!entity email-security-team "<email>team@security.debian.org</email>">
 
 <!-- misc Debian info -->
 <!entity file-mail-lists "<file>/usr/share/doc/debian/mailing-lists.txt</file>">
 <!entity file-bts-mailing "<file>/usr/share/doc/debian/bug-log-mailserver.txt</file>">
 <!entity file-bts-info "<file>/usr/share/doc/debian/bug-maint-info.txt</file>">
 <!entity file-bts-docs "<file>/usr/share/doc/debian/bug-*</file>">
+<!entity file-python-policy "<file>/usr/share/doc/python/python-policy.txt.gz</file>">
+<!entity file-ocaml-policy "<file>/usr/share/doc/ocaml/ocaml_packaging_policy.gz</file>">
+<!entity file-debian-private-archive "~debian/archive/debian-private/">
+<!entity file-bpp-autotools "<file>/usr/share/doc/autotools-dev/README.Debian.gz</file>">
+
 <!entity cron-bug-report '0 17 * * fri   echo "index maint <var>address</var>" | mail request@bugs.debian.org'>
 
 <!entity control-file-fields "<list compact>