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 6e501c7ababaf3983d2b0c7f1cb8f3d506a1b00c..6adae92c7c59e7eb79d8cc47ce7724df74ab7fd5 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -3,10 +3,9 @@
    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'),
+        }
 %]