Merge commit 'origin/master' into debian-master

diff --combined templates/config.tmpl
index 7f954935c03a514adaea7afea75769e67dd04584,def9bae5351a6f23bab2ec8754a9a0789225f7c5..86e7cc958d7feb88581df45ebd1ba66d7d994aad
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -4,7 -4,7 +4,7 @@@
  
     organisation = 'Debian'
     homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -13,6 -13,9 +13,9 @@@
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
     mirror_url = 'http://ftp.debian.org/'
+    security_mirror = 'security.debian.org'
+    security_mirror_url = security_mirror _ '/debian-security'
+    security_suite_suffix = '/updates'
     changelogs_url = 'http://packages.debian.org/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = homepage _ 'intro/cn'
@@@ -46,7 -49,6 +49,7 @@@
  -%]
  [%-
     # possible values for importance: high, normal, low
 -   sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 +#   sitewidemsg = { importance => "high",
 +#                txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
 +#                txt => "Site maintainance in progress, some temporary problems might occour." }
  -%]