Merge branch 'master' into imported-sad270-devdocs-9258

Author: bdenham

_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

@@ -131,7 +131,7 @@
           url: /design-styleguide/bk-styleguide.html
 
         - label: PWA Documentation Site
-          url: https://magento.github.io/pwa-studio/
+          url: https://developer.adobe.com/commerce/pwa-studio/
 
         - label: Page Builder Developer Guide
           url: /page-builder/docs/index.html
@@ -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/_data/whats-new.yml

@@ -4,8 +4,25 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Mon Nov 15 11:32:08 2021
+updated: Mon Nov 29 15:40:15 2021
 entries:
+- description: Added the 'Reindexing in parallel mode` section to the [Manage the
+    indexers](https://devdocs.magento.com/guides/v2.4/config-guide/cli/config-cli-subcommands-index.html)
+    topic.
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: November 15, 2021
+  link: https://github.com/magento/devdocs/pull/9208
+  merge_commit: b524213fe1fd9a63bbe117eee6c57ba70097665b
+  contributor: nitish-ranjan05
+  membership: false
+  labels:
+  - Major Update
+  - 2.3.x
+  - partners-contribution
+  - 'Partner: Ziffity'
+  - 2.4.x
+  - 'Progress: done'
 - description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
     for the 1.1.6 Quality Patches Tool (QPT) package release.
   versions: 2.x

src/_includes/cloud/data-collection.md

@@ -1,6 +1,6 @@
 To help export Production data as test data to use in Staging and Integration environments, [Run the support utilities]({{ site.baseurl }}/guides/v2.3/config-guide/cli/config-cli-subcommands-spt-util.html):
 
 *  [CLI commands]({{ site.baseurl }}/guides/v2.3/config-guide/cli/config-cli-subcommands-spt-util.html#config-cli-spt-utils-db) (Recommended) to export a protected backup of customer and store data using your {{site.data.var.ee}} encryption key
-*  [Data Collection](http://docs.magento.com/m2/ee/user_guide/system/support-data-collector.html) tool for generating and exporting data
+*  [Data Collection]({{ site.user_guide_url }}/system/support-data-collector.html) tool for generating and exporting data
 
 To migrate this data, see [Migrate and deploy static files and data]({{ site.baseurl }}/cloud/live/stage-prod-migrate.html).

src/_includes/cloud/error-codes.md

@@ -46,7 +46,7 @@ Critical errors indicate a problem with the {{ site.data.var.ece }} project conf
 | 104 |  | Failed to parse the `.magento.env.yaml` file | Configuration is not defined in the `./vendor/magento/ece-tools/config/schema.yaml` file. Check that the config variable name is correct, and that it is defined. |
 | 105 |  | Unable to read the `.magento.env.yaml` file | Unable to read the `./.magento.env.yaml` file. Check file permissions. |
 | 106 |  | Unable to read the `.schema.yaml` file |  |
-| 107 | pre-deploy: clean-redis-cache | Failed to clean the Redis cache | Failed to clean the Redis cache. Check that the Redis cache configuration is correct and that the Redis service is available. See [Setup Redis service](https://devdocs.magento.com/cloud/project/services-redis.html). |
+| 107 | pre-deploy: clean-redis-cache | Failed to clean the Redis cache | Failed to clean the Redis cache. Check that the Redis cache configuration is correct and that the Redis service is available. See [Setup Redis service]({{ site.baseurl }}/cloud/project/services-redis.html). |
 | 108 | pre-deploy: set-production-mode | Command `/bin/magento maintenance:enable` failed | Check the `cloud.log` for more information. For more detailed command output, add the `VERBOSE_COMMANDS: '-vvv'` option to the `.magento.env.yaml` file. |
 | 109 | validate-config | Incorrect database configuration | Check that the `DATABASE_CONFIGURATION` environment variable is configured correctly. |
 | 110 | validate-config | Incorrect session configuration | Check that the `SESSION_CONFIGURATION` environment variable is configured correctly. The configuration must contain at least the `save` parameter. |
@@ -70,7 +70,7 @@ Critical errors indicate a problem with the {{ site.data.var.ece }} project conf
 | 128 | disable-maintenance-mode | Command `/bin/magento maintenance:disable` failed | Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: '-vvv'` into `.magento.env.yaml` for more detailed command output. |
 | 129 | install-update: reset-password | Unable to read reset password template |  |
 | 130 | install-update: cache_type | Command failed: `php ./bin/magento cache:enable` | Command `php ./bin/magento cache:enable` runs only when Magento was installed but `./app/etc/env.php` file was absent or empty at the beginning of the deployment. Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: '-vvv'` into `.magento.env.yaml` for more detailed command output. |
-| 131 | install-update | The `crypt/key`  key value does not exist in the `./app/etc/env.php` file or the `CRYPT_KEY` cloud environment variable | This error occurs if the `./app/etc/env.php` file is not present when Magento deployment begins, or if the `crypt/key` value is undefined. If you migrated the database from another environment, retrieve the crypt key value from that environment. Then, add the value to the [CRYPT_KEY](https://devdocs.magento.com/cloud/env/variables-deploy.html#crypt_key) cloud environment variable in your current environment. See [Add the Magento encryption key](https://devdocs.magento.com/cloud/setup/first-time-setup-import-import.html#encryption-key). If you accidentally removed the `./app/etc/env.php` file, use the following command to restore it from the backup files created from a previous deployment: `./vendor/bin/ece-tools backup:restore` CLI command ." |
+| 131 | install-update | The `crypt/key`  key value does not exist in the `./app/etc/env.php` file or the `CRYPT_KEY` cloud environment variable | This error occurs if the `./app/etc/env.php` file is not present when Magento deployment begins, or if the `crypt/key` value is undefined. If you migrated the database from another environment, retrieve the crypt key value from that environment. Then, add the value to the [CRYPT_KEY]({{ site.baseurl }}/cloud/env/variables-deploy.html#crypt_key) cloud environment variable in your current environment. See [Add the Magento encryption key]({{ site.baseurl }}/cloud/setup/first-time-setup-import-import.html#encryption-key). If you accidentally removed the `./app/etc/env.php` file, use the following command to restore it from the backup files created from a previous deployment: `./vendor/bin/ece-tools backup:restore` CLI command ." |
 | 132 |  | Can not connect to the Elasticsearch service | Check for valid Elasticsearch credentials and verify that the service is running |
 | 133 | validate-config | Remove Magento Braintree module configuration which is no longer supported in Magento 2.4 and later versions. | Support for the Braintree module is no longer included with Magento 2.4.0 and later. Remove the CONFIG__STORES__DEFAULT__PAYMENT__BRAINTREE__CHANNEL variable from the variables section of the .magento.app.yaml file. For Braintree support, use an official Braintree Payments extension from the Commerce Marketplace instead. |
 | 134 | validate-config | Magento 2.4.0 requires Elasticsearch service to be installed | Install Elasticsearch service |

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).