Merge pull request canonical#13579 from lizzochek/task/WD-8569

WD-8569 - refresh service terms

templates/legal/ubuntu-pro-service-terms/2015-06-24.html

@@ -1,7 +1,7 @@
 {% extends "legal/_base_legal.html" %}
 
-{% block title %}Short form services agreement | 2015-06-24{% endblock %}
-{% block meta_description %}Ubuntu and Canonical Legal - Short form services agreement{% endblock %}
+{% block title %}Ubuntu Pro service terms | 2015-06-24{% endblock %}
+{% block meta_description %}Ubuntu and Canonical Legal - Ubuntu Pro service terms{% endblock %}
 {% block meta_copydoc %}https://docs.google.com/document/d/1Hlto3k8FUPns9INEpPGJ90cK_Mtmn0ya5W6Cx88RAzM/edit{% endblock meta_copydoc %}
 
 {% block content %}

templates/legal/ubuntu-pro-service-terms/2015-09-09.html

@@ -1,7 +1,7 @@
 {% extends "legal/_base_legal.html" %}
 
-{% block title %}Short Form Services Agreement | 2015-09-09{% endblock %}
-{% block meta_description %}Ubuntu and Canonical Legal - Short form services agreement{% endblock %}
+{% block title %}Ubuntu Pro service terms | 2015-09-09{% endblock %}
+{% block meta_description %}Ubuntu and Canonical Legal - Ubuntu Pro service terms{% endblock %}
 {% block meta_copydoc %}https://docs.google.com/document/d/12UDLzKWVhXAeBsCFUvud4X4ACb5NsZ5lRcpOUrdlCqk/edit{% endblock meta_copydoc %}
 
 {% block content %}

templates/legal/ubuntu-pro-service-terms/2016-05-20.html

@@ -1,7 +1,7 @@
 {% extends "legal/_base_legal.html" %}
 
-{% block title %}Short Form Services Agreement | 2016-05-20{% endblock %}
-{% block meta_description %}Ubuntu and Canonical Legal - Short form services agreement{% endblock %}
+{% block title %}Ubuntu Pro service terms | 2016-05-20{% endblock %}
+{% block meta_description %}Ubuntu and Canonical Legal - Ubuntu Pro service terms{% endblock %}
 {% block meta_copydoc %}https://docs.google.com/document/d/1EK4AF_16oJOfRwu0_Kvw0R4p-4jd-y5B8LxcPjbuO7g/edit{% endblock meta_copydoc %}
 
 {% block content %}

templates/legal/ubuntu-pro-service-terms/2016-06-24.html

@@ -1,7 +1,7 @@
 {% extends "legal/_base_legal.html" %}
 
-{% block title %}Short Form Services Agreement | 2016-06-24{% endblock %}
-{% block meta_description %}Ubuntu and Canonical Legal - Short form services agreement{% endblock %}
+{% block title %}Ubuntu Pro service terms | 2016-06-24{% endblock %}
+{% block meta_description %}Ubuntu and Canonical Legal - Ubuntu Pro service terms{% endblock %}
 {% block meta_copydoc %}https://drive.google.com/drive/folders/0B3hNyKyLEnE6clUxQndBME5uRXM{% endblock meta_copydoc %}
 
 {% block content %}

templates/legal/ubuntu-pro-service-terms/2019-02-11.md

@@ -1,8 +1,8 @@
 ---
 wrapper_template: "legal/ubuntu-pro-service-terms/_base_uast_markdown.html"
 context:
-  title: "Short form services agreement | 2019-02-11"
-  description: "Ubuntu and Canonical Legal - Short form services agreement"
+  title: "Ubuntu Pro service terms | 2019-02-11"
+  description: "Ubuntu and Canonical Legal - Ubuntu Pro service terms"
   copydoc: https://docs.google.com/document/d/1W0WJrXaIvC54MDPgS62xfgPhqJaSE7RcZ2mjIqz1Y2o/edit
 ---
 

templates/legal/ubuntu-pro-service-terms/_base_uast_markdown.html

@@ -9,13 +9,14 @@
     <div class="p-strip is-deep">
       <div class="row" id="service-description">
         <div class="col-8 l-legal-pages">
-{{ content | safe }}
+          {{ content | safe }}
         </div>
         <div class="col-4">
           <nav>
             <div class="p-card">
               <h3>Older versions</h3>
               <ul class="p-list">
+                <li class="p-list__item"><a href="/legal/ubuntu-pro-service-terms/2023-01-25">25 January 2023&nbsp;&rsaquo;</a></li>
                 <li class="p-list__item"><a href="/legal/ubuntu-pro-service-terms/2019-02-11">11 February 2019&nbsp;&rsaquo;</a></li>
                 <li class="p-list__item"><a href="/legal/ubuntu-pro-service-terms/2016-06-24">24 June 2016&nbsp;&rsaquo;</a></li>
                 <li class="p-list__item"><a href="/legal/ubuntu-pro-service-terms/2016-05-20">20 May 2016&nbsp;&rsaquo;</a></li>

templates/legal/ubuntu-pro-service-terms/ja.html

