Update references to merkel (which is decommissionned) where needed.

Thanks to Charles Plessy for the patch.

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

diff --git a/common.ent b/common.ent
index 4725f0e6ce0bac7fe7039e8f63a066bb3f84ed9f..9d88041ecf7f94a547b1fbe9338b551659ee87aa 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -37,7 +37,7 @@
 <!ENTITY ftp-upload-host "ftp.upload.debian.org">
 <!ENTITY ftp-eu-upload-host "ftp.eu.upload.debian.org">
 <!ENTITY ssh-upload-host "ssh.upload.debian.org">
 <!ENTITY ftp-upload-host "ftp.upload.debian.org">
 <!ENTITY ftp-eu-upload-host "ftp.eu.upload.debian.org">
 <!ENTITY ssh-upload-host "ssh.upload.debian.org">

-<!ENTITY ftp-master-mirror "merkel.debian.org">
+<!ENTITY ftp-master-mirror "ries.debian.org">

 <!ENTITY upload-queue "/pub/UploadQueue/">
 
 <!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
 <!ENTITY upload-queue "/pub/UploadQueue/">
 
 <!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">

diff --git a/debian/changelog b/debian/changelog
index 041b47909197109e1e6108157ccf929e2f5c783b..4774b055c1c38a8e23d2cfd9aa823662610d4f93 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ developers-reference (3.4.5) UNRELEASED; urgency=low
     checklist for the sponsor. Closes: #453313
   * Update the "Debian Developer's Duties" chapter to be more explicit
     about duties of package maintainers. Closes: #548867
     checklist for the sponsor. Closes: #453313
   * Update the "Debian Developer's Duties" chapter to be more explicit
     about duties of package maintainers. Closes: #548867

+  * Update references to merkel (which is decommissionned) where
+    needed. Closes: #619990
+    Thanks to Charles Plessy for the patch.

 
  -- Raphaël Hertzog <hertzog@debian.org>  Wed, 24 Nov 2010 23:54:39 +0100
 
 
  -- Raphaël Hertzog <hertzog@debian.org>  Wed, 24 Nov 2010 23:54:39 +0100
 

diff --git a/pkgs.dbk b/pkgs.dbk
index d7273299c1972a79dae2bbf3724bf1022a2ff10d..38256bfe2cd3b863ca1c524d883ed59d105c846f 100644 (file)
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -2596,11 +2596,8 @@ tests include this package.  Hints from the release team are processed
 before or after this main run, depending on the exact type.
 </para>
 <para>
 before or after this main run, depending on the exact type.
 </para>
 <para>

-If you want to see more details, you can look it up on
-<filename>merkel:/org/&ftp-debian-org;/testing/update_out/</filename> (or
-in <filename>merkel:~aba/testing/update_out</filename> to see a setup with
-a smaller packages file).  Via web, it's at <ulink
-url="http://&ftp-master-host;/testing/update_out_code/"></ulink>.
+If you want to see more details, you can look it up on <ulink
+url="http://&ftp-master-host;/testing/update_output/"></ulink>.

 </para>
 <para>
 The hints are available via <ulink
 </para>
 <para>
 The hints are available via <ulink

diff --git a/resources.dbk b/resources.dbk
index 72740732edf9d0757870041403f9c3ad3a1c52a5..a49dbc276e9c3d09aa7685d220ce69db83144926 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -260,9 +260,6 @@ mirrored to another server.
 the Bug Tracking System (BTS).
 </para>
 <para>
 the Bug Tracking System (BTS).
 </para>
 <para>

-It is restricted; a mirror is available on <literal>merkel</literal>.
-</para>
-<para>

 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on
 &email-debian-devel; before implementing anything, however, to
 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on
 &email-debian-devel; before implementing anything, however, to


@@ -278,7 +275,7 @@ the Debian archive.  Generally, package uploaded to &ftp-upload-host;
 end up on this server, see <xref linkend="upload"/>.
 </para>
 <para>
 end up on this server, see <xref linkend="upload"/>.
 </para>
 <para>

-It is restricted; a mirror is available on <literal>merkel</literal>.
+It is restricted; a mirror is available on <literal>&ftp-master-mirror;</literal>.

 </para>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs
 </para>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs