X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=3873ad93bd672af4699e2087ea7917c12d64c9a3;hp=0181bd91bfef8336d7846ba60f05c76d9ec5e50b;hb=e3cb6d3f6afc7f8ed94ea6021aa0f9b4fa0e5551;hpb=1f33487fe2d9aecde9dc05b2a66e654b529358af

diff --git a/common.ent b/common.ent
index 0181bd9..3873ad9 100644
--- a/common.ent
+++ b/common.ent
@@ -18,7 +18,7 @@
 <!-- standard information -->
 <!ENTITY fsf-addr "Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA">
-<!ENTITY file-GPL "<file>/usr/share/common-licenses/GPL</file>">
+<!ENTITY file-GPL "<filename>/usr/share/common-licenses/GPL</filename>">
 <!ENTITY debian-formal "Debian GNU/Linux">
 
 <!--
@@ -26,8 +26,6 @@
   -->
 <!ENTITY www-debian-org "www.debian.org">
 <!ENTITY ftp-debian-org "ftp.debian.org">
-<!ENTITY ftp-host "&ftp-debian-org;">
-<!ENTITY www-host "&www-debian-org;">
 <!ENTITY lists-host "lists.debian.org">
 <!ENTITY archive-host "archive.debian.org">
 <!ENTITY keyserver-host "keyring.debian.org">
@@ -36,8 +34,7 @@
 <!ENTITY pts-host "packages.qa.debian.org">
 <!ENTITY ftp-master-host "ftp-master.debian.org">
 <!ENTITY ftp-master-mirror "merkel.debian.org">
-<!ENTITY non-us-host "non-us.debian.org">
-<!ENTITY upload-queue "<ftppath>/pub/UploadQueue/</ftppath>">
+<!ENTITY upload-queue "/pub/UploadQueue/">
 
 <!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
 <!ENTITY url-perl-policy "http://&www-debian-org;/doc/packaging-manuals/perl-policy/">
@@ -49,16 +46,12 @@
 <!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-new "http://&www-debian-org;/MailingLists/HOWTO_start_list">
-<!ENTITY url-lists-archives "http://&lists-host;/">
+<!ENTITY url-debian-lists-new "&url-debian-lists;HOWTO_start_list">
 <!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;/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/">
@@ -69,16 +62,15 @@
 <!ENTITY url-buildd "http://buildd.debian.org/">
 <!ENTITY url-lintian "http://lintian.debian.org/">
 <!ENTITY url-debian-qa "http://qa.debian.org/">
-<!ENTITY url-debian-qa-orphaned "http://qa.debian.org/orphaned.html">
+<!ENTITY url-debian-qa-orphaned "&url-debian-qa;orphaned.html">
 <!ENTITY url-debian-db "https://db.debian.org/">
-<!ENTITY url-debian-db-login "https://db.debian.org/login.html">
+<!ENTITY url-debian-db-login "&url-debian-db;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">
-<!ENTITY url-newmaint-checklist "http://&www-debian-org;/devel/join/nm-checklist">
+<!ENTITY url-newmaint "&url-devel-docs;join/newmaint">
 <!ENTITY url-newmaint-db "http://nm.debian.org/">
-<!ENTITY url-newmaint-advocate "http://&www-debian-org;/devel/join/nm-advocate">
-<!ENTITY url-newmaint-amchecklist "http://&www-debian-org;/devel/join/nm-amchecklist">
+<!ENTITY url-newmaint-advocate "&url-devel-docs;join/nm-advocate">
+<!ENTITY url-newmaint-amchecklist "&url-devel-docs;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/">
@@ -89,27 +81,14 @@
 <!ENTITY url-dcg "http://people.debian.org/~enrico/dcg/">
 <!ENTITY url-rt "https://rt.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>">
-<!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/">
-<!ENTITY url-upload-samosa "ftp://samosa.debian.org/pub/UploadQueue/">
-<!ENTITY url-upload-jp "ftp://master.debian.or.jp/pub/Incoming/upload/">
 
 <!ENTITY url-mentors "http://people.debian.org/~mpalmer/debian-mentors_FAQ.html">
