Merge main into feature branch

meganav.yaml

@@ -140,7 +140,7 @@ products:
               url: /server
             - title: Landscape
               description: Monitor and manage machines
-              url: https://landscape.canonical.com/
+              url: /landscape
             - title: MAAS
               description: Bare metal provisioning
               url: https://maas.io/
@@ -255,6 +255,9 @@ products:
             - title: Certifications and hardening
               description: CIS, DISA-STIG, FIPS compliance
               url: /security/certifications
+            - title: Confidential computing
+              description: Protect your data in use
+              url: /confidential-computing
 
       secondary_links:
         - title: Quick links
@@ -492,6 +495,9 @@ use_case:
         - title: Signage
           description: Smart displays and kiosks
           url: /internet-of-things/smart-displays
+        - title: Storage
+          description: Scalable software-defined storage
+          url: /ceph
 
   highlighted_secondary_links:
     - title: By industry
@@ -677,9 +683,12 @@ community:
             - title: Report bugs
               description: Report bugs on Launchpad
               url: https://help.ubuntu.com/community/ReportingBugs
-            - title: Software development
+            - title: Ubuntu development
+              description: Help maintain Ubuntu OS
+              url: /community/contribute/ubuntu-development
+            - title: Application development
               description: Create and maintain software
-              url: /community/contribute/software-development
+              url: /community/contribute/application-development
             - title: Improve documentation
               description: Help write the docs
               url: https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation
@@ -886,8 +895,6 @@ get_ubuntu:
               url: /download/iot/intel-iotg
             - title: Intel NUC
               url: /download/intel-nuc
-            - title: KVM
-              url: /download/kvm
             - title: Qualcomm Dragonboard 410c
               url: /download/qualcomm-dragonboard-410c
             - title: Intel IEI TANK 870

static/files/site.webmanifest

