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

Commit 474e08e

Browse files
magento-docsmagento-docs
committed
Merge branch 'master' into 2.4.3-p1-develop
2 parents f0f26bf + 6d2dc04 commit 474e08e

File tree

19 files changed

+108
-51
lines changed

19 files changed

+108
-51
lines changed

‎Gemfile.lock

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: c437253c75119e8c890b7e8e968ddf812205085c
3+
revision: b1e43366e1fa7c7cd33a2213c6a9304f57536e8f
44
specs:
55
devdocs (16)
66
jekyll (>= 4.0)
@@ -16,7 +16,7 @@ GEM
1616
algoliasearch (1.27.5)
1717
httpclient (~> 2.8, >= 2.8.3)
1818
json (>= 1.5.1)
19-
chef-utils (17.2.29)
19+
chef-utils (17.5.22)
2020
concurrent-ruby
2121
colorator (1.1.0)
2222
concurrent-ruby (1.1.9)
@@ -27,14 +27,15 @@ GEM
2727
ffi (>= 1.15.0)
2828
eventmachine (1.2.7)
2929
exifr (1.3.9)
30-
faraday (1.5.1)
30+
faraday (1.8.0)
3131
faraday-em_http (~> 1.0)
3232
faraday-em_synchrony (~> 1.0)
3333
faraday-excon (~> 1.1)
3434
faraday-httpclient (~> 1.0.1)
3535
faraday-net_http (~> 1.0)
3636
faraday-net_http_persistent (~> 1.1)
3737
faraday-patron (~> 1.0)
38+
faraday-rack (~> 1.0)
3839
multipart-post (>= 1.2, < 3)
3940
ruby2_keywords (>= 0.0.4)
4041
faraday-em_http (1.0.0)
@@ -44,7 +45,8 @@ GEM
4445
faraday-net_http (1.0.1)
4546
faraday-net_http_persistent (1.2.0)
4647
faraday-patron (1.0.0)
47-
ffi (1.15.3)
48+
faraday-rack (1.0.0)
49+
ffi (1.15.4)
4850
filesize (0.2.0)
4951
forwardable-extended (2.6.0)
5052
fspath (3.1.2)
@@ -72,9 +74,9 @@ GEM
7274
image_optim_pack (0.7.0.20210511-x86_64-darwin)
7375
fspath (>= 2.1, < 4)
7476
image_optim (~> 0.19)
75-
image_size (2.1.1)
77+
image_size (2.1.2)
7678
in_threads (1.5.4)
77-
jekyll (4.2.0)
79+
jekyll (4.2.1)
7880
addressable (~> 2.4)
7981
colorator (~> 1.0)
8082
em-websocket (~> 0.5)
@@ -120,7 +122,7 @@ GEM
120122
launchy (2.5.0)
121123
addressable (~> 2.7)
122124
liquid (4.0.3)
123-
listen (3.5.1)
125+
listen (3.7.0)
124126
rb-fsevent (~> 0.10, >= 0.10.3)
125127
rb-inotify (~> 0.9, >= 0.9.10)
126128
mdl (0.11.0)
@@ -130,25 +132,25 @@ GEM
130132
mixlib-config (>= 2.2.1, < 4)
131133
mixlib-shellout
132134
mercenary (0.4.0)
133-
mini_portile2 (2.5.3)
135+
mini_portile2 (2.6.1)
134136
mixlib-cli (2.1.8)
135137
mixlib-config (3.0.9)
136138
tomlrb
137139
mixlib-shellout (3.2.5)
138140
chef-utils
139141
multipart-post (2.1.1)
140142
netrc (0.11.0)
141-
nokogiri (1.11.7)
142-
mini_portile2 (~> 2.5.0)
143+
nokogiri (1.12.5)
144+
mini_portile2 (~> 2.6.1)
143145
racc (~> 1.4)
144-
nokogiri (1.11.7-x86_64-darwin)
146+
nokogiri (1.12.5-x86_64-darwin)
145147
racc (~> 1.4)
146148
nokogumbo (2.0.5)
147149
nokogiri (~> 1.8, >= 1.8.4)
148150
octokit (4.21.0)
149151
faraday (>= 0.9)
150152
sawyer (~> 0.8.0, >= 0.5.3)
151-
parallel (1.20.1)
153+
parallel (1.21.0)
152154
pathutil (0.16.2)
153155
forwardable-extended (~> 2.6)
154156
progress (3.6.0)
@@ -161,8 +163,8 @@ GEM
161163
rb-inotify (0.10.1)
162164
ffi (~> 1.0)
163165
rexml (3.2.5)
164-
rouge (3.26.0)
165-
ruby2_keywords (0.0.4)
166+
rouge (3.26.1)
167+
ruby2_keywords (0.0.5)
166168
safe_yaml (1.0.5)
167169
sassc (2.4.0)
168170
ffi (~> 1.9)
@@ -175,7 +177,7 @@ GEM
175177
tomlrb (2.0.1)
176178
typhoeus (1.4.0)
177179
ethon (>= 0.9.0)
178-
unicode-display_width (1.7.0)
180+
unicode-display_width (1.8.0)
179181
verbal_expressions (0.1.5)
180182
wdm (0.1.1)
181183
whatsup_github (0.4.2)

‎_config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,13 @@ defaults:
115115
values:
116116
group: module-reference-guide-2_3
117117
github_link: false
118-
feedback_link: false
119118

120119
-
121120
scope:
122121
path: guides/v2.4/mrg
123122
values:
124123
group: module-reference-guide-2_4
125124
github_link: false
126-
feedback_link: false
127125

128126
-
129127
scope:

‎src/_data/features.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ features:
1616
2.2: false
1717
2.3: false
1818
2.4: true
19+
-
20+
name: Live Search powered by Adobe Sensei
21+
support:
22+
2.0: false
23+
2.1: false
24+
2.2: false
25+
2.3: false
26+
2.4: true
1927
-
2028
name: Product Recommendations powered by Adobe Sensei
2129
support:

‎src/_data/whats-new.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,32 @@ 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 Sep 20 16:02:49 2021
7+
updated: Mon Sep 27 14:38:55 2021
88
entries:
9+
- description: Fixed [backward incompatible changes for 2.4.2-2.4.3](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html#242---243).
10+
The topic showed data for 2.4.1-2.4.2 instead.
11+
versions: 2.4.3
12+
type: Technical
13+
date: September 23, 2021
14+
link: https://github.com/magento-commerce/devdocs/pull/2547
15+
merge_commit: 9f28563f024a27d3f541deac50179c69194e1824
16+
contributor: dshevtsov
17+
membership: true
18+
labels:
19+
- Technical
20+
- 2.4.3
21+
- description: Updated [`magento-cloud` reference](https://devdocs.magento.com/guides/v2.4/reference/cli/magento-cloud.html)
22+
(1.38.1).
23+
versions: 2.x
24+
type: Technical
25+
date: September 22, 2021
26+
link: https://github.com/magento-commerce/devdocs/pull/2544
27+
merge_commit: e4563f2b1c7caeebe44cddb3acda037a0ecd5a3f
28+
contributor: dshevtsov
29+
membership: true
30+
labels:
31+
- 2.x
32+
- Technical
933
- description: Added the [The built-in Upgrade Compatibility Tool (MVP)](https://devdocs.magento.com/guides/v2.4/ext-best-practices/phpstorm/built-in-upgrade-compatibility-tool.html)
1034
topic.
1135
versions: 2.4.x

‎src/_includes/layout/page-header.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
</div>
3535
{% endif %}
3636

37+
{% unless page.github_link %}
38+
<div class="message-banner">
39+
This topic is generated and maintained through automation, so we do not accept direct contributions from pull requests on GitHub.
40+
</div>
41+
{% endunless %}
42+
3743
{% if page.url contains "guides/v2.3/" %}
3844
<div class="bs-callout-warning">
3945
PHP 7.3 reaches end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ See the examples at the end of this section for help specifying different releas
7676
The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
7777
To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
7878

79+
To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
80+
7981
{:.bs-callout-tip}
8082
Use `composer require --help` to learn more about available options.
8183
To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ It is important to understand the variables that determine the complexity of an
1616

1717
The level of effort to upgrade your {{site.data.var.ee}} instance depends upon these factors:
1818

19-
* **How you have built your site?** The amount of custom work and the number of installed 3rd-party modules strongly affects the complexity of an upgrade. The quality of the custom work and modules also can also determine whether an upgrade will go smoothly.
19+
* **How did you build your site?** The amount of custom work and the number of installed 3rd-party modules strongly affects the complexity of an upgrade. The quality of the custom work and modules can determine whether an upgrade will go smoothly.
2020

2121
* **Are you skipping multiple releases?** Skipping releases will makes the next upgrade more complex, upgrading from consequent versions will make the process easier and cheaper.
2222

‎src/guides/v2.3/extension-dev-guide/extension_attributes/adding-attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function afterSave
115115
$ourCustomData = $extensionAttributes->getOurCustomData();
116116
$this->customDataRepository->save($ourCustomData);
117117

118-
$resultAttributes = $result->getExtentionAttributes(); /** get extension attributes as they exist after save **/
118+
$resultAttributes = $result->getExtensionAttributes(); /** get extension attributes as they exist after save **/
119119
$resultAttributes->setOurCustomData($ourCustomData); /** update the extension attributes with correct data **/
120120
$result->setExtensionAttributes($resultAttributes);
121121

‎src/guides/v2.3/frontend-dev-guide/translations/theme_dictionary.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ The locale dictionary would use the default values (keys) in the left column fol
6464
"Card Verification Number", <translation>
6565
```
6666

67-
## Element translations per module
68-
69-
You can translate the same element in different ways for different modules:
70-
71-
```text
72-
"Add to Cart", "Add to Cart", module, Magento_Review
73-
"Add to Cart", "Add to Shopping Cart", module, Magento_Catalog
74-
```
75-
7667
## Additional information
7768

7869
- [Translations overview]

‎src/guides/v2.3/ui_comp_guide/components/ui-fileuploader.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,24 @@ Here is an example of how File Uploader component integrates with [Form]({{ page
2929
...
3030
<fieldset name="foo">
3131
...
32-
<argument name="data" xsi:type="array">
33-
<item name="config" xsi:type="array">
34-
<item name="label" xsi:type="string"/>
35-
</item>
36-
</argument>
37-
<field name="bar">
38-
<argument name="data" xsi:type="array">
39-
<item name="config" xsi:type="array">
40-
<item name="label" xsi:type="string">Sound Check</item>
41-
<item name="visible" xsi:type="boolean">true</item>
42-
<item name="formElement" xsi:type="string">fileUploader</item>
43-
<item name="uploaderConfig" xsi:type="array">
44-
<item name="url" xsi:type="url" path="path/to/controller"/>
45-
</item>
46-
</item>
47-
</argument>
32+
<settings>
33+
<label translate="true">Foo</label>
34+
<collapsible>true</collapsible>
35+
<opened>true</opened>
36+
</settings>
37+
<field name="bar" formElement="fileUploader">
38+
<settings>
39+
<label translate="true">Sound Check</label>
40+
</settings>
41+
<formElements>
42+
<fileUploader>
43+
<settings>
44+
<uploaderConfig>
45+
<param xsi:type="string" name="url">path/to/controller</param>
46+
</uploaderConfig>
47+
</settings>
48+
</fileUploader>
49+
</formElements>
4850
</field>
4951
</fieldset>
5052
</form>

0 commit comments

Comments
 (0)