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

Commit d9654ae

Browse files
committed
Merge branch 'master' into ds_DOC-351
2 parents 527af17 + b060608 commit d9654ae

File tree

306 files changed

+2183
-1763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+2183
-1763
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: db7dbc1cc59ebacdc293be883683a3351cf84a8f
3+
revision: c437253c75119e8c890b7e8e968ddf812205085c
44
specs:
5-
devdocs (15)
5+
devdocs (16)
66
jekyll (>= 4.0)
77

88
GEM

src/_data/core-releases.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
{
22
"2.4": {
33
"releases": [
4+
{
5+
"publishedAt": "2021-08-10T16:44:14Z",
6+
"tagName": "2.4.3"
7+
},
8+
{
9+
"publishedAt": "2021-08-10T16:44:09Z",
10+
"tagName": "2.4.2-p2"
11+
},
412
{
513
"publishedAt":"2021-05-11T15:16:17Z",
614
"tagName":"2.4.2-p1"
@@ -30,6 +38,10 @@
3038
},
3139
"2.3": {
3240
"releases": [
41+
{
42+
"publishedAt": "2021-08-10T16:44:05Z",
43+
"tagName": "2.3.7-p1"
44+
},
3345
{
3446
"publishedAt":"2021-05-11T15:16:04Z",
3547
"tagName":"2.3.7"

src/_data/main-nav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
url: /live-search/overview.html
203203
versionless: true
204204

205-
- label: Magento Marketplace
205+
- label: Commerce Marketplace
206206
url: /marketplace/sellers/getting-started.html
207207
versionless: true
208208

src/_data/mde.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@ extensions:
1515
-
1616
name: Amazon Sales Channel
1717
versions:
18+
-
19+
name: 4.4.1
20+
support:
21+
2.3.0: compatible
22+
2.3.1: compatible
23+
2.3.2: compatible
24+
2.3.3: compatible
25+
2.3.4: compatible
26+
2.3.5-p1: compatible
27+
2.3.6: compatible
28+
2.3.7: compatible
29+
2.4.0: compatible
30+
2.4.1: supported
31+
2.4.2: supported
32+
2.4.3: supported
1833
-
1934
name: 4.4.0
2035
support:
@@ -800,8 +815,8 @@ extensions:
800815
2.3.6: compatible
801816
2.3.7: compatible
802817
2.4.0: compatible
803-
2.4.1: not supported
804-
2.4.2: not supported
818+
2.4.1: compatible
819+
2.4.2: compatible
805820
2.4.3: supported
806821
-
807822
name: 1.3.1
@@ -815,7 +830,7 @@ extensions:
815830
2.3.6: compatible
816831
2.3.7: compatible
817832
2.4.0: compatible
818-
2.4.1: not supported
833+
2.4.1: compatible
819834
2.4.2: supported
820835
2.4.3: not supported
821836
-

src/_data/toc/cloud-guide.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@ pages:
404404
- label: Build and deploy
405405
url: /cloud/project/magento-env-yaml.html
406406
versionless: true
407-
408407
children:
409408
- label: Set up notifications
410409
url: /cloud/env/setup-notifications.html
@@ -486,7 +485,6 @@ pages:
486485
url: /cloud/env/working-with-variables.html
487486
versionless: true
488487

489-
490488
- label: Configuration management for store settings
491489
url: /cloud/live/sens-data-over.html
492490
versionless: true
@@ -518,6 +516,7 @@ pages:
518516
- label: Smart wizards
519517
url: /cloud/deploy/smart-wizards.html
520518
versionless: true
519+
521520
- label: Deploy your store
522521
url: /cloud/live/stage-prod-live.html
523522
versionless: true
@@ -559,7 +558,7 @@ pages:
559558
versionless: true
560559
children:
561560
- label: Launch checklist
562-
url: /cloud/live/go-live-checklist.html
561+
url: /cloud/live/site-launch-checklist.html
563562
versionless: true
564563

565564
- label: Launch steps
@@ -615,7 +614,7 @@ pages:
615614
url: /cloud/project/project-upgrade-parent.html
616615
versionless: true
617616
children:
618-
- label: Update ece-tools version
617+
- label: Update ece-tools
619618
url: /cloud/project/ece-tools-update.html
620619
versionless: true
621620

@@ -627,7 +626,7 @@ pages:
627626
url: /cloud/project/project-upgrade.html
628627
versionless: true
629628

630-
- label: Upgrade to use ece-tools
629+
- label: Upgrade project
631630
url: /cloud/project/ece-tools-upgrade-project.html
632631
versionless: true
633632

src/_data/toc/live-search.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ pages:
88
url: /live-search/install.html
99
versionless: true
1010

11-
- label: Configure and Connect
12-
url: /live-search/config-connect.html
13-
versionless: true
14-
1511
- label: Storefront Popover
1612
url: /live-search/storefront-popover.html
1713
versionless: true

src/_data/toc/php-developer-guide.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pages:
7373
- label: Package a component
7474
url: /extension-dev-guide/package/package_module.html
7575

76-
- label: Upload your component to the Magento Marketplace
76+
- label: Upload your component to the Commerce Marketplace
7777
url: /extension-dev-guide/package/package_mktpl.html
7878

7979
- label: Validate
@@ -297,6 +297,9 @@ pages:
297297
- label: Sensitive Information
298298
url: /extension-dev-guide/security/sensitive-information.html
299299

300+
- label: Denial of Service (DoS) attacks
301+
url: /extension-dev-guide/security/dos.html
302+
300303
- label: Mass assignment
301304
url: /extension-dev-guide/security/mass-assignment.html
302305

@@ -306,6 +309,12 @@ pages:
306309
- label: Authorization
307310
url: /extension-dev-guide/security/authorization.html
308311

312+
- label: Brute force attacks
313+
url: /extension-dev-guide/security/anti-brute-force.html
314+
315+
- label: CSRF
316+
url: /extension-dev-guide/security/csrf.html
317+
309318
- label: Versioning
310319
url: /extension-dev-guide/versioning/
311320
children:

src/_data/toc/rest-api.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ pages:
4040
children:
4141

4242
- label: Admin REST endpoints
43-
url: https://magento.redoc.ly/2.4.2-admin/
43+
url: https://magento.redoc.ly/2.4.3-admin/
4444
include_versions: ["2.4"]
4545

4646
- label: Customer REST endpoints
47-
url: https://magento.redoc.ly/2.4.2-customer/
47+
url: https://magento.redoc.ly/2.4.3-customer/
4848
include_versions: ["2.4"]
4949

5050
- label: Guest REST endpoints
51-
url: https://magento.redoc.ly/2.4.2-guest/
51+
url: https://magento.redoc.ly/2.4.3-guest/
5252
include_versions: ["2.4"]
5353

5454
- label: Generate a local API reference

src/_data/var.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,26 @@ mbi: Adobe Commerce Reporting
2020

2121
# Cloud product name variables
2222

23-
ece: Cloud for Adobe Commerce
23+
ece: Adobe Commerce on cloud infrastructure
2424
ece-release-date: July 29, 2021
2525
csuite: Cloud Suite for Commerce
26+
2627
ct: ece-tools
2728
ct-repo: magento/ece-tools
2829
ct-release: 2002.1.7
29-
mcp-prod: Cloud Patches for Commerce
30-
mcp-package: magento/magento-cloud-patches
31-
mcp-release: 1.0.11
32-
mcd-package: magento/magento-cloud-docker
33-
mcd-prod: Cloud Docker for Commerce
34-
mcd-release: 1.2.4
30+
3531
mcc-prod: Cloud Components of Commerce
3632
mcc-package: magento/magento-cloud-components
3733
mcc-release: 1.0.8
3834

35+
mcd-prod: Cloud Docker for Commerce
36+
mcd-package: magento/magento-cloud-docker
37+
mcd-release: 1.2.4
38+
39+
mcp-prod: Cloud Patches for Commerce
40+
mcp-package: magento/magento-cloud-patches
41+
mcp-release: 1.0.12
42+
3943
# TIP: Use the following syntax to use a variable in the documentation source: {{site.data.var.xx}} where xx
4044
# is the variable value.
4145

0 commit comments

Comments
 (0)