Merge commit 'origin/master' into ubuntu-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_debports
	cron.d/100syncarchive_volatile
	lib/Packages/Search.pm
	static/index.tmpl
	templates/config.tmpl
	templates/config/archive_layout.tmpl
	templates/config/mirrors.tmpl

diff --cc conf/apache.conf.sed.in
Simple merge

diff --cc lib/Packages/DoShow.pm
Simple merge

diff --cc templates/config.tmpl
index d6e9bd6938310a7b374cff1aa4ff470673ee6332,5ce7cc736eddbc6501d8432c58ccf1b19f09d081..3526f5e707cf7fc0ae779f4d5bb953bdf191ad8f
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -14,13 -13,14 +14,14 @@@
     pts_url = 'http://packages.qa.debian.org/'
     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/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   security_mirror = 'security.ubuntu.com'
 +   security_mirror_url = security_mirror _ '/ubuntu'
 +   security_suite_suffix = '-security'
 +   changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
 -   cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracking.debian.net/package'
 +#   cn_help_url = project_homepage _ 'intro/cn'
++#   patch_tracking_url = 'http://patch-tracking.debian.net/package'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',

diff --cc templates/config/archive_layout.tmpl
index 1eacb1600baa34d49bb5a2ea5bae290d4623d9f8,30c28501fa39671a1774c9998cbc7d54a034dfc5..6adae92c7c59e7eb79d8cc47ce7724df74ab7fd5
--- 1/templates/config/archive_layout.tmpl
--- 2/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@@ -2,4 -2,18 +2,10 @@@
     main_section = 'main'
     main_archive = 'us'
     standard_priority = 'optional'
 -   suite_aliases = {
 -              sarge => 'oldstable', 
 -              etch => 'stable',
 -              lenny => 'testing',
 -              sid => 'unstable',
 -                 }
 -
+ 
 -
+    section_titles = {
+                 main => g('packages that meet the Debian Free Software Guidelines'),
+                 contrib => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'),
+                 'non-free' => g('packages that do not meet the Debian Free Software Guidelines'),
+         }
  %]

diff --cc templates/config/mirrors.tmpl
Simple merge

diff --cc templates/html/show.tmpl
Simple merge