Merge commit 'alioth/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 6adae92c7c59e7eb79d8cc47ce7724df74ab7fd5..fcf6e5b3e526e38e5b6b3fb5e8785421a61d6921 100644 (file)
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@ -4,8 +4,9 @@
    standard_priority = 'optional'
 
    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'),
         }
 %]