X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=common.ent;h=2f96f48a3d669627a6159bd9b341a219d20f40bc;hb=5381651c352723b79a2c71528f5fd0670d826725;hp=dce61a6500c8ed870953cc745377f320c6eb7ad3;hpb=ce236593eb4a38a15f752e953e248953cfe44446;p=developers-reference.git

diff --git a/common.ent b/common.ent
index dce61a6..2f96f48 100644
--- a/common.ent
+++ b/common.ent
@@ -11,13 +11,13 @@
 <!-- volatile information -->
 
 <!ENTITY number-of-pkgs "9000">
-<!ENTITY number-of-maintainers "800">
+<!ENTITY number-of-maintainers "900">
 
 <!ENTITY number-of-arches "12">
 
 <!-- standard information -->
-<!ENTITY fsf-addr "Free Software Foundation,
-  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA">
+<!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 debian-formal "Debian GNU/Linux">
 
@@ -35,6 +35,7 @@
 <!ENTITY bugs-host "bugs.debian.org">
 <!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>">
 
@@ -112,7 +113,7 @@
 
 <!ENTITY url-i18n-doc-check "http://cvs.debian.org/boot-floppies/documentation/doc-check?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">
 
-<!ENTITY url-eg-desc-upstream-info "http://&packages-host;/unstable/text/docbook-dsssl.html">
+<!ENTITY url-eg-desc-upstream-info "http://&packages-host;/unstable/web/wml">
 
 <!ENTITY url-alioth "http://alioth.debian.org/">
 
@@ -122,10 +123,11 @@
 <!ENTITY url-gnu-manifesto "http://www.gnu.org/gnu/manifesto.html">
 <!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-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>">
@@ -136,6 +138,7 @@
 <!ENTITY email-debian-devel-announce "<email>debian-devel-announce@&lists-host;</email>">
 <!ENTITY email-debian-devel-changes "<email>debian-devel-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel-req "<email>debian-devel-REQUEST@&lists-host;</email>">
+<!ENTITY email-debian-i18n "<email>debian-i18n@&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>">
@@ -148,6 +151,7 @@
 <!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-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>">
@@ -187,8 +191,7 @@
 <!--
      misc, non-debian
   -->
-<!ENTITY pgp-keyserv "<tt>pgp5.ai.mit.edu</tt>">
-<!ENTITY file-keyservs "<file>/usr/share/doc/pgp/keyserv.doc</file>">
+<!ENTITY pgp-keyserv "<tt>subkeys.pgp.net</tt>">
 
 <!ENTITY sample-dist-dirtree "<example>
 dists/stable/main/