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

Commit 5bf277a

Browse files
committed
Merge branch 'master' of github.com:magento-commerce/devdocs into AC-1537_update-devdocs
2 parents 224e5b2 + 4f9cf19 commit 5bf277a

File tree

86 files changed

+558
-477
lines changed

Some content is hidden

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

86 files changed

+558
-477
lines changed

src/_data/toc/cloud-guide.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -570,46 +570,14 @@ pages:
570570
versionless: true
571571
children:
572572

573-
- label: Troubleshoot deployment
574-
url: /cloud/trouble/troubleshoot-deployment.html
575-
versionless: true
576-
577-
- label: Incorrect credentials
578-
url: /cloud/trouble/trouble_ce-creds.html
579-
versionless: true
580-
581-
- label: Resolve issues with a new project
582-
url: /cloud/trouble/trouble_proj-startover.html
583-
versionless: true
584-
585573
- label: Component deployment failure
586574
url: /cloud/trouble/trouble_comp-deploy-fail.html
587575
versionless: true
588576

589-
- label: Resolve issues with encryption key
590-
url: /cloud/trouble/trouble-crypt-key-variable.html
591-
versionless: true
592-
593-
- label: Resolve issues with HTML minification
594-
url: /cloud/trouble/trouble-error-html-minification.html
595-
versionless: true
596-
597-
- label: Resolve issues with Google Analytics during deployment
598-
url: /cloud/trouble/trouble-google-analytics-deploy.html
599-
versionless: true
600-
601-
- label: Site availability
602-
url: /cloud/trouble/site-availability.html
603-
versionless: true
604-
605577
- label: Add site map and search engine robots
606578
url: /cloud/trouble/robots-sitemap.html
607579
versionless: true
608580

609-
- label: Theme troubleshooting
610-
url: /cloud/trouble/theme-troubleshooting.html
611-
versionless: true
612-
613581
- label: Upgrades and patches
614582
url: /cloud/project/project-upgrade-parent.html
615583
versionless: true

src/_data/toc/product-recommendations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pages:
1212
url: /recommendations/install-configure.html
1313
versionless: true
1414

15-
- label: Recommendation Events
15+
- label: Data Collection for Recommendations
1616
url: /recommendations/events.html
1717
versionless: true
1818

src/_data/var.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,23 @@ mbi: Adobe Commerce Reporting
2121
# Cloud product name variables
2222

2323
ece: Adobe Commerce on cloud infrastructure
24-
ece-release-date: July 29, 2021
2524
csuite: Cloud Suite for Commerce
2625

2726
ct: ece-tools
2827
ct-repo: magento/ece-tools
29-
ct-release: 2002.1.7
28+
ct-release: 2002.1.8
3029

3130
mcc-prod: Cloud Components of Commerce
3231
mcc-package: magento/magento-cloud-components
33-
mcc-release: 1.0.8
32+
mcc-release: 1.0.9
3433

3534
mcd-prod: Cloud Docker for Commerce
3635
mcd-package: magento/magento-cloud-docker
37-
mcd-release: 1.2.4
36+
mcd-release: 1.3.0
3837

3938
mcp-prod: Cloud Patches for Commerce
4039
mcp-package: magento/magento-cloud-patches
41-
mcp-release: 1.0.12
40+
mcp-release: 1.0.13
4241

4342
# TIP: Use the following syntax to use a variable in the documentation source: {{site.data.var.xx}} where xx
4443
# is the variable value.

