StackStorm · amanda11 · Jun 12, 2021 · Jun 10, 2021 · Jun 10, 2021 · Jun 10, 2021
diff --git a/docs/source/_redirects/install/deb.html b/docs/source/_redirects/install/deb.html
@@ -1,8 +1,8 @@
 <html>
 <head>
-<meta http-equiv="Refresh" content="0; url=u16.html" />
+<meta http-equiv="Refresh" content="0; url=u18.html" />
 </head>
 <body>
-<p>This page has moved to <a href="u16.html">here</a>.</p>
+<p>This page has moved to <a href="u18.html">here</a>.</p>
 </body>
 </html>
diff --git a/docs/source/install/index.rst b/docs/source/install/index.rst
@@ -14,7 +14,7 @@ Here's an overview of the options:
   <ref-one-line-install>` section below for details.
 * **Manual Installation:** Have custom needs? Maybe no Internet access from your servers? Or just
   don't like using scripted installs? Read the manual installation instructions for your OS
-  (:doc:`Ubuntu 16 </install/u16>`, :doc:`Ubuntu 18 </install/u18>`,
+  (:doc:`Ubuntu 18 </install/u18>`, :doc:`Ubuntu 20 </install/u20>`,
   :doc:`RHEL/CentOS 7 </install/rhel7>`, :doc:`RHEL/CentOS 8 </install/rhel8>`) and adapt them to
   your needs. Here's some `additional guidance
   <https://stackstorm.com/2017/02/10/installing-stackstorm-offline-systems/>`_ for setting up an
@@ -91,7 +91,6 @@ For more details on reference deployments, or OS-specific installation instructi
 
     Reference Deployment Overview <overview>
     system_requirements
-    Ubuntu 16.04 <u16>
     Ubuntu 18.04 <u18>
     Ubuntu 20.04 <u20>
     RHEL 7 / CentOS 7 <rhel7>

diff --git a/docs/source/install/system_requirements.rst b/docs/source/install/system_requirements.rst
@@ -18,8 +18,6 @@ be automatically added when you install |st2|.
 +-------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Linux (64-bit)                                                                                        | Vagrant Box                                                                  | Amazon AWS AMI                                                                                                                                                    |
 +=======================================================================================================+==============================================================================+===================================================================================================================================================================+
-| `Ubuntu 16.04 <https://www.ubuntu.com/download/server/thank-you?version=16.04.6&architecture=amd64>`_ | `bento/ubuntu-16.04 <https://app.vagrantup.com/bento/boxes/ubuntu-16.04>`_   | `Ubuntu 16.04 LTS - Xenial (HVM)  <https://aws.amazon.com/marketplace/pp/B01JBL2M0O/>`_                                                                           |
-+-------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | `Ubuntu 18.04 <http://cdimage.ubuntu.com/releases/18.04.2/release/ubuntu-18.04.2-server-amd64.iso>`_  | `bento/ubuntu-18.04 <https://app.vagrantup.com/bento/boxes/ubuntu-18.04>`_   | `Ubuntu Server 18.04 LTS Bionic  <https://aws.amazon.com/marketplace/pp/B07CQ33QKV/>`_                                                                            |
 +-------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | `Ubuntu 20.04 <http://releases.ubuntu.com/focal/ubuntu-20.04.2-live-server-amd64.iso>`_               | `bento/ubuntu-20.04 <https://app.vagrantup.com/bento/boxes/ubuntu-20.04>`_   | `Ubuntu Server 20.04 LTS Focal  <https://aws.amazon.com/marketplace/pp/B087QQNGF1>`_                                                                              |
@@ -72,9 +70,11 @@ Linux Distribution Support Policy
 StackStorm only support Ubuntu and RHEL/CentOS Linux distributions. In general, it is supported
 on the two most recent major supported releases for those distributions. Specifically:
 
-* **Ubuntu**: Current LTS releases are supported. Today this is ``16.04``, ``18.04`` and ``20.04``.
+* **Ubuntu**: Current LTS releases are supported. Today this is ``18.04`` and ``20.04``.
 
 * **RHEL/CentOS**: We currently support RHEL/CentOS ``7.x`` and ``8.x``. In general, we recommend using
   the most recent version in that series, but any version may be used.
 
   Support for RHEL/CentOS ``6.x`` has been removed. |st2| 3.2  is the last release that supported RHEL/CentOS ``6.x``.
+
+  Support for Ubuntu ``16.04`` has been removed. |st2| 3.4  is the last release that supported RHEL/CentOS ``16.04``.
diff --git a/docs/source/install/u16.rst b/docs/source/install/u16.rst
diff --git a/docs/source/install/u18.rst b/docs/source/install/u18.rst
@@ -72,6 +72,8 @@ Setup Datastore Encryption
 
 .. include:: common/datastore_crypto_key.rst
 
+.. _ref-config-ssh-sudo-deb:
+
 Configure SSH and SUDO
 ~~~~~~~~~~~~~~~~~~~~~~
 
@@ -87,6 +89,8 @@ Verify
 
 .. include:: common/verify.rst
 
+.. _ref-config-auth-deb:
+
 Configure Authentication
 ------------------------
 
@@ -106,6 +110,8 @@ To set up authentication with file-based provider:
 
 .. include:: common/configure_authentication.rst
 
+.. _ref-install-webui-ssl-deb:
+
 Install WebUI and Setup SSL Termination
 ---------------------------------------
 
@@ -142,6 +148,8 @@ Use your browser to connect to ``https://${ST2_HOSTNAME}`` and login to the WebU
 
 .. include:: common/api_access.rst
 
+.. _ref-setup-chatops-deb:
+
 Setup ChatOps
 -------------
 

diff --git a/docs/source/install/uninstall.rst b/docs/source/install/uninstall.rst
@@ -40,7 +40,7 @@ below. Only execute the instructions for your distribution.
 1. Stop Services
 ----------------
 
-* Ubuntu 16.04/18.04/20.04:
+* Ubuntu 18.04/20.04:
 
   .. sourcecode:: bash
 
@@ -69,7 +69,7 @@ below. Only execute the instructions for your distribution.
 2. Remove Packages
 ------------------
 
-* Ubuntu 16.04/18.04/20.04:
+* Ubuntu 18.04/20.04:
 
   If you are using StackStorm only:
 

diff --git a/docs/source/roadmap.rst b/docs/source/roadmap.rst
@@ -2,7 +2,7 @@ Roadmap
 =======
 
 |st2| is still under active development. We welcome community feedback, and encourage
-contributions. Here's our plans for the next two releases.
+contributions. Here's our plans for the next releases.
 
 
 .. note::
@@ -16,16 +16,10 @@ contributions. Here's our plans for the next two releases.
     the feature. Pull Requests are open to anyone.
 
 
-3.5
+3.6
 ---
 
-* The roadmap for ``3.5`` is in the works, stay tuned!
-
-  Current plans include:
-
-  * Add support for Ubuntu 20.04, with Python 3.8
-  * Performance improvements
-  * Add Redis as a coordination backend
+* The roadmap for ``3.6`` is in the works, stay tuned!
 
 Monitor the `master branch <https://github.com/StackStorm/st2/>`_ to see how we're progressing.
 
@@ -64,6 +58,13 @@ Submit a PR!
 Release History
 ---------------
 
+.. rubric:: Done in v3.5
+
+* **Ubuntu Focal:** Add support for Ubuntu 20.04, with Python 3.8 and Mongo 4.4
+* **Ubuntu Xenial:** Remove support for Ubuntu 16.04
+* **Performance improvements:** Performance improvements on JSON serialization/deserialization
+* **Redis:** Add Redis as a coordination backend
+
 .. rubric:: Done in v3.4
 
 * **Python 2 deprecation:** Updated RHEL/CentOS 7.x and Ubuntu 16.04 to use Python 3.6, and update packs in StackStorm-Exchange 

diff --git a/docs/source/upgrade_notes.rst b/docs/source/upgrade_notes.rst
@@ -10,7 +10,7 @@ Upgrade Notes
 
 * Node was upgraded from v10 to v14. Node 14 repository will be required to be
   setup, prior to upgrade of st2chatops.
-  
+* Support for Ubuntu 16.04 (Xenial) was removed.
 * Redis server is installed and configured as backend for the coordination service
   by default to support workflows with multiple branches and tasks with items.
   Upgrade requires coordination service to be setup manually.