The following commit has been merged in the debian-master branch:
commit 259b50024689309869a7076d232c34cdd3b2af38
Merge: 4016d6838e985b347884a49807d0c7cb97041cad 
c8f25b919183b1416bc717c59ab8b0d7de6c9374
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Tue Aug 5 18:04:52 2008 -0300

    Merge branch 'master' into debian-master

diff --combined templates/config.tmpl
index f7392b8,98525eb..ad940b3
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -5,7 -5,7 +5,7 @@@
  
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -47,12 -47,15 +47,16 @@@
        mail => '[EMAIL PROTECTED]',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', 
organisation, trademark.url, trademark.name)
+ #   sponsor = {
+ #     url => 'http://example.invalid/',
+ #     name => 'Example Sponsor, Inc.',
+ #   }
  -%]
  [%-
     # 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('.'),

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to