The following commit has been merged in the ubuntu-master branch:
commit 587dcc6f49188c0a2076e7316643f90a7c3d1d5a
Merge: 974926bc9499febca5504f5e4da8e4733ddd960e
7f5251931aa1c43d71d8da89f8d111203ec2cedb
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Mon Apr 21 20:06:31 2008 +0200
Merge branch 'master' into ubuntu-master
Conflicts:
templates/html/head.tmpl
diff --combined templates/html/download.tmpl
index a021d55,c524423..57339a2
--- a/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>
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
