Merge branch 'master' into debian-master

diff --combined templates/config/mirrors.tmpl
index 79ee6f4b8bf4166acf0b73403de64330c851dd9e,bb931728d5aa3d45aa7b3ba03d215423708ee8c8..b01bd335d174f0d599738bccad3aeab7ba44e920
--- 1/templates/config/mirrors.tmpl
--- 2/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -134,7 -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/",
@@@ -163,10 -163,22 +163,22 @@@
                title => g('ports of packages to architectures not yet or not anymore available in Debian'),
                mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
                unofficial_port => {
+                       alpha => {
+                               url_name => 'alpha',
+                               name => 'Alpha',
+                       },
                        avr32 => {
                                url => 'http://avr32.debian.net/',
                                name => 'AVR32',
                        },
+                       hppa => {
+                               url_name => 'hppa',
+                               name => 'HPPA',
+                       },
+                       m68k => {
+                               url_name => 'm68k',
+                               name => 'M68K',
+                       },
                        powerpcspe => {
                                url => 'http://wiki.debian.org/PowerPCSPEPort',
                                name => 'PowerPCSPE',
@@@ -179,10 -191,6 +191,6 @@@
                                url => 'http://wiki.debian.org/Sparc64',
                                name => 'Sparc64',
                        },
-                       m68k => {
-                               url_name => 'm68k',
-                               name => 'M68K',
-                       },
                },
                north_america => [
                        "www.gtlib.gatech.edu/pub/gnuab/debian",