Merge branch 'master' into whatsnew-this-week

Author: jfrontain

src/_data/toc/cloud-guide.yml

@@ -491,11 +491,11 @@ pages:
           url: /cloud/live/stage-prod-test.html
           versionless: true
 
-    - label: Go live and launch
+    - label: Site launch
       url: /cloud/live/live.html
       versionless: true
       children:
-        - label: Go live checklist
+        - label: Launch checklist
           url: /cloud/live/go-live-checklist.html
           versionless: true
 

src/_data/whats-new.yml

@@ -933,7 +933,7 @@ entries:
   type: Major update
   date: November 27, 2019
   link: https://github.com/magento/devdocs/pull/6080
-- description: Added the [Security configuration](https://devdocs.magento.com/cloud/live/go-live-checklist.html#security-configuration)
+- description: Added the [Security configuration](https://devdocs.magento.com/cloud/live/site-launch-checklist.html#security-configuration)
     section to the "Go live checklist" topic in the _Cloud Guide_ and replaced the
     current Go live checklist document attachment with the most recent version, which
     is more comprehensive and up-to-date.

src/_includes/install/composer-overview.md

@@ -8,3 +8,5 @@ We use [Composer](https://getcomposer.org/){:target="_blank"} to manage Magento
 
 {:.bs-callout-warning}
 You must create a Composer project from our metapackage if you want to use the Magento Web Setup Wizard to upgrade the Magento software and third-party extensions.
+
+{% include install/web/deprecated.md %}

src/_includes/install/file-system-perms-before.md

@@ -2,6 +2,8 @@
 
 This topic discusses how to set read-write permissions for the web server group before you install the Magento software. This is necessary so the Setup Wizard or command line can write files to the Magento file system.
 
+{% include install/web/deprecated.md %}
+
 The procedure you use is different, depending on whether you use [shared hosting](#perms-shared) and have one user or if you use a [private server](#perms-private) and have two users.
 
 {:.bs-callout-info}

src/_includes/install/file-system-perms-before_22.md

@@ -2,6 +2,8 @@
 
 This topic discusses how to set read-write permissions for the web server group before you install the Magento software. This is necessary so the Setup Wizard or command line can write files to the Magento file system.
 
+{% include install/web/deprecated.md %}
+
 The procedure you use is different, depending on whether you use [shared hosting](#perms-shared) and have one user or if you use a [private server](#perms-private) and have two users.
 
 {:.bs-callout-info}

src/_includes/install/flow-diagram.md

@@ -19,6 +19,8 @@ The diagram shows the following:
 
 1. Install the Magento software using either the Web Setup Wizard or command line.
 
+   {% include install/web/deprecated.md %}
+
    For simplicity, only the Web Setup Wizard is shown in the diagram.
 
    At each step, the Web Setup Wizard validates the information you entered. As shown in the preceding diagram, if validation fails, you must manually fix the issues before you proceed.

src/_includes/install/get-software_zip.md

@@ -5,6 +5,8 @@ The following table discusses where to get the Magento software. We provide the
 
 These packages are easy to get and install. You don't need to use Composer, all you need to do is to upload a package to your Magento server or hosted platform, unpack it, and run the web-based Setup Wizard.
 
+{% include install/web/deprecated.md %}
+
 Archives are available in the following formats: `.zip`, `.tar.bz2`, `.tar.gz`
 
 <table>

src/_includes/install/tls-repo.md

@@ -20,6 +20,8 @@ failed to open stream: operation failed
 
 ### Using the Web Setup Wizard
 
+{% include install/web/deprecated.md %}
+
 Actions like saving your authentication credentials or synchronizing with Magento Marketplace fail with the following error:
 
 ![SSL connect error]({{ site.baseurl }}/common/images/install_ssl-connect-error.png)

src/_includes/install/web/deprecated.md

@@ -0,0 +1,2 @@
+{:.bs-callout-warning}
+The Web Setup Wizard is being deprecated in Magento 2.3.6 and will be removed in Magento 2.4.0. After it is removed, you must use the command line to [install]({{ site.baseurl }}/guides/v2.3/install-gde/install/cli/install-cli.html) or [upgrade]({{ site.baseurl }}/guides/v2.3/comp-mgr/cli/cli-upgrade.html) Magento.

src/_includes/layout/page-header.html

@@ -1,6 +1,12 @@
 <!-- page-header -->
 <section class="page-intro">
 
+  {% if page.url contains "guides/v2.3/install-gde/install/web/" or page.url contains "guides/v2.3/comp-mgr/upgrader/" %}
+  <div class="bs-callout-warning">
+    The Web Setup Wizard is being deprecated in Magento 2.3.6 and will be removed in Magento 2.4.0. After it is removed, you must use the command line to <a href="https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli.html">install</a> or <a href="https://devdocs.magento.com/guides/v2.3/comp-mgr/cli/cli-upgrade.html">upgrade</a> Magento.
+  </div>
+  {% endif %}
+
   <h1 class="page-title">{{ page.title }}</h1>
 
   {% if page.subtitle %}

src/cloud/architecture/pro-develop-deploy-workflow.md

@@ -9,7 +9,7 @@ functional_areas:
   - Cloud
 ---
 
-The {{site.data.var.ece}} Pro plan includes a single, Git repository with a Global Master and three, main environments: the Integration environment for development and testing, the Staging environment for testing with all services, and the Production environment to go live. See [Pro architecture]({{ site.baseurl }}/cloud/architecture/pro-architecture.html) for an overview.
+The {{site.data.var.ece}} Pro plan includes a single, Git repository with a Global Master and three, main environments: the Integration environment for development and testing, the Staging environment for testing with all services, and the Production environment for launching and maintaining your live site. See [Pro architecture]({{ site.baseurl }}/cloud/architecture/pro-architecture.html) for an overview.
 
 The following graphic demonstrates the Pro develop and deploy workflow, which uses a simple, git-branching approach. You [develop](#develop) code using an Active branch based on the Integration environment branch, _pushing_ and _pulling_ code changes to and from your remote, Active branch. You deploy verified code by _merging_ the remote branch to the base branch, which activates an automated [build and deploy](#deploy) process for that environment.
 
@@ -67,10 +67,10 @@ It is best to thoroughly test every service, verify your performance testing too
 
 ### Merge to Production
 
-After thorough testing in the Staging environment, merge to the Production environment and thoroughly test using live credentials. The moment you go live, customers must be able to complete purchases and administrators must be able to manage the live store. We provide a detailed, clear walk-through for deploying your store and going live:
+After thorough testing in the Staging environment, merge to the Production environment and thoroughly test using live credentials. The moment you launch your production site, customers must be able to complete purchases and administrators must be able to manage the live store. We provide a detailed, clear walk-through for deploying your store and going live:
 
 -  See [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html)
--  See [Go live and launch]({{ site.baseurl }}/cloud/live/live.html)
+-  See [Site launch]({{ site.baseurl }}/cloud/live/live.html)
 
 ### Merge to Global Master
 

src/cloud/basic-information/starter-architecture.md

@@ -19,7 +19,7 @@ The Production environment is your live store(s) and site(s). The environment in
 
 The Production environment runs your public-facing Magento single and multi-site storefronts. This system is read-only, requiring deployment across the architecture from the Integration environment to the Staging environment, and finally to the Production environment.
 
-We walk you through [deploying to Production]({{ site.baseurl }}/cloud/live/stage-prod-live.html) and [Go Live]({{ site.baseurl }}/cloud/live/live.html) requirements and processes.
+We walk you through [deploying to Production]({{ site.baseurl }}/cloud/live/stage-prod-live.html) and [launching your site]({{ site.baseurl }}/cloud/live/live.html) requirements and processes.
 
 We highly recommend fully testing in your Staging environment and branch before pushing to the `master` branch which deploys to the Production environment.
 

src/cloud/basic-information/starter-develop-deploy-workflow.md

@@ -78,7 +78,7 @@ We recommend using a branching strategy with your development work. Using one br
 *  Integrate with a 3rd party service
 *  Push this code, test, and merge to Staging then Production
 
-And so on until you have your store fully built, configured, and ready to go live. But keep reading, we have even better options for your store and code configuration!
+And so on until you have your store fully built, configured, and ready to launch. But keep reading, we have even better options for your store and code configuration!
 
 {:.bs-callout-info}
 Do not complete any configurations in your local workstation yet.
@@ -203,14 +203,15 @@ To learn more, see [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-
 
 ### Push to Master / Production {#pro}
 
-When you push to the `master` branch, you are pushing to the Production environment. Complete configuration and testing activities in the Production environment like you did in the Staging environment with one important difference. In the Production environment use live credentials for during configuration and testing. The moment you go live and launch, customers must be able to complete purchases and administrators should be able to manage your live store.
+When you push to the `master` branch, you are pushing to the Production environment. Complete configuration and testing activities in the Production environment like you did in the Staging environment with one important difference. In the Production environment use live credentials for configuration and testing. The moment you launch your site, customers must be able to complete purchases and administrators should be able to manage your live store.
+
 To learn more, see [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html).
 
-### Go live {#go-live}
+### Site launch
 
 We provide a clear walk-through for going live and launching, which requires more steps than pressing a button. After you complete these steps, your store can serve up products in your customized theme for sale immediately.
 
-To learn more, check out [Go live and launch]({{ site.baseurl }}/cloud/live/live.html).
+To learn more, see [Site launch]({{ site.baseurl }}/cloud/live/live.html).
 
 ## Continuous integration {#continuous-integration}
 

src/cloud/before/before-setup-env-install.md

@@ -108,6 +108,8 @@ Be ready to install Magento using one of the following options:
 -  [Install the Magento software using the command line]({{ site.baseurl }}/guides/v2.3/install-gde/install/cli/install-cli.html)
 -  [Install the Magento software using the Web Setup Wizard]({{ site.baseurl }}/guides/v2.3/install-gde/install/web/install-web.html)
 
+   {% include install/web/deprecated.md %}
+
 {:.procedure}
 To install Magento using the command line:
 

src/cloud/before/before-workspace.md

@@ -39,7 +39,7 @@ Developing code for {{site.data.var.ee}} requires working in Git branches. Not e
 Have the following prepared to complete your initial workspace and project setup:
 
 *  {{site.data.var.ece}} account with an added user account
-*  Magento authentication keys from Magento Marketplace. If the Project Owner or Technical Lead created the project according to these instructions, the [Magento authentication keys]({{ site.baseurl }}/guides/v2.3/install-gde/prereq/connect-auth.html) should already be installed and available in the auth.json file in the code repository.
+*  Magento authentication keys from Magento Marketplace. If the License Owner or Technical Lead created the project according to these instructions, the [Magento authentication keys]({{ site.baseurl }}/guides/v2.3/install-gde/prereq/connect-auth.html) should already be installed and available in the auth.json file in the code repository.
 
 ## Get started
 

src/cloud/cdn/configure-fastly.md

@@ -265,7 +265,7 @@ CNAME records cannot be set for apex domains, also referred to as a naked or bas
 -  `151.101.129.124`
 -  `151.101.193.124`
 
-Refer to [Go live checklist]({{ site.baseurl }}/cloud/live/go-live-checklist.html) for more information.
+Refer to [Go live checklist]({{ site.baseurl }}/cloud/live/site-launch-checklist.html) for more information.
 
 ### TLS and Fastly {#fastly-tls}
 

src/cloud/cdn/trouble-fastly.md

@@ -113,7 +113,7 @@ If the apex domain and subdomains for your {{ site.data.var.ece }} project are a
 
 -  Update the apex and subdomain configuration on the existing Fastly account. See [Multiple Fastly accounts and assigned domains]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html#domain).
 
--  [Enable and configure Fastly]({{ site.baseurl }}/cloud/cdn/configure-fastly.html#cloud-fastly-config) and complete the [DNS configuration]({{ site.baseurl }}/cloud/live/go-live-checklist.html#dns) for your project environment.
+-  [Enable and configure Fastly]({{ site.baseurl }}/cloud/cdn/configure-fastly.html#cloud-fastly-config) and complete the [DNS configuration]({{ site.baseurl }}/cloud/live/site-launch-checklist.html#dns) for your project environment.
 
 ## Verify or debug Fastly services
 
@@ -270,7 +270,7 @@ Based on the status returned, use the following instructions to update the Fastl
 
 -  `Module is disabled`—If the Fastly module is disabled, update the environment configuration on an Integration branch in your local environment to enable it. Then, push the changes to Staging and Production. See [Manage extensions]({{ site.baseurl }}/cloud/howtos/install-components.html).
 
-   If you use [Configuration Management]({{site.baseurl}}/cloud/live/sens-data-over.html#cloud-config-specific-recomm), check the Fastly CDN module status in the `app/etc/config.php` configuration file before you push changes to the Production or Staging environment.
+   If you use [Configuration Management]({{site.baseurl}}/cloud/live/sens-data-over.html), check the Fastly CDN module status in the `app/etc/config.php` configuration file before you push changes to the Production or Staging environment.
 
    If the module is not enabled (`Fastly_CDN => 0`) in the `config.php` file, delete the file and run the following command to update `config.php` with the latest configuration settings.
 

src/cloud/docker/docker-development.md

@@ -21,11 +21,11 @@ Prior to setting up a local workspace, gather the following credentials and acco
 
 -  **Magento authentication keys (Composer keys)**
 
-    Magento authentication keys are 32-character authentication tokens that provide secure access to the Magento 2 Composer repository (repo.magento.com), and any other Git services required for Magento development such as GitHub. Your account can have multiple Magento authentication keys. For the workspace setup, start with one specific key for your code repository. If you do not have any keys, contact the Project Owner to create them, or create the [Magento authentication keys] yourself.
+    Magento authentication keys are 32-character authentication tokens that provide secure access to the Magento 2 Composer repository (repo.magento.com), and any other Git services required for Magento development such as GitHub. Your account can have multiple Magento authentication keys. For the workspace setup, start with one specific key for your code repository. If you do not have any keys, contact the Account Owner to create them, or create the [Magento authentication keys] yourself.
 
 -  **Cloud Project account**
 
-   The Project Owner or Technical Admin (Super User) should invite you to the {{site.data.var.ece}} project. When you receive the e-mail invitation, click the link and follow the prompts to create your account. See [Set up an account] for details.
+   The License Owner or Technical Admin (Super User) should invite you to the {{site.data.var.ece}} project. When you receive the e-mail invitation, click the link and follow the prompts to create your account. See [Set up an account] for details.
 
 -  **Magento Encryption Key**
 

src/cloud/env/environments-start.md

@@ -48,7 +48,7 @@ Only delete an environment if you are certain that you no longer need it. You ca
 {:.bs-callout-warning}
 You cannot delete the `master` environment of any project.
 
-You must be a [project administrator]({{ site.baseurl }}/cloud/project/user-admin.html#cloud-role-project), [environment administrator]({{ site.baseurl }}/cloud/project/user-admin.html#cloud-role-env), or [Project Owner]({{ site.baseurl }}/cloud/project/user-admin.html#cloud-role-acct-owner) to perform this task.
+You must be a [project administrator]({{ site.baseurl }}/cloud/project/user-admin.html#cloud-role-project), [environment administrator]({{ site.baseurl }}/cloud/project/user-admin.html#cloud-role-env), or [Account Owner]({{ site.baseurl }}/cloud/project/user-admin.html#cloud-role-acct-owner) to perform this task.
 
 When you delete an environment, the environment is set to _inactive_. The code is still available in the Git branch, but no longer contains the services or the database. To delete the environment completely, you must also delete the corresponding remote Git branch.
 

src/cloud/live/launch-steps.md

@@ -13,19 +13,19 @@ functional_areas:
 {:.ref-header}
 Previous step
 
-[Go live checklist]({{ site.baseurl }}/cloud/live/go-live-checklist.html)
+[Go live checklist]({{ site.baseurl }}/cloud/live/site-launch-checklist.html)
 
 After testing and completing your launch checklist, you can start the final steps to launch. These steps include entering tickets, cutting over access, and finally testing your store(s) when live.
 
 Magento support staff work with you through the process, checking status, and helping if any questions or issues occur. All issues should be tracked with tickets to best capture what happened and how it was resolved. When you begin continuous iterations deploying updates to your launched store, you may have similar issues occur again. These tickets can help pinpoint the issues and help adjust your deployment tasks.
 
-## Contact Magento to go live {#contact}
+## Contact Magento to launch your site {#contact}
 
-Contact Magento support and update any go live tickets with the intended date and time to switch over and launch your store(s).
+Contact Magento support and update any site launch (go live) tickets with the intended date and time to switch over and launch your store(s).
 
 ## Switch DNS to the new site {#dns}
 
-The Time-to-Live changed value is important for checking your changed domain. When you modify the A and CNAME records, the update will take the TTL configured time to update correctly. For details on DNS settings, see [DNS configurations]({{ site.baseurl }}/cloud/live/go-live-checklist.html#dns).
+The Time-to-Live changed value is important for checking your changed domain. When you modify the A and CNAME records, the update will take the TTL configured time to update correctly. For details on DNS settings, see [DNS configurations]({{ site.baseurl }}/cloud/live/site-launch-checklist.html#dns).
 
 {:.procedure}
 To cut over to the new site: