Merge branch 'master' into debian-master

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

diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl
index 6e501c7ababaf3983d2b0c7f1cb8f3d506a1b00c..0cad75b213b1e4d322aa3f932bf3ee011971ff94 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -4,9 +4,22 @@
    standard_priority = 'optional'
 
    suite_aliases = {
-               sarge => 'oldstable', 
-               etch => 'stable',
-               lenny => 'testing',
+               lenny => 'oldstable', 
+               squeeze => 'stable',
+               wheezy => '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'),
+        }
+
+   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',
+        }
+
 %]