Merge branch 'master' into release-note-update-MC-38509

Author: jfrontain

.github/MAINTAINER_GUIDELINES.md

@@ -4,12 +4,13 @@ In general, the same [guidelines](https://devdocs.magento.com/contributor-guide/
 
 ## General expectations
 
--  Self assign issues/pull requests (mostly pull requests)
-   -  Review and approve or request changes
-   -  Enforce the use of the issue/pull requests template
-   -  Ask contributors to link to the code base to validate documentation updates when applicable
-   -  Ask contributors not to contribute to unsupported versions of documentation when applicable
--  If a DevDocs maintainer creates a pull request, it must be reviewed by another maintainer or DevDocs admin
+-  Self assign issues/pull requests (mostly pull requests). See the [Pull Request Process wiki topic](https://github.com/magento/devdocs/wiki/Pull-Request-Process) to learn more.
+   -  Review and approve, or request changes.
+   -  Enforce the use of the issue/pull request template.
+   -  Ask contributors to link to the code base to validate documentation updates when applicable.
+   -  Ask contributors not to contribute to unsupported versions of documentation when applicable.
+   -  Ask contributors to add a [`whatsnew`](https://github.com/magento/devdocs/wiki/Pull-Request-Process) to their `New Topic`, `Major Update`, or `Technical` labeled PRs.
+-  If a DevDocs maintainer creates a pull request, it must be reviewed by another maintainer or DevDocs admin.
 
 ## Labels
 
@@ -23,12 +24,21 @@ Here is a brief summary of the most important labels:
 -  `Editorial`: Typos, grammatical inconsistencies, or minor rewrites
 -  `small changes`: See [Small changes workflow](#small-changes-workflow)
 
+PRs with the `Internal Dev` label were created by Magento/Adobe employees and will be handled by the Documentation team only.
+
 We also use version labels when appropriate (for example, 2.3.x).
 
 As a maintainer, we expect you to add or remove labels according to these guidelines.
 
 See https://github.com/magento/devdocs/labels for all labels and their descriptions.
 
+## Communicating internally and externally
+
+There may be instances in which a maintainer has questions about a specific PR or issue. There are proper channels for communicating internally (Magento) and externally (contributors):
+
+-  Externally: Questions, revisions, or other conversation with the contributor must happen within the applicable PR or issue. Tag the contributor, if needed, to get their attention.
+-  Internally: Questions for the Magento Documentation team about a PR or issue can happen as a comment in the applicable PR or issue or within the #devdocs_maintainers channel in Magento Community Engineering Slack. If your question pertains to a specific team member, you can tag their name to initiate the conversation.
+
 ## Testing
 
 We use a private CI/CD stack and do not provide access to it.

src/_data/toc/cloud-guide.yml

@@ -343,7 +343,7 @@ pages:
               versionless: true
 
             - label: IP allow list
-              url: /cloud/cdn/fastly-vcl-whitelist.html
+              url: /cloud/cdn/fastly-vcl-allowlist.html
               versionless: true
 
             - label: IP block list

src/_data/toc/marketplace-sellers.yml

@@ -103,8 +103,24 @@ pages:
       url: /marketplace/sellers/technical-review-guidelines.html
       versionless: true
 
-    - label: Code Validation
-      url: /marketplace/sellers/code-validation.html
+    - label: Malware Scan
+      url: /marketplace/sellers/malware-scan.html
+      versionless: true
+
+    - label: Code Sniffer
+      url: /marketplace/sellers/code-sniffer.html
+      versionless: true
+
+    - label: Installation and Varnish Tests
+      url: /marketplace/sellers/installation-and-varnish-tests.html
+      versionless: true
+
+    - label: Copy Paste Detector
+      url: /marketplace/sellers/copy-paste-detector.html
+      versionless: true
+
+    - label: Semantic Version Check
+      url: /marketplace/sellers/semantic-version-check.html
       versionless: true
 
 - label: Submit for Marketing Review
@@ -153,12 +169,3 @@ pages:
     - label: Analytics
       url: /marketplace/sellers/analytics.html
       versionless: true
-
-- label: Technical Reference
-  url: /marketplace/sellers/technical-reference.html
-  versionless: true
-  children:
-
-    - label: Packaging v1.x Extensions
-      url: /marketplace/sellers/packaging-v1x-extensions.html
-      versionless: true

src/cloud/architecture/pro-architecture.md

@@ -148,7 +148,7 @@ You cannot create a branch from the Production environment branch. You must push
 
 Rather than running a traditional, active-passive master or a master-slave setup, {{site.data.var.ece}} runs a redundant architecture where all three instances accept reads and writes. This architecture offers zero downtime when scaling and provides guaranteed transactional integrity.
 
-Because of our unique, redundant hardware, we can provide you with three gateway servers. Most external services enable you to [whitelist](https://glossary.magento.com/whitelist) multiple IP addresses, so having more than one fixed IP address is not a problem.
+Because of our unique, redundant hardware, we can provide you with three gateway servers. Most external services enable you to add multiple IP addresses to an [allowlist](https://glossary.magento.com/whitelist), so having more than one fixed IP address is not a problem.
 
 The three gateways map to the three servers in your Production environment cluster and retain static IP addresses. It is fully redundant and highly available at every level:
 

src/cloud/cdn/fastly-vcl-allowlist.md

@@ -1,8 +1,6 @@
 ---
 group: cloud-guide
 title: Custom VCL for allowing requests
-redirect_from:
-   - /cloud/configure/fastly-vcl-whitelist.html
 functional_areas:
   - Cloud
   - Setup
@@ -89,11 +87,11 @@ In the code sample, the condition `!req.http.Fastly-FF` is important when using
 
 After reviewing and updating the code for your environment, use either of the following methods to add the custom VCL snippet to your Fastly service configuration:
 
--  [Add the custom VCL snippet from the Magento Admin](#add-whitelist-vcl). This method is recommended if you can access the Magento Admin UI. (Requires [Fastly CDN module for Magento 2 version 1.2.58]({{site.baseurl}}/cloud/cdn/configure-fastly.html#upgrade) or later.)
+-  [Add the custom VCL snippet from the Magento Admin](#add-the-custom-vcl-snippet). This method is recommended if you can access the Magento Admin UI. (Requires [Fastly CDN module for Magento 2 version 1.2.58]({{site.baseurl}}/cloud/cdn/configure-fastly.html#upgrade) or later.)
 
 -  Save the JSON code example to a file (for example, `allowlist.json`) and [upload it using the Fastly API]({{site.baseurl}}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api). Use this method if you cannot access the Magento Admin UI.
 
-## Add the custom VCL snippet {#add-whitelist-vcl}
+## Add the custom VCL snippet
 
 {% include cloud/admin-ui-login-step.md %}
 

src/cloud/env/environments-start.md

@@ -112,7 +112,7 @@ To activate an inactive environment, use the `magento-cloud environment:activate
 
 The following table lists incoming and outgoing IP addresses used by {{site.data.var.ece}} [Integration environments]({{ site.baseurl }}/cloud/architecture/pro-architecture.html#cloud-arch-int). These IP addresses are stable, but might change. We always notify customers before making any IP address changes.
 
-If you have a corporate firewall that blocks outgoing SSH connections, you can add the inbound IP addresses to your whitelist.
+If you have a corporate firewall that blocks outgoing SSH connections, you can add the inbound IP addresses to your allowlist.
 
 ### AWS regions
 

src/cloud/live/live.md

@@ -49,7 +49,7 @@ content='The security scan tool uses the following public IP addresses:
 52.87.98.44
 ```
 
-You must whitelist these IP addresses in your network firewall rules to allow the tool to scan your site. The tool posts requests to ports 80 and 443 only.'
+You must add these IP addresses to an allowlist in your network firewall rules to allow the tool to scan your site. The tool posts requests to ports 80 and 443 only.'
 %}
 
 The Magento Security Scan Tool enables you to regularly monitor your store websites and receive updates for known security risks, malware, and out-of-date software. This is a free service available for all implementations and versions of {{site.data.var.ece}}. You access the tool through your [Magento Marketplace account](https://account.magento.com/customer/account/login).

src/cloud/project/magento-app-php-ini.md

@@ -54,4 +54,4 @@ cat /etc/php5/fpm/php.ini
 ```
 
 {:.bs-callout-info}
-If you use {{site.data.var.mcd-prod}} for local development, see [Docker service containers]({{site.baseurl}}//cloud/docker/docker-containers-service.html#fpm-container) for information about using a custom `php.ini` file in a Docker environment.
+If you use {{site.data.var.mcd-prod}} for local development, see [Docker service containers]({{site.baseurl}}/cloud/docker/docker-containers-service.html#fpm-container) for information about using a custom `php.ini` file in a Docker environment.

src/cloud/project/project-webint-basic.md

@@ -135,7 +135,7 @@ Routes allow you to set redirects or upstream settings for applications for your
    1. Enter the **Upstream** route.
    1. Use the toggle to enable or disable the **Cache** for the route.
    1. Enter the cookies to list: No cookies, All cookies, or Specify a specific cookie. You can enter multiple specific cookies.
-   1. For Headers to Whitelist, select Default Headers or Specify a header. You can enter multiple headers.
+   1. To add Headers to an allowlist, select Default Headers or Specify a header. You can enter multiple headers.
    1. Use the toggle to enable or disable the Server-Side Includes (**SSI**).
 
 1. To configure a Redirect, enter a URL to **Redirect to**. You can use `{default}` in the URL, which is a placeholder for the default domain.

src/cloud/project/sendgrid.md

@@ -26,4 +26,4 @@ You can find Sendgrid details for your account in the Onboarding UI. Use the `ht
 
 The CNAME records resolve to the Domain Keys Identified Mail (DKIM) and Sender Policy Framework (SPF) records managed by SendGrid, so that spam filters are less likely to inhibit your messages.
 
-Magento does not support whitelisting, but you can review the [Sender Policy Framework (SPF)](https://sendgrid.com/docs/Glossary/spf.html) guidelines to improve delivery.
+Magento does not support allowlists, but you can review the [Sender Policy Framework (SPF)](https://sendgrid.com/docs/Glossary/spf.html) guidelines to improve delivery.