Merge branch 'master' into ubuntu-master

Conflicts:

	templates/html/head.tmpl

diff --combined templates/html/download.tmpl
index a021d5559623d232ed72c7cc3b96bfbbe08a14c4,c524423d7bee245729a8ff48bf0174e681f21c03..57339a287d85d002e935c14748b07a7a65e51c51
--- 1/templates/html/download.tmpl
--- 2/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@@ -23,15 -23,20 +23,20 @@@
  <p>[% g('If you are running %s, it is strongly suggested to use a package manager like <a href="%s">aptitude</a> or <a href="%s">synaptic</a> to download and install packages, instead of doing so manually via this website.',
        organisation, make_url('aptitude','','arch',''), make_url('synaptic','','arch','')) %]</p>
  <p>[% g('You should be able to use any of the listed mirrors by adding a line to your <kbd>/etc/apt/sources.list</kbd> like this:') %]</p>
- [% IF archive != "security" %]
+ [% IF archive == "volatile" %]
  <pre>
- deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
+ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite.replace('-','/') %] main [% section IF section != main_section %]
  </pre>
  <p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
- [% ELSE %]
+ [% ELSIF archive == "security" %]
  <pre>
  deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] main [% section IF section != main_section %]
  </pre>
+ [% ELSE %]
+ <pre>
+ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section IF section != main_section %]
+ </pre>
+ <p>[% g('Replacing <em>%s</em> with the mirror in question.', mirrors.$archive.europa.0) %]
  [%- END %]
  [% IF suite == "experimental" %]
  <h2>[% g('Experimental package') %]</h2>
@@@ -49,7 -54,7 +54,7 @@@
    <p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory at any of these sites:',
        filename.directory) %]</p>
    <div class="cardleft">
 -  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa' ] %]
 +  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa', 'australia' ] %]
      [% IF a.$continent %]
        <p><em>[% continents.$continent %]</em></p>
        <ul>
@@@ -60,7 -65,7 +65,7 @@@
      [% END %]
    [% END %]
    </div><div class="cardright">
 -  [% FOREACH continent IN [ 'europa','australia' ] %]
 +  [% FOREACH continent IN [ 'europa' ] %]
      [% IF a.$continent %]
        <p><em>[% continents.$continent %]</em></p>
        <ul>