Merge branch 'master' into debian-master

[deb/packages.git] / templates / config / mirrors.tmpl

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 3df5af35845a5654193ada3756268dcbdfecbfcd..85f478e87a5b209d5ab24ccf696eff588549464f 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -134,7 +134,7 @@ mirrors = {
        backports => {
                url => 'http://backports.debian.org/',
                title => g('newer packages that have been adapted to stable releases of Debian'),
-               mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
+               mirror_list => 'http://backports.debian.org/Mirrors/',
                europa => [
                        "backports.debian.org/debian-backports",
                        "ftp.at.debian.org/debian-backports/",
@@ -171,6 +171,10 @@ mirrors = {
                                url => 'http://avr32.debian.net/',
                                name => 'AVR32',
                        },
+                       armhf => {
+                               url => 'http://wiki.debian.org/ArmHardFloatPort',
+                               name => 'ARMHF',
+                       },
                        hppa => {
                                url_name => 'hppa',
                                name => 'HPPA',