@@ -0,0 +1,19 @@
+{
+  "name": "Canonical Ubuntu",
+  "short_name": "",
+  "icons": [
+    {
+      "src": "https://assets.ubuntu.com/v1/9c69b268-COF%20android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "https://assets.ubuntu.com/v1/c55060fd-COF%20android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}

templates/desktop/developers.html

@@ -47,19 +47,6 @@ <h2 class="p-text--small-caps u-no-margin--bottom">Why choose Ubuntu Desktop?</h
       <p class="p-heading--2">The developers' choice</p>
     </div>
     <div class="col">
-      <div class="u-align--center">
-        {{ 
-          image (
-          url="https://assets.ubuntu.com/v1/7f76ac3a-hp-laptop-studio-jammy.png",
-          alt="",
-          width="1659",
-          height="1246",
-          hi_def=True,
-          loading="lazy"
-          ) | safe
-        }}
-      </div>
-      <hr class="is-extra-muted" />
       <ul class="p-list--divided u-no-margin--bottom">
         <li class="p-list__item is-ticked">Using Ubuntu Desktop provides a common platform for development, test, and production environments.</li>
         <li class="p-list__item is-ticked">Tools, such as <a href="https://juju.is/">Juju</a>, <a href="https://microk8s.io/">Microk8s</a>, and <a href="https://multipass.run/">Multipass</a> make developing, testing, and cross-building easy and affordable.</li>

templates/hpe/index.html

@@ -163,7 +163,7 @@ <h2>Proven results from collaborative solutions</h2>
       <div class="p-logo-section__items">
         <div class="p-logo-section__item"><img class="p-logo-section__logo" src="https://assets.ubuntu.com/v1/6cd78b57-at%26t-logo.png" alt=""></div>
         <div class="p-logo-section__item"><img class="p-logo-section__logo" src="https://assets.ubuntu.com/v1/a3bb7ca4-mercedes-benz-group-logo.png" alt=""></div>
-        <div class="p-logo-section__item"><img class="p-logo-section__logo" src="https://assets.ubuntu.com/v1/1459d379-tmn_logo.png" alt=""></div>
+        <div class="p-logo-section__item"><img class="p-logo-section__logo" src="https://assets.ubuntu.com/v1/d6df40cd-tmn_logo.png" alt=""></div>
         <div class="p-logo-section__item"><img class="p-logo-section__logo" src="https://assets.ubuntu.com/v1/1dc7af1e-panasonic-logo.png" alt=""></div>
         <div class="p-logo-section__item"><img class="p-logo-section__logo" src="https://assets.ubuntu.com/v1/4af3ad39-barclays-logo.png" alt=""></div>
       </div>

templates/internet-of-things/smart-displays.html

@@ -196,10 +196,10 @@ <h2>Partners</h2>
         <a href="https://www.screenly.io/">
           {{
             image(
-              url="https://assets.ubuntu.com/v1/3eb6002c-screenly+box-logo-horizontal+purple+%281%29.png",
+              url="https://assets.ubuntu.com/v1/be292257-Dark%20Logo.svg",
               alt="Screenly",
-              width="166",
-              height="80",
+              width="200",
+              height="46",
               hi_def=True,
               loading="lazy"
             ) | safe
@@ -209,7 +209,7 @@ <h2>Partners</h2>
       <hr class="u-sv1 u-hide--small" />
       <h3 class="p-card__title">Screenly</h3>
       <p class="p-card__content">Screenly provides the hardware and software you need to manage digital signs at scale. Update and schedule content, monitor screen health, and show content from your existing tech stack.</p>
-      <a href="https://www.screenly.io/"">Learn more about Screenly&nbsp;&rsaquo;</a>
+      <a href="https://www.screenly.io/">Learn more about Screenly&nbsp;&rsaquo;</a>
     </div>
     <div class="col-4 p-card">
       <header class="no-border u-align--center u-vertically-center u-hide--small" style="min-height: 7rem;">

templates/kubernetes/charmed-k8s.html

@@ -119,7 +119,7 @@ <h3 class="p-heading--4">Streamlined cluster lifecycle management with Charmed O
   </div>
   <div class="row">
     <div class="col-12">
-      <p><a href="https://juju.is/">Learn more about the Charmed Operator Framework&nbsp;&rsaquo;</a></p>
+      <p><a href="https://juju.is/">Learn more about Juju, an orchestration engine for software operators&nbsp;&rsaquo;</a></p>
       <p>Need help to tackle the K8s complexity? <a href="/kubernetes/managed">Let us manage Kubernetes for you&nbsp;&rsaquo;</a></p>
     </div>
   </div>

templates/legal/ubuntu-pro-service-terms/index.md

@@ -34,7 +34,7 @@ When used in this Agreement, the following terms mean:
 
 **Licensed IP**: Canonical’s Intellectual Property Rights in the Software and Services.
 
-**Order**: If Customer is buying Services directly from Canonical: Customer's order for Services which incorporates this Agreement and identifies Customer's name, contact information, Services, fees. An Order may be in the form of a statement of work. If Customer is buying Services through Canonical's reseller: Customer's agreement to purchase the Services and pay applicable fees.
+**Order**: If Customer is buying Services directly from Canonical: Customer's order for Services which incorporates this Agreement and identifies Customer's name, contact information, Services, and fees. An Order may be in the form of a statement of work. If Customer is buying Services through Canonical's reseller: Customer's agreement to purchase the Services and pay applicable fees.
 
 **Registration Process**: The process under which a Customer registers with Canonical to receive Services purchased through Canonical's reseller.
 

templates/templates/base.html

@@ -22,8 +22,12 @@
 
   <link rel="canonical" href="{% block canonical_url %}{{ request.url }}{% endblock %}">
 
-  <link rel="shortcut icon" href="https://assets.ubuntu.com/v1/49a1a858-favicon-32x32.png" type="image/x-icon">
-  <link rel="apple-touch-icon" href="https://assets.ubuntu.com/v1/17b68252-apple-touch-icon-180x180-precomposed-ubuntu.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="https://assets.ubuntu.com/v1/f38b9c7e-COF%20apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="https://assets.ubuntu.com/v1/be7e4cc6-COF-favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="https://assets.ubuntu.com/v1/16c27f81-COF%20favicon-16x16.png">
+  <link rel="manifest" href="{{ versioned_static('files/site.webmanifest') }}">
+  <!-- Serving favicon for search engines locally -->
+  <link rel="icon" type="image/png" sizes="48x48" href="{{ versioned_static('favicons/COF-favicon-48x48.png') }}">
 
   {% block head_extra %}{% endblock %}