Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 5836415

Browse files
authored
Sync 2.4.2-develop (#8169)
Manually resolved conflicts: CONFLICT (content): Merge conflict in src/marketplace/sellers/extension-create.md CONFLICT (add/add): Merge conflict in src/guides/v2.4/release-notes/open-source-2-4-1.md CONFLICT (add/add): Merge conflict in src/guides/v2.4/release-notes/commerce-2-4-1.md CONFLICT (content): Merge conflict in src/guides/v2.4/release-notes/b2b-release-notes.md CONFLICT (add/add): Merge conflict in src/guides/v2.4/graphql/queries/available-stores.md CONFLICT (add/add): Merge conflict in src/guides/v2.3/release-notes/open-source-2-3-6.md CONFLICT (add/add): Merge conflict in src/guides/v2.3/release-notes/commerce-2-3-6.md CONFLICT (content): Merge conflict in src/cloud/project/magento-app-php-ini.md CONFLICT (add/add): Merge conflict in src/_includes/graphql/store-config.md CONFLICT (content): Merge conflict in src/_includes/graphql/customer-output-24.md CONFLICT (content): Merge conflict in src/_data/toc/graphql.yml
1 parent 0aada6a commit 5836415

39 files changed

+768
-540
lines changed

.github/MAINTAINER_GUIDELINES.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ In general, the same [guidelines](https://devdocs.magento.com/contributor-guide/
44

55
## General expectations
66

7-
- Self assign issues/pull requests (mostly pull requests)
8-
- Review and approve or request changes
9-
- Enforce the use of the issue/pull requests template
10-
- Ask contributors to link to the code base to validate documentation updates when applicable
11-
- Ask contributors not to contribute to unsupported versions of documentation when applicable
12-
- If a DevDocs maintainer creates a pull request, it must be reviewed by another maintainer or DevDocs admin
7+
- 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.
8+
- Review and approve, or request changes.
9+
- Enforce the use of the issue/pull request template.
10+
- Ask contributors to link to the code base to validate documentation updates when applicable.
11+
- Ask contributors not to contribute to unsupported versions of documentation when applicable.
12+
- 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.
13+
- If a DevDocs maintainer creates a pull request, it must be reviewed by another maintainer or DevDocs admin.
1314

1415
## Labels
1516

@@ -23,12 +24,21 @@ Here is a brief summary of the most important labels:
2324
- `Editorial`: Typos, grammatical inconsistencies, or minor rewrites
2425
- `small changes`: See [Small changes workflow](#small-changes-workflow)
2526

27+
PRs with the `Internal Dev` label were created by Magento/Adobe employees and will be handled by the Documentation team only.
28+
2629
We also use version labels when appropriate (for example, 2.3.x).
2730

2831
As a maintainer, we expect you to add or remove labels according to these guidelines.
2932

3033
See https://github.com/magento/devdocs/labels for all labels and their descriptions.
3134

35+
## Communicating internally and externally
36+
37+
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):
38+
39+
- 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.
40+
- 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.
41+
3242
## Testing
3343

3444
We use a private CI/CD stack and do not provide access to it.

src/_data/toc/cloud-guide.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ pages:
343343
versionless: true
344344

345345
- label: IP allow list
346-
url: /cloud/cdn/fastly-vcl-whitelist.html
346+
url: /cloud/cdn/fastly-vcl-allowlist.html
347347
versionless: true
348348

349349
- label: IP block list

src/_data/toc/marketplace-sellers.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,24 @@ pages:
103103
url: /marketplace/sellers/technical-review-guidelines.html
104104
versionless: true
105105

106-
- label: Code Validation
107-
url: /marketplace/sellers/code-validation.html
106+
- label: Malware Scan
107+
url: /marketplace/sellers/malware-scan.html
108+
versionless: true
109+
110+
- label: Code Sniffer
111+
url: /marketplace/sellers/code-sniffer.html
112+
versionless: true
113+
114+
- label: Installation and Varnish Tests
115+
url: /marketplace/sellers/installation-and-varnish-tests.html
116+
versionless: true
117+
118+
- label: Copy Paste Detector
119+
url: /marketplace/sellers/copy-paste-detector.html
120+
versionless: true
121+
122+
- label: Semantic Version Check
123+
url: /marketplace/sellers/semantic-version-check.html
108124
versionless: true
109125

110126
- label: Submit for Marketing Review
@@ -153,12 +169,3 @@ pages:
153169
- label: Analytics
154170
url: /marketplace/sellers/analytics.html
155171
versionless: true
156-
157-
- label: Technical Reference
158-
url: /marketplace/sellers/technical-reference.html
159-
versionless: true
160-
children:
161-
162-
- label: Packaging v1.x Extensions
163-
url: /marketplace/sellers/packaging-v1x-extensions.html
164-
versionless: true

src/cloud/architecture/pro-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ You cannot create a branch from the Production environment branch. You must push
148148

149149
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.
150150

151-
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.
151+
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.
152152

153153
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:
154154

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
group: cloud-guide
33
title: Custom VCL for allowing requests
4-
redirect_from:
5-
- /cloud/configure/fastly-vcl-whitelist.html
64
functional_areas:
75
- Cloud
86
- Setup
@@ -89,11 +87,11 @@ In the code sample, the condition `!req.http.Fastly-FF` is important when using
8987

9088
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:
9189

92-
- [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.)
90+
- [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.)
9391

9492
- 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.
9593

96-
## Add the custom VCL snippet {#add-whitelist-vcl}
94+
## Add the custom VCL snippet
9795

9896
{% include cloud/admin-ui-login-step.md %}
9997

0 commit comments

Comments
 (0)