X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=0e82133f5d307dd3648dee535d7c0f2606b996dc;hp=61d5ae1071db067eebffc2d01d97c63a8027f00e;hb=441c42955be5f83ec4cf6f97c86b79279dee23c6;hpb=17b5ee7c8f6747aa5776d5545f28f62e5b1ac0b3

diff --git a/common.ent b/common.ent
index 61d5ae1..0e82133 100644
--- a/common.ent
+++ b/common.ent
@@ -18,6 +18,7 @@
 <!entity fsf-addr "Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA">
 <!entity file-GPL "<file>/usr/share/common-licenses/GPL</file>">
+<!entity debian-formal "Debian GNU/Linux">
 
 <!--
      URLs, Debian
@@ -44,6 +45,8 @@
 <!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/">
@@ -58,11 +61,14 @@
 <!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-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 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">
@@ -70,6 +76,8 @@
 <!entity url-upload-samosa "ftp://samosa.debian.org/pub/UploadQueue/">
 <!entity url-upload-jp "ftp://master.debian.or.jp/pub/Incoming/upload/">
 
+<!entity url-sponsors "http://www.internatif.org/bortzmeyer/debian/sponsor/">
+
 <!-- 
      URLs, non-debian
   -->
@@ -106,9 +114,11 @@
 <!entity email-bts-control "<email>control@bugs.debian.org</email>">
 
 <!-- misc Debian info -->
-<!entity file-mail-lists "<file>/usr/doc/debian/mailing-lists.txt</file>">
-<!entity file-bts-mailing "<file>/usr/doc/debian/bug-log-mailserver.txt</file>">
-<!entity file-bts-info "<file>/usr/doc/debian/bug-maint-info.txt</file>">
+<!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 cron-bug-report '0 17 * * fri   echo "index maint <var>address</var>" | mail request@bugs.debian.org'>
 
 <!entity control-file-fields "<list compact>
 	      <item><tt>Format</tt>
@@ -129,7 +139,7 @@
      misc, non-debian
   -->
 <!entity pgp-keyserv "<tt>pgp5.ai.mit.edu</tt>">
-<!entity file-keyservs "<file>/usr/doc/pgp/keyserv.doc</file>">
+<!entity file-keyservs "<file>/usr/share/doc/pgp/keyserv.doc</file>">
 
 <!entity sample-dist-dirtree "<example>
 dists/stable/main/