Merge branch 'master' into whatsnew-update

Author: dobooth

_config.yml

@@ -109,6 +109,12 @@ defaults:
       github_files: https://github.com/magento/magento2-page-builder-docs/tree/master/
       github_repo: https://github.com/magento/magento2-page-builder-docs/
 
+  - 
+    scope:
+      path: magento-payments
+    values:
+      group: magento-payments
+
   -
     scope:
       path: guides/v2.3/mrg

src/_data/main-nav.yml

@@ -206,6 +206,10 @@
       url: /marketplace/sellers/getting-started.html
       versionless: true
 
+    - label: Payment Services
+      url: /payment-services/index.html
+      versionless: true
+
     - label: Order Management
       url: http://omsdocs.magento.com/en/
 

src/_data/toc/marketplace-sellers.yml

@@ -198,3 +198,16 @@ pages:
     - label: Analytics
       url: /marketplace/sellers/analytics.html
       versionless: true
+
+- label: Subscriptions
+  url: /marketplace/sellers/subscriptions/extension-subscriptions.html
+  versionless: true
+  children:
+
+    - label: Selling Subscription-based Extensions
+      url: /marketplace/sellers/subscriptions/selling-subscriptions.html
+      versionless: true
+
+    - label: Buying Subscription-based Extensions
+      url: /marketplace/sellers/subscriptions/buying-subscriptions.html
+      versionless: true

src/_data/toc/payment-services.yml

@@ -0,0 +1,26 @@
+label: Payment Services
+versionless: true
+pages:
+- label: Introduction
+  url: /payment-services/index.html
+  versionless: true
+
+- label: Install Payment Services
+  url: /payment-services/install-payments.html
+  versionless: true
+
+- label: Configure Payment Services
+  url: /payment-services/configure-payments.html
+  versionless: true
+  children:
+    - label: Customize buttons and messaging
+      url: /payment-services/customize-buttons-messaging.html
+      versionless: true
+
+- label: Security
+  url: /payment-services/security.html
+  versionless: true
+
+- label: Release Notes
+  url: /payment-services/release-notes.html
+  versionless: true

src/_data/toc/release-notes.yml

@@ -143,10 +143,14 @@ pages:
     - label: Product Recommendations
       url: /recommendations/release-notes.html
       versionless: true
-
+    
     - label: Sales Channels
       children:
 
         - label: Amazon
           url: /extensions/amazon-sales/release-notes/
           versionless: true
+
+    - label: Payment Services
+      url: /payment-services/release-notes.html
+      versionless: true

src/_data/toc/release.yml

@@ -22,9 +22,9 @@ pages:
     versionless: true
 
   - label: Lifecycle policy
-    url: https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf
+    url: /release/lifecycle-policy.html
     versionless: true
-  
+
   - label: Availability
     url: /release/availability.html
     versionless: true

src/_includes/cloud/note-env-config-redeploy-warning.md

@@ -0,0 +1,2 @@
+{:.bs-callout-warning}
+Updating the environment configuration triggers a redeployment, which takes your site offline until deployment completes. For Production environments, Adobe recommends completing this work during off-peak hours to avoid service disruptions. See [Working with variables]({{site.baseurl}}/cloud/env/working-with-variables.html).

src/cloud/docker/docker-development-debug.md

@@ -100,7 +100,7 @@ To configure PhpStorm to work with Xdebug:
 
 1. Select **Use path mappings**. In the _File/Directory_ pane, the root of the project for the `serverName` displays.
 
-1. In the **Absolute path on the server** column, click ![Edit]({{ site.baseurl }}/common/images/install_docker_php-storm-edit.png){:width="15px"} and add a value to the `MAGENTO_ROOT` option. The default value is `/app`
+1. In the **Absolute path on the server** column, click ![Edit]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm-edit.png){:width="15px"} and add a value to the `MAGENTO_ROOT` option. The default value is `/app`
 
 1. Change the Xdebug port to 9001 in the **Languages & Frameworks** > **PHP** > **Debug** > **Xdebug** > **Debug Port** panel.
 
@@ -113,7 +113,7 @@ The following steps describe debugging web requests and CLI commands.
 {:.procedure}
 To debug web requests:
 
-1. In your PhpStorm project, click ![Start listening for connections]({{ site.baseurl }}/common/images/install_docker_php-storm_xdebug-start-listening.png){:width="25px"} (**Start listening**) in the top navigation bar.
+1. In your PhpStorm project, click ![Start listening for connections]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm_xdebug-start-listening.png){:width="25px"} (**Start listening**) in the top navigation bar.
 
 1. Add breakpoints in the `pub/index.php` file.
 
