From e84e6f9febac639b3d74f057a4b3e2f2a20e094e Mon Sep 17 00:00:00 2001
From: kspoelstra-aviatrix
 <101131137+kspoelstra-aviatrix@users.noreply.github.com>
Date: Mon, 21 Mar 2022 11:26:29 +0100
Subject: [PATCH 1/5] Update cloudformation links

CFT_links have to be added, alignment of first item in numbered list is off
---
 .../aviatrix-cloud-controller-startup-guide.rst       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
index b4778f249..4a9af552d 100644
--- a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
+++ b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
@@ -120,14 +120,11 @@ to run the Cloudformation script.
 
 ..
     `CloudFormation for Aviatrix Secure Networking Platform Metered - Copilot & 24x7 Support <https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template>`_
+    
+**Cloudformation templates for other Aviatrix products**
 
-**Other Aviatrix Products**
-
-CloudFormation for Aviatrix Secure Networking Platform Metered with Copilot
-
-* Aviatrix Secure Networking Platform - BYOL
-* Aviatrix Secure Networking Platform - Enterprise Subscription
-* Check out `Other Aviatrix Products CloudFormation launch scripts  <https://docs.aviatrix.com/StartUpGuides/aviatrix-cloud-controller-startup-guide.html#other-aviatrix-products>`_.
+* `Aviatrix Secure Networking Platform - BYOL <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-BYOL.template>`_
+* `Aviatrix Secure Networking Platform - Enterprise Subscription <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template>`_
 
 2. If you have not logged in, you will be prompted to log in to the AWS console. 
 3. Change to the region where you would like to install the Aviatrix Controller on the CloudFormation page. Note the CloudFormation is already loaded.

From e6cb7b579c2c2dae3a33c8551c4a4c8bc49160cb Mon Sep 17 00:00:00 2001
From: kspoelstra-aviatrix
 <101131137+kspoelstra-aviatrix@users.noreply.github.com>
Date: Mon, 21 Mar 2022 12:21:22 +0100
Subject: [PATCH 2/5] Fix alignment

---
 .../aviatrix-cloud-controller-startup-guide.rst  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
index 4a9af552d..c982f6c35 100644
--- a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
+++ b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
@@ -108,23 +108,21 @@ If you have already subscribed the Metered AMI on AWS Marketplace, skip this ste
 Launching the Controller with CloudFormation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-1. Click the link below to take you to the CloudFormation page on the AWS Console with the pre-loaded template. Follow the instructions in the next steps 
-to run the Cloudformation script.   
+1. Click the link below to take you to the CloudFormation page on the AWS Console with the pre-loaded template. Follow the instructions in the next steps to run the Cloudformation script. 
+  
+.. |CFT_link| raw:: html 
 
-.. |CFT_link| raw:: html
-
-    <a href="https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch');">CloudFormation for Aviatrix Secure Networking Platform Metered with Copilot</a> 
+    <a href="https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch');">CloudFormation for Aviatrix Secure Networking Platform Metered with Copilot</a>
 
 
 |CFT_link|
 
 ..
-    `CloudFormation for Aviatrix Secure Networking Platform Metered - Copilot & 24x7 Support <https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template>`_
-    
+    `CloudFormation for Aviatrix Secure Networking Platform Metered - Copilot & 24x7 Support <https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template>`_    
 **Cloudformation templates for other Aviatrix products**
 
-* `Aviatrix Secure Networking Platform - BYOL <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-BYOL.template>`_
-* `Aviatrix Secure Networking Platform - Enterprise Subscription <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template>`_
+  * `CloudFormation for Aviatrix Secure Networking Platform - BYOL <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-BYOL.template>`_
+  * `CloudFormation for Aviatrix Secure Networking Platform - Enterprise Subscription <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template>`_
 
 2. If you have not logged in, you will be prompted to log in to the AWS console. 
 3. Change to the region where you would like to install the Aviatrix Controller on the CloudFormation page. Note the CloudFormation is already loaded.

From a485fff9c8a09c06cefeac6f9f96ead6cf89f6b3 Mon Sep 17 00:00:00 2001
From: kspoelstra-aviatrix
 <101131137+kspoelstra-aviatrix@users.noreply.github.com>
Date: Mon, 21 Mar 2022 12:47:33 +0100
Subject: [PATCH 3/5] Added raw HTML for getOutboundLinkAndOpen

---
 ...viatrix-cloud-controller-startup-guide.rst | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
index c982f6c35..3bb60ed9b 100644
--- a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
+++ b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
@@ -109,19 +109,31 @@ Launching the Controller with CloudFormation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Click the link below to take you to the CloudFormation page on the AWS Console with the pre-loaded template. Follow the instructions in the next steps to run the Cloudformation script. 
-  
-.. |CFT_link| raw:: html 
 
-    <a href="https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch');">CloudFormation for Aviatrix Secure Networking Platform Metered with Copilot</a>
+  * |CFT_link_METERED|
+**Cloudformation templates for other Aviatrix products**
+  * |CFT_link_BYOL|
+  * |CFT_link_ENTERPRISE|
 
+.. |CFT_link_METERED| raw:: html 
 
-|CFT_link|
+    <a href="https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch');">CloudFormation for Aviatrix Secure Networking Platform Metered with Copilot</a>
 
 ..
     `CloudFormation for Aviatrix Secure Networking Platform Metered - Copilot & 24x7 Support <https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=AviatrixController&templateURL=https://aviatrix-cloudformation-templates.s3-us-west-2.amazonaws.com/aws-cloudformation-aviatrix-metered-controller-copilot-24x7-support.template>`_    
-**Cloudformation templates for other Aviatrix products**
 
-  * `CloudFormation for Aviatrix Secure Networking Platform - BYOL <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-BYOL.template>`_
+.. |CFT_link_BYOL| raw:: html 
+
+    <a href="https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-BYOL.template" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch_BYOL');">CloudFormation for Aviatrix Secure Networking Platform - BYOL</a>
+
+..
+   `CloudFormation for Aviatrix Secure Networking Platform - BYOL <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-BYOL.template>`_
+
+.. |CFT_link_ENTERPRISE| raw:: html 
+
+    <a href="https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch_ENTERPRISE');">CloudFormation for Aviatrix Secure Networking Platform - Enterprise Subscription</a>
+
+..
   * `CloudFormation for Aviatrix Secure Networking Platform - Enterprise Subscription <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template>`_
 
 2. If you have not logged in, you will be prompted to log in to the AWS console. 

From 882bd645fb3b5724fbb3c8f2a6abbb4e30494b2e Mon Sep 17 00:00:00 2001
From: kspoelstra-aviatrix
 <101131137+kspoelstra-aviatrix@users.noreply.github.com>
Date: Mon, 21 Mar 2022 13:41:50 +0100
Subject: [PATCH 4/5] Add link to github as replacement to "other"

Is title ok? All templates? Other templates?
---
 StartUpGuides/aviatrix-cloud-controller-startup-guide.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
index 3bb60ed9b..b749914ba 100644
--- a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
+++ b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
@@ -114,6 +114,7 @@ Launching the Controller with CloudFormation
 **Cloudformation templates for other Aviatrix products**
   * |CFT_link_BYOL|
   * |CFT_link_ENTERPRISE|
+  * |CFT_link_GITHUB|
 
 .. |CFT_link_METERED| raw:: html 
 
@@ -135,6 +136,13 @@ Launching the Controller with CloudFormation
 
 ..
   * `CloudFormation for Aviatrix Secure Networking Platform - Enterprise Subscription <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template>`_
+  
+.. |CFT_link_GITHUB| raw:: html 
+
+    <a href="https://github.com/AviatrixSystems/aws-controller-launch-cloudformation-templates" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch_GITHUB');">CloudFormation templates on Aviatrix GitHub</a>
+
+..
+  * `CloudFormation templates on Aviatrix GitHub <https://github.com/AviatrixSystems/aws-controller-launch-cloudformation-templates>`_
 
 2. If you have not logged in, you will be prompted to log in to the AWS console. 
 3. Change to the region where you would like to install the Aviatrix Controller on the CloudFormation page. Note the CloudFormation is already loaded.

From bc38f2ede4414b8d784b249915b324f585758a88 Mon Sep 17 00:00:00 2001
From: kspoelstra-aviatrix
 <101131137+kspoelstra-aviatrix@users.noreply.github.com>
Date: Thu, 24 Mar 2022 21:52:36 +0100
Subject: [PATCH 5/5] Fixed title, link,link text to other products

---
 .../aviatrix-cloud-controller-startup-guide.rst       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
index b749914ba..6b9596b87 100644
--- a/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
+++ b/StartUpGuides/aviatrix-cloud-controller-startup-guide.rst
@@ -111,10 +111,10 @@ Launching the Controller with CloudFormation
 1. Click the link below to take you to the CloudFormation page on the AWS Console with the pre-loaded template. Follow the instructions in the next steps to run the Cloudformation script. 
 
   * |CFT_link_METERED|
-**Cloudformation templates for other Aviatrix products**
+**Other Aviatrix Products**
   * |CFT_link_BYOL|
   * |CFT_link_ENTERPRISE|
-  * |CFT_link_GITHUB|
+  * `Check out Other Aviatrix Products CloudFormation launch scripts <https://docs.aviatrix.com/HowTos/aws_startup_cfg.html>`_
 
 .. |CFT_link_METERED| raw:: html 
 
@@ -136,13 +136,6 @@ Launching the Controller with CloudFormation
 
 ..
   * `CloudFormation for Aviatrix Secure Networking Platform - Enterprise Subscription <https://us-east-2.console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/create/template?stackName=AviatrixController&templateURL=https:%2F%2Fs3-us-west-2.amazonaws.com%2Faviatrix-cloudformation-templates%2Favx-awsmp-5tunnel.template>`_
-  
-.. |CFT_link_GITHUB| raw:: html 
-
-    <a href="https://github.com/AviatrixSystems/aws-controller-launch-cloudformation-templates" target="_blank" onclick="getOutboundLinkAndOpen('CFT_launch_GITHUB');">CloudFormation templates on Aviatrix GitHub</a>
-
-..
-  * `CloudFormation templates on Aviatrix GitHub <https://github.com/AviatrixSystems/aws-controller-launch-cloudformation-templates>`_
 
 2. If you have not logged in, you will be prompted to log in to the AWS console. 
 3. Change to the region where you would like to install the Aviatrix Controller on the CloudFormation page. Note the CloudFormation is already loaded.