Merge commit 'origin/master' into ubuntu-master

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

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index c563e6e3386ee8971711ce1d5eb98727c7c46327..d4290f2f100caa41ace4a06f336c3f1aa7335fe4 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -3,23 +3,14 @@
    main_archive = 'us'
    standard_priority = 'optional'
 
-   suite_aliases = {
-               etch => 'oldstable', 
-               lenny => 'stable',
-               squeeze => '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'),
+               main => g('Canonical supported Open Source software'),
+               universe => g('Community maintained open source software'),
+               multiverse => g('Software restricted by copyright or legal issues'),
+               restricted => g('Proprietary drivers for devices'),
         }
 
    section_urls = {
-                main => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-main',
-                contrib => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-contrib',
-                'non-free' => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free',
         }
 
 %]