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

Commit be24271

Browse files
doboothdobooth
authored
Merge branch 'master' into issue-8471-clarification-on-environments
2 parents a474b17 + 231d6b1 commit be24271

File tree

6 files changed

+80
-54
lines changed

6 files changed

+80
-54
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/config-guide/prod/config-reference-systemxml.md

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -374,29 +374,38 @@ The following validation rules are available:
374374

375375
| Rule | Description |
376376
|---------------------------------|-------------------------------------------------------------------------------------------------------------------------|
377-
| `alphanumeric` | Allows letters, numbers, spaces or underscores only. |
378-
| `integer` | Enter a positive or negative non-decimal number. |
379-
| `letters-only` | Allows letters only. For example, `abcABC`. |
377+
| `alphanumeric` | Allows letters, numbers, spaces or underscores only. |
378+
| `integer` | Allows a positive or negative non-decimal number. |
379+
| `ipv4` | Allows a valid IP v4 address. |
380+
| `ipv6` | Allows a valid IP v6 address. |
381+
| `letters-only` | Allows letters only. For example, `abcABC`. |
382+
| `letters-with-basic-punc` | Allows letters or punctuation only.<br>Must pass the following expression: `/^[a-z\-.,()\u0027\u0022\s]+$/i`. |
383+
| `mobileUK` | Allows a (UK) mobile phone number. |
384+
| `no-marginal-whitespace` | Disallows white spaces at the start or end of the value. |
380385
| `no-whitespace` | Disallows white spaces. |
381-
| `time` | Allows a valid time in 24-hour format, between 00:00 and 23:59. For example `15`, `15:05` or `15:05:48` |
382-
| `time12h` | Allows a valid time in 12-hour format, between 12:00 am and 11:59:59 pm. For example `3 am`, `11:30 pm`, `02:15:00 pm`. |
383-
| `validate-no-html-tags` | HTML tags are not allowed. |
384-
| `validate-select` | Select an option. |
385-
| `validate-no-empty` | Empty Value |
386-
| `validate-alphanum-with-spaces` | Use letters (a-z or A-Z), numbers (0-9), or spaces only in this field. |
387-
| `validate-data` | Use letters (a-z or A-Z), numbers (0-9), or underscores (_) only in this field. The first character should be a letter. |
388-
| `validate-street` | Use letters (a-z or A-Z), numbers (0-9), spaces, and “#” only in this field. |
389-
| `validate-phoneStrict` | Enter a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
390-
| `validate-phoneLax` | Enter a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
391-
| `validate-fax` | Enter a valid fax number. For example, 123-456-7890. |
392-
| `validate-email` | Enter a valid email address. For example, johndoe@domain.com. |
393-
| `validate-emailSender` | Enter a valid email address. For example, johndoe@domain.com. |
394-
| `validate-password` | Enter 6 or more characters. Leading and trailing spaces will be ignored. |
395-
| `validate-admin-password` | Enter 7 or more characters, using both numeric and alphabetic. |
396-
| `validate-url` | Enter a valid URL. Protocol is required (http://, https:// or ftp://). |
397-
| `validate-clean-url` | Enter a valid URL. For example, http://www.example.com or www.example.com. |
398-
| `validate-xml-identifier` | Enter a valid XML-identifier. For example, something_1, block5, id-4. |
399-
| `validate-ssn` | Enter a valid social security number. For example, 123-45-6789. |
400-
| `validate-zip-us` | Enter a valid ZIP code. For example, 90602 or 90602-1234. |
401-
| `validate-date-au` | Use this date format: dd/mm/yyyy. For example, 17/03/2006 for the 17th of March, 2006. |
402-
| `validate-currency-dollar` | Enter a valid $ amount. For example, $100.00. |
386+
| `phoneUK` | Allows a (UK) phone number. |
387+
| `phoneUS` | Allows a (US) phone number. |
388+
| `required-entry` | Disallows an empty value (equivalent validation as `validate-no-empty`).<br>Validation failure message: "This is a required field." |
389+
| `time` | Allows a valid time in 24-hour format, between 00:00 and 23:59. For example `15`, `15:05` or `15:05:48`. |
390+
| `time12h` | Allows a valid time in 12-hour format, between 12:00 am and 11:59:59 pm. For example `3 am`, `11:30 pm`, `02:15:00 pm`. |
391+
| `validate-admin-password` | Allows 7 or more characters, using both numeric and alphabetic. |
392+
| `validate-alphanum-with-spaces` | Allows usage of letters (a-z or A-Z), numbers (0-9), or spaces only. |
393+
| `validate-clean-url` | Allows a valid URL. For example, http://www.example.com or www.example.com. |
394+
| `validate-currency-dollar` | Allows a valid (dollar) amount. For example, $100.00. |
395+
| `validate-data` | Allows usage of letters (a-z or A-Z), numbers (0-9), or underscores (\_) only.<br>The first character must be a letter.<br>(Must match expression: `/^[A-Za-z]+[A-Za-z0-9_]+$/`)<br>Validation failure message: "Please use only letters (a-z or A-Z), numbers (0-9) or underscore (\_) in this field, and the first character should be a letter." |
396+
| `validate-date-au` | Enforces the following date format: dd/mm/yyyy. For example, 17/03/2006 for the 17th of March, 2006. |
397+
| `validate-email` | Allows a valid email address. For example, johndoe@domain.com. |
398+
| `validate-emailSender` | Allows a valid email address. For example, johndoe@domain.com. |
399+
| `validate-fax` | Allows a valid fax number. For example, 123-456-7890. |
400+
| `validate-no-empty` | Disallows an empty value (equivalent validation as `requried-entry`).<br>Validation failure message: "Empty value." |
401+
| `validate-no-html-tags` | Disallows usage of HTML tags. |
402+
| `validate-password` | Allows 6 or more characters. Leading and trailing spaces will be ignored. |
403+
| `validate-phoneLax` | Allows a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
404+
| `validate-phoneStrict` | Allows a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
405+
| `validate-select` | Enforces that the select option chosen not have a `null` value, string value of `none` or string length of 0. |
406+
| `validate-ssn` | Allows a valid (US) social security number. For example, 123-45-6789. |
407+
| `validate-street` | Allows usage of letters (a-z or A-Z), numbers (0-9), spaces, and “#” only. |
408+
| `validate-url` | Allows a valid URL. Protocol is required (http://, https:// or ftp://). |
409+
| `validate-xml-identifier` | Allows a valid XML-identifier. For example, something_1, block5, id-4. |
410+
| `validate-zip-us` | Allows a valid (US) ZIP code. For example, 90602 or 90602-1234. |
411+
| `vinUS` | Allows (US) vehicle identification number (VIN) value. |

‎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

‎src/guides/v2.3/javascript-dev-guide/javascript/js_init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Use the `data-mage-init` attribute to insert a JS component in a specified HTML
9999

100100
When the Javascript is inserted into the specified element, the script is called only for this particular element. It is not automatically called for other elements of this type on the page.
101101

102-
##### How `data-mage-init` is processed {#init_process}
102+
#### How `data-mage-init` is processed {#init_process}
103103

104104
On DOM ready, the `data-mage-init` attribute is parsed to extract component names and configuration to be applied to the element. Depending on the type of the inserted JS component, processing is performed as follows:
105105

0 commit comments

Comments
 (0)