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

Commit 426982a

Browse files
authored
Merge branch 'master' into improvement-fix-subtitle-look
2 parents 3538fef + cf6ba1b commit 426982a

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

src/_data/whats-new.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ 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 4 22:34:52 2021
7+
updated: Mon Jan 11 15:41:03 2021
88
entries:
9+
- description: Added a [legal disclaimer](https://devdocs.magento.com/compliance/privacy/pi-data-reference-m2.html#customer-data)
10+
to references of the `date_of_birth` attribute of the `customer` database entity.
11+
versions: 2.3.x, 2.4.x
12+
type: Major Update
13+
date: January 8, 2021
14+
link: https://github.com/magento/devdocs/pull/8488
15+
contributor: jeff-matthews
16+
profile: https://github.com/jeff-matthews
917
- description: Added a new topic with instructions for [reverting from a split database
1018
to a single database](https://devdocs.magento.com/guides/v2.4/config-guide/revert-split-database.html)
1119
implementation.

src/cloud/docker/docker-containers-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ The default Magento Cloud Docker configuration includes the MailHog service as a
163163
By default, MailHog listens on port 1025 for SMTP and port 8025 for the frontend dashboard and API (HTTP). You can change the default ports using the `--mailhog-http-port` and `--mailhog-smtp-port` options. When you build the Docker compose configuration, you can change the default ports:
164164

165165
```bash
166-
./vendor/bin/ece-docker build:compose --mailhog-smtp-port=1026 --mailhog-http-port=8026
166+
./vendor/bin/ece-docker build:compose --mailhog-smtp-port=1025 --mailhog-http-port=8025
167167
```
168168

169-
After updating the configuration and restarting the Docker environment, you can connect to the MailHog service from `http://magento2.docker:8026`, and use port 1026 for SMTP communication.
169+
After updating the configuration and restarting the Docker environment, you can connect to the MailHog service from `http://magento2.docker:8025`, and use port 1025 for SMTP communication.
170170

171171
If needed, you can disable the MailHog service when you generate the Docker compose configuration:
172172

src/guides/v2.3/frontend-dev-guide/themes/theme-structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ The key difference between static files and other theme files is that static fil
282282
Static view files that can be accessed by a direct link from the storefront, are distinguished as public theme files.
283283

284284
{:.bs-callout-info}
285-
To be actually accessible for browsers public static files are [published]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview) to the `/pub/static/frontend/<Vendor>/<theme>/<language>/css/` directory.
285+
To be actually accessible for browsers public static files are [published]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview) to the `/pub/static/frontend/<Vendor>/<theme>/<locale>/css/` directory.
286286

287287
### Dynamic view files
288288

0 commit comments

Comments
 (0)