Merge branch 'master' into ubuntu-master

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

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 451b0e60ff668c10c2acc1863274302ab129ff83..11d04044c1ba86430fece6fa66f8d91d9ee95a5e 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,8 +4,8 @@
    ddtp_lang = 'en'
 
    organisation = 'Ubuntu'
-   homepage = 'http://www.ubuntu.com/'
-   packages_homepage = 'http://packages.ubuntu.lichtenheld.net/'
+   project_homepage = 'http://www.ubuntu.com/'
+   packages_homepage = 'http://packages.ubuntu.com/'
    searchformurl = packages_homepage
    search_url = '/'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -20,9 +20,9 @@
    security_suite_suffix = '-security'
    changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
    policy_url = 'http://www.debian.org/doc/debian-policy/'
-#   cn_help_url = homepage _ 'intro/cn'
+#   cn_help_url = project_homepage _ 'intro/cn'
    logo = {
-       url => homepage,
+       url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
         alt => organisation,
    }
@@ -32,16 +32,16 @@
         years => timestamp.year,
    }
    license = {
-       url => homepage _ 'legal'
+       url => project_homepage _ 'legal'
    }
    trademark = {
        name => copyright.name,
-       url => homepage _ 'trademark'
+       url => project_homepage _ 'trademark'
    }
    contact = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
-        url => homepage _ 'support',
+        url => project_homepage _ 'support',
    }
    admin = {
        name => 'Frank Lichtenheld',
@@ -51,8 +51,8 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-                  txt => g('Please note that this is an experimental version of <a href="http://packages.ubuntu.com/">packages.ubuntu.com</a>. Errors and obsolete information should be expected') }
+#   sitewidemsg = { importance => "high",
+#                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),