@@ -136,7 +136,7 @@ <h2>準拠法</h2>
       <div class="p-card">
         <h3>英訳</h3>
         <ul class="p-list">
-          <li class="p-list__item"><a href="/legal/ubuntu-pro-service-terms">Short Form Services Agreement&nbsp;&rsaquo;</a></li>
+          <li class="p-list__item"><a href="/legal/ubuntu-pro-service-terms">Ubuntu Pro service terms&nbsp;&rsaquo;</a></li>
         </ul>
       </div>
     </nav>

templates/ubuntu-ia.csv

@@ -111,7 +111,7 @@
 "Ubuntu Advantage service description | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-description/ja/"
 "Ubuntu Advantage service description | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-description/"
 "Ubuntu Advantage | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage/"
-"Short Form Services Agreement | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage/ua-terms/"
+"Ubuntu Pro service terms | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage/ua-terms/"
 "Ubuntu Assurance | Ubuntu Advantage | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-assurance/"
 "UA 略式サービス契約 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage/ua-terms-ja/"
 "Developer terms and conditions | Ubuntu", "https://www.ubuntu.com/legal/developer-terms-and-conditions/"
@@ -138,12 +138,12 @@
 "BootStack | Ubuntu", "https://www.ubuntu.com/legal/managed-services/"
 "BootStack privacy information | Ubuntu", "https://www.ubuntu.com/legal/managed-services-privacy/"
 "Dell Ubuntu Advantage Reseller end user terms | Ubuntu", "https://www.ubuntu.com/legal/ua-dell-tc/"
-"Short Form Services Agreement | 2016-05-20 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2016-05-20/"
+"Ubuntu Pro service terms | 2016-05-20 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2016-05-20/"
 "UA 略式サービス契約 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/ja/"
-"Short Form Services Agreement | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/"
-"Short Form Services Agreement | 2015-09-09 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-09-09/"
-"Short form services agreement | 2015-06-24 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-06-24/"
-"Miracle Linux - UA Short Form Services Agreement | Ubuntu", "https://www.ubuntu.com/legal/ua-miracle-tc/"
+"Ubuntu Pro service terms | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/"
+"Ubuntu Pro service terms | 2015-09-09 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-09-09/"
+"Ubuntu Pro service terms | 2015-06-24 | Ubuntu", "https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-06-24/"
+"Miracle Linux - UA Ubuntu Pro service terms | Ubuntu", "https://www.ubuntu.com/legal/ua-miracle-tc/"
 "Thank you | Support | Ubuntu", "https://www.ubuntu.com/support/thank-you/"
 "Support and management tools | Ubuntu", "https://www.ubuntu.com/support/"
 "Community support | Ubuntu", "https://www.ubuntu.com/support/community-support/"

templates/ubuntu-ia.txt

@@ -110,7 +110,7 @@ Miracle Linux - UA 略式サービス契約 | Ubuntu	https://www.ubuntu.com/lega
 Ubuntu Advantage service description | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage/service-description-ja/
 Ubuntu Advantage service description | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage/service-description/
 Ubuntu Advantage | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage/
-Short Form Services Agreement | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage/ua-terms/
+Ubuntu Pro service terms | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage/ua-terms/
 Ubuntu Assurance | Ubuntu Advantage | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-assurance/
 UA 略式サービス契約 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage/ua-terms-ja/
 Developer terms and conditions | Ubuntu	https://www.ubuntu.com/legal/developer-terms-and-conditions/
@@ -137,12 +137,12 @@ BootStack services description | Ubuntu	https://www.ubuntu.com/legal/managed-ser
 BootStack | Ubuntu	https://www.ubuntu.com/legal/managed-services/
 BootStack privacy information | Ubuntu	https://www.ubuntu.com/legal/managed-services-privacy/
 Dell Ubuntu Advantage Reseller end user terms | Ubuntu	https://www.ubuntu.com/legal/ua-dell-tc/
-Short Form Services Agreement | 2016-05-20 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2016-05-20/
+Ubuntu Pro service terms | 2016-05-20 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2016-05-20/
 UA 略式サービス契約 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/ja/
-Short Form Services Agreement | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/
-Short Form Services Agreement | 2015-09-09 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-09-09/
-Short form services agreement | 2015-06-24 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-06-24/
-Miracle Linux - UA Short Form Services Agreement | Ubuntu	https://www.ubuntu.com/legal/ua-miracle-tc/
+Ubuntu Pro service terms | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/
+Ubuntu Pro service terms | 2015-09-09 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-09-09/
+Ubuntu Pro service terms | 2015-06-24 | Ubuntu	https://www.ubuntu.com/legal/ubuntu-advantage-service-terms/2015-06-24/
+Miracle Linux - UA Ubuntu Pro service terms | Ubuntu	https://www.ubuntu.com/legal/ua-miracle-tc/
 Thank you | Support | Ubuntu	https://www.ubuntu.com/support/thank-you/
 Support and management tools | Ubuntu	https://www.ubuntu.com/support/
 Community support | Ubuntu	https://www.ubuntu.com/support/community-support/