src/_data/whats-new.yml

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,73 @@ 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 Oct 18 14:38:48 2021
7+
updated: Mon Oct 25 15:15:23 2021
88
entries:
9+
- description: Added the "cache" and "system" descriptions to the [env.php reference](https://devdocs.magento.com/guides/v2.4/config-guide/prod/config-reference-envphp.html)
10+
topic.
11+
versions: 2.4.x
12+
type: Major Update
13+
date: October 22, 2021
14+
link: https://github.com/magento/devdocs/pull/9186
15+
merge_commit: ecfce43befaea1054d0ed8451a208ea07de3d2b4
16+
contributor: srsathish92
17+
membership: false
18+
labels:
19+
- Major Update
20+
- partners-contribution
21+
- 2.4.x
22+
- 'Progress: done'
23+
- 'Partner: ITG Commerce'
24+
- description: "[Release notes](https://devdocs.magento.com/live-search/release-notes.html)
25+
for Live Search 1.3.0"
26+
versions: 2.4.x
27+
type: Major Update
28+
date: October 21, 2021
29+
link: https://github.com/magento-commerce/devdocs/pull/2592
30+
merge_commit: ecd524f562b0f03de9b65c06d849415617e53dd6
31+
contributor: ccondra
32+
membership: true
33+
labels:
34+
- Major Update
35+
- 2.4.x
36+
- description: The Composer `root-update-plugin` has been updated to be compatible
37+
with Composer 2.1.6. [Upgrade Commerce](https://devdocs.magento.com/guides/v2.4/comp-mgr/cli/cli-upgrade.html)
38+
provides details about upgrading Magento Open Source and Adobe Commerce with the
39+
new version of the plugin.
40+
versions: 2.4.4
41+
type: Major Update
42+
date: October 20, 2021
43+
link: https://github.com/magento-commerce/devdocs/pull/2581
44+
merge_commit: 5a9604f08dac24aaf84ecf423486d460798df5dd
45+
contributor: keharper
46+
membership: true
47+
labels:
48+
- Major Update
49+
- 2.4.4
50+
- description: Update [reference data for the backward incompatible changes](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html).
51+
Covering entire products instead of the main source code repositories.
52+
versions: 2.4.x
53+
type: Major Update
54+
date: October 20, 2021
55+
link: https://github.com/magento-commerce/devdocs/pull/2598
56+
merge_commit: 7c08bc0fb8369b1c524dca7abd027eb837aeb3a0
57+
contributor: dshevtsov
58+
membership: true
59+
labels:
60+
- Major Update
61+
- 2.4.x
62+
- description: Added a [public roadmap](https://devdocs.magento.com/release/roadmap.html)
63+
for Magento Open Source.
64+
versions: 2.x
65+
type: New Topic
66+
date: October 20, 2021
67+
link: https://github.com/magento-commerce/devdocs/pull/2603
68+
merge_commit: 5a0d39d531a142d92d97a6b0e7cec249aa03757e
69+
contributor: jeff-matthews
70+
membership: true
71+
labels:
72+
- 2.x
73+
- New Topic
974
- description: Reference data for the [2.4.3-p1](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html),
1075
[2.3.7-p1 and 2.3.7-p2](https://devdocs.magento.com/guides/v2.3/release-notes/backward-incompatible-changes/reference.html)
1176
backward incompatible changes.

src/_includes/cloud/backup-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To back up your Staging or Production environment database before deploying:
2525

2626
1. Use SSH to log in to the remote server.
2727

28-
1. Create a database dump.
28+
1. Create a database dump. To choose a target directory for the DB dump, use the `--dump-directory` option.
2929

3030
```bash
3131
vendor/bin/ece-tools db-dump

src/cloud/docker/docker-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Prior to setting up a local workspace, gather the following credentials and acco
115115
[authentication keys]: {{site.baseurl}}/guides/v2.3/install-gde/prereq/connect-auth.html
116116
[Magento Cloud template]: https://github.com/magento/magento-cloud
117117
[Set up an account]: {{site.baseurl}}/cloud/before/before-workspace.html#newaccount
118-
[Resolve issues with encryption key]: {{site.baseurl}}/cloud/trouble/trouble-crypt-key-variable.html
118+
[Resolve issues with encryption key]: https://support.magento.com/hc/en-us/articles/360033978652
119119
[Update the hosts file and install dependencies]: {{site.baseurl}}/cloud/docker/docker-installation.html#update-the-hosts-file-and-install-dependencies
120120
[{{site.data.var.mcd-package}} GitHub repository]: https://github.com/magento/magento-cloud-docker
121121
[Get support for {{site.data.var.mcd-prod}}]: {{site.baseurl}}/cloud/docker/docker-troubleshooting.html

src/cloud/docker/docker-mode-developer.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Developer mode supports an active development environment with full, writable fi
1111

1212
## Performance considerations
1313

14-
On macOS and Windows systems, performance is slower in developer mode because of additional file synchronization operations. However, you can improve performance by using either the `manual-native` or the `mutagen` file synchronization option when you generate the `docker-compose.yml` file. See [Synchronizing data in Docker].
14+
On macOS and Windows systems, performance is slower in developer mode because of additional file synchronization operations. However, you can improve performance by using either the `manual-native` or the `mutagen` file synchronization option when you generate the `docker-compose.yml` file. See [Synchronizing data in Docker][sync].
1515

1616
{: .bs-callout-info }
1717
The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
@@ -24,7 +24,7 @@ Large files (>1 GB) can cause a period of inactivity. DB dumps and archive files
2424
**Prerequisites:**
2525

2626
- Complete the [installation steps].
27-
- [Install file synchronization tools][Synchronizing data in Docker] if needed.
27+
- [Install file synchronization tools][sync] if needed.
2828

2929
{:.procedure}
3030
To launch the Docker environment in developer mode:
@@ -35,7 +35,10 @@ To launch the Docker environment in developer mode:
3535
./vendor/bin/ece-docker build:compose --mode="developer"
3636
```
3737

38-
If required, set the option for [synchronizing data in Docker]. For example:
38+
{:.bs-callout-info}
39+
The `--mode` option in this step determines the mode in a later `deploy` step.
40+
41+
If required, set the option for [synchronizing data in Docker][sync]. For example:
3942

4043
```bash
4144
./vendor/bin/ece-docker build:compose --mode="developer" --sync-engine="mutagen"
@@ -107,10 +110,6 @@ To launch the Docker environment in developer mode:
107110
docker-compose run --rm deploy cloud-deploy
108111
```
109112

110-
```bash
111-
docker-compose run --rm deploy magento-command deploy:mode:set developer
112-
```
113-
114113
- Run post-deploy hooks.
115114

116115
```bash
@@ -153,12 +152,10 @@ To launch the Docker environment in developer mode:
153152

154153
<!--Link definitions-->
155154

156-
[{{site.data.var.mcd-prod}} Docker image]: https://hub.docker.com/r/magento/magento-cloud-docker-php/tags
157155
[installation steps]: {{site.baseurl}}/cloud/docker/docker-installation.html
158-
[latest release of the {{site.data.var.mcd-package}}]: https://github.com/magento/magento-cloud-docker/releases
159156
[magento-creds]: {{site.baseurl}}/cloud/setup/first-time-setup-import-prepare.html#auth-json
160157
[mutagen-install]: https://mutagen.io/documentation/introduction/installation/
161158
[services]: {{site.baseurl}}/cloud/docker/docker-containers.html#service-containers
162159
[service configuration options]: {{site.baseurl}}/cloud/docker/docker-containers.html#service-configuration-options
163-
[Synchronizing data in Docker]: {{site.baseurl}}/cloud/docker/docker-syncing-data.html
160+
[sync]: {{site.baseurl}}/cloud/docker/docker-syncing-data.html
164161
[xdebug]: {{site.baseurl}}/cloud/docker/docker-development-debug.html#configure-xdebug]

src/cloud/howtos/install-components.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ To install an extension:
7474
Module is enabled
7575
```
7676

77-
If you encounter deployment errors, see [extension deployment failure][trouble].
77+
If you encounter deployment errors, see [extension deployment failure][].
7878

7979
## Manage extensions
8080

@@ -168,4 +168,4 @@ If you encounter errors, see [extension deployment failure][].
168168
[config]: {{ site.baseurl }}/guides/v2.3/config-guide/config/config-php.html
169169
[extensions]: {{ site.baseurl }}/extensions/
170170
[Commerce Marketplace]: https://marketplace.magento.com
171-
[trouble]: {{ site.baseurl }}/cloud/trouble/trouble_comp-deploy-fail.html
171+
[extension deployment failure]: {{ site.baseurl }}/cloud/trouble/trouble_comp-deploy-fail.html

src/cloud/live/live-sanity-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If you modified your `composer.json` file to add modules, we recommend running t
2727

2828
Your Git branch must have the following files for building and deploying to your local, Integration, Staging, and Production environments:
2929

30-
* `auth.json` in the root project directory. This file includes the authentication keys entered when creating the project. If you need to verify the file and settings, see [Troubleshoot deployment]({{ site.baseurl }}/cloud/trouble/troubleshoot-deployment.html).
30+
* `auth.json` in the root project directory. This file includes the authentication keys entered when creating the project. If you need to verify the file and settings, see [Troubleshoot deployment](https://support.magento.com/hc/en-us/articles/4411647469965).
3131
* `config.php` if you use [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html) to manage configuration settings
3232
* [`.magento.app.yaml`]({{ site.baseurl }}/cloud/project/magento-app.html) is updated and saved in the root directory
3333
* [`services.yaml`]({{ site.baseurl }}/cloud/project/services.html) is updated and saved in `magento/`

0 commit comments

Comments
 (0)