From fcd2bb150b475344363d4c994165182533a10573 Mon Sep 17 00:00:00 2001 From: Anthony Dillon Date: Fri, 15 Dec 2023 09:43:14 +0000 Subject: [PATCH 1/2] Update the Ubuntu Pro service description --- templates/legal/ubuntu-pro/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/legal/ubuntu-pro/index.html b/templates/legal/ubuntu-pro/index.html index e1926ef4b38..606cfdc9b69 100755 --- a/templates/legal/ubuntu-pro/index.html +++ b/templates/legal/ubuntu-pro/index.html @@ -35,7 +35,7 @@

Ubuntu Pro

Ubuntu Pro service description

This describes the services we provide to our Ubuntu Pro customers. It mentions several Canonical products, but please note that we can only provide services for the products listed in your customer agreement.

-

View the Ubuntu Pro service description ›

+

View the Ubuntu Pro service description ›

Ubuntu Assurance

From 04c2992e56cf356626a5a0c60ed61739f92f8eba Mon Sep 17 00:00:00 2001 From: Anthony Dillon Date: Fri, 15 Dec 2023 10:56:05 +0000 Subject: [PATCH 2/2] Remove the page and add a redirect --- redirects.yaml | 2 + templates/legal/ubuntu-pro/index.html | 61 --------------------------- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100755 templates/legal/ubuntu-pro/index.html diff --git a/redirects.yaml b/redirects.yaml index bfdb30fa6a0..e3dd6f92379 100644 --- a/redirects.yaml +++ b/redirects.yaml @@ -879,6 +879,8 @@ usn/rss\.xml: "/security/notices/rss.xml" telecommunications/?: "/telco" telcos/?: "/telco" fan/?: "https://wiki.ubuntu.com/FanNetworking" +legal/ubuntu-pro-description/?: "https://assets.ubuntu.com/v1/c7468163-Ubuntu%20Pro%20description%2014.12.23.pdf" +legal/ubuntu-pro-description/jp?: "https://assets.ubuntu.com/v1/c7468163-Ubuntu%20Pro%20description%2014.12.23.pdf" # Community community/canonical/?: "/community/governance/canonical" diff --git a/templates/legal/ubuntu-pro/index.html b/templates/legal/ubuntu-pro/index.html deleted file mode 100755 index 606cfdc9b69..00000000000 --- a/templates/legal/ubuntu-pro/index.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "legal/_base_legal.html" %} - -{% block title %}Ubuntu Pro service description{% endblock %} - -{% block meta_copydoc %}https://docs.google.com/document/d/1p-xlkejIG5ZZhOfGrYnq6rmIpTpaX46yW4HArDtPX1s/edit{% endblock meta_copydoc %} - -{% block content %} -
-
-
-

Ubuntu Pro

-

Ubuntu Pro is Canonical's service package for Ubuntu. It offers tiered levels of support for desktop, server and cloud deployments. In this section, you can see our service description, but don't forget that there will still be some details in your customer agreement that are specific to your deployment.

-

If you're interested in support for an Ubuntu deployment or you're a reseller and you want to offer it to your customers, you can learn more about Ubuntu Pro here.

-
-
-
- {{ - image( - url="https://assets.ubuntu.com/v1/4e72de34-image-document-ubuntuassurance.svg", - alt="Ubuntu Pro", - width="166", - height="200", - hi_def=True, - loading="auto", - attrs={"class": "u-hide--small"}, - ) | safe - }} -
-
-
-
- -
-
-
-

Ubuntu Pro service description

-

This describes the services we provide to our Ubuntu Pro customers. It mentions several Canonical products, but please note that we can only provide services for the products listed in your customer agreement.

-

View the Ubuntu Pro service description ›

-
-
-

Ubuntu Assurance

-

The Ubuntu Pro Assurance Programme provides indemnification from Canonical against claims of intellectual property infringement support customers might face as a result of using Ubuntu. This agreement is part of all Canonical support contracts. -

-

View Ubuntu Pro Assurance ›

-
-
-
-
-

Ubuntu Pro terms

-

This agreement sets out Canonical's standard service terms for Ubuntu Pro customers.

-

View the Ubuntu Pro service terms ›

-
-
-

Ubuntu Pro Personal terms

-

The terms of service of the free personal use of Ubuntu Pro on up to 5 machines

-

View the Ubuntu Pro Personal service terms ›

-
-
-
- -{% endblock content %}