@@ -168,17 +168,17 @@ To use Xdebug Helper with Chrome:
 
 1. Enable the extension in Chrome as shown in the following figure.
 
-   ![Enable the Xdebug extension in Chrome]({{ site.baseurl }}/common/images/install_docker_php-storm_xdebug-chrome.png)
+   ![Enable the Xdebug extension in Chrome]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm_xdebug-chrome.png)
 
-1. In _Chrome_, click ![Xdebug helper icon]({{ site.baseurl }}/common/images/cloud-xdebug_helper-icon.png){:width="25px"} in the Chrome toolbar.
+1. In _Chrome_, click ![Xdebug helper icon]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_helper-icon.png){:width="25px"} in the Chrome toolbar.
 
 1. From the _Xdebug helper_ menu, click **Options**.
 
 1. From the _IDE Key_ list, select **PhpStorm**.
 
 1. Click **Save**.
 
-   ![Xdebug Helper options]({{ site.baseurl }}/common/images/cloud-xdebug_helper-options.png){:width="400px"}
+   ![Xdebug Helper options]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_helper-options.png){:width="400px"}
 
 [docker-config]: {{site.baseurl}}/cloud/docker/docker-config.html
 [launch the Docker environment in Developer mode]: {{site.baseurl}}/cloud/docker/docker-mode-developer.html

src/cloud/howtos/debug.md

@@ -107,7 +107,7 @@ To configure PhpStorm to work with Xdebug:
 
 1. Select **Use path mappings**. In the _File/Directory_ pane, the root of the project for the `serverName` displays.
 
-1. In the **Absolute path on the server** column, click ![Edit]({{ site.baseurl }}/common/images/install_docker_php-storm-edit.png){:width="15px"} (**Edit**) and add a setting based on the environment:
+1. In the **Absolute path on the server** column, click ![Edit]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm-edit.png){:width="15px"} (**Edit**) and add a setting based on the environment:
 
    -  For all Starter environments and Pro Integration environments, the remote path is `/app`.
    -  For Pro Staging and Production environments:
@@ -195,7 +195,7 @@ To set up an SSH tunnel on Windows using Putty:
    -  **Hostname (or IP address)** field: Enter the [SSH URL]({{ site.baseurl }}/cloud/env/environments-ssh.html) for your Cloud server
    -  **Port** field: Enter `22`
 
-   ![Set up Putty]({{ site.baseurl }}/common/images/cloud-xdebug_putty-session.png){:width="350px"}
+   ![Set up Putty]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_putty-session.png){:width="350px"}
 
 1. In the _Category_ pane, click **Connection** > **SSH** > **Tunnels**.
 
@@ -207,15 +207,15 @@ To set up an SSH tunnel on Windows using Putty:
 
 1. Click **Add**.
 
-   ![Create an SSH tunnel in Putty]({{ site.baseurl }}/common/images/cloud-xdebug_putty-tunnels.png){:width="350px"}
+   ![Create an SSH tunnel in Putty]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_putty-tunnels.png){:width="350px"}
 
 1. In the _Category_ pane, click **Session**.
 
 1. In the **Saved Sessions** field, enter a name for this SSH tunnel.
 
 1. Click **Save**.
 
-   ![Save your SSH tunnel]({{ site.baseurl }}/common/images/cloud-xdebug_putty-session-save.png){:width="350px"}
+   ![Save your SSH tunnel]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_putty-session-save.png){:width="350px"}
 
 1. To test the SSH tunnel, click **Load**, then click **Open**.
 
@@ -359,21 +359,21 @@ To use Xdebug Helper with Chrome:
 
 1. Enable the extension in Chrome as shown in the following figure.
 
-   ![Enable the Xdebug extension in Chrome]({{ site.baseurl }}/common/images/install_docker_php-storm_xdebug-chrome.png)
+   ![Enable the Xdebug extension in Chrome]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm_xdebug-chrome.png)
 
-1. In Chrome, right-click ![Xdebug helper icon]({{ site.baseurl }}/common/images/cloud-xdebug_helper-icon.png){:width="25px"} in the Chrome toolbar.
+1. In Chrome, right-click ![Xdebug helper icon]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_helper-icon.png){:width="25px"} in the Chrome toolbar.
 
 1. From the pop-up menu, click **Options**.
 
 1. From the _IDE Key_ list, click **PhpStorm**.
 
 1. Click **Save**.
 
