X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=88c47e041a1e25de361eef8b97d5a6ed6a9cf935;hp=5ed862e90ebb1cc0025c167c61db3cc5b1050841;hb=fc3fa15399366fcaaee863a1775d3121c510a56d;hpb=78e9b506ddf2a8d6faf40b11649ed89ab6528598

diff --git a/common.ent b/common.ent
index 5ed862e..88c47e0 100644
--- a/common.ent
+++ b/common.ent
@@ -29,7 +29,8 @@
 <!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/">
+<!-- deprecate, this is dead
+  <!entity url-pkg-manual "http://&www-debian-org;/doc/packaging-manuals/packaging.html/"> -->
 <!entity url-social-contract "http://&www-debian-org;/social_contract">
 <!entity url-dfsg "&url-social-contract;#guidelines">
 <!entity url-debian-lists-subscribe "http://&www-debian-org;/MailingLists/subscribe">
@@ -69,6 +70,8 @@
 <!entity url-gpl "http://www.gnu.org/copyleft/gpl.html">
 <!entity url-pgp-faq "http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">
 <!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/">
 
 <!-- Debian email addresses -->
 <!entity email-listmaster "<email>listmaster@&lists-host;</email>">
@@ -81,7 +84,7 @@
 <!entity email-debian-mentors "<email>debian-mentors@&lists-host;</email>">
 <!entity email-debian-private "<email>debian-private@&lists-host;</email>">
 <!entity email-debian-policy "<email>debian-policy@&lists-host;</email>">
-<!entity email-debian-user "<email>debian-policy@&lists-host;</email>">
+<!entity email-debian-user "<email>debian-user@&lists-host;</email>">
 <!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>">
@@ -121,41 +124,60 @@
 <!entity file-keyservs "<file>/usr/doc/pgp/keyserv.doc</file>">
 
 <!entity sample-dist-dirtree "<example>
-main/
-main/binary-all/
-main/binary-all/admin/
-main/binary-all/base/
-main/binary-all/comm/
-main/binary-all/devel/
+dists/stable/main/
+dists/stable/main/binary-all/
+dists/stable/main/binary-all/admin/
+dists/stable/main/binary-all/base/
+dists/stable/main/binary-all/comm/
+dists/stable/main/binary-all/devel/
      ...
-main/binary-i386/
-main/binary-i386/admin/
-main/binary-i386/base/
+dists/stable/main/binary-i386/
+dists/stable/main/binary-i386/admin/
+dists/stable/main/binary-i386/base/
      ...
-main/binary-m68k
-main/binary-m68k/admin/
-main/binary-m68k/base/
+dists/stable/main/binary-m68k/
+dists/stable/main/binary-m68k/admin/
+dists/stable/main/binary-m68k/base/
      ...
-main/source/
-main/source/admin/
-main/source/base/
+dists/stable/main/source/
+dists/stable/main/source/admin/
+dists/stable/main/source/base/
      ...
-main/disks-i386/
-main/disks-m68k/
+dists/stable/main/disks-i386/
+dists/stable/main/disks-m68k/
      ...
 
-contrib/
-contrib/binary-all/
-contrib/binary-i386/
-contrib/binary-m68k/
+dists/stable/contrib/
+dists/stable/contrib/binary-all/
+dists/stable/contrib/binary-i386/
+dists/stable/contrib/binary-m68k/
      ...
-contrib/source/
-
-non-free/
-non-free/binary-all/
-non-free/binary-i386/
-non-free/binary-m68k/
-         ...
-non-free/source/
-</example>">
+dists/stable/contrib/source/
+
+dists/stable/non-free/
+dists/stable/non-free/binary-all/
+dists/stable/non-free/binary-i386/
+dists/stable/non-free/binary-m68k/
+     ...
+dists/stable/non-free/source/
+
+dists/testing
+[everything like in stable]
+
+dists/unstable
+[ditto]
 
+pool/
+pool/a/
+pool/a/apt/
+     ...
+pool/b/
+pool/b/bash/
+     ...
+pool/liba/
+pool/liba/libalias-perl/
+     ...
+pool/m/
+pool/m/mailx/
+     ...
+</example>">