madison on merkel

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@2656 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/common.ent b/common.ent
index 13a8572acfcad736cd3e8da1f042f7af15185a05..7b63a62b98865df3e12748cb567304d56400abec 100644 (file)
--- 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 72b06a7d2e35dd4938ba55d0df7ab7a93c469158..7977ea35b7f183df4f9aac992e194a6b253598ae 100644 (file)
--- 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 9bc69d811d8b6a14cbbf9f384d56ab98d1594c25..21fdade7a51ccb962729aebba66f17bbc079355c 100644 (file)
--- 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