Merge branch 'master' into Cloud-2002.0.16

magento · Feb 26, 2019 · 08a493e · 08a493e
2 parents e40a6f1 + f8b75f4
commit 08a493e
Show file tree

Hide file tree

Showing 25 changed files with 339 additions and 247 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 1ce56765123d6c552ae1c251a0df924971269f89
+  revision: dcb189be6fd4e0ebc69dce7cd6cdeb3b960b3a9e
   specs:
     devdocs (0.0.1)
       jekyll (~> 3.3)

diff --git a/_config.yml b/_config.yml
@@ -178,6 +178,10 @@ algolia:
     - guides/m1x/**/*.md
     - swagger
     - redoc
+  # Index HTML elements, especially code samples.
+  nodes_to_index: 'p,li,td,code'
+  # Indexing fails if this isn't set because some of our records are very large.
+  max_record_size: 400000
 
 google:
   analytics: UA-66243208-1

diff --git a/_data/toc/graphql.yml b/_data/toc/graphql.yml
@@ -79,6 +79,3 @@ pages:
 
             - label: urlResolver endpoint
               url: /graphql/reference/url-resolver.html
-
-            - label: Wishlist endpoint
-              url: /graphql/reference/wishlist.html
diff --git a/_data/toc/magento-functional-testing-framework-guide-2_3.yml b/_data/toc/magento-functional-testing-framework-guide-2_3.yml
@@ -113,6 +113,10 @@ pages:
     url: /mftf/2.3/troubleshooting.html
     versionless: true
 
+  - label: Versioning
+    url: /mftf/2.3/versioning.html
+    versionless: true
+
   - label: Contribution guidelines
     url: https://github.com/magento/magento2-functional-testing-framework/blob/master/.github/CONTRIBUTING.md
     versionless: true

diff --git a/_data/whats-new.yml b/_data/whats-new.yml
@@ -4,8 +4,38 @@ description: |
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: /whats-new.html
 thread: /whatsnew-feed.xml
-updated: Tue Feb 19 10:45:50 2019
+updated: Mon Feb 25 10:43:52 2019
 entries:
+- description: Removed improper git commands for composer reinstall in [Uninstall
+    and Reinstall Magento](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-uninstall.html#instgde-install-magento-reinstall)
+    and links to correct instructions.
+  versions: 2.2.x, 2.3.x
+  type: Technical changes
+  date: February 22, 2019
+  link: https://github.com/magento/devdocs/pull/3802
+- description: Added the section [Merge action groups](http://devdocs.magento.com/mftf/2.3/merging.html#merge-action-groups)
+    to the Merging page in the MFTF guide.
+  versions: 2.3.x
+  type: Major update
+  date: February 21, 2019
+  link: https://github.com/magento/devdocs/pull/3792
+- description: Added the missing `cache` command in [Disable Module Output](https://devdocs.magento.com/guides/v2.2/config-guide/config/disable-module-output.html#export-the-configuration-changes).
+  versions: 2.2.x, 2.3.x
+  type: Technical changes
+  date: February 21, 2019
+  link: https://github.com/magento/devdocs/pull/3799
+- description: Added a [Versioning](https://devdocs.magento.com/mftf/2.3/versioning.html)
+    topic to the MFTF guide.
+  versions: 2.2.x, 2.3.x
+  type: Major update
+  date: February 21, 2019
+  link: https://github.com/magento/devdocs/pull/3781
+- description: Added information about testing strategies to the [Magento Testing
+    Guide](https://devdocs.magento.com/guides/v2.3/test/testing.html).
+  versions: 2.2.x, 2.3.x
+  type: Major update
+  date: February 20, 2019
+  link: https://github.com/magento/devdocs/pull/3791
 - description: Added [Use parameterized selectors in action groups with argument references](https://devdocs.magento.com/mftf/2.3/tips-tricks.html#use-parameterized-selectors-in-action-groups-with-argument-references)
     to Tips and Tricks.
   versions: 2.3.x

diff --git a/guides/v2.0/cloud/architecture/pro-architecture-legacy.md b/guides/v2.0/cloud/architecture/pro-architecture-legacy.md
@@ -103,7 +103,7 @@ We highly recommend testing every merchant and customer interaction in the Stagi
 
 ## Production environment {#cloud-arch-prod}
 
-The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring triple-redundant, high-availability nodes for continuous access and failover protection for your customers.
+The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring redundant, high-availability nodes for continuous access and failover protection for your customers.
 
 #### Branches
 
@@ -116,9 +116,9 @@ We highly recommend testing every merchant and customer interaction in the Stagi
 
 ### Advantage of redundant hardware
 
-Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a triple-redundant, multi-master architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
+Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a redundant, multi-master architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
 
-Because of our unique, triple-redundant hardware, we can provide you with a set of three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
+Because of our unique, redundant hardware, we can provide you with a set of three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
 
 These three gateways map to the three servers in your Production environment cluster and retain static IP addresses. It is fully redundant and highly available at every level:
 
@@ -156,7 +156,7 @@ The following figure shows the technology used in the Production environment:
 
 ![Production technology stack]({{ site.baseurl }}/common/images/cloud_stack-diagram.png)
 
-{{site.data.var.ee}} seamlessly scales from the smallest 6 CPU cluster with 11.25GB of RAM to the largest 96 CPU cluster with 180GB of RAM. Our triple-redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade without downtime of your site.
+{{site.data.var.ee}} seamlessly scales from the smallest 6 CPU cluster with 11.25GB of RAM to the largest 96 CPU cluster with 180GB of RAM. Our redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade without downtime of your site.
 
 In addition, extra web servers can be added to an existing cluster should the constriction be at the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} level rather than the database level. This provides [*horizontal scaling*](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling){:target="_blank"} to complement the vertical scaling provided by extra CPUs on the database level.
 

diff --git a/guides/v2.0/cloud/architecture/pro-architecture.md b/guides/v2.0/cloud/architecture/pro-architecture.md
@@ -107,15 +107,15 @@ We highly recommend testing every merchant and customer interaction in the Stagi
 
 ## Production environment {#cloud-arch-prod}
 
-The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring triple-redundant, high-availability nodes for continuous access and failover protection for your customers.
+The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring redundant, high-availability nodes for continuous access and failover protection for your customers.
 
 You cannot create a branch from the Production environment branch. You must push code changes from the Staging environment branch to the Production environment branch.
 
 ### Redundant hardware
 
-Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a triple-redundant architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
+Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a redundant architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
 
-Because of our unique, triple-redundant hardware, we can provide you with three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
+Because of our unique, redundant hardware, we can provide you with three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
 
 The three gateways map to the three servers in your Production environment cluster and retain static IP addresses. It is fully redundant and highly available at every level:
 
@@ -163,7 +163,7 @@ The following figure shows the technologies used in the Production environment:
 
 ![Production technology stack]({{ site.baseurl }}/common/images/cloud_stack-diagram.png)
 
-{{site.data.var.ee}} scales seamlessly from the smallest 6-CPU cluster with 11.25GB of RAM to the largest 96-CPU cluster with 180GB of RAM. Our triple-redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade without downtime of your site.
+{{site.data.var.ee}} scales seamlessly from the smallest 6-CPU cluster with 11.25GB of RAM to the largest 96-CPU cluster with 180GB of RAM. Our redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade without downtime of your site.
 
 [//]: # (HG—careful: In addition, you can add extra web servers to an existing cluster should the constriction be at the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} level rather than the database level. This provides _horizontal scaling_ to complement the vertical scaling provided by extra CPUs on the database level.)
 

diff --git a/guides/v2.0/mtf/mtf_installation.md b/guides/v2.0/mtf/mtf_installation.md
@@ -37,16 +37,14 @@ If you're not sure that Composer is installed, see [Install Composer]({{ page.ba
 
 ```bash
 cd <magento2_root_dir>/dev/tests/functional/
-```
-```bash
 composer install
 ```
 
 {: .bs-callout .bs-callout-info }
 If command failed, maybe [Composer](https://getcomposer.org) hasn't been installed globally.  
  Copy `composer.phar` to `/usr/local/bin/composer`.  
  To run it locally put `composer.phar` into directory, where `composer.json` file is located (that is, `<magento2>/dev/tests/functional/`).  
- And run from this directory `php {% glossarytooltip d85e2d0a-221f-4d03-aa43-0cda9f50809e %}composer{% endglossarytooltip %}.phar install`.
+ And run from this directory `php composer.phar install`.
 
 ## Check the installation {#mtf_install_check}
 
@@ -56,17 +54,13 @@ Check whether the `vendor` directory exists in `<magento2_root_dir>/dev/tests/fu
 
 ```bash
 cd <magento2_root_dir>/dev/tests/functional/
-```
-```bash
 ls
 ```
 
 Find the `mtf` directory.
 
 ```bash
 cd vendor/magento
-```
-```bash
 ls
 ```
 
@@ -76,5 +70,4 @@ Open `<magento2_root_dir>/dev/tests/functional/vendor/magento/mtf/CHANGELOG.md`.
 
 ## Next Steps   {#mtf_install_next}
 
-[Adjust FTF configuration ]({{ page.baseurl }}/mtf/mtf_quickstart/mtf_quickstart_config.html)
-
+[Adjust FTF configuration ]({{ page.baseurl }}/mtf/mtf_quickstart/mtf_quickstart_config.html)
diff --git a/guides/v2.1/cloud/architecture/pro-architecture-legacy.md b/guides/v2.1/cloud/architecture/pro-architecture-legacy.md
@@ -103,7 +103,7 @@ We highly recommend testing every merchant and customer interaction in the Stagi
 
 ## Production environment {#cloud-arch-prod}
 
-The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring triple-redundant, high-availability nodes for continuous access and failover protection for your customers.
+The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring redundant, high-availability nodes for continuous access and failover protection for your customers.
 
 #### Branches
 
@@ -116,9 +116,9 @@ We highly recommend testing every merchant and customer interaction in the Stagi
 
 ### Advantage of redundant hardware
 
-Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a triple-redundant, multi-master architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
+Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a redundant, multi-master architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
 
-Because of our unique, triple-redundant hardware, we can provide you with a set of three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
+Because of our unique, redundant hardware, we can provide you with a set of three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
 
 These three gateways map to the three servers in your Production environment cluster and retain static IP addresses. It is fully redundant and highly available at every level:
 
@@ -156,7 +156,7 @@ The following figure shows the technology used in the Production environment:
 
 ![Production technology stack]({{ site.baseurl }}/common/images/cloud_stack-diagram.png)
 
-{{site.data.var.ee}} seamlessly scales from the smallest 6 CPU cluster with 11.25GB of RAM to the largest 96 CPU cluster with 180GB of RAM. Our triple-redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade without downtime of your site.
+{{site.data.var.ee}} seamlessly scales from the smallest 6 CPU cluster with 11.25GB of RAM to the largest 96 CPU cluster with 180GB of RAM. Our redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade without downtime of your site.
 
 In addition, extra web servers can be added to an existing cluster should the constriction be at the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} level rather than the database level. This provides [*horizontal scaling*](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling) to complement the vertical scaling provided by extra CPUs on the database level.
 

diff --git a/guides/v2.1/cloud/architecture/pro-architecture.md b/guides/v2.1/cloud/architecture/pro-architecture.md
@@ -112,15 +112,15 @@ We highly recommend testing every merchant and customer interaction in the Stagi
 
 ## Production environment {#cloud-arch-prod}
 
-The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring triple-redundant, high-availability nodes for continuous access and failover protection for your customers.
+The Production environment runs your public-facing Magento single and multi-site storefronts. This environment runs on dedicated IaaS hardware featuring redundant, high-availability nodes for continuous access and failover protection for your customers.
 
 You cannot create a branch from the Production environment branch. You must push code changes from the Staging environment branch to the Production environment branch.
 
 ### Redundant hardware
 
-Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a triple-redundant architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
+Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a redundant architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
 
-Because of our unique, triple-redundant hardware, we can provide you with three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
+Because of our unique, redundant hardware, we can provide you with three gateway servers. Most external services enable you to {% glossarytooltip 34f8f61d-2b48-4628-be06-aaa6e32ddc1f %}whitelist{% endglossarytooltip %} multiple IP addresses, so having more than one fixed IP address is not a problem.
 
 The three gateways map to the three servers in your Production environment cluster and retain static IP addresses. It is fully redundant and highly available at every level:
 
@@ -175,7 +175,7 @@ The following figure shows the technologies used in the Production environment:
 -   Pro12 offers a 12-CPU (4 x 3 nodes) and 48GB RAM (16 x 3 nodes)
 -   Pro120 offers 120 CPU (40 x 3 nodes) up to 480GB RAM (160 x 3 nodes)
 
-Our triple-redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade capacity without impacting site operation.
+Our redundant architecture means we can offer upscaling without downtime. When upscaling, we rotate each of the three instances to upgrade capacity without impacting site operation.
 
 <!-- [//]: # (HG—careful: In addition, you can add extra web servers to an existing cluster should the constriction be at the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} level rather than the database level. This provides _horizontal scaling_ to complement the vertical scaling provided by extra CPUs on the database level.) -->
 

diff --git a/guides/v2.1/cloud/cdn/configure-fastly.md b/guides/v2.1/cloud/cdn/configure-fastly.md
@@ -178,7 +178,7 @@ Complete the following configuration steps in Staging and Production environment
 
 1.	After configuring the caching options, click **Save Config** at the top of the page.
 
-1.	Clear the cache according to the notification. Then, navigate back to **Stores** > **Configuration** > **Advanced** > **System** >
+1.	Clear the cache according to the notification. Then, navigate back to **Stores** > **Settings** > **Configuration** > **Advanced** > **System** >
 **Fastly Configuration** to continue configuring Fastly.
 
 Configure the following features and enable additional [configuration options](https://github.com/fastly/fastly-magento2/blob/master/Documentation/CONFIGURATION.md#further-configuration-options):

diff --git a/guides/v2.1/cloud/project/project-multi-sites.md b/guides/v2.1/cloud/project/project-multi-sites.md
@@ -30,7 +30,7 @@ After successfully creating and testing the local installation to use multiple s
 Magento Enterprise Edition *routes* define how incoming URLs are processed. The way you configure routes depends on how you want your site to operate. We suggest configuring routes for integration as follows. You can edit the values later if your needs change.
 
 {:.bs-callout .bs-callout-info}
-To set up routes in a staging or production environment, you must create a [Support ticket]({{ page.baseurl }}/cloud/trouble/trouble.html).
+For Pro, you must create a [Support ticket]({{ page.baseurl }}/cloud/trouble/trouble.html) to set up routes in the Staging or Production environment.
 
 #### To configure routes in an integration environment: