X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fhtml%2Fdownload.tmpl;h=bfb4a2314a84a819999fc969473a471f01b10a27;hb=ba5be70ae27ddcb97cae5b9e5ceb9c97c06649f3;hp=a021d5559623d232ed72c7cc3b96bfbbe08a14c4;hpb=4c6c02445d6bd955db66d82946b8c955b1f43615;p=deb%2Fpackages.git

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index a021d55..bfb4a23 100644
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -23,15 +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 @@ deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] ma
   <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', 'australia' ] %]
+  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa' ] %]
     [% IF a.$continent %]
 	<p><em>[% continents.$continent %]</em></p>
 	<ul>
@@ -60,7 +65,7 @@ deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] ma
     [% END %]
   [% END %]
   </div><div class="cardright">
-  [% FOREACH continent IN [ 'europa' ] %]
+  [% FOREACH continent IN [ 'europa', 'australia' ] %]
     [% IF a.$continent %]
 	<p><em>[% continents.$continent %]</em></p>
 	<ul>
@@ -89,7 +94,7 @@ deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] ma
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]
-<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
+<p style="clear:both">[% g('Note that %s is not officially included in the %s archive, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
 	port.name, organisation, port.name, port.url, port.name) %]</p>
 [% END %]
 
@@ -105,4 +110,4 @@ deb [% 'http://' _ security_mirror_url %] [% suite _ security_suite_suffix %] ma
 <tr><th>[% g('SHA256 checksum') %]</th>	<td><tt>[% sha256  || g('Not Available') %]</tt></td>
 </table>
 
-[%- PROCESS 'html/foot.tmpl' -%]
+[%- PROCESS 'html/foot.tmpl' page_name="$pkg/download" -%]