From 291a6dcebb594fdcc5ce1e50b024fe6303b0d596 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 8 Oct 2019 16:01:02 +0100 Subject: [PATCH 01/20] Initial cut of 19.10 release variables and download pages --- releases.yaml | 14 +++---- sitemap.xml.gz | Bin 0 -> 14393 bytes templates/download/alternative-downloads.html | 6 +-- templates/download/desktop/index.html | 16 ++++---- templates/download/flavours.html | 5 +-- templates/download/server/index.html | 38 +++++++++--------- 6 files changed, 38 insertions(+), 41 deletions(-) create mode 100644 sitemap.xml.gz diff --git a/releases.yaml b/releases.yaml index f063e00afe2..10456b9f34b 100644 --- a/releases.yaml +++ b/releases.yaml @@ -1,23 +1,23 @@ latest: - slug: DiscoDingo - short_version: "19.04" - full_version: "19.04" - eol: January 2020 + slug: EoanErmine + short_version: "19.10" + full_version: "19.10" + eol: July 2020 lts: slug: BionicBeaver short_version: "18.04" full_version: "18.04.3" eol: April 2023 openstack_lts: - slug: Queens + slug: Train previous_lts: short_version: "16.04" full_version: "16.04.6" checksums: desktop: - "19.04": 2da6f8b5c65b71b040c5c510311eae1798545b8ba801c9b63e9e3fd3c0457cbe *ubuntu-19.04-desktop-amd64.iso + "19.10": 9846a5b513b50deea86da7ae9d5726d8f0ca9c89c925417d474f3679909b4bac *ubuntu-19.10-beta-desktop-amd64.iso "18.04.3": add4614b6fe3bb8e7dddcaab0ea97c476fbd4ffe288f2a4912cb06f1a47dcfa0 *ubuntu-18.04.3-desktop-amd64.iso live-server: - "19.04": 25d483341ccd0d522a6660b00db933787c86c47b42f1845bcf997127f4b61e9d *ubuntu-19.04-live-server-amd64.iso + "19.10": 4579d4f98c4ac9d3a8ae8c75dc471e6a4034f5600ac005bf06552d230ada80c1 *ubuntu-19.10-beta-live-server-amd64.iso "18.04.3": b9beac143e36226aa8a0b03fc1cbb5921cff80123866e718aaeba4edb81cfa63 *ubuntu-18.04.3-live-server-amd64.iso diff --git a/sitemap.xml.gz b/sitemap.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..cf4e8c145df3171d6be3be42782ef54169421931 GIT binary patch literal 14393 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 literal 0 HcmV?d00001 diff --git a/templates/download/alternative-downloads.html b/templates/download/alternative-downloads.html index 55393ec084c..0d55eb89243 100755 --- a/templates/download/alternative-downloads.html +++ b/templates/download/alternative-downloads.html @@ -41,21 +41,21 @@

BitTorrent

-
+ -
+ -
+

Ubuntu {{ releases.previous_lts.full_version }} LTS

  • Ubuntu {{ releases.previous_lts.full_version }} Desktop (64-bit)
  • diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html index 694e78b3734..57e609bc05e 100755 --- a/templates/download/desktop/index.html +++ b/templates/download/desktop/index.html @@ -15,8 +15,8 @@

    Download Ubuntu Desktop

    Ubuntu {{ releases.lts.full_version }} LTS

    -

    Download the latest LTS version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support — which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.

    -

    Ubuntu {{ releases.lts.short_version }} LTS release notes

    +

    Download the latest LTS version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support — which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.

    +

    Ubuntu {{ releases.lts.short_version }} LTS release notes

    Recommended system requirements:

    • 2 GHz dual core processor or better
    • @@ -27,7 +27,7 @@

      Ubuntu {{ releases.lts.full_version }} LTS

    -

    +

    Download

    @@ -41,15 +41,15 @@

    Ubuntu {{ releases.lts.full_version }} LTS

    Ubuntu {{ releases.latest.full_version }}

    -

    The latest version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{ releases.latest.full_version }} comes with nine months, until {{ releases.latest.eol }}, of security and maintenance updates.

    -

    Ubuntu {{ releases.latest.short_version }} release notes

    -

    Recommended system requirements are the same as for Ubuntu {{ releases.lts.full_version }} LTS.

    +

    The latest version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{ releases.latest.full_version }} comes with nine months, until {{ releases.latest.eol }}, of security and maintenance updates.

    +

    Recommended system requirements are the same as for Ubuntu {{ releases.lts.full_version }} LTS.

    +

    Ubuntu {{ releases.latest.short_version }} release notes

    diff --git a/templates/download/flavours.html b/templates/download/flavours.html index 82c51b8b03d..f1a98894286 100644 --- a/templates/download/flavours.html +++ b/templates/download/flavours.html @@ -5,7 +5,7 @@ {% block meta_copydoc %}https://docs.google.com/document/d/1M5nkigcSRzq1YVjiXOZkeU4EUCqT0uYBR3Y_sjxM-wM/edit{% endblock meta_copydoc %} {% block content %} -
    +

    Ubuntu flavours

    @@ -15,9 +15,6 @@

    Ubuntu flavours

    and updates.

    -
    - -
    diff --git a/templates/download/server/index.html b/templates/download/server/index.html index 17368263b05..11f577ff23c 100755 --- a/templates/download/server/index.html +++ b/templates/download/server/index.html @@ -11,23 +11,23 @@

    Download Ubuntu Server

    -
    -
    +
    +

    Ubuntu Server {{ releases.lts.full_version }} LTS

    -
    +
    -

    +

    The long-term support version of Ubuntu Server, including the {{ releases.openstack_lts.slug }} release of OpenStack and support guaranteed until {{ releases.lts.eol }} — 64-bit only.

    -

    +

    This release uses our new installer, Subiquity. If you need support for options not implemented in Subiquity, such as encrypted filesystem support, the traditional installer can be found on the alternative downloads page.

    -

    +

    Ubuntu Server {{ releases.lts.short_version }} LTS release notes

    -

    +

    Download

    @@ -37,20 +37,20 @@

    Ubuntu Server {{ releases.lts.full_version }} LTS

    -
    -
    +
    +

    Ubuntu Server {{ releases.latest.full_version }}

    -
    +
    -

    +

    The latest version of Ubuntu Server, including nine months of security and maintenance updates, until {{ releases.latest.eol }}.

    -

    +

    Ubuntu Server {{ releases.latest.short_version }} release notes

    -

    +

    Download

    @@ -106,28 +106,28 @@

    Alternative architectures

    Ubuntu Server for ARM

    -

    +

    Optimised for hyperscale deployments and certified on a number of ARM chipsets, including HP, Cavium, Applied Micro and Marvell — Ubuntu Server for ARM includes the 64-bit ARMv8 platforms.

    -

    +

    Get Ubuntu Server for ARM ›

    Ubuntu for POWER

    -

    +

    Ubuntu is available on the IBM POWER platform, bringing the entire Ubuntu and OpenStack ecosystem to IBM POWER.

    -

    +

    Get Ubuntu for POWER ›

    Ubuntu for IBM Z

    -

    +

    IBM Z and LinuxONE leverage open technology solutions to meet the demands of the new application economy. Ubuntu is now available, with Juju and Ubuntu OpenStack.

    -

    +

    Get Ubuntu for IBM Z ›

    From 0ec3d965690c907f73465006397656235f4163b5 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 9 Oct 2019 11:55:06 +0100 Subject: [PATCH 02/20] Update What's new in 19.10 for /desktop/developers --- templates/desktop/developers.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html index 968f4d56b37..56b52c98cee 100755 --- a/templates/desktop/developers.html +++ b/templates/desktop/developers.html @@ -49,8 +49,7 @@

    Why use Ubuntu for development?

    With Ubuntu, you’re in good company

    Ubuntu is used by thousands of development teams around the world because of its versatility, reliability, constantly updated features, and extensive developer libraries.

    -

    If you’re managing developers, Ubuntu is the best way to increase your team’s productivity and guarantee a smooth transition from development all the way to production. Ubuntu is the world’s most popular open source OS for both development and deployment, from the data centre to the cloud.

    -

    And, as the Ubuntu OS converges, these same applications will be able to run on desktop, tablets, phone and even on the Internet of Things — one application across our full range of devices.

    +

    If you’re managing developers, Ubuntu is the best way to increase your team’s productivity and guarantee a smooth transition from development all the way to production. Ubuntu is the world’s most popular open source OS for both development and deployment, from the data centre to the cloud to the Internet of Things.

    Learn more about Ubuntu’s cloud offering ›

    @@ -89,10 +88,10 @@

    What’s new in Ubuntu {{ releases.latest.short_version }}?

    • Thousands of updated snaps and packages such as Spotify, VLC, Skype, Slack, Discord, Visual Studio Code and Telegram
    • -
    • The latest version of the GNOME Desktop including many performance upgrades and reduced memory footprint
    • -
    • New fractional scaling allows you to scale your displays independently - available for Wayland and as an experimental option for Xorg
    • -
    • Improved experience for alt-tab, Ubuntu dock and right click
    • -
    • Installing Ubuntu desktop on VMware will now automatically install open-vm-tools providing greater integration between Ubuntu and the host system
    • +
    • The fastest and most responsive GNOME Desktop, featuring improved settings for wifi, wallpaper and application groups in the Activities overview
    • +
    • Plugging in a USB drive now automatically display the device on the launcher giving you instant access to your files
    • +
    • Nvidia hardware is now supported out of the box. Now you can be up and running with your Nvidia graphics card from the moment you install
    • +
    • Support for ZFS as your root filesystem. When coupled with the new zsys package you get access to modern features such as file system snapshotting, rolling backwards and forwards between snapshots and automated snapshots. Note, this is an experimental feature.

    Read the full release notes

    From 839b4c0dcb4341534b66fcab4edda380a80c45f7 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 9 Oct 2019 12:33:51 +0100 Subject: [PATCH 03/20] Remove copyable link on the verify step --- templates/download/desktop/thank-you.html | 2 +- templates/download/server/thank-you.html | 2 +- templates/download/shared/_verify-checksums.html | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/templates/download/desktop/thank-you.html b/templates/download/desktop/thank-you.html index 3d619db077b..17ac2d06d16 100755 --- a/templates/download/desktop/thank-you.html +++ b/templates/download/desktop/thank-you.html @@ -28,7 +28,7 @@
    -
    +
    {% if start_download %}

    Thank you for downloading Ubuntu Desktop

    Your download should start automatically. If it doesn’t, diff --git a/templates/download/server/thank-you.html b/templates/download/server/thank-you.html index 5df45f646d5..5d11fba674f 100755 --- a/templates/download/server/thank-you.html +++ b/templates/download/server/thank-you.html @@ -16,7 +16,7 @@

    -
    +

    Thank you for downloading Ubuntu Server

    {% if version and architecture %}

    Your download should start automatically. If it doesn’t, diff --git a/templates/download/shared/_verify-checksums.html b/templates/download/shared/_verify-checksums.html index 5f8ead34f38..0ca18afd799 100644 --- a/templates/download/shared/_verify-checksums.html +++ b/templates/download/shared/_verify-checksums.html @@ -5,10 +5,7 @@

    +
    +
    +
    + webinar +
    +
    +
    +

    + What’s new in Ubuntu 19.10 +

    +

    Ubuntu 19.10 includes enhanced K8s capabilities for edge and AI/ML, OpenStack Train live-migration extensions for easier infrastructure deployments and more.

    +
    +
    diff --git a/templates/index.html b/templates/index.html index 522d78fb36b..2397673bb34 100755 --- a/templates/index.html +++ b/templates/index.html @@ -33,10 +33,7 @@ {% include "takeovers/_french_takeover_openstack_made_easy.html" %} {% include "takeovers/_french_14-04-esm.html" %} {# ALL #} - {% include "takeovers/_vmware-to-charmed-openstack.html" %} - {% include "takeovers/_buy-ubuntu-advantage.html" %} - {% include "takeovers/_deep-tech-webinar-takeover.html" %} - {% include "takeovers/_edge-month_takeover.html" %} + {% include "takeovers/_1910_takeover.html" %} {% endblock takeover_content %} diff --git a/templates/takeovers/_1910_takeover.html b/templates/takeovers/_1910_takeover.html new file mode 100644 index 00000000000..5e6390ccf0b --- /dev/null +++ b/templates/takeovers/_1910_takeover.html @@ -0,0 +1,14 @@ +{% with title="What’s new in Ubuntu 19.10", +subtitle="Ubuntu 19.10 includes enhanced K8s capabilities for edge and AI/ML, OpenStack Train live-migration extensions for easier infrastructure deployments and more.", +header_image="https://assets.ubuntu.com/v1/76095fd7-1910-eoan-ermine-mascot-white.svg", +image_style="", +image_hide_small=true, +equal_cols="", +primary_url="/download", +primary_cta="Get Ubuntu", +primary_cta_class="p-button--positive", +secondary_url="/engage/19-10-webinar", +secondary_cta="Register for the webinar", +locale="en_GB" %} + {% include "takeovers/_template.html" %} +{% endwith %} diff --git a/templates/takeovers/index.html b/templates/takeovers/index.html index d29db2197b1..847f332daac 100644 --- a/templates/takeovers/index.html +++ b/templates/takeovers/index.html @@ -85,4 +85,8 @@ {% include "takeovers/_buy-ubuntu-advantage.html" %}

    11 Sept 2019

    {% include "takeovers/_get-started-with-ai-part-2.html" %} +{% include "takeovers/_deep-tech-webinar-takeover.html" %} +{% include "takeovers/_edge-month_takeover.html" %} +

    17 Oct 2019

    +{% include "takeovers/_1910_takeover.html" %} {% endblock %} From b55211d8963ade13e0f4e173ad684d48a41172e4 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 15 Oct 2019 06:51:37 +0100 Subject: [PATCH 06/20] Add links to engage page --- templates/engage/19-10-webinar.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/engage/19-10-webinar.md b/templates/engage/19-10-webinar.md index a9bfb1b86c1..1207c570067 100644 --- a/templates/engage/19-10-webinar.md +++ b/templates/engage/19-10-webinar.md @@ -21,8 +21,8 @@ Highlights of the 19.10 release updates will be discussed between Ubuntu product In this webinar you will learn about: -- New edge and AI capabilities for Kubernetes for a secure, production-grade Kubernetes environment -- The inclusion of OpenStack Train updates, including live-migration to aid infrastructure operations +- New edge and AI capabilities for [Kubernetes](/kubernetes) for a secure, production-grade Kubernetes environment +- The inclusion of [OpenStack](/openstack) Train updates, including live-migration to aid infrastructure operations - Additional hardware support, including the Raspberry Pi 4 and NVIDIA drivers enabled in the desktop image - Desktop performance improvements with GNOME 3.34, delivering a more responsive, smooth and organised experience From 8b83aa6b504d39d98e38148b3c659a14230a6d20 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 15 Oct 2019 10:37:33 +0100 Subject: [PATCH 07/20] Update mascot on /download --- templates/download/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/download/index.html b/templates/download/index.html index e6ce55865d2..7712c5686cb 100755 --- a/templates/download/index.html +++ b/templates/download/index.html @@ -30,7 +30,7 @@

    - Disco Dingo pictogram + Eoan Ermine pictogram
    From a8c7769b456960f55ef7ad16f126b829c6d3f0ce Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Tue, 15 Oct 2019 11:35:52 +0100 Subject: [PATCH 08/20] Embed the svg to get the blend mode to work --- templates/takeovers/_1910_takeover.html | 473 +++++++++++++++++++++++- 1 file changed, 459 insertions(+), 14 deletions(-) diff --git a/templates/takeovers/_1910_takeover.html b/templates/takeovers/_1910_takeover.html index 5e6390ccf0b..5bd82f6f1fc 100644 --- a/templates/takeovers/_1910_takeover.html +++ b/templates/takeovers/_1910_takeover.html @@ -1,14 +1,459 @@ -{% with title="What’s new in Ubuntu 19.10", -subtitle="Ubuntu 19.10 includes enhanced K8s capabilities for edge and AI/ML, OpenStack Train live-migration extensions for easier infrastructure deployments and more.", -header_image="https://assets.ubuntu.com/v1/76095fd7-1910-eoan-ermine-mascot-white.svg", -image_style="", -image_hide_small=true, -equal_cols="", -primary_url="/download", -primary_cta="Get Ubuntu", -primary_cta_class="p-button--positive", -secondary_url="/engage/19-10-webinar", -secondary_cta="Register for the webinar", -locale="en_GB" %} - {% include "takeovers/_template.html" %} -{% endwith %} +
    +
    +
    +
    +

    + What’s new in Ubuntu 19.10 +

    +

    + Ubuntu 19.10 includes enhanced K8s capabilities for edge and AI/ML, OpenStack Train live-migration extensions for easier infrastructure deployments and more. +

    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + +
    +
    From cda95c78fb205a8187c46f19bd901a411e842504 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 16 Oct 2019 14:58:55 +0100 Subject: [PATCH 09/20] Update download server arm and power pages for 19.10 --- templates/download/server/arm.html | 50 ++++++++++++----- templates/download/server/power.html | 83 ++++++++++++++-------------- 2 files changed, 77 insertions(+), 56 deletions(-) diff --git a/templates/download/server/arm.html b/templates/download/server/arm.html index 2ba2d63333b..e6d53abd0d5 100755 --- a/templates/download/server/arm.html +++ b/templates/download/server/arm.html @@ -4,7 +4,7 @@ {% block meta_copydoc %}https://docs.google.com/document/d/1whVU3DvB9j5k6Ed3UvLZCEN6BU-lZcow4ZefqKQqokg/edit{% endblock meta_copydoc %} {% block content %} -
    +
    +
    -
    +

    Containers, databases, web and more

    @@ -52,9 +76,9 @@

    Containers, databases, web and more

    -
    + -
    +
    @@ -66,7 +90,7 @@

    Commercially supported and ready to deploy today

    Contact us about your ARM server plans ›

    -
    + {% with first_item="_download_server_arm_guide", second_item="_download_enterprise_support", third_item="_download_helping_hands" %}{% include "shared/contextual_footers/_contextual_footer.html" %}{% endwith %} diff --git a/templates/download/server/power.html b/templates/download/server/power.html index 516a4cb6cdc..29471ab88b6 100755 --- a/templates/download/server/power.html +++ b/templates/download/server/power.html @@ -5,64 +5,61 @@ {% block meta_copydoc %}https://docs.google.com/document/d/1e-vav_b54KlKsi92w3rDu9J14O0gpp8yAanEAIImlE8/edit{% endblock meta_copydoc %} {% block content %} -
    +

    Ubuntu Server for IBM POWER

    +

    Ubuntu Server for POWER brings Ubuntu Server and Ubuntu Server for cloud to POWER, opening the door to the entire OpenStack ecosystem and the scale-out and cloud markets. Power is optimised for workloads in the mobile, social, cloud, Big Data, analytics and machine learning spaces. With its unique deployment toolset (including Juju and MAAS), Ubuntu makes the management of those workloads trivial.

    -
    -
    - - +
    +

    Netboot image

    +
    +

    This installer lets you install Ubuntu over the network.

    +
      +
    • + + Download Ubuntu {{ releases.lts.full_version }} LTS + + +
    • -
      -
      -
      -

      Ubuntu {{ releases.lts.short_version }} LTS for IBM POWER

      -

      Ubuntu {{ releases.lts.short_version }} LTS adds support for Openstack Queens, LXD 3.0 with clustering and resource quotas, netplan.io, Chrony, and fresh package updates throughout the distribution. Ubuntu 18.04 is the first release to support Power9.

      -

      Ubuntu Server {{ releases.lts.short_version }} LTS release notes ›

      -
      -
      -

      Ubuntu 16.04 LTS for IBM POWER8

      -

      Ubuntu 16.04 continues to enable rapid innovation for POWER8 including support for new POWER8 models, memory and PCI Hotplug, Docker 1.9.1, many performance and availability enhancements. Includes the only commercially available Linux to provide initial support for support the OpenPOWER Foundation’s industry leading NVLink technology.

      -
      -
      -
      +
    • + + Download Ubuntu {{ releases.latest.full_version }} + +
    • -
      -
      -
      -

      Ready to deploy now

      -

      Ubuntu Server for POWER brings Ubuntu Server and Ubuntu Server for cloud to POWER, opening the door to the entire OpenStack ecosystem and the scale-out and cloud markets. Power is optimised for workloads in the mobile, social, cloud, Big Data, analytics and machine learning spaces. With its unique deployment toolset (including Juju and MAAS), Ubuntu makes the management of those workloads trivial.

      -
      -
      - +
    +

    + Learn about netboot images +

    +
    -
    +
    {% with first_item="_download_server_installation", second_item="_download_server_guide", third_item="_download_helping_hands" %}{% include "shared/contextual_footers/_contextual_footer.html" %}{% endwith %} From 45eb71784d3da4d37539c0220160b956a636ec6b Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 16 Oct 2019 15:06:45 +0100 Subject: [PATCH 10/20] Adding s390x --- templates/download/server/thank-you-s390x.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/download/server/thank-you-s390x.html b/templates/download/server/thank-you-s390x.html index 0839c28f5cb..9ace47e04b8 100644 --- a/templates/download/server/thank-you-s390x.html +++ b/templates/download/server/thank-you-s390x.html @@ -2,7 +2,7 @@ {% block title %}Thanks for downloading Ubuntu Server for IBM Z and LinuxONE{% endblock %} {% block canonical_url %}https://ubuntu.com/download/server/s390x{% endblock %} -{% block meta_copydoc %}https://docs.google.com/document/d/1hDkrBqpJXWaENYZMSxd8P-XLFQ2LQqS1wNe4o2MGLho/edit{% endblock meta_copydoc %} +{% block meta_copydoc %}https://docs.google.com/document/d/1GptXtMfbgOjOmqb8DZCCTRwogkiP_cM95U9Z0gFSt7g/edit{% endblock meta_copydoc %} {% block head_extra %} @@ -13,15 +13,14 @@
    -

    Thanks for downloading Ubuntu for LinuxONE and z Systems

    -

    Thank you for downloading Ubuntu Server for IBM Z and LinuxONE. Please select the release you wish to download.

    +

    Thank you for downloading Ubuntu for LinuxONE and z Systems

    +

    Please select the release you wish to download.

    From fbdd79b86e6a5a3dea138c156651725ba280f1aa Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 16 Oct 2019 15:52:23 +0100 Subject: [PATCH 11/20] Update download pi page info --- redirects.yaml | 1 + templates/download/iot/_flash-image.html | 2 +- templates/download/iot/index.html | 4 +-- ...aspberry-pi-2-3.html => raspberry-pi.html} | 27 +++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) rename templates/download/iot/{raspberry-pi-2-3.html => raspberry-pi.html} (76%) diff --git a/redirects.yaml b/redirects.yaml index 7fdcfaf2181..e0a4aa699bc 100644 --- a/redirects.yaml +++ b/redirects.yaml @@ -364,6 +364,7 @@ download/help/install-ubuntu-server/?: "https://tutorials.ubuntu.com/tutorial/tu download/help/install-ubuntu-with-windows/?: "https://tutorials.ubuntu.com/tutorial/try-ubuntu-before-you-install" download/help/install-ubuntu-with-windowswww\.alternatifbilisim\.org/?: "https://tutorials.ubuntu.com/tutorial/try-ubuntu-before-you-install" download/help/try-ubuntu-before-you-install/?: "https://tutorials.ubuntu.com/tutorial/try-ubuntu-before-you-install" +download/iot/raspberry-pi-2-3/?: "/download/iot/raspberry-pi" download/releasenotes.*/?: "https://wiki.ubuntu.com/Releases" download/server/download/?: "/download/server" download/server/install-ubuntu-server/?: "https://tutorials.ubuntu.com/tutorial/tutorial-install-ubuntu-server" diff --git a/templates/download/iot/_flash-image.html b/templates/download/iot/_flash-image.html index 46b830ebe86..a140ac2da25 100644 --- a/templates/download/iot/_flash-image.html +++ b/templates/download/iot/_flash-image.html @@ -3,6 +3,6 @@

    Flash the {{ card or "card" }}

    -

    Copy the Ubuntu image on the {{ card or "card" }} by following the installation media instructions.

    +

    Copy the Ubuntu image on a {{ card or "card" }} by following the installation media instructions.

    diff --git a/templates/download/iot/index.html b/templates/download/iot/index.html index b5e5530bb65..87e86dec112 100644 --- a/templates/download/iot/index.html +++ b/templates/download/iot/index.html @@ -19,9 +19,9 @@

    Get Ubuntu for IoT

    Ubuntu for Raspberry Pi

    -

    Get the power, ease and flexibility of Ubuntu for Raspberry Pi 2 or 3.
    +

    Get the power, ease and flexibility of Ubuntu for Raspberry Pi 2, 3 or 4.
    Get started with an Ubuntu Server image for a familiar development environment.

    -

    Install on Raspberry Pi 2 or 3

    +

    Install on Raspberry Pi 2, 3 or 4

    diff --git a/templates/download/iot/raspberry-pi-2-3.html b/templates/download/iot/raspberry-pi.html similarity index 76% rename from templates/download/iot/raspberry-pi-2-3.html rename to templates/download/iot/raspberry-pi.html index 6f345c37466..2a1be8ebf9b 100644 --- a/templates/download/iot/raspberry-pi-2-3.html +++ b/templates/download/iot/raspberry-pi.html @@ -1,13 +1,13 @@ {% extends "download/_base_download.html" %} -{% block title %}Install Ubuntu Server on a Raspberry Pi 2 or 3{% endblock %}} +{% block title %}Install Ubuntu Server on a Raspberry Pi 2, 3 or 4{% endblock %}} {% block meta_copydoc %}https://docs.google.com/document/d/1KgnSBa8mbR7qwlxxtqbE5a1wXh5GjtVums8TIB7IGVw/edit#{% endblock meta_copydoc %} {% block content %}
    -

    Install Ubuntu Server on a Raspberry Pi 2 or 3

    +

    Install Ubuntu Server on a Raspberry Pi 2, 3 or 4

    Raspberry Pi @@ -18,12 +18,12 @@

    Install Ubuntu Server on a Raspberry Pi 2 or 3

    Install Ubuntu Server

    -

    We will walk you through the steps of flashing Ubuntu Server on a Raspberry Pi 2 or 3. At the end of this process, you will have a fully fledged development or production environment..

    +

    We will walk you through the steps of flashing Ubuntu Server on a Raspberry Pi 2, 3 or 4. At the end of this process, you will have a fully fledged development or production environment..

    Minimum requirements

      -
    • A Raspberry Pi 2 or 3
    • +
    • A Raspberry Pi 2, 3 or 4
    • A microSD card
    • An Ubuntu Server image
    • A monitor with an HDMI interface
    • @@ -42,24 +42,23 @@

      Installation instructions

      1. - Download Ubuntu Server

        -

        Get the correct Ubuntu Server image for your board:

        - +

        + Download the Ubuntu Server image for your board: +

        +

        + Ubuntu Server image for Raspberry Pi 2, 3 and 4 +

        +

        + You can verify the integrity of the files using the SHA256SUM and SHA256SUM.gpg files. +

      2. {% with card="microSD card" %}{% include "download/iot/_flash-image.html" %}{% endwith %}
      3. - Install Ubuntu Server

        From 84417a60581cbdaad8a9b53c8d00d95b8c741e57 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 16 Oct 2019 15:53:04 +0100 Subject: [PATCH 12/20] Update download pi page info --- templates/download/iot/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/download/iot/index.html b/templates/download/iot/index.html index 87e86dec112..bdfcf6f4b03 100644 --- a/templates/download/iot/index.html +++ b/templates/download/iot/index.html @@ -19,9 +19,11 @@

        Get Ubuntu for IoT

        Ubuntu for Raspberry Pi

    -

    Get the power, ease and flexibility of Ubuntu for Raspberry Pi 2, 3 or 4.
    - Get started with an Ubuntu Server image for a familiar development environment.

    -

    Install on Raspberry Pi 2, 3 or 4

    +

    + Get the power, ease and flexibility of Ubuntu for Raspberry Pi 2, 3 or 4.
    + Get started with an Ubuntu Server image for a familiar development environment. +

    +

    Install on Raspberry Pi 2, 3 or 4

    From beab2acee48d5b55bff22a879c458c5a74e5d521 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Wed, 16 Oct 2019 16:23:11 +0100 Subject: [PATCH 13/20] make box text all in p --- templates/download/server/power.html | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/templates/download/server/power.html b/templates/download/server/power.html index 29471ab88b6..cd15c62dedd 100755 --- a/templates/download/server/power.html +++ b/templates/download/server/power.html @@ -31,28 +31,26 @@

    Ubuntu Server

    Download Ubuntu {{ releases.latest.full_version }}

    -

    Alternative and previous releases ›

    +

    + Alternative and previous releases › +

    Netboot image

    This installer lets you install Ubuntu over the network.

    - +

    + + Download Ubuntu {{ releases.latest.full_version }} + +

    Learn about netboot images

    From 4c75f41bcdc6a6da3c20db4159451918b15b198a Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 17 Oct 2019 10:00:34 +0100 Subject: [PATCH 14/20] Fix resource rows --- .../download/server/thank-you-s390x.html | 38 +++++++++---------- templates/kubernetes/index.html | 10 ++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/download/server/thank-you-s390x.html b/templates/download/server/thank-you-s390x.html index 9ace47e04b8..570bbafd6d4 100644 --- a/templates/download/server/thank-you-s390x.html +++ b/templates/download/server/thank-you-s390x.html @@ -2,7 +2,7 @@ {% block title %}Thanks for downloading Ubuntu Server for IBM Z and LinuxONE{% endblock %} {% block canonical_url %}https://ubuntu.com/download/server/s390x{% endblock %} -{% block meta_copydoc %}https://docs.google.com/document/d/1GptXtMfbgOjOmqb8DZCCTRwogkiP_cM95U9Z0gFSt7g/edit{% endblock meta_copydoc %} +{% block meta_copydoc %}https://docs.google.com/document/d/1hDkrBqpJXWaENYZMSxd8P-XLFQ2LQqS1wNe4o2MGLho/edit{% endblock meta_copydoc %} {% block head_extra %} @@ -13,14 +13,15 @@
    -

    Thank you for downloading Ubuntu for LinuxONE and z Systems

    -

    Please select the release you wish to download.

    +

    Thanks for downloading Ubuntu for LinuxONE and z Systems

    +

    Thank you for downloading Ubuntu Server for IBM Z and LinuxONE. Please select the release you wish to download.

    @@ -28,34 +29,33 @@

    Thank you for downloading Ubuntu for LinuxONE and z Systems

    -
    +
    - ubuntu advantage -

    Forrester Research eBook

    + +

    eBook

    -

    Get more from the cloud with the right platform approach.

    -

    Download eBook

    +

    Forrester Research - get more from the cloud

    +
    -
    +
    - ubuntu one -

    IDC Analyst White Paper

    + +

    Whitepaper

    -

    Learn more about next generation applications on Ubuntu for LinuxONE/z.

    -

    Download whitepaper

    +

    IDC - next generation applications on Ubuntu for LinuxONE/z

    +
    -
    +
    - ubuntu advantage -

    IBM Systems Magazine Webinar

    + +

    Webinar

    -

    Discover the Cloud and scale out world of Ubuntu on IBM.

    -

    Watch webinar on-demand

    +

    Discover the Cloud and scale out world of Ubuntu on IBM

    diff --git a/templates/kubernetes/index.html b/templates/kubernetes/index.html index 8ba012dfece..0cfbbc2871a 100644 --- a/templates/kubernetes/index.html +++ b/templates/kubernetes/index.html @@ -45,7 +45,7 @@

    MicroK8s

    Developers love MicroK8s as a fast, lean upstream K8s for rapid iteration. It’s also popular as a secure and robust K8s for IoT and appliances.

    Learn more and install MicroK8s

    - +

    Charmed Kubernetes

    Multi-cloud clusters

    @@ -279,7 +279,7 @@

    Learn more about Kubernetes

    - +
    @@ -297,7 +297,7 @@

    Webinar

    -

    Kubernetes for the Enterprise: 1, 2, 3, Go!

    +

    Kubernetes for the Enterprise: 1, 2, 3, Go! ›

    @@ -306,7 +306,7 @@

    Whitepaper

    -

    The no-nonsense way to accelerate your business with containers

    +

    The no-nonsense way to accelerate your business with containers ›

    From 5ef46d5b5bd36dd9991d23f4eb03cad457adcb54 Mon Sep 17 00:00:00 2001 From: Peter Mahnke Date: Thu, 17 Oct 2019 10:04:17 +0100 Subject: [PATCH 15/20] replace top again --- templates/download/server/thank-you-s390x.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/templates/download/server/thank-you-s390x.html b/templates/download/server/thank-you-s390x.html index 570bbafd6d4..79d040dc114 100644 --- a/templates/download/server/thank-you-s390x.html +++ b/templates/download/server/thank-you-s390x.html @@ -2,7 +2,7 @@ {% block title %}Thanks for downloading Ubuntu Server for IBM Z and LinuxONE{% endblock %} {% block canonical_url %}https://ubuntu.com/download/server/s390x{% endblock %} -{% block meta_copydoc %}https://docs.google.com/document/d/1hDkrBqpJXWaENYZMSxd8P-XLFQ2LQqS1wNe4o2MGLho/edit{% endblock meta_copydoc %} +{% block meta_copydoc %}https://docs.google.com/document/d/1GptXtMfbgOjOmqb8DZCCTRwogkiP_cM95U9Z0gFSt7g/edit{% endblock meta_copydoc %} {% block head_extra %} @@ -13,15 +13,14 @@
    -

    Thanks for downloading Ubuntu for LinuxONE and z Systems

    -

    Thank you for downloading Ubuntu Server for IBM Z and LinuxONE. Please select the release you wish to download.

    +

    Thank you for downloading Ubuntu for LinuxONE and z Systems

    +

    Please select the release you wish to download.

    From d25ba4c6bc26c4959566353fad705fa1d6530375 Mon Sep 17 00:00:00 2001 From: Anthony Dillon Date: Thu, 17 Oct 2019 09:20:38 +0100 Subject: [PATCH 16/20] Small QA issues for 19.10 --- static/sass/styles.scss | 7 +++++++ templates/desktop/developers.html | 2 +- templates/download/desktop/index.html | 4 ++-- templates/download/index.html | 2 +- templates/download/iot/index.html | 2 +- templates/download/iot/raspberry-pi.html | 10 +++++----- templates/download/server/arm.html | 5 ++++- templates/download/server/index.html | 4 ++-- templates/download/server/power.html | 5 ++++- 9 files changed, 27 insertions(+), 14 deletions(-) diff --git a/static/sass/styles.scss b/static/sass/styles.scss index c49f6511c9a..5805f8fb31b 100644 --- a/static/sass/styles.scss +++ b/static/sass/styles.scss @@ -309,3 +309,10 @@ summary { } } } + +.u-pull-up--large { + @media only screen and (min-width: $breakpoint-large) { + position: relative; + top: -2rem; + } +} diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html index 56b52c98cee..fd44825c2e9 100755 --- a/templates/desktop/developers.html +++ b/templates/desktop/developers.html @@ -91,7 +91,7 @@

    What’s new in Ubuntu {{ releases.latest.short_version }}?

  • The fastest and most responsive GNOME Desktop, featuring improved settings for wifi, wallpaper and application groups in the Activities overview
  • Plugging in a USB drive now automatically display the device on the launcher giving you instant access to your files
  • Nvidia hardware is now supported out of the box. Now you can be up and running with your Nvidia graphics card from the moment you install
  • -
  • Support for ZFS as your root filesystem. When coupled with the new zsys package you get access to modern features such as file system snapshotting, rolling backwards and forwards between snapshots and automated snapshots. Note, this is an experimental feature.
  • +
  • Support for ZFS as your root filesystem. When coupled with the new zsys package you get access to modern features such as file system snapshotting, rolling backwards and forwards between snapshots and automated snapshots.
    Experimental feature

Read the full release notes

diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html index 57e609bc05e..944424657aa 100755 --- a/templates/download/desktop/index.html +++ b/templates/download/desktop/index.html @@ -15,7 +15,7 @@

Download Ubuntu Desktop

Ubuntu {{ releases.lts.full_version }} LTS

-

Download the latest LTS version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support — which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.

+

Download the latest LTS version of Ubuntu, for desktop PCs and laptops. LTS stands for long-term support — which means five years, until {{ releases.lts.eol }}, of free security and maintenance updates, guaranteed.

Ubuntu {{ releases.lts.short_version }} LTS release notes

Recommended system requirements: