Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 67f86e2

Browse files
dshevtsovdshevtsov
committed
Merge branch 'master' into sync-2.4.3
2 parents 318e1dc + d04257e commit 67f86e2

Some content is hidden

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

57 files changed

+2032
-69
lines changed

‎_config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,12 @@ mage2bloburl: https://github.com/magento/magento2/blob
217217
# Current version
218218
gdeurl: /guides/v2.4
219219

220-
# Path to S3 location where we store large downloadable binary files, such as .ai, .psd, .zip, .pdf, .sketch
220+
# URL to downloadable binary files, such as .ai, .psd, .zip, .pdf, .sketch
221221
downloads: https://devdocs.magento.com/download
222222

223+
# URL to the User guide
224+
user_guide_url: https://docs-beta.magento.com/user-guide
225+
226+
# Patterns to exclude for Jekyll
223227
exclude:
224228
- .git

‎src/_data/main-nav.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,17 @@
195195
- label: Checkout
196196
url: /howdoi/checkout/checkout_overview.html
197197

198+
- label: Inventory Management
199+
url: /inventory/index.html
200+
201+
- label: Live Search
202+
url: /live-search/overview.html
203+
versionless: true
204+
198205
- label: Magento Marketplace
199206
url: /marketplace/sellers/getting-started.html
200207
versionless: true
201208

202-
- label: Inventory Management
203-
url: /inventory/index.html
204-
205209
- label: Order Management
206210
url: http://omsdocs.magento.com/en/
207211

‎src/_data/toc/live-search.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
label: Live Search
2+
pages:
3+
- label: Overview
4+
url: /live-search/overview.html
5+
versionless: true
6+
7+
- label: Install Live Search
8+
url: /live-search/install.html
9+
versionless: true
10+
11+
- label: Configure and Connect
12+
url: /live-search/config-connect.html
13+
versionless: true
14+
15+
- label: Storefront Popover
16+
url: /live-search/storefront-popover.html
17+
versionless: true
18+
19+
- label: Facets
20+
url: /live-search/facets.html
21+
versionless: true
22+
23+
- label: Synonyms
24+
url: /live-search/synonyms.html
25+
versionless: true
26+
27+
- label: Rules
28+
url: /live-search/rules.html
29+
versionless: true
30+
31+
- label: Indexing
32+
url: /live-search/indexing.html
33+
versionless: true
34+
35+
- label: GraphQL
36+
children:
37+
- label: GraphQL Support
38+
url: /live-search/graphql-support.html
39+
versionless: true
40+
41+
- label: attributeMetadata query
42+
url: /live-search/attribute-metadata.html
43+
versionless: true
44+
45+
- label: productSearch query
46+
url: /live-search/product-search.html
47+
versionless: true
48+
49+
- label: Release Notes
50+
url: /live-search/release-notes.html
51+
versionless: true

‎src/_data/toc/release-notes.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,21 @@ pages:
114114
- label: Inventory Management
115115
url: /inventory/release-notes.html
116116

117+
- label: Live Search
118+
url: /live-search/release-notes.html
119+
versionless: true
120+
117121
- label: Page Builder
118122
url: /page-builder/docs/release-notes.html
119123
versionless: true
120-
124+
125+
- label: Product Recommendations
126+
url: /recommendations/release-notes.html
127+
versionless: true
128+
121129
- label: Sales Channels
122130
children:
123131

124132
- label: Amazon
125133
url: /extensions/amazon-sales/release-notes/
126134
versionless: true
127-
128-
- label: Product Recommendations
129-
url: /recommendations/release-notes.html
130-
versionless: true
131-

‎src/_data/whats-new.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,20 @@ 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 Jun 14 14:38:40 2021
7+
updated: Mon Jun 21 14:38:39 2021
88
entries:
9+
- description: Published the Cloud Docker for Commerce [version 1.2.3 release notes](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html).
10+
versions: 2.4.x
11+
type: Major Update
12+
date: June 14, 2021
13+
link: https://github.com/magento-commerce/devdocs/pull/2343
14+
merge_commit: 7b17c2872f90c1a9a900c3da49ca825e18ff63ec
15+
contributor: bdenham
16+
membership: true
17+
labels:
18+
- 2.4.x
19+
- In progress
20+
- Major Update
921
- description: Added the new [Extend Catalog Rule Conditions](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/extend-catalog-rule-conditions.html)
1022
topic.
1123
versions: 2.4.x

‎src/_includes/install/maria-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Reindexing on MariaDB 10.4 takes more time compared to other MariaDB or MySQL versions. See [Configuration best practices]({{ site.baseurl }}/guides/v2.4/performance-best-practices/configuration.html#indexers).
1+
Reindexing on MariaDB 10.4 takes more time compared to other MariaDB or MySQL versions. See [Configuration best practices]({{ site.baseurl }}{{ site.gdeurl }}/performance-best-practices/configuration.html#indexers).

‎src/_videos/fundamentals/add-new-product-attribute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ Basic instructions for creating a product attribute by setup or upgrade script c
351351

352352
For use case `1` (an 'immutable' set of options), follow the above instructions ["Add a source model"](#AddSourceModel). You will create a model that contains and dynamically returns the attribute's selectable options to the client.
353353

354-
For use case `2` (a 'mutable' set of options), see ["EAV and extension attributes"]({{ site.baseurl }}/guides/v2.4/extension-dev-guide/attributes.html). Make sure to declare 'Magento\Eav\Model\Entity\Attribute\Source\Table' as the value for the 'source' attribute option. This ensures that Magento will store options in the appropriate database table.
354+
For use case `2` (a 'mutable' set of options), see ["EAV and extension attributes"]({{ site.baseurl }}{{ site.gdeurl }}/extension-dev-guide/attributes.html). Make sure to declare 'Magento\Eav\Model\Entity\Attribute\Source\Table' as the value for the 'source' attribute option. This ensures that Magento will store options in the appropriate database table.
355355

356356
With `\Magento\Eav\Setup\EavSetup.php::addAttribute()` and `\Magento\Eav\Setup\EavSetup.php::addAttributeOptions()` you can add a series of options with the following array:
357357

‎src/cloud/live/sens-data-over.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,4 @@ This process **overwrites** the store configuration; only do the following if th
195195
[Pipeline deployment]: {{ site.baseurl }}/guides/v2.3/config-guide/deployment/pipeline/technical-details.html
196196
[quick]: {{ site.baseurl }}/cloud/env/variables-build.html#scd_strategy
197197
[scd]: {{ site.baseurl }}/cloud/deploy/static-content-deployment.html
198-
[Sensitive or system-specific settings]: {{ site.baseurl }}/guides/v2.4/config-guide/prod/config-reference-sens.html
198+
[Sensitive or system-specific settings]: {{ site.baseurl }}{{ site.gdeurl }}/config-guide/prod/config-reference-sens.html

‎src/cloud/project/magento-app-php-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following table shows the supported PHP extensions when deploying {{site.dat
4848
|--------------------|---------------------|---------------------|
4949
| `bcmath`<br> `bz2`<br> `calendar`<br> `exif`<br> `gd`<br> `gettext`<br> `intl`<br> `mysqli`<br> `pcntl`<br> `pdo_mysql`<br> `soap`<br> `sockets`<br> `sysvmsg`<br> `sysvsem`<br> `sysvshm`<br> `opcache`<br> `zip` |`ctype`<br> `curl`<br> `date`<br> `dom`<br> `fileinfo`<br> `filter`<br> `ftp`<br> `hash`<br> `iconv`<br> `json`<br> `mbstring`<br> `mysqlnd`<br> `openssl`<br> `pcre`<br> `pdo`<br> `pdo_sqlite`<br> `phar`<br> `posix`<br> `readline`<br> `session`<br> `sqlite3`<br> `tokenizer`<br> `xml`<br> `xmlreader`<br> `xmlwriter`<br> |`geoip`<br>`gmp`<br> `igbinary`<br> `imagick`<br> `imap`<br>`ioncube`<br> `ldap`<br> `mailparse`<br> `mcrypt`<br> `msgpack`<br> `mysqli`<br> `oauth`<br> `pdo_mysql`<br> `propro`<br> `pspell`<br> `raphf`<br> `recode`<br> `redis`<br> `shmop` `sockets`<br> `sodium`<br> `ssh2`<br>`tidy`<br> `xdebug`<br> `xmlrpc`<br> `xsl`<br> `yaml`|
5050

51-
The PHP module requirements for {{ site.data.var.ee }} are tied to the Magento version. See [PHP requirements]({{ site.baseurl }}/guides/v2.4/install-gde/prereq/php-settings.html).
51+
The PHP module requirements for {{ site.data.var.ee }} are tied to the Magento version. See [PHP requirements]({{ site.baseurl }}{{ site.gdeurl }}/install-gde/prereq/php-settings.html).
5252

5353
{:.bs-callout-warning}
5454
PHP compiled with debug is not supported and the Probe may conflict with XDebug or XHProf. Disable those extensions when enabling the Probe. The Probe conflicts with some PHP extensions like Pinba or IonCube.

‎src/cloud/project/magento-app-php-ini.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ realpath_cache_ttl = 7200
4343
These settings allow PHP processes to cache paths to files instead of looking them up each time a page loads. See [Performance Tuning](https://www.php.net/manual/en/ini.core.php) in the PHP documentation.
4444

4545
{:.bs-callout-info}
46-
For a list of recommended PHP configuration settings, see [Required PHP settings]({{ site.baseurl }}/guides/v2.4/install-gde/prereq/php-settings.html).
46+
For a list of recommended PHP configuration settings, see [Required PHP settings]({{ site.baseurl }}{{ site.gdeurl }}/install-gde/prereq/php-settings.html).
4747

4848
## Check custom php.ini settings
4949

‎src/cloud/project/project-patch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ functional_areas:
1414
Both packages improve the integration of all {{site.data.var.ee}} versions with Cloud environments and support quick delivery of critical, optional, and custom fixes. You can use these packages to apply, revert, and view general information about all individual patches that are available for Magento.
1515

1616
{:.bs-callout-tip}
17-
You can use the [Magento Quality Patches]({{ site.baseurl }}/guides/v2.4/comp-mgr/patching/mqp.html) and [{{ site.data.var.mcp-prod }}](#standalone) packages as stand-alone packages for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects. We recommend using the Magento Quality Patches package for non-Cloud projects.
17+
You can use the [Magento Quality Patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) and [{{ site.data.var.mcp-prod }}](#standalone) packages as stand-alone packages for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects. We recommend using the Magento Quality Patches package for non-Cloud projects.
1818

1919
When you deploy changes to the remote environment, `{{site.data.var.ct}}` uses {{ site.data.var.mcp-package }} and `magento/quality-patches` to check for pending patches and applies them automatically in the following order:
2020

@@ -201,7 +201,7 @@ To apply and test a custom patch on a Cloud environment:
201201

202202
## Apply patches to a non-Cloud project {#standalone}
203203

204-
Use the [Magento Quality Patches]({{ site.baseurl }}/guides/v2.4/comp-mgr/patching/mqp.html) package for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects.
204+
Use the [Magento Quality Patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) package for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects.
205205

206206
## Revert a patch in a local environment
207207

‎src/cloud/project/services-redis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ redirect_from:
1010

1111
[Redis](http://redis.io) is an optional, backend cache solution that replaces the Zend Framework [Zend_Cache_Backend_File](http://framework.zend.com/apidoc/1.0/Zend_Cache/Backend/Zend_Cache_Backend_File.html), which is used in Magento 2 by default.
1212

13-
We support Redis versions 3.2, 5.0, and 6.0. See [Configure Redis]({{ site.baseurl }}/guides/v2.4/config-guide/redis/config-redis.html).
13+
We support Redis versions 3.2, 5.0, and 6.0. See [Configure Redis]({{ site.baseurl }}{{ site.gdeurl }}/config-guide/redis/config-redis.html).
1414

1515
{% include cloud/service-config-integration-starter.md %}
1616

‎src/cloud/requirements/cloud-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ To get started as a developer in a {{site.data.var.ece}} project, you need to se
8888
## Magento configurations {#cloud-req-test}
8989

9090
{:.bs-callout-info}
91-
{{ site.data.var.ece }} deploys Magento in [Production mode]({{ site.baseurl }}/guides/v2.4/config-guide/bootstrap/magento-modes.html#production-mode) by default.
91+
{{ site.data.var.ece }} deploys Magento in [Production mode]({{ site.baseurl }}{{ site.gdeurl }}/config-guide/bootstrap/magento-modes.html#production-mode) by default.
9292
{{ site.data.var.ece }} does not support `Developer` mode.
9393

9494
Before you test any custom code in your local {{site.data.var.ee}} environment, you must do all of the following:

‎src/contributor-guide/maintainer-handbook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ It is important to check the pull request is targeted to the correct branch. For
4949

5050
#### Code review
5151

52-
The code review is one of the most important parts of the review process. Our community maintainers are responsible for reviewing the proposed changes and confirm they are following the [Magento Technical Guidelines]({{ site.baseurl }}/guides/v2.4/coding-standards/technical-guidelines.html). It is important to evaluate if the proposed changes are backward compatible and follow the rules and best practice of our [Backward Compatible Development Guide]({{ site.baseurl }}/contributor-guide/backward-compatible-development/). We count on our Maintainers judgement for other recommendations to increase contribution quality.
52+
The code review is one of the most important parts of the review process. Our community maintainers are responsible for reviewing the proposed changes and confirm they are following the [Magento Technical Guidelines]({{ site.baseurl }}{{ site.gdeurl }}/coding-standards/technical-guidelines.html). It is important to evaluate if the proposed changes are backward compatible and follow the rules and best practice of our [Backward Compatible Development Guide]({{ site.baseurl }}/contributor-guide/backward-compatible-development/). We count on our Maintainers judgement for other recommendations to increase contribution quality.
5353

5454
![Code review]({{ site.baseurl }}/contributor-guide/img/pr-code-review.png)
5555

‎src/guides/v2.3/comp-mgr/cli/cli-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,4 @@ If the application fails with a `We're sorry, an error has occurred while gener
211211
[Upgrade using the custom composer plugin]: upgrade-with-plugin.html
212212
[Upgrade using the script]: upgrade-with-script.html
213213
[Modify docroot to improve security]: {{ page.baseurl }}/install-gde/tutorials/change-docroot-to-pub.html
214-
[Check the catalog search engine]: {{ site.baseurl }}/guides/v2.4/comp-mgr/prereq/prereq-elasticsearch.html
214+
[Check the catalog search engine]: {{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/prereq/prereq-elasticsearch.html

‎src/guides/v2.3/comp-mgr/prereq/prereq_compman.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ functional_areas:
77

88
Complete the following tasks before upgrading Magento:
99

10-
* [Check the catalog search engine]({{ site.baseurl }}/guides/v2.4/comp-mgr/prereq/prereq-elasticsearch.html) (for Magento 2.4.0 and later)
10+
* [Check the catalog search engine]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/prereq/prereq-elasticsearch.html) (for Magento 2.4.0 and later)
1111
* [Set `ulimit` for the web server user]({{ page.baseurl }}/comp-mgr/prereq/prereq_compman-ulimit.html)
1212
* [Checklist]({{ page.baseurl }}/comp-mgr/prereq/prereq_compman-checklist.html)
1313

‎src/guides/v2.3/release-notes/ReleaseNotes2.3.2Commerce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Merchants can now install time-sensitive security fixes without applying the hun
1717

1818
**If you have already upgraded to the pre-release version of this patch (2.3.2-p1), we strongly recommend that you upgrade to 2.3.2-p2 as soon as possible.**  Patch 2.3.2-p2 contains the critical security fixes that are included in Magento 2.3.3, 2.2.10, 1.9.4.3, and 1.14.4.3, but that are not included in patch 2.3.2-p1.
1919

20-
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer](https://devdocs-beta.magento.com/guides/v2.3/install-gde/composer.html#get-the-metapackage).
20+
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html#get-the-metapackage).
2121

2222
## Apply updated hot fix for CVE-2019-8118
2323

‎src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Merchants can now install time-sensitive security fixes without applying the hun
1717

1818
**If you have already upgraded to the pre-release version of this patch (2.3.2-p1), we strongly recommend that you upgrade to 2.3.2-p2 as soon as possible.**  Patch 2.3.2-p2 contains the critical security fixes that are included in Magento 2.3.3, 2.2.10, 1.9.4.3, and 1.14.4.3, but that are not included in patch 2.3.2-p1.
1919

20-
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer](https://devdocs-beta.magento.com/guides/v2.3/install-gde/composer.html#get-the-metapackage).
20+
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html#get-the-metapackage).
2121

2222
## Apply updated hot fix for CVE-2019-8118
2323

‎src/guides/v2.3/release-notes/bk-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ title: 2.3 Release Information
3333

3434
With the release of Magento 2.3.3, Magento introduced a new type of patch: the security-only patch. Patch 2.3.3-p1 includes the significant security fixes that Magento 2.3.4 introduces, plus the hot fixes that were applied to Magento 2.3.3, without the hundreds of functional fixes and enhancements that Magento 2.3.4 also includes. (A *hot fix* provides a fix to a released version of Magento that addresses a specific problem or bug.) Merchants deploying Magento 2.3.3 can apply patch 2.3.3-p1 to immediately take advantage of time-sensitive security fixes without investing the time required to install Magento 2.3.4.
3535

36-
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer](https://devdocs-beta.magento.com/guides/v2.3/install-gde/composer.html#get-the-metapackage).
36+
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html#get-the-metapackage).
3737

3838
## Backward-incompatible changes
3939

‎src/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Merchants can now install time-sensitive security fixes without applying the hun
1717

1818
**If you have already upgraded to the pre-release version of this patch (2.3.2-p1), we strongly recommend that you upgrade to 2.3.2-p2 as soon as possible.**  Patch 2.3.2-p2 contains the critical security fixes that are included in Magento 2.3.3, 2.2.10, 1.9.4.3, and 1.14.4.3, but that are not included in patch 2.3.2-p1.
1919

20-
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer](https://devdocs-beta.magento.com/guides/v2.3/install-gde/composer.html#get-the-metapackage).
20+
For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security-only patches (including patch 2.3.2-p1), see [Install Magento using Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html#get-the-metapackage).
2121

2222
## Other release information
2323

0 commit comments

Comments
 (0)