Merge branch 'master' into patch-1

Author: dobooth

src/_data/toc/cloud-guide.yml

@@ -61,10 +61,6 @@ pages:
           url: /cloud/project/new-relic.html
           versionless: true
 
-        - label: Blackfire.io
-          url: /cloud/project/project-integrate-blackfire.html
-          versionless: true
-
         - label: SendGrid
           url: /cloud/project/sendgrid.html
           versionless: true

src/_data/toc/compliance.yml

@@ -29,6 +29,6 @@ pages:
       versionless: true
       children:
 
-        - label: Adobe Privacy JavaScript Library
+        - label: Magento Privacy JavaScript Library
           versionless: true
-          url: /compliance/privacy/adobe-privacy-js-library.html
+          url: /compliance/privacy/magento-privacy-js-library.html

src/_data/toc/configuration-guide.yml

@@ -193,6 +193,9 @@ pages:
             - label: env.php reference
               url: /config-guide/prod/config-reference-envphp.html
 
+            - label: system.xml reference
+              url: /config-guide/prod/config-reference-systemxml.html
+
     - label: Configure caching
       url: /config-guide/cache.html
       children:

src/_data/toc/page-builder.yml

@@ -77,6 +77,10 @@ pages:
 - label: How-Tos
   versionless: true
   children:
+  - label: Configure styling options
+    url: /page-builder/docs/how-to/how-to-configure-styling-options.html
+    versionless: true
+
   - label: Add an appearance
     url: /page-builder/docs/how-to/how-to-add-appearance.html
     versionless: true

src/_data/toc/product-recommendations.yml

@@ -1,11 +1,11 @@
 label: Product Recommendations
 pages:
-- label: Product Recommendations
+- label: Overview
   url: /recommendations/product-recs.html
   versionless: true
 
-- label: Configure Recommendations
-  url: /recommendations/configure.html
+- label: Install and Configure Recommendations
+  url: /recommendations/install-configure.html
   versionless: true
 
 - label: Recommendation Events
@@ -20,18 +20,10 @@ pages:
   url: /recommendations/test.html
   versionless: true
 
-- label: Troubleshoot Recommendations
-  url: /recommendations/troubleshooting.html
-  versionless: true
-
 - label: Customize Recommendations
   url: /recommendations/customize.html
   versionless: true
 
 - label: Recommendations SDK
   url: /recommendations/recs-api.html
   versionless: true
-
-- label: Get Support
-  url: /recommendations/support.html
-  versionless: true

src/_data/toc/rest-api.yml

@@ -70,7 +70,7 @@ pages:
         - label: Search for the status of a bulk operation
           url: /rest/operation-status-search.html
 
-        - label: Parameters in URLs
+        - label: API usage notes
           url: /rest/notes.html
 
     - label: Tutorials

src/_includes/cloud/enable-ssh.md

@@ -150,11 +150,11 @@ To add an SSH key using the Project Web Interface:
 1. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
 1. In your selected branch, an icon displays if you do not have an SSH key added.
 
-   ![No SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-install.png)
+   ![No SSH key]({{ site.baseurl }}/common/images/cloud/cloud_ssh-key-install.png)
 
 1. Copy and paste the content of your public SSH key in the screen.
 
-   ![Add SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-add.png)
+   ![Add SSH key]({{ site.baseurl }}/common/images/cloud/cloud_ssh-key-add.png)
 
 1. Follow the prompts on your screen to complete the task.
 

src/_includes/graphql/cart-object.md

@@ -8,7 +8,7 @@ Attribute |  Data Type | Description
 `billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
 `email` | String | The customer's email address
 `id` | ID! | The ID of the cart
-`is_virtual` | Boolean | Indicates whether the cart contains only virtual products
+`is_virtual` | Boolean! | Indicates whether the cart contains only virtual products
 `items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
 `prices` | [CartPrices][CartPrices] | Contains subtotals and totals
 `selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method

src/_includes/install/auth-tokens-get.md

@@ -10,7 +10,7 @@ To create authentication keys:
 
 1. Click **Access Keys** in the Marketplace tab.
 
-   ![Get your secure access keys on Magento Marketplace]({{ site.baseurl }}/common/images/cloud_access-key.png){:width="500px"}
+   ![Get your secure access keys on Magento Marketplace]({{ site.baseurl }}/common/images/cloud/cloud_access-key.png){:width="500px"}
 
 1. Click **Create a New Access Key**. Enter a specific name for the keys (e.g., the name of the developer receiving the keys) and click **OK**.
 

src/_includes/layout/page-header.html

@@ -15,11 +15,5 @@ <h1 class="page-subtitle">{{ page.subtitle }}</h1>
   </div>
 {% endif %}
 
-{% if page.group == "product-recommendations" %}
-  <div class="message-banner">
-    This documentation is for the Product Recommendations Early Access Program. If you would like to participate, <a href="mailto:magento-product-recs-feedback@adobe.com">E-mail us</a>!
-  </div>
-{% endif %}
-
 <h1 class="page-heading">{{ page.title }}</h1>
 </section>

src/_layouts/redoc.html

@@ -14,7 +14,7 @@
 }
 </style>
 
-<script src="https://cdn.jsdelivr.net/npm/redoc@2.0.0-alpha.41/bundles/redoc.standalone.js"> </script>
+<script src="https://cdn.jsdelivr.net/npm/redoc/bundles/redoc.standalone.js"> </script>
 <script>
     Redoc.init('{{ page.specUrl }}', {
         scrollYOffset: '.site-nav',
@@ -58,4 +58,4 @@
 
 </script>
 
-{% include layout/footer.html %}
+{% include layout/footer.html %}

src/cloud/architecture/cloud-architecture.md

@@ -45,9 +45,6 @@ For comparison, each plan includes the following infrastructure features and sup
           <li>
             <a href="{{ site.baseurl }}/cloud/project/new-relic.html">New Relic</a> APM (Performance Monitoring) on 3 branches: <code>master</code> and 2 of your choice
           </li>
-          <li>
-            <a href="{{ site.baseurl }}/cloud/project/project-integrate-blackfire.html">Blackfire.io</a> Enterprise (Performance Testing)
-          </li>
           <li>Platform-as-a-service (PaaS) based Production, Staging, and development environments (4 total active environments) optimized for {{site.data.var.ee}}</li>
         </ul>
       </td>
@@ -58,9 +55,6 @@ For comparison, each plan includes the following infrastructure features and sup
           <li>
             <a href="{{ site.baseurl }}/cloud/project/new-relic.html">New Relic</a> Infrastructure on Production + APM (Performance Monitoring) on Staging and Production. <a href="{{ site.baseurl }}/cloud/project/new-relic.html">Adobe-generated alert policies</a> implement monitoring best practices to proactively notify you about application and infrastructure issues affecting site performance.
           </li>
-          <li>
-            <a href="{{ site.baseurl }}/cloud/project/project-integrate-blackfire.html">Blackfire.io</a> Enterprise (Performance Testing)
-          </li>
           <li>Platform-as-a-service (PaaS) based Integration development environments (8 total active environments) optimized for {{site.data.var.ee}}</li>
           <li>Infrastructure-as-a-Service (IaaS)—dedicated virtual infrastructure for Production environments and for Staging environments</li>
         </ul>

src/cloud/architecture/pro-architecture.md

@@ -56,24 +56,18 @@ The following table summarizes the differences between environments:
       <td>Yes</td>
       <td>Yes</td>
     </tr>
-   <tr>
-     <td>Includes Blackfire.io</td>
-     <td>Yes</td>
-     <td>Yes</td>
-     <td>Yes</td>
-   </tr>
-   <tr>
+    <tr>
      <td>Includes New Relic</td>
      <td>No</td>
      <td>APM</td>
-     <td>APM + NRI</td>
+     <td>APM &plus; NRI</td>
    </tr>
   </tbody>
 </table>
 
 Your project is a single Git repository with three, main environment branches for Integration, Staging, and Production. The following diagram shows the hierarchical relationship of the environments:
 
-![High-level view of Pro Environment architecture]({{ site.baseurl }}/common/images/cloud_pro-branch-architecture-wings.png)
+![High-level view of Pro Environment architecture]({{ site.baseurl }}/common/images/cloud/cloud_pro-branch-architecture-wings.png)
 
 ## Integration environment {#cloud-arch-int}
 
@@ -97,7 +91,7 @@ Do **not** create a branch from Global Master. Use the Integration environment b
 
 ## Staging environment {#cloud-arch-stage}
 
-The Staging environment provides a near-production environment to test your site. This environment includes all services, such as Fastly CDN, New Relic APM, Blackfire Profiler, and search—and shares the same dedicated IaaS hardware as the Production environment.
+The Staging environment provides a near-production environment to test your site. This environment includes all services, such as Fastly CDN, New Relic APM, and search—and shares the same dedicated IaaS hardware as the Production environment.
 
 You cannot create a branch from the Staging environment branch. You must push code changes from the Integration environment branch to the Staging environment branch.
 
@@ -161,7 +155,7 @@ The Production environment has three virtual machines (VMs) behind an Elastic Lo
 
 The following figure shows the technologies used in the Production environment:
 
-![Production technology stack]({{ site.baseurl }}/common/images/cloud_stack-diagram.png)
+![Production technology stack]({{ site.baseurl }}/common/images/cloud/cloud_stack-diagram.png)
 
 ### Pro cluster scaling
 

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

@@ -13,7 +13,7 @@ The {{site.data.var.ece}} Pro plan includes a single, Git repository with a Glob
 
 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.
 
-![High-level view of Pro architecture development workflow]({{ site.baseurl }}/common/images/cloud_pro-dev-workflow.png)
+![High-level view of Pro architecture development workflow]({{ site.baseurl }}/common/images/cloud/cloud_pro-dev-workflow.png)
 
 ## Development workflow {#develop}
 
@@ -61,7 +61,7 @@ Combine all verified code changes by merging your Active development branch into
 
 ### Merge to Staging
 
-Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes from the Integration environment to the Staging environment so that you can perform thorough testing with all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
+Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes from the Integration environment to the Staging environment so that you can perform thorough testing with all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html) and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
 
 It is best to thoroughly test every service, verify your performance testing tools, and perform UAT testing as an administrator and as a customer, until you feel that your store is ready for the Production environment. See [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html).
 

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

@@ -11,7 +11,7 @@ All environments are in PaaS (Platform-as-a-Service) containers. These container
 
 You can use any development and branching methodology you like. We strongly recommend creating a Staging environment and branch as one of the Integration environments.
 
-![High-level view of Starter project]({{ site.baseurl }}/common/images/cloud_arch-starter.png)
+![High-level view of Starter project]({{ site.baseurl }}/common/images/cloud/cloud_arch-starter.png)
 
 ## Production with a master branch {#cloud-arch-prod}
 
@@ -25,7 +25,7 @@ We highly recommend fully testing in your Staging environment and branch before
 
 ## Staging branch and environment {#cloud-arch-stage}
 
-We recommend creating a branch called `staging` from `master`. The Staging environment is created from the `staging` branch to provide a pre-production environment to test code, modules and extensions, payment gateways, shipping, product data, and much more. This environment provides the configuration for all services to match the Production environment including Fastly, New Relic APM, Blackfire, and search.
+We recommend creating a branch called `staging` from `master`. The Staging environment is created from the `staging` branch to provide a pre-production environment to test code, modules and extensions, payment gateways, shipping, product data, and much more. This environment provides the configuration for all services to match the Production environment including Fastly, New Relic APM, and search.
 
 Additional sections in this guide provide instructions and walk-throughs for final code deployments and testing production level interactions in a safe Staging environment. For best performance and feature testing, replicate your Production database into the Staging environment.
 

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

@@ -27,7 +27,7 @@ The development workflow uses the following process:
 *  [Generate configuration](#config-management) management files
 *  [Push code](#push-code) and configuration to build and deploy to the Staging and Production environments
 
-![Develop and deploy workflow]({{ site.baseurl }}/common/images/cloud_workflow-starter.png)
+![Develop and deploy workflow]({{ site.baseurl }}/common/images/cloud/cloud_workflow-starter.png)
 
 You also have a few optional steps to help develop and test your code and your store data:
 
@@ -63,7 +63,7 @@ The format of the Magento Cloud CLI branch command is:
 magento-cloud environment:branch <environment name> <parent environment ID>
 ```
 
