Merge branch 'master' into db_restAPI

Author: dobooth

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,8 +77,8 @@ pages:
 - label: How-Tos
   versionless: true
   children:
-  - label: Use attributes for CSS styling
-    url: /page-builder/docs/how-to/how-to-use-attributes-for-styling.html
+  - label: Configure styling options
+    url: /page-builder/docs/how-to/how-to-configure-styling-options.html
     versionless: true
 
   - label: Add an appearance

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/_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/configure/import-url-rewrites.md

@@ -10,7 +10,7 @@ functional_areas:
 You can easily migrate to the {{site.data.var.ece}} platform without losing SEO rankings and traffic. Use the `magento/url-rewrite-import-export` module to redirect traffic from your old, indexed URLs to new URLs.
 
 {:.bs-callout-info}
-This module supports ~7.0.13|~7.1.0|~7.2.0|~7.3.0 PHP versions and is available for Magento version 2.2.x and 2.3.x only.
+This module supports PHP versions 7.0.13 and later patch releases and all 7.1.x and 7.2.x patch releases. The module is available for Magento version 2.2.x and 2.3.x only.
 
 {:.procedure}
 To install the URL rewrite module:

src/cloud/docker/docker-containers-service.md

@@ -56,6 +56,34 @@ See [Manage the database] for details about using the database.
 
 The Elasticsearch container for {{site.data.var.mcd-prod}} is a standard Elasticsearch container with required plugins and configurations for {{site.data.var.ee}}.
 
+### Troubleshooting
+
+On some Linux systems, when you launch the Docker environment, the Elasticsearch service fails to start and the following error displays:
+
+```terminal
+ERROR: [1] bootstrap checks failed
+[1]: max virtual memory areas vm.max_map_count [65530] is too low, increase to at least [262144]
+```
+
+To fix the error, run the following `sysctl` command to increase the memory map area allocation.
+
+```bash
+sysctl -w vm.max_map_count=262144
+```
+
+{:.procedure}
+To permanently update the system setting for `vm.max_map_count`:
+
+1. Edit the sysctl configuration file (`etc/sysctl.conf`) and set the required value for the `vm.max_map_count` option.
+
+1. Reboot your system.
+
+1. Run the following command to verify the change.
+
+   ```bash
+   sysctl vm.max_map_count
+   ```
+
 ## FPM container
 
 **Container name**: fpm<br/>

src/cloud/project/project-integrate-blackfire.md

@@ -0,0 +1,6 @@
+---
+title: Blackfire.io for Magento Cloud
+redirect_from:
+  - guides/v2.2/cloud/project/project-integrate-blackfire.html
+redirect_to: https://support.blackfire.io/en/articles/771436-step-3-configure-blackfire-to-run-in-all-magento-cloud-environments
+---

src/cloud/project/project-upgrade.md

@@ -96,7 +96,7 @@ Review the [service versions][version compatibility matrix] information for the
 
 ### Complete the upgrade
 
-If you use PHP version 7.2, you must remove the `mcrypt` extension from the [extensions section of the .magento.app.yaml file]. For Pro projects, you need to create a support ticket to completely disable the `mcrypt` extension.
+If you use PHP version 7.2, you must remove the `mcrypt` extension from the [extensions section of the .magento.app.yaml file].
 
  {:.bs-callout-info}
 When upgrading to 2.3.x from 2.2.x, you must verify that the `composer.json` file contains `"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"` in the `"psr-4":` section of the `autoload` property.

src/compliance/industry-compliance.md

@@ -12,4 +12,4 @@ This compliance documentation provides the technical information to ensure that
 
 ## Compliance tools
 
--  [Adobe Privacy JavaScript Library](<{{ site.baseurl }}/compliance/privacy/adobe-privacy-js-library.html>)
+-  [Magento Privacy JavaScript Library](<{{ site.baseurl }}/compliance/privacy/magento-privacy-js-library.html>)

src/compliance/privacy/adobe-privacy-js-library.md renamed to src/compliance/privacy/__adobe-privacy-js-library.md

@@ -3,6 +3,8 @@ group: compliance
 title: Adobe Privacy JavaScript Library
 ---
 
+<!-- TODO: Rename this topic without the `__` prefix to publish it when the library integration is ready -->
+
 The [Adobe Privacy JavaScript Library][] is a set of tools to help create a process for accessing and deleting private data.
 
 Magento and Adobe's data tracking services can store private information applicable to privacy regulations such as the [General Data Protection Regulation (GDPR)][] and [California Consumer Privacy Act (CCPA)][].

src/compliance/privacy/magento-privacy-js-library.md

@@ -0,0 +1,65 @@
+---
+group: compliance
+title: Magento Privacy JavaScript Library
+---
+
+<!-- TODO: Unpublish this topic and create a topic redirect to the adobe privacy js topic when the adobe privacy library is integrated with Magento -->
+
+The Magento Privacy JavaScript Library is a set of tools to help create a process for accessing and deleting private data collected by Magento.
+
+Magento's data tracking services can store private information applicable to privacy regulations such as the [General Data Protection Regulation (GDPR)][] and [California Consumer Privacy Act (CCPA)][].
+This library provides a set of functions for creating privacy-data requests and gathering their responses.
+Use this library to retrieve and remove the data stored in the browser by Magento's data tracking services.
+
+{:.bs-callout-info}
+If [Cookie Restriction Mode](https://docs.magento.com/m2/ce/user_guide/stores/compliance-cookie-restriction-mode.html) is enabled, Magento does not collect behavioral data until the shopper consents. If Cookie Restriction Mode is disabled, Magento collects behavioral data by default.
+
+## Installation
+
+The Magento Privacy JavaScript Library is available at the following CDN location: `commerce.adobe.net/magentoprivacy.js`
+
+After you have the file, you will need to add it to a custom module or theme installed in your Magento instance.
+Follow the instructions described in the [Use custom JavaScript][] topic to accomplish this task.
+
+### Initialization
+
+Import and instantiate a new `MagentoPrivacy` object or use the `window` object to access the Magento Privacy JavaScript functions.
+
+Example using `import`:
+
+```js
+import MagentoPrivacy from "./MagentoPrivacy"
+
+const magePriv = new MagentoPrivacy()
+```
+
+Example using `window`:
+
+```js
+const magePriv = new window.MagentoPrivacy()
+```
+
+## Usage
+
+The Magento Privacy JS Library provides various functions to manage identity data stored in the browser.
+
+`retrieveIdentity()`
+: Returns a JavaScript promise for an identity object from a service in the browser.
+
+  ```js
+  magePriv.retrieveIdentity().then((ids)=>console.log(ids))
+  // {"value":"1ccfd8c2-5159-433c-98d7-e937ce3b13f3"}
+  ```
+
+`removeIdentity()`
+: Removes the identity data from a service in the browser.
+  This function returns a JavaScript promise for an identity object with an `isDeleted` boolean property to indicate whether the data has been deleted.
+
+  ```js
+  magePriv.removeIdentity().then((ids)=>console.log(ids))
+  // {"value":"1ccfd8c2-5159-433c-98d7-e937ce3b13f3","isDeleted":true}
+  ```
+
+[General Data Protection Regulation (GDPR)]: <{{ site.baseurl }}/compliance/privacy/gdpr.html>
+[California Consumer Privacy Act (CCPA)]: <{{ site.baseurl }}/compliance/privacy/ccpa.html>
+[Use custom JavaScript]: <{{ site.baseurl }}/guides/v2.3/javascript-dev-guide/javascript/custom_js.html>