From d5ed0b432accb07a79c3d5e0dcd633c642fb9b36 Mon Sep 17 00:00:00 2001
From: aba <aba@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Wed, 8 Dec 2004 15:42:39 +0000
Subject: [PATCH] madison on merkel

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@2656 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 common.ent                | 1 +
 debian/changelog          | 8 ++++++++
 developers-reference.sgml | 5 +++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common.ent b/common.ent
index 13a8572..7b63a62 100644
--- a/common.ent
+++ b/common.ent
@@ -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>">
 
diff --git a/debian/changelog b/debian/changelog
index 72b06a7..7977ea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+developers-reference (3.3.6) unstable; urgency=low
+
+  * Andreas Barth
+    - closes: and NMUs/experimental uploads. Closes: #284714
+    - madison is on merkel.
+
+ -- Andreas Barth <aba@not.so.argh.org>  Wed,  8 Dec 2004 03:03:01 -0700
+
 developers-reference (3.3.5) unstable; urgency=low
 
   * Andreas Barth
diff --git a/developers-reference.sgml b/developers-reference.sgml
index 9bc69d8..21fdade 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -6,7 +6,7 @@
   <!ENTITY % commondata  SYSTEM "common.ent" > %commondata;
 
   <!-- CVS revision of this document -->
-  <!ENTITY cvs-rev "$Revision: 1.251 $">
+  <!ENTITY cvs-rev "$Revision: 1.252 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -1206,7 +1206,8 @@ You can view the bugs of a given package at the URL
       <sect1 id="madison">The <prgn>madison</prgn> utility
         <p>
 <prgn>madison</prgn> is a command-line utility that is available
-on both <tt>&ftp-master-host;</tt> and <tt>&non-us-host;</tt>. It
+on both <tt>&ftp-master-host;</tt> and <tt>&non-us-host;</tt>, and on
+the mirror on <tt>&ftp-master-mirror;</tt>. It
 uses a single argument corresponding to a package name. In result
 it displays which version of the package is available for each
 architecture and distribution combination. An example will explain
-- 
2.30.2