Add more notes and links for 2.2 Cloud upgrades

Fix typo and add notes for 2.2 Cloud upgrades
Merge pull request #1291 from magento/lk_cloud-upgrade-2-2-tweak

Author: Lori Krell

guides/v2.0/cloud/before/before-workspace-magento-prereqs.md

@@ -96,7 +96,7 @@ You have multiple options for databases to use for your local. One database opti
 Regardless of database, for **Pro plans** you need to modify the `auto_increment_increment` value.
 
 <div class="bs-callout bs-callout-warning" markdown="1">
-For **Pro plans**, tye Production environment in the 3 node infrastructure uses auto-incrementing by 3 for all data IDs. Do not develop using hard-coded database IDs in your development. Due to the incremented data IDs, the referenced data will differ across the three nodes in Production.
+For **Pro plans**, the Production environment has a three node infrastructure that uses auto-incrementing by 3 for all data IDs. Do not develop using hard-coded database IDs in your development. Due to the incremented data IDs, the referenced data will differ across the three nodes in Production.
 </div>
 
 These example instructions detail how to install and create a MariaDB database for Magento on your local:

guides/v2.2/cloud/project/project-upgrade.md

@@ -20,7 +20,7 @@ When you upgrade {{site.data.var.ece}}, you also upgrade with patches and availa
 
 Our upgrades are Composer driven. For more information on Composer, see [Composer in Cloud]({{ page.baseurl }}cloud/reference/cloud-composer.html).
 