-![Branch from Master]({{ site.baseurl }}/common/images/cloud_workflow-branching.png)
+![Branch from Master]({{ site.baseurl }}/common/images/cloud/cloud_workflow-branching.png)
 
 ### Develop code {#dev-code}
 
@@ -83,7 +83,7 @@ And so on until you have your store fully built, configured, and ready to go liv
 {:.bs-callout-info}
 Do not complete any configurations in your local workstation yet.
 
-![Develop code and push to deploy]({{ site.baseurl }}/common/images/cloud_workflow-push-code.png)
+![Develop code and push to deploy]({{ site.baseurl }}/common/images/cloud/cloud_workflow-push-code.png)
 
 ### Configure store {#configure-store}
 
@@ -123,11 +123,11 @@ You generate the file in the Integration environment where you configured Magent
 
 *  The generated file can be long depending on the size of your deployment. The `.vendor/bin/m2-ece-scd-dump` command generates a much smaller file than the file generated by the `app:config:dump` command.
 
-![Generate configuration management file]({{ site.baseurl }}/common/images/cloud_workflow-config-mgmt.png)
+![Generate configuration management file]({{ site.baseurl }}/common/images/cloud/cloud_workflow-config-mgmt.png)
 
 If you are using {{site.data.var.ece}} version 2.2 or later, the configuration management commands provide an additional feature to protect sensitive data, like sandbox credentials for a PayPal module. During the export process, any values that contain sensitive data are exported to separate configuration file—`env.php` in the `app/etc/` directory. This file remains in your local environment and does not get copied when you push your code to another branch. You can also create environment variables with CLI commands in all {{site.data.var.ece}} versions.
 
