Merge branch 'archive-master' of git+ssh://git.debian.org/git/webwml/packages into...

diff --combined templates/html/homepage.tmpl
index 4befa4fc9a36ede73961c45342e30838b7df3a21,b022b88158fab5ab33b6680f5680b5bb7e90042a..0ea68ca008172ccf6208a25230ebf115e1cc8e6e
--- 1/templates/html/homepage.tmpl
--- 2/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@@ -12,7 -12,7 +12,7 @@@
                        slink  => '2.1',
                        hamm   => '2.0',
                        bo     => '1.3.1'}
-     current_release = 'sarge'
+     current_release = 'etch'
      all_sections = [ 'main', 'contrib', 'non-free' ]
      all_architectures = [ 'alpha', 'amd64', 'arm', 'hppa', 'i386', 'ia64',
                          'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]
@@@ -42,7 -42,6 +42,7 @@@
  <h3>[% g('Search package directories') %]</h3>
  
  <form method="GET" action="/search">
 +<p>
  <label for="kw">[% g('Keyword:') %]</label>
  <input type="text" size="30" name="keywords" id="kw">
  <input type="submit" value="[% g('Search') %]"> <input type="reset" value="[% g('Reset') %]">
@@@ -72,7 -71,6 +72,7 @@@ Distribution
  [% END %]
    <option value="all" selected="selected">[% g('any') %]</option>
  </select>
 +</p>
  </form>
  <p>[% g('There are shortcuts for some searches available:') %]</p>
  <ul>
@@@ -86,7 -84,6 +86,7 @@@
  
  <p>[% g('This search engine allows you to search the contents of %s distributions for any files (or just parts of file names) that are part of packages. You can also get a full list of files in a given package.', organisation) %]<br>
  <form method="GET" action="/search">
 +<p>
  <input type="hidden" name="searchon" value="contents">
  
  <label for="keyword">[% g('Keyword:') %]</label>
@@@ -120,7 -117,6 +120,7 @@@
  [% END %]
    <option value="any" selected="selected">[% g('any') %]</option>
  </select>
 +</p>
  </form>
  
 -[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2009' %]
 +[% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years = '1997 - 2010' %]