-When upgrading from 2.0.X or 2.1.X to 2.2.X, please see [Upgrade from 2.1.X](#old-version).
+When upgrading from 2.0.X or 2.1.X to 2.2.X, please see [Upgrade from 2.0.X or 2.1.X](#old-version). For additional information on the release, see the [{{site.data.var.ece}} 2.2 Release Notes].
 
 <div class="bs-callout bs-callout-warning" markdown="1">
 Always apply and test a patch your local system in an active branch. You can push and test in an Integration environment prior to deploying across all environments.
@@ -32,7 +32,7 @@ You can directly upgrade to {{site.data.var.ece}} 2.2 from the following version
 * 2.0.X versions: 2.0.14, 2.0.15, 2.0.16
 * 2.1.X versions: 2.1.7, 2.1.8, 2.1.9
 
-We have heavily tested and verifed upgrades to 2.2 from the latest three versions of 2.0.X and 2.1.X.
+We have heavily tested and verified upgrades to 2.2 from the latest three versions of 2.0.X and 2.1.X.
 
 You can attempt to upgrade from any version directly to {{site.data.var.ece}} 2.2. We cannot guarantee the results. For example, you should be able to upgrade from 2.0.10 or 2.1.4 directly to 2.2.
 

guides/v2.2/cloud/release-notes/CloudReleaseNotes2.2.md

@@ -15,7 +15,7 @@ redirect_from:
 
 We are pleased to present {{site.data.var.ece}} 2.2.0 General Availability. This release includes numerous functional fixes and enhancements.
 
-To fully upgrade {{site.data.var.ece}}, see [Upgrade Magento Commerce (Cloud)](http://devdocs.magento.com/guides/v2.2/cloud/project/project-upgrade.html). Specific steps and vital information for upgrading from 2.1.X are included.
+To fully upgrade {{site.data.var.ece}}, see [Upgrade Magento Commerce (Cloud)](http://devdocs.magento.com/guides/v2.2/cloud/project/project-upgrade.html). Specific steps and vital information for upgrading from 2.0.X and 2.1.X are included. For specific changes for deployments, see [Changes in Deployment](#deploy).
 
 ## Highlights {#highlights}
 
@@ -25,9 +25,9 @@ Look for the following {{site.data.var.ece}} highlights in this release:
 
 * **B2B Commerce functionality** is designed to meet the needs of merchants whose primary customers are companies, rather than consumers. Companies can create and maintain their own accounts, each with teams of buyers with various roles and levels of permission. B2B Commerce functionality also includes a flexible API that integrates with a variety of ERP solutions from Magento partners. B2B is supported for {{site.data.var.ece}} Pro subscriptions. See [B2B Quick Tour](http://docs.magento.com/m2/ce/user_guide/getting-started/quick-tour.html) for an overview of the rich B2B feature set we're introducing in this release, and [Getting Started with Magento Commerce for B2B](http://docs.magento.com/m2/b2b/user_guide/getting-started.html) for a more complete exploration of these new features.
 
-* **Magento Commerce Starter**. In addition to our Pro plan, Magento Cloud (Commerce) now comes in a smaller, platform-as-a-service version — Magento Commerce Starter. For an overview of these plans, see [Welcome to Magento Commerce Cloud](http://devdocs.magento.com/guides/v2.2/cloud/bk-cloud.html).
+* **Magento Commerce Starter**. In addition to our Pro plan, Magento Cloud (Commerce) now comes in a smaller, Platform-as-a-Service version — Magento Commerce Starter. For an overview of these plans, see [Welcome to Magento Commerce Cloud](http://devdocs.magento.com/guides/v2.2/cloud/bk-cloud.html). For specific information on Starter, see Starter [architecture](http://devdocs.magento.com/guides/v2.2/cloud/basic-information/starter-architecture.html) and [develop and deploy workflow](http://devdocs.magento.com/guides/v2.2/cloud/basic-information/starter-develop-deploy-workflow.html).
 
-* **Improvements to the {{site.data.var.ece}} deployment process**. This release includes new build and deployment variables. Users of earlier versions of {{site.data.var.ece}} will note that MCC has been replaced by ece-tools and ece-patches, which allows for patching your {{site.data.var.ece}} without requiring a full installation of base code and the patch. For more information, see [Magento application environment variables](http://devdocs.magento.com/guides/v2.2/cloud/env/environment-vars_magento.html) and [Composer](http://devdocs.magento.com/guides/v2.2/cloud/reference/cloud-composer.html).
+* **Improvements to the {{site.data.var.ece}} deployment process**. This release includes new build and deployment variables. Users of earlier versions of {{site.data.var.ece}} will note that MCC has been replaced by ece-tools and ece-patches, which allows for patching your {{site.data.var.ece}} without requiring a full installation of base code and the patch. For more information, see [Magento application environment variables](http://devdocs.magento.com/guides/v2.2/cloud/env/environment-vars_magento.html), [Composer](http://devdocs.magento.com/guides/v2.2/cloud/reference/cloud-composer.html), and [Changes in Deployment](#deploy).
 
 * **Upgraded technology stack.**  {{site.data.var.ece}} recommends Fastly 1.2.28 and dropped support for PHP 5.6 and Varnish 3.  We now support PHP 7.1 and Varnish 5, along with Redis 3.2 and MySQL 5.7. All [third-party libraries](http://devdocs.magento.com/guides/v2.2/release-notes/thirdparty-mccloud.html) have been upgraded to the latest stable version.
 
@@ -87,12 +87,12 @@ When upgrading to {{site.data.var.ece}} 2.2, consider the following changes in d
 
 * `.magento.app.yaml` has new build and deploy hooks. As part of your upgrade, you should update the `.magento.app.yaml` file with new build and deploy hooks and a set of environment variables. All actions completed by build and deploy are completed by these hooks. For instructions, see [Update .magento.app.yaml](http://devdocs.magento.com/guides/v2.2/cloud/project/project-upgrade.html#magento-app-yaml). For additional technical information, we have removed pre-deployment tasks, refined build and deploy tasks, and modified build and deploy variables.
 
-* Modified and updated available build and deploy variables. For a full list, see [Magento application environment variables](http://devdocs.magento.com/guides/v2.2/cloud/env/environment-vars_magento.html). For 2.2, we have removed `skip_di_compilation` and `skip_di_clearing` from `build-options.ini`. These cannot be run for 2.2 in the build phase.
-
 * The build variable `GENERATED_CODE_SYMLINKS` has been removed. The generated folders `var/generation` and `var/di` have been moved to a `generated/` read-only directory. The folder `var/generation` is now `generated/code` and `var/di` is now `generated/metapackage`.
 
 * With the removal of `GENERATED_CODE_SYMLINKS`, you cannot execute `setup:di:compile` directly on a server.
 
+* Modified and updated available build and deploy variables. For a full list, see [Magento application environment variables](http://devdocs.magento.com/guides/v2.2/cloud/env/environment-vars_magento.html). For 2.2, we have removed `skip_di_compilation` and `skip_di_clearing` from `build-options.ini`. These cannot be run for 2.2 in the build phase.
+
 ## Community contributions {#community}
 
 We are grateful to the wider Magento community and would like to acknowledge their contributions to this release. Check out the following ways you can learn about the community contributions to our current releases:
@@ -109,7 +109,17 @@ For {{site.data.var.ece}} requirements, see [Technologies and Requirements](http
 The {{site.data.var.ee}} technology stack is built on PHP and MySQL. For details, see [Technology stack requirements]({{ page.baseurl }}install-gde/system-requirements-tech.html) and [System Requirements]({{ site.baseurl }}magento-system-requirements.html){:target="_blank"}.
 
 ## Installation and upgrade instructions {#install-upgrade}
+If installing and working with {{site.data.var.ece}} for the first time, we recommend [First-time development setup]({{ page.baseurl }}cloud/access-acct/first-time-setup.html).
 
 To test and implement your {{site.data.var.ece}} upgrade, see [Upgrade Magento Commerce (Cloud)]({{ page.baseurl }}cloud/project/project-upgrade.html). We include upgrade paths and additional instructions for upgrading from 2.0.X and 2.1.X.
 
-If installing and working with {{site.data.var.ece}} for the first time, we recommend [First-time development setup]({{ page.baseurl }}cloud/access-acct/first-time-setup.html).
+You can directly upgrade to {{site.data.var.ece}} 2.2 from the following versions:
+
+* 2.0.X versions: 2.0.14, 2.0.15, 2.0.16
+* 2.1.X versions: 2.1.7, 2.1.8, 2.1.9
+
+We have heavily tested and verified upgrades to 2.2 from the latest three versions of 2.0.X and 2.1.X.
+
+You can attempt to upgrade from any version directly to {{site.data.var.ece}} 2.2. We cannot guarantee the results. For example, you should be able to upgrade from 2.0.10 or 2.1.4 directly to 2.2.
+
+If you prefer a secured and verified upgrade path, you can upgrade to one of the verified and tested versions, then directly upgrade to 2.2. For example, you could upgrade from 2.0.10 to 2.0.14, then upgrade to 2.2.