Merge branch 'master' into debian-master

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

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 294d8f0a1ee8a3b3e764facbc44473621230f23a..addbd8df4403a499319425a72a8c6bcf8142b2f0 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,8 +4,8 @@
    ddtp_lang = 'en'
 
    organisation = 'Debian'
-   homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   project_homepage = 'http://www.debian.org/'
+   packages_homepage = 'http://packages.debian.org/'
    searchformurl = packages_homepage
    search_url = '/'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -19,9 +19,9 @@
    security_suite_suffix = '/updates'
    changelogs_url = 'http://packages.debian.org/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,
    }
@@ -31,16 +31,16 @@
         years => '1997 - ' _ timestamp.year,
    }
    license = {
-       url => homepage _ 'license'
+       url => project_homepage _ 'license'
    }
    trademark = {
        name => copyright.name,
-       url => homepage _ 'trademark'
+       url => project_homepage _ 'trademark'
    }
    contact = {
        name => g('Debian Web Mailinglist'),
        mail => 'debian-www@lists.debian.org',
-        url => homepage _ 'contact',
+        url => project_homepage _ 'contact',
    }
    admin = {
        name => g('%s Webmaster', organisation),
@@ -50,8 +50,9 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
-   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.debian.org', 'packages.debian.org') }
+#   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.debian.org', 'packages.debian.org') }
+#                 txt => "Site maintainance in progress, some temporary problems might occour." }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),