Merge branch 'master' into ubuntu-master

Conflicts:

	templates/config.tmpl

diff --cc conf/apache.conf.sed.in
index c79e41ec4fc000b7bdcda1b71c43b3eaa94a0a7f,eba66647e2b9b35d243e56f9445e64df864bc0d4..10e2521e23acfc8bea994f52afc45126e3baaa69
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -107,9 -108,9 +108,10 @@@
     RewriteRule ^/changelogs/ - [L]
     RewriteRule ^/Pics/ - [L]
     RewriteRule ^/about/ - [L]
 +   RewriteRule ^/ubuntu/ - [L]
     RewriteRule ^/[^/]+\.css - [L]
     RewriteRule ^/[^/]+\.js - [L]
+    RewriteRule ^/favicon.ico$ - [L]
  
  #   RewriteRule ^/$ http://www.debian.org/distrib/packages
     RewriteRule ^/$ /index.html [L]

diff --cc static/index.tmpl
Simple merge

diff --cc templates/config.tmpl
index 8cc3a273d37a42bb33f0b087a15d94c78efd03f5,e4ccf7210df2a181afd7048e4d45b635413d746e..d08c26a7df0a3360719cb1270c017359260ae966
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,9 -3,9 +3,9 @@@
     po_lang = 'en'
     ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   organisation = 'Ubuntu'
-    homepage = 'http://www.ubuntu.com/'
++   project_homepage = 'http://www.ubuntu.com/'
 +   packages_homepage = 'http://packages.ubuntu.com/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -14,38 -13,38 +14,38 @@@
     pts_url = 'http://packages.qa.debian.org/'
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
 -   mirror_url = 'http://ftp.debian.org/'
 -   security_mirror = 'security.debian.org'
 -   security_mirror_url = security_mirror _ '/debian-security'
 -   security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   mirror_url = 'http://archive.ubuntu.com/'
 +   security_mirror = 'security.ubuntu.com'
 +   security_mirror_url = security_mirror _ '/ubuntu'
 +   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'
++#   cn_help_url = project_homepage _ 'intro/cn'
     logo = {
-       url => homepage,
+       url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',
          alt => organisation,
     }
     copyright = {
 -      url => 'http://www.spi-inc.org/',
 -        name => 'SPI Inc.',
 -        years => '1997 - ' _ timestamp.year,
 +      url => 'http://www.canonical.com/',
 +        name => 'Canonical Ltd.',
 +        years => timestamp.year,
     }
     license = {
-       url => homepage _ 'legal'
 -      url => project_homepage _ 'license'
++      url => project_homepage _ 'legal'
     }
     trademark = {
        name => copyright.name,
-       url => homepage _ 'trademark'
+       url => project_homepage _ 'trademark'
     }
     contact = {
 -      name => g('Debian Web Mailinglist'),
 -      mail => 'debian-www@lists.debian.org',
 -        url => project_homepage _ 'contact',
 +      name => 'Frank Lichtenheld',
 +      mail => 'frank@lichtenheld.de',
-         url => homepage _ 'support',
++        url => project_homepage _ 'support',
     }
     admin = {
 -      name => g('%s Webmaster', organisation),
 -      mail => 'webmaster@debian.org',
 +      name => 'Frank Lichtenheld',
 +      mail => 'frank@lichtenheld.de',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
  -%]

diff --cc templates/html/foot.tmpl
Simple merge

diff --cc templates/html/head.tmpl
index c0923f81bafd06352c5d28a4e4a9e01936203bc8,9aed6a27c138e6fa93118c48180cdc56bc7e847a..8fbe1b7d2ebf6de16798133f7dd68000d2667bc2
--- 1/templates/html/head.tmpl
--- 2/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@@ -59,22 -55,13 +59,22 @@@
  <span style="font-size: 60%"><a href="[% searchformurl %]">[% g('all options') %]</a></span>
  </div> <!-- end hpacketsearch -->
  </form>
 +</div>
  [% END %]
  
 -</div> <!-- end upperheader -->
 +     <!-- masthead content begin -->
 +    <h5 class="hiddenStructure">Sections</h5>    
 +    <div id="nav">
 +      <ul>        
 +      </ul>
 +    </div> <!-- nav -->
 +    <!-- masthead content end -->
 +    </div> <!-- masthead -->
 +   </div>  <!-- mastWrapper -->
  
 -<p class="hidecss"><a href="#inner">[% g('skip the navigation') %]</a></p>
 +<div class="visualClear"></div>
  <div id="pnavbar">
-  &gt;&gt; <a href="[% homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
+  &gt;&gt; <a href="[% project_homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
   &gt;&gt; <a href="[% packages_homepage %]" title="[% g('%s Packages Homepage', organisation) %]">[% g('Packages') %]</a>
  [% FOREACH n IN navigation %]
   &gt;&gt; [% IF n.url %]<a href="[% n.url %]" [% IF n.title %]title="[% n.title %]"[% END %]>[% n.name %]</a>[% ELSE %][% n.name %][% END %]