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
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
<title>The VCS servers</title>
<para>
If you need to use a Version Control System for any of your Debian work,
-you can use one the existing repositories hosted on Alioth or you can
+you can use one of the existing repositories hosted on Alioth or you can
request a new project and ask for the VCS repository of your choice.
Alioth supports CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion
(svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar
The <link linkend="testing">testing</link> distribution is generated
automatically by taking packages from <literal>unstable</literal> if they
satisfy certain criteria. Those criteria should ensure a good quality for
-packages within <literal>testing</literal>. The update to <literal>testing
-</literal> is launched twice each day, right after the new packages
-have been installed. See <xref linkend="testing"/>.
+packages within <literal>testing</literal>. The update to
+<literal>testing</literal> is launched twice each day, right after the new
+packages have been installed. See <xref linkend="testing"/>.
</para>
<para>
After a period of development, once the release manager deems fit, the
new copy is created for the new <literal>testing</literal>, and the previous
<literal>stable</literal> is renamed to <literal>oldstable</literal> and
stays there until it is finally archived. On archiving, the contents are moved
-to <literal>&archive-host;</literal>).
+to <literal>&archive-host;</literal>.
</para>
<para>
This development cycle is based on the assumption that the
<para>
<command>dak ls</command> is part of the dak suite of tools, listing
available package versions for all known distributions and architectures.
-The <command>dak</command> tool is available on <literal>&ftp-master-host;
-</literal>, and on the mirror on <literal>&ftp-master-mirror;</literal>.
-It uses a single argument corresponding to a package name. An example will
-explain it better:
+The <command>dak</command> tool is available on
+<literal>&ftp-master-host;</literal>, and on the mirror on
+<literal>&ftp-master-mirror;</literal>. It uses a single argument
+corresponding to a package name. An example will explain it better:
</para>
<screen>
$ dak ls evince