-<!ENTITY url-sponsors "http://www.internatif.org/bortzmeyer/debian/sponsor/">
 
 <!ENTITY url-rules-files "http://arch.debian.org/arch/private/srivasta/">
 
-<!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">
 
@@ -122,7 +101,6 @@
 <!ENTITY url-alioth-wiki "http://wiki.debian.org/Alioth">
 <!ENTITY url-alioth-faq "http://wiki.debian.org/Alioth/FAQ">
 
-
 <!-- 
      URLs, non-debian
   -->
@@ -130,14 +108,11 @@
 <!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.rfc-editor.org/rfc/rfc2440.txt">
-<!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/">
 <!ENTITY url-oftc "http://www.oftc.net/oftc/">
 
 <!-- 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>">
@@ -149,7 +124,6 @@
 <!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>">
@@ -159,48 +133,28 @@
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 <!ENTITY email-mia "<email>mia@qa.debian.org</email>">
 
-<!ENTITY email-new-maintainer "<email>new-maintainer@debian.org</email>">
-<!ENTITY email-debian-keyring "<email>keyring-maint@debian.org</email>">
-<!ENTITY email-debian-admin "<email>debian-admin@debian.org</email>">
+<!ENTITY email-rt-dsa "<email>admin@rt.debian.org</email>">
 <!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-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-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-lisp-controller "<file>/usr/share/doc/common-lisp-controller/README.packaging</file>">
+<!ENTITY file-bts-docs "<filename>/usr/share/doc/debian/bug-*</filename>">
+<!ENTITY file-python-policy "<filename>/usr/share/doc/python/python-policy.txt.gz</filename>">
+<!ENTITY file-ocaml-policy "<filename>/usr/share/doc/ocaml/ocaml_packaging_policy.gz</filename>">
+<!ENTITY file-lisp-controller "<filename>/usr/share/doc/common-lisp-controller/README.packaging</filename>">
 <!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-host;'>
+<!ENTITY file-bpp-autotools "<filename>/usr/share/doc/autotools-dev/README.Debian.gz</filename>">
 
-<!ENTITY control-file-fields "<list compact>
-	      <item><tt>Format</tt>
-	      <item><tt>Date</tt>
-	      <item><tt>Source</tt>
-	      <item><tt>Binary</tt>
-	      <item><tt>Architecture</tt>
-	      <item><tt>Version</tt>
-	      <item><tt>Distribution</tt>
-	      <item><tt>Urgency</tt>
-	      <item><tt>Maintainer</tt>
-	      <item><tt>Description</tt>
-	      <item><tt>Changes</tt>
-	      <item><tt>Files</tt>
-	    </list>">
+<!ENTITY cron-bug-report '0 17 * * fri   echo "index maint <replaceable>address</replaceable>" | mail request@&bugs-host;'>
 
 <!--
      misc, non-debian
   -->
-<!ENTITY pgp-keyserv "<tt>subkeys.pgp.net</tt>">
+<!ENTITY pgp-keyserv "<literal>subkeys.pgp.net</literal>">
 
-<!ENTITY sample-dist-dirtree "<example>
-dists/stable/main/
+<!ENTITY sample-dist-dirtree "<screen>dists/stable/main/
 dists/stable/main/binary-i386/
 dists/stable/main/binary-m68k/
 dists/stable/main/binary-alpha/
@@ -257,10 +211,15 @@ pool/main/m/mailx/
      ...
 pool/non-free/n/
 pool/non-free/n/netscape/
-     ...
-</example>">
+     ...</screen>">
+
+<!ENTITY example-uu "<programlisting>uuencode-file:
+    perl -ne 'print(pack &quot;u&quot;, $$_);' $(file) &gt; $(file).uuencoded
+
+uudecode-file:
+    perl -ne 'print(unpack &quot;u&quot;, $$_);' $(file).uuencoded &gt; $(file)</programlisting>">
 
-<!ENTITY example-pathfind '<example>pathfind() {
+<!ENTITY example-pathfind '<programlisting>pathfind() {
     OLDIFS="$IFS"
     IFS=:
     for p in $PATH; do
@@ -271,4 +230,4 @@ pool/non-free/n/netscape/
     done
     IFS="$OLDIFS"
     return 1
-}</example>'>
+}</programlisting>'>