-![Environment variables generate]({{ site.baseurl }}/common/images/cloud_workflow-env-variables.png)
+![Environment variables generate]({{ site.baseurl }}/common/images/cloud/cloud_workflow-env-variables.png)
 
 For more information, see [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html).
 
@@ -149,7 +149,7 @@ We recommend installing sample data in your local and Integration environments.
 
 For instructions, see [Install optional sample data]({{ site.baseurl }}/cloud/howtos/sample-data.html).
 
-![Install optional sample data]({{ site.baseurl }}/common/images/cloud_workflow-sample-data.png)
+![Install optional sample data]({{ site.baseurl }}/common/images/cloud/cloud_workflow-sample-data.png)
 
 ### Optional: Pull production data {#prod-data}
 
@@ -159,7 +159,7 @@ As you develop features, add extensions, and design themes, having real data to
 
 {% include cloud/data-collection.md %}
 
-![Pull and sanitize production data]({{ site.baseurl }}/common/images/cloud_workflow-data-code-process.png)
+![Pull and sanitize production data]({{ site.baseurl }}/common/images/cloud/cloud_workflow-data-code-process.png)
 
 {:.bs-callout-info}
 Before pushing the data to another environment, you should consider sanitizing your data. You have a couple of options including [using support utilities]({{ site.baseurl }}/guides/v2.3/config-guide/cli/config-cli-subcommands-spt-util.html) or developing a script to scrub out customer data.
@@ -195,7 +195,7 @@ To learn more, see [Deployment process]({{ site.baseurl }}/cloud/reference/disco
 
 ### Push to Staging and test {#staging}
 
-You should always push all of your code in iterations to your Staging environment for full testing. The first time you use this environment, you will need to configure a few services including [Fastly]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). We also recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
+You should always push all of your code in iterations to your Staging environment for full testing. The first time you use this environment, you will need to configure a few services including [Fastly]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html) and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). We also recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials.
 
 Staging is a pre-production environment, providing all services and settings as close to Production as possible. Thoroughly test every service, verify your performance testing tools, perform UAT testing as an administrator and customers, until you feel your store is ready for Production.