X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.ent;h=fd543e86fa1f9c19cff1fa7820ca944cb6947ad4;hb=e5dac6a9f044e6959f8007fdaf24ce8b04a8d467;hp=dec0300f927c0d46661753b745d5f64f45a7f6d8;hpb=390dc188cb8982985775fbb9434f4111f6613a62;p=developers-reference.git

diff --git a/common.ent b/common.ent
index dec0300..fd543e8 100644
--- a/common.ent
+++ b/common.ent
@@ -40,7 +40,7 @@
 <!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-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">
@@ -51,10 +51,11 @@
 <!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-report "&url-bts;Reporting">
 <!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-mirrors "http://&www-debian-org;/mirror/">
+<!entity url-debian-mirroring "&url-debian-mirrors;">
 <!entity url-debian-ports "http://&www-debian-org;/ports/">
 <!entity url-debian-port-lists "http://&lists-host;/ports.html">
 <!entity url-wnpp "http://&www-debian-org;/devel/wnpp/">
@@ -66,6 +67,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-login "https://db.debian.org/login.html">
 <!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">
@@ -102,8 +104,9 @@
 <!entity url-debconf-l10n-help "http://&www-debian-org;/intl/l10n/templates/hints">
 
 <!entity url-dmup "http://&www-debian-org;/devel/dmup">
+<!entity url-worldmap "http://&www-debian-org;/devel/developers.loc">
 
-<!entity url-i18n-doc-check "&url-cvsweb;boot-floppies/documentation/doc-check?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">
+<!entity url-i18n-doc-check CDATA "http://cvs.debian.org/boot-floppies/documentation/doc-check?rev=HEAD&content-type=text/vnd.viewcvs-markup">
 
 <!entity url-eg-desc-upstream-info "http://&packages-host;/unstable/text/docbook-dsssl.html">
 
@@ -121,6 +124,7 @@
 <!-- Debian email addresses -->
 <!entity email-listmaster "<email>listmaster@&lists-host;</email>">
 <!entity email-debian-announce "<email>debian-announce@&lists-host;</email>">
+<!entity email-devel-ref "<email>developers-reference@&packages-host;</email>">
 <!entity email-debian-changes "<email>debian-changes@lists.debian.org</email>">
 <!entity email-debian-devel "<email>debian-devel@&lists-host;</email>">
 <!entity email-debian-devel-announce "<email>debian-devel-announce@&lists-host;</email>">
@@ -145,13 +149,11 @@
 <!entity email-ftpmaster "<email>ftpmaster@debian.org</email>">
 <!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-bts-control "<email>control@&bugs-host;</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>">
@@ -159,7 +161,7 @@
 <!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 cron-bug-report '0 17 * * fri   echo "index maint <var>address</var>" | mail request@&bugs-host;'>
 
 <!entity control-file-fields "<list compact>
 	      <item><tt>Format</tt>