diff --git a/aws/aws-reference/pro.rst b/aws/aws-reference/pro.rst index 1f36b071..3ddca6e1 100644 --- a/aws/aws-reference/pro.rst +++ b/aws/aws-reference/pro.rst @@ -1,23 +1,23 @@ Ubuntu Pro on AWS ----------------- -`Ubuntu Pro `_ is a paid offering that +`Ubuntu Pro`_ is a paid offering that provides expanded security coverage, enhanced kernel patching, and hardening options for compliance frameworks. All Ubuntu Pro images on Amazon receive the following features through Pro. Expanded Security Maintenance (ESM) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -`ESM archives `_ extends the security patching of +`ESM`_ extends the security patching of the main archive to 10 years through the `esm-infra` entitlement. In addition -to patching the core of Ubuntu, Pro offers security maintenance of the -`universe` pocket. This security coverage is considered best effort +to patching the core of Ubuntu (i.e. the `Ubuntu main` repository), Pro also offers security maintenance of the +`Ubuntu universe` repository. This security coverage is considered best effort without Ubuntu Pro. Livepatch ~~~~~~~~~ -`Livepatch `_ applies security updates -to the kernel for critical and high security vulnerabilities to a live system. -This provides a buffer for system administrators to minimise downtime between +`Livepatch`_ applies security updates +to the kernel for critical and high security vulnerabilities in a live system. +This allows system administrators to minimise downtime between scheduled maintenance windows. This is particularly helpful for workloads that are expensive to migrate, such as kubernetes workers for EKS. @@ -25,15 +25,21 @@ Compliance ~~~~~~~~~~ Ubuntu Pro offers compliance options for users that need to apply CIS (level 1 and 2) or FIPS hardening. FIPS is currently supported -on Ubuntu 18.04 and 20.04. 22.04 is currently available through the +on Ubuntu 18.04 and 20.04. For 22.04, it is currently available through the `fips-preview` and `fips-updates` repositories provided through the FIPS pro entitlement, but these modules are not yet certified. Ubuntu Landscape ~~~~~~~~~~~~~~~~ -All Ubuntu Pro customers are entitled to usage of +All Ubuntu Pro customers are entitled to the usage of `Landscape _` self-hosted and SaaS solutions. Landscape is an endpoint management solution for monitoring your Ubuntu estate. This includes alerting for security vulnerabilities, patching status, managing repository mirrors, and more. To sign up for Landscape SaaS see -the `sign up page _`. \ No newline at end of file +the `sign up page`_. + +.. _`Ubuntu Pro`: https://ubuntu.com/aws/pro +.. _`ESM`: https://ubuntu.com/security/esm +.. _`Livepatch`: https://ubuntu.com/security/livepatch +.. _`Landscape`: https://ubuntu.com/landscape +.. _`sign up page`: https://landscape.canonical.com/signup \ No newline at end of file diff --git a/aws/aws-reference/support.rst b/aws/aws-reference/support.rst index 70d253cc..b4eb0272 100644 --- a/aws/aws-reference/support.rst +++ b/aws/aws-reference/support.rst @@ -3,14 +3,14 @@ Support options on AWS Ubuntu Pro on AWS ----------------- -Ubuntu Pro provides numerous support options. Please see the `Pro `_ page for +Ubuntu Pro provides numerous support options. Please see the :doc:`Pro ` page for more details. Amazon front line support ------------------------- Canonical and Amazon collaborate on publishing Ubuntu Pro images -through the `Amazon Web Services marketplace seller `_. +through the `Amazon Web Services marketplace `_. Users of these images are able to get support directly through the `AWS support portal `_.