Merge branch 'master' into archive-master

diff --combined templates/config.tmpl
index 70f14a8ddb95341a2196f346eb24356349fe134f,98525ebc247c768350cbe924871bc599a8fc23f7..719dcf98405b29b504a1576e15a2a75809e3db6c
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,7 +5,7 @@@
  
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://archive.debian.net/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -17,7 -17,7 +17,7 @@@
     security_mirror = 'security.debian.org'
     security_mirror_url = security_mirror _ '/debian-security'
     security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = 'http://archive.debian.net/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = project_homepage _ 'intro/cn'
     logo = {
@@@ -38,22 -38,24 +38,26 @@@
        url => project_homepage _ 'trademark'
     }
     contact = {
 -      name => g('Debian Web Mailinglist'),
 -      mail => 'debian-www@lists.debian.org',
 +      name => 'Frank Lichtenheld',
 +      mail => 'djpig@debian.org',
          url => project_homepage _ 'contact',
     }
     admin = {
 -      name => g('%s Webmaster', organisation),
 -      mail => 'webmaster@debian.org',
 +      name => 'Frank Lichtenheld',
 +      mail => 'djpig@debian.org',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
+ #   sponsor = {
+ #     url => 'http://example.invalid/',
+ #     name => 'Example Sponsor, Inc.',
+ #   }
  -%]
  [%-
     # possible values for importance: high, normal, low
 +   #sitewidemsg = { importance => "high",
 +   #             txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
     sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +                 txt => g('Please note that this site contains information about obsolete %s releases; if you search for current data, please use <a href="http://%s/">%s</a>.', organisation, 'packages.debian.org', 'packages.debian.org') }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),