Merge branch 'master' into em_prex-headless

Author: erikmarr

src/guides/v2.3/coding-standards/code-standard-javascript.md

@@ -360,4 +360,4 @@ var foo = 'bar',
 [jquery-widget-coding-standard]: {{ page.baseurl }}/coding-standards/code-standard-jquery-widgets.html
 [eslint]: http://eslint.org/
 [eslint-rules]: https://github.com/magento/magento-coding-standard/blob/develop/eslint/.eslintrc-magento
-[jscs-rules]: {{ site.mage2bloburl }}/{{ page.guide_version }}/dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc
+[jscs-rules]: https://github.com/magento/magento-coding-standard/blob/develop/jscs/.jscsrc

src/guides/v2.3/config-guide/cli/config-cli-subcommands-catalog-sync.md

@@ -6,7 +6,7 @@ title: Catalog Sync
 Magento compiles catalog data into tables using indexers. This process is automatically [triggered by several events](https://docs.magento.com/user-guide/system/index-management-events.html), such as changes to a product's price or inventory levels. To allow some Magento services to use that catalog data, a catalog sync process runs hourly. The catalog sync process exports product data from the Magento server to SaaS services on an ongoing basis. For example, the [Product Recommendations](https://docs.magento.com/user-guide/marketing/product-recommendations.html) feature needs up-to-date catalog information so that it can accurately return recommendations with correct names, pricing, and availability. Use the command-line interface to trigger the catalog sync and reindex product data for consumption by SaaS services.
 
 {:.bs-callout-info}
-To use the catalog sync commands, you must have an [API key and a SaaS environment configured](https://docs.magento.com/user-guide/system/saas.html). If you do not have an API key and have not configured a SaaS environment, you can still reindex product data but that data will not be exported to SaaS services.
+To use the catalog sync commands, you must have an [API key and a SaaS Data Space configured](https://docs.magento.com/user-guide/system/saas.html). If you do not have an API key and have not configured a SaaS Data Space, you can still reindex product data but that data will not be exported to SaaS services.
 
 The commands used to sync catalog data are part of the `magento/saas-export` package. See [Install and configure Product Recommendations]({{ site.baseurl }}/recommendations/install-configure.html) for more information.
 

src/guides/v2.3/test/static/static-analysis.md

@@ -29,7 +29,7 @@ To install the JSCS plugin:
 1. Check **Enable**, if it is unchecked.
 1. Enter the path to your node binary (the result of outputting `which node` in your terminal).
 1. Enter the path to your JSCS package: `[magento_root]/node_modules/jscs`
-1. Click **Configuration File** and in the adjacent input field enter the path to the JSCS file Magento uses, which is located in: `dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc`
+1. Click **Configuration File** and in the adjacent input field enter the path to the JSCS file Magento uses, which is located in: `https://github.com/magento/magento-coding-standard/blob/develop/jscs/.jscsrc`
 
 ![JSCS config]({{site.baseurl}}/common/images/static-jscs.png)
 

src/guides/v2.4/coding-standards/code-standard-javascript.md

@@ -368,6 +368,6 @@ The source code of the rules can be found in the [Eslint custom rules folder][es
 [jquery-widget-coding-standard]: {{ page.baseurl }}/coding-standards/code-standard-jquery-widgets.html
 [eslint]: http://eslint.org/
 [eslint-rules]: https://github.com/magento/magento-coding-standard/blob/develop/eslint/.eslintrc-magento
-[jscs-rules]: {{ site.mage2bloburl }}/{{ page.guide_version }}/dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc
+[jscs-rules]: https://github.com/magento/magento-coding-standard/blob/develop/jscs/.jscsrc
 [grunt-eslint-configuration]: {{ site.mage2bloburl }}/{{ page.guide_version }}/dev/tools/grunt/configs/eslint.json
 [eslint-custom-rules-folder]: {{ site.mage2bloburl }}/{{ page.guide_version }}/dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/rules/

src/live-search/install.md

@@ -154,15 +154,15 @@ In this scenario, Elasticsearch temporarily manages search requests from the sto
 
 ## Configure API keys
 
-The {{site.data.var.ee}} API key and its associated private key are required to connect Live Search to an installation of {{site.data.var.ee}}. The API key is generated and maintained in the account of the {{site.data.var.ee}} license holder, who can share it with the developer or SI. The developer can then create and manage the SaaS environments on behalf of the license-holder. For detailed instructions, see Commerce Services in the [User Guide](https://docs.magento.com/user-guide/system/saas.html) and [Configuration Reference](https://docs.magento.com/user-guide/configuration/services/saas.html).
+The {{site.data.var.ee}} API key and its associated private key are required to connect Live Search to an installation of {{site.data.var.ee}}. The API key is generated and maintained in the account of the {{site.data.var.ee}} license holder, who can share it with the developer or SI. The developer can then create and manage the SaaS Data Spaces on behalf of the license-holder. For detailed instructions, see Commerce Services in the [User Guide](https://docs.magento.com/user-guide/system/saas.html) and [Configuration Reference](https://docs.magento.com/user-guide/configuration/services/saas.html).
 
 ### {{site.data.var.ee}} license holder
 
 To generate an API key and private key, see [Commerce Services](https://docs.magento.com/user-guide/system/saas.html) in the {{site.data.var.ee}} User Guide.
 
 ### {{site.data.var.ee}} developer or SI
 
-The developer or SI configures the SaaS environment as described in the Commerce Services section of the configuration. Commerce Services becomes available in the Admin Configuration sidebar when a SaaS module is installed.
+The developer or SI configures the SaaS Data Space as described in the Commerce Services section of the configuration. Commerce Services becomes available in the Admin Configuration sidebar when a SaaS module is installed.
 
 ## Synchronize catalog data
 

src/recommendations/install-configure.md

@@ -85,8 +85,8 @@ If needed, you can [uninstall the product-recommendations module]({{ site.baseur
 
 ## Configure Product Recommendations {#configure}
 
-After you install the `magento/product-recommendations` module, you must configure the module by [specifying the API Key and selecting a SaaS Environment](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html).
+After you install the `magento/product-recommendations` module, you must configure the module by [specifying the API Key and selecting a SaaS Data Space](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html). The license-holder must generate these keys in order to pass entitlement validation.
 
 To ensure catalog export is running correctly, confirm that the [cron]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/config-cli-subcommands-cron.html) jobs and the [indexers]({{ site.baseurl }}/guides/v{{ site.version }}/config-guide/cli/config-cli-subcommands-index.html) are running and the `Product Feed` indexer is set to `Update by Schedule`.
 
-When you successfully link to Magento Services through the API key and specify the SaaS Environment, the catalog sync initiates and [behavioral data collection]({{ page.baseurl }}/recommendations/verify.html) begins on your storefront.
+When you successfully link to Magento Services through the API key and specify the SaaS Data Space, the catalog sync initiates and [behavioral data collection]({{ page.baseurl }}/recommendations/verify.html) begins on your storefront.

src/recommendations/release-notes.md

@@ -109,7 +109,7 @@ The release notes include:
 
 This is a major version release. You must [edit your project's root composer.json file]({{ page.baseurl }}/recommendations/install-configure.html#update-your-product-recommendations-installation).
 
--  {:.new}Fetch Product Recommendations from alternate SaaS environments. This allows you to use product recommendations computed in your product environment on other, non-production environments. [Switching SaaS Environments](https://docs.magento.com/user-guide/marketing/recommendation-change-source.html) further describes this feature.
+-  {:.new}Fetch Product Recommendations from alternate SaaS Data Spaces. This allows you to use product recommendations computed in your product environment on other, non-production environments. [Switching SaaS Data Spaces](https://docs.magento.com/user-guide/marketing/recommendation-change-source.html) further describes this feature.
 
 -  {:.fix}Fixed an issue where checkout was inhibited for shoppers using uBlock Origin
 -  {:.fix}Fixed an issue sending extraneous add-to-cart events

src/recommendations/test.md

@@ -18,7 +18,7 @@ How can you test your recommendations in a non-production environment using beha
 
 ## Fetch recommendations from your production environment (recommended)
 
-Magento allows you to fetch recommendations from your production environment and preview them in your non-production environment by switching the SaaS Environment.
+Magento allows you to fetch recommendations from your production environment and preview them in your non-production environment by switching the SaaS Data Space.
 
 To fetch recommendations from your production environment, you must make sure that:
 
@@ -41,6 +41,6 @@ See the [user guide](https://docs.magento.com/user-guide/marketing/recommendatio
 
 ### Caveats
 
--  The non-production SaaS Environment behavioral and catalog data identifies an isolated environment in which the resulting product recommendations will be based entirely on the behavioral data generated on the associated storefront.
+-  The non-production SaaS Data Space behavioral and catalog data identifies an isolated environment in which the resulting product recommendations will be based entirely on the behavioral data generated on the associated storefront.
 
 -  Because you will not have large amounts of behavioral data, input data for computing product associations is sparse. However, that data is still sent to Sensei to compute the machine learning models and provide recommendations based on data you generated within this environment.