-   ![Xdebug Helper options]({{ site.baseurl }}/common/images/cloud-xdebug_helper-options.png){:width="400px"}
+   ![Xdebug Helper options]({{ site.baseurl }}/common/images/cloud/cloud-xdebug_helper-options.png){:width="400px"}
 
 1. Open your PhpStorm project.
 
-1. In the top navigation bar, click ![Start listening for connections]({{ site.baseurl }}/common/images/install_docker_php-storm_xdebug-start-listening.png){:width="25px"}  (**Start listening**).
+1. In the top navigation bar, click ![Start listening for connections]({{ site.baseurl }}/common/images/cloud/cloud-install_docker_php-storm_xdebug-start-listening.png){:width="25px"}  (**Start listening**).
 
    If the navigation bar isn't displayed, click **View** > **Navigation Bar**.
 

src/cloud/project/new-relic.md

@@ -106,8 +106,7 @@ To connect a Cloud environment to New Relic, add the New Relic license key to th
 
 For Starter environments, enable the New Relic integration by adding the New Relic license key to the environment configuration. We recommend adding the key to the Staging and Production (master) environments and one other environment of your choice. Only the New Relic license key is required for configuration. You can find information about additional configuration options in the [New Relic reporting] topic in the _{{site.data.var.ee}} User Guide_.
 
-{:.bs-callout-warning}
-Updating the environment configuration triggers a redeployment, which takes your site offline until deployment completes. For Production environments, we recommend completing this work during off-peak hours to avoid service disruptions. See [Working with variables].
+{% include cloud/note-env-config-redeploy-warning.md%}
 
 **Prerequisites:**
 
@@ -227,7 +226,7 @@ To use the New Relic Logs application:
 1. To review infrastructure log data for cloud services, enter the query string `has: "filePath"` in the _Find logs where_ field. Then, click **Query logs**.
    The names of the log files are stored in the `filePath` field, with full paths to the log file.
 
-   ![Cloud project New Relic service log data]({{ site.baseurl }}/common/images/cloud/cloud_new-relic-log-query-has-ident.png){:width="650px"}
+   ![Cloud project New Relic service log data]({{ site.baseurl }}/common/images/cloud/cloud-new-relic-log-query-has-ident.png){:width="650px"}
 
 1. To review Fastly log data, enter the query string `has: "client_ip"` in the _Find logs where_ field. Then, click **Query logs**.
 
@@ -250,15 +249,15 @@ For further information and examples, see [Introduction to New Relic Logs][New R
 Adobe provides the Managed Alerts for {{ site.data.var.ee }} alert policy to track performance metrics.
 Based on industry best practices, the policy includes a collection of alerts that set thresholds to trigger warning and critical notifications when site infrastructure or application issues affect performance. The Managed Alerts policy tracks the following metrics on Production environments only:
 
-| Metric | Data collection | Availability
-|:--------|:------------------------|:-------------
-| [Apdex score] | APM   | Pro and Starter
-| error rate    | APM   | Pro and Starter
-| disk space    | NRI   | Pro
-| CPU usage     | NRI   | Pro
-| memory usage  | NRI   | Pro
-| Redis         | NRI   | Pro
-| MariaDB       | NRI   | Pro
+| Metric        | Data collection | Availability    |
+|:--------------|:----------------|:----------------|
+| [Apdex score] | APM             | Pro and Starter |
+| error rate    | APM             | Pro and Starter |
+| disk space    | NRI             | Pro             |
+| CPU usage     | NRI             | Pro             |
+| memory usage  | NRI             | Pro             |
+| Redis         | NRI             | Pro             |
+| MariaDB       | NRI             | Pro             |
 
 When site infrastructure or application conditions trigger an alert threshold, New Relic sends alert notifications so that you can proactively address the issue.  See [Managed Alerts for Magento Commerce] in the _{{site.data.var.ee}} Help Center_ for details about alert thresholds and troubleshooting steps to resolve the issues that triggered the alert.
 
@@ -393,4 +392,3 @@ See [Alerts concepts and workflow] in the New Relic documentation for more detai
 [Update the account owner]: https://docs.newrelic.com/docs/accounts/accounts/roles-permissions/change-account-owner
 [Update policies or conditions]: https://docs.newrelic.com/docs/alerts/new-relic-alerts/configuring-alert-policies/update-or-disable-policies-conditions
 [View your license key]: https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/license-key#finding
-[Working with variables]: {{site.baseurl}}/cloud/env/working-with-variables.html