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

[developers-reference.git] / resources.dbk

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