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

Commit a793d1c

Browse files
committed
Merge branch 'master' into patch-1
2 parents 3548e7a + 35d9898 commit a793d1c

File tree

100 files changed

+530
-341
lines changed

Some content is hidden

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

100 files changed

+530
-341
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/_data/main-nav.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
versionless: true
6767

6868
- label: Software Update Guide
69-
url: /comp-mgr/bk-compman-upgrade-guide.html
69+
url: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html
7070

7171
- label: Configuration Guide
7272
url: /config-guide/bk-config-guide.html
@@ -83,6 +83,10 @@
8383
- label: Command-line Tools Reference
8484
url: /reference/cli/magento.html
8585

86+
- label: Tools
87+
url: /quality-patches/tool.html
88+
versionless: true
89+
8690
- label: Development
8791
children:
8892

src/_data/toc/graphql.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@ pages:
318318
edition: ee-only
319319
exclude_versions: ["2.3"]
320320

321+
- label: contactUs mutation
322+
url: /graphql/mutations/contact-us.html
323+
edition: pwa-only
324+
exclude_versions: ["2.3"]
325+
321326
- label: createBraintreeClientToken mutation
322327
url: /graphql/mutations/create-braintree-client-token.html
323328

src/_data/toc/software-update-guide.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,6 @@ pages:
6969
- label: Add or update components
7070
url: /install-gde/install/cli/dev_add-update.html
7171

72-
- label: Quality Patches Tool
73-
url: /quality-patches/tool.html
74-
versionless: true
75-
children:
76-
77-
- label: Usage
78-
url: /quality-patches/usage.html
79-
versionless: true
80-
81-
- label: Release notes
82-
url: /quality-patches/release-notes.html
83-
versionless: true
84-
8572
- label: Apply patches
8673
url: /comp-mgr/patching.html
8774
children:
@@ -94,10 +81,6 @@ pages:
9481
url: /comp-mgr/patching/composer.html
9582
children:
9683

97-
- label: Update the updater application
98-
url: /comp-mgr/updater/update-updater.html
99-
include_versions: ["2.3"]
100-
10184
- label: Troubleshooting
10285
children:
10386

src/_data/toc/tools.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
label: Tools
2+
pages:
3+
- label: Quality Patches Tool
4+
url: /quality-patches/tool.html
5+
versionless: true
6+
children:
7+
8+
- label: Usage
9+
url: /quality-patches/usage.html
10+
versionless: true
11+
12+
- label: Release notes
13+
url: /quality-patches/release-notes.html
14+
versionless: true

src/_data/var.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ce: Magento Open Source
1717
ee: Adobe Commerce
1818
b2b: B2B for Adobe Commerce
1919
mbi: Adobe Commerce Reporting
20+
pwa: PWA Studio
2021

2122
# Cloud product name variables
2223

src/_data/whats-new.yml

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,74 @@ description: This page contains recent changes that we think you'd like to know
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: "/whats-new.html"
66
thread: "/whatsnew-feed.xml"
7-
updated: Mon Jan 3 15:38:47 2022
7+
updated: Mon Jan 17 15:38:41 2022
88
entries:
9+
- description: Added the [contactUs](https://devdocs.magento.com/guides/v2.4/graphql/mutations/contact-us.html)
10+
mutation topic.
11+
versions: 2.4.x
12+
type: New Topic
13+
date: January 14, 2022
14+
link: https://github.com/magento-commerce/devdocs/pull/2737
15+
merge_commit: 9b2b6d74a7e866d899ef83b4391de3d6c7e8b4ba
16+
contributor: dobooth
17+
membership: true
18+
labels:
19+
- New Topic
20+
- 2.4.x
21+
- description: Redirected [Software Update Guide](https://devdocs.magento.com/guides/v2.4/comp-mgr/bk-compman-upgrade-guide.html)
22+
topics to the new location on [Adobe Experience League](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html).
23+
versions: 2.3.x, 2.4.x
24+
type: Major Update
25+
date: January 12, 2022
26+
link: https://github.com/magento-commerce/devdocs/pull/2734
27+
merge_commit: 9e570a8ea66876b5086ba909810e95f5d7d21b77
28+
contributor: jeff-matthews
29+
membership: true
30+
labels:
31+
- Major Update
32+
- 2.3.x
33+
- 2.4.x
34+
- description: Added a new Tools section to the top navigation and moved the [Quality
35+
Patches Tool](https://devdocs.magento.com/quality-patches/tool.html) content to
36+
the new section.
37+
versions: 2.x
38+
type: Major Update
39+
date: January 12, 2022
40+
link: https://github.com/magento-commerce/devdocs/pull/2735
41+
merge_commit: dce1c7fdc03ffa7f88a12b26b8907320d1c8143a
42+
contributor: jeff-matthews
43+
membership: true
44+
labels:
45+
- 2.x
46+
- Major Update
47+
- description: Added new supported versions of Elasticsearch, OpenSearch, Redis, RabbitMQ,
48+
and Varnish to the [system requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
49+
for 2.4.4 and 2.4.5
50+
versions: 2.4.4
51+
type: Major Update
52+
date: January 7, 2022
53+
link: https://github.com/magento-commerce/devdocs/pull/2726
54+
merge_commit: 98c3b406f2275faac00f8fa7a24a04bf315ed961
55+
contributor: jeff-matthews
56+
membership: true
57+
labels:
58+
- Major Update
59+
- 2.4.4
60+
- description: Added new [parameterized data fixture](https://devdocs.magento.com/guides/v2.4/test/integration/parameterized_data_fixture.html)
61+
and [data fixture data provider annotation](https://devdocs.magento.com/guides/v2.4/test/integration/annotations/magento-data-fixture-data-provider.html)
62+
documentation for writing tests.
63+
versions: 2.4.x
64+
type: New Topic
65+
date: January 4, 2022
66+
link: https://github.com/magento/devdocs/pull/9273
67+
merge_commit: ad816f5435223fd1bbdf8187f458fe1582193cb0
68+
contributor: thiaramus
69+
membership: true
70+
labels:
71+
- Internal Dev
72+
- New Topic
73+
- 2.4.x
74+
- 'Progress: done'
975
- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
1076
for the 1.1.8 Quality Patches Tool (QPT) package release.
1177
versions: 2.x

src/_includes/cloud/cloud-fastly-manage-vcl-from-admin.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,24 @@
1515
1. After the upload completes, refresh the cache according to the notification at the top of the page.
1616

1717
{:.bs-callout-warning}
18-
The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must use the Fastly API to [manage custom snippets added through the API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
18+
The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must [manage custom VCL snippets using the Fastly API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
1919

2020
## Delete the custom VCL snippet
2121

22-
You can delete custom VCL snippet code from your Fastly configuration by uploading an empty version of the snippet from the Admin UI, or delete it completely using the Fastly API.
22+
1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Admin UI.
23+
24+
1. Click **Stores** > **Settings** > **Configuration** > **Advanced** > **System**.
25+
26+
1. Expand **Full Page Cache** > **Fastly Configuration** > **Custom VCL Snippets**.
27+
28+
![Manage custom VCL snippets]
2329

24-
- Upload an empty version of the snippet file to Fastly to remove the VCL logic from the active VCL version:
30+
1. In the _Action_ column, click the trash icon next to the snippet to delete.
2531

26-
- Edit the snippet and delete the **VCL** snippet content.
27-
- Save the configuration.
28-
- Upload the VCL to Fastly to apply your changes.
32+
1. On the next modal window, click **DELETE** and activate a new version.
2933

30-
- Use the Fastly API [Delete custom VCL snippet]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation to delete the snippet completely, or submit a support ticket to request deletion.
34+
{:.bs-callout-warning}
35+
The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must [manage custom VCL snippets using the Fastly API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
3136

3237
[Manage custom VCL snippets]: {{site.baseurl}}/common/images/cloud/cloud-fastly-manage-snippets.png
33-
{:width="650px"}
38+
{:width="650px"}

src/_includes/config/redis-verify.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If you use Redis for page caching, you'll see output similar to the following:
5252

5353
### Inspecting compressed data
5454

55-
To inspect compressed Session data and Page Cache, the [Redis Desktop Manager](https://flathub.org/apps/details/dev.rdm.RDM) supports the automatic decompression of Magento 2 Session and Page cache and displays PHP session data in a human-readable form.
55+
To inspect compressed Session data and Page Cache, the [RESP.app](https://flathub.org/apps/details/app.resp.RESP) supports the automatic decompression of Magento 2 Session and Page cache and displays PHP session data in a human-readable form.
5656

5757
### Redis ping command
5858

src/_includes/config/setup-cron_2.3_how-to.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ A sample follows:
4040
{%
4141
include note.html
4242
type='info'
43-
content='The `update/cron.php` file exists in [Composer](https://glossary.magento.com/composer)- and [archive-based](https://magento.com/tech-resources/download) Magento installations. It does not exist if you installed Magento by cloning the [Magento 2 git repository](https://github.com/magento/magento2/).
43+
content='The `update/cron.php` file exists in [Composer](https://glossary.magento.com/composer)- and [archive-based](https://magento.com/tech-resources/download) installations. It does not exist in git-based installations.
4444

45-
In [Composer-based installations](https://glossary.magento.com/composer), Magento creates the `update/` directory when you run `composer create-project`. Running `composer install` does not create the `update/` directory (if it did not exist before). See [Recreate the Magento updater](https://devdocs.magento.com/guides/v2.3/comp-mgr/updater/update-updater.html).'
45+
In [Composer-based installations](https://glossary.magento.com/composer), running the `composer create-project` command creates an `update/` directory. Running the `composer install` command does not create the `update/` directory (if it did not exist before).'
4646
%}
4747

4848
Starting in Magento version 2.3.4, cron tasks are categorized into two groups:

0 commit comments

Comments
 (0)