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

Commit 77d89be

Browse files
authored
Merge branch 'master' into Live-Search-popover-active-class
2 parents 3fd11ec + a2b458f commit 77d89be

20 files changed

+86
-35
lines changed

src/_data/whats-new.yml

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,48 @@ 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 11 14:51:53 2021
7+
updated: Mon Oct 18 14:38:48 2021
88
entries:
9+
- description: Reference data for the [2.4.3-p1](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html),
10+
[2.3.7-p1 and 2.3.7-p2](https://devdocs.magento.com/guides/v2.3/release-notes/backward-incompatible-changes/reference.html)
11+
backward incompatible changes.
12+
versions: 2.4.3, 2.3.7
13+
type: Major Update
14+
date: October 13, 2021
15+
link: https://github.com/magento-commerce/devdocs/pull/2584
16+
merge_commit: c09fc76fce47943badea59e3c304da42ecee7b71
17+
contributor: dshevtsov
18+
membership: true
19+
labels:
20+
- Major Update
21+
- 2.4.3
22+
- 2.3.7
23+
- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
24+
for the 1.1.4 Quality Patches Tool (QPT) package release.
25+
versions: 2.x
26+
type: Major Update
27+
date: October 13, 2021
28+
link: https://github.com/magento-commerce/devdocs/pull/2585
29+
merge_commit: da4ca195ba9815e49163b4180c4ced2dc1d60767
30+
contributor: agorbivskyi
31+
membership: true
32+
labels:
33+
- 2.x
34+
- Major Update
35+
- description: "[2.4.3-p1](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html)
36+
and [2.3.7-p2](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
37+
releases."
38+
versions: 2.4.3, 2.3.7
39+
type: Major Update
40+
date: October 12, 2021
41+
link: https://github.com/magento-commerce/devdocs/pull/2576
42+
merge_commit: '061890a9fe9a3a1e6c36f0c5eb4a03fbf7fe469d'
43+
contributor: dshevtsov
44+
membership: true
45+
labels:
46+
- Major Update
47+
- 2.4.3
48+
- 2.3.7
949
- description: Added release notes for the 2.4.3-p1 and 2.3.7-p2 Adobe Commerce releases.
1050
See [2.4 Release Information](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html)
1151
and [2.3 Release Information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).

src/_includes/cloud/log-in-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The following steps provide an example of accessing a database:
1414

1515
Sample output follows:
1616

17-
```php
17+
```terminal
1818
Array
1919
(
2020
[0] => stdClass Object

src/_includes/config/split-deploy/example_update-prod.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To update the production system:
1515

1616
1. Stop any running queue workers by setting `cron_run` to `false` in `app/etc/env.php` as follows:
1717

18-
```php
18+
```php?start_inline=1
1919
'cron_consumers_runner' => [
2020
'cron_run' => false
2121
]

src/_videos/fundamentals/add-a-javascript-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Now create two files:
4545

4646
{% collapsible Show source code %}
4747

48-
```php?start_inline=1
48+
```php
4949
<?php
5050
\Magento\Framework\Component\ComponentRegistrar::register(
5151
\Magento\Framework\Component\ComponentRegistrar::MODULE,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
7272

7373
{% collapsible Show code %}
7474

75-
```php?start_inline=1
75+
```php
7676
<?php
7777
/**
7878
* Copyright © 2016 Magento. All rights reserved.
@@ -97,7 +97,7 @@ Create the file `app/code/Learning/ClothingMaterial/Setup/InstallData.php`:
9797

9898
{% collapsible Show code %}
9999

100-
```php?start_inline=1
100+
```php
101101
<?php
102102
/**
103103
* Copyright © 2016 Magento. All rights reserved.
@@ -204,7 +204,7 @@ Next, we need to create the source model:
204204

205205
{% collapsible Show code %}
206206

207-
```php?start_inline=1
207+
```php
208208
<?php
209209
/**
210210
* Copyright © 2016 Magento. All rights reserved.
@@ -248,7 +248,7 @@ Now we will create a backend model:
248248

249249
{% collapsible Show code %}
250250

251-
```php?start_inline=1
251+
```php
252252
<?php
253253
/**
254254
* Copyright © 2016 Magento. All rights reserved.
@@ -295,7 +295,7 @@ And finally, we create a frontend model to make our value bold:
295295

296296
{% collapsible Show code %}
297297

298-
```php?start_inline=1
298+
```php
299299
<?php
300300
namespace Learning\ClothingMaterial\Model\Attribute\Frontend;
301301

src/cloud/cdn/configure-fastly.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ To upload the Fastly VCL:
125125

126126
## Provision SSL/TLS certificates
127127

128-
Adobe provides a Domain-Validated Let's Encrypt SSL/TLS certificate to serve secure HTTPS traffic from Fastly. Adobe provides one certificate for each Pro Production, Staging, and Starter Production environment to secure all domains in that environment.
128+
Adobe provides a Domain-Validated Let's Encrypt SSL/TLS certificate to serve secure HTTPS traffic from Fastly. Adobe provides one certificate for each Pro Production, Staging, and Starter Production environment to secure all domains in that environment. See [Adobe SSL/TLS certificate requirements and clean up](https://support.magento.com/hc/en-us/articles/115004685333-Magento-SSL-TLS-certificate-requirements-and-clean-up) in the _Support knowledge base_.
129129

130130
{:.bs-callout-info}
131131
You can provide your own TLS/SSL certificate instead of using the Let's Encrypt certificate provided by Adobe. However, this process requires additional work to set up and maintain. To choose this option, submit a [{{site.data.var.ee}} Support ticket](https://support.magento.com/hc/en-us/articles/360019088251) or work with your CTA to add custom hosted certificates to your Cloud environments.
@@ -291,3 +291,6 @@ After you verify Fastly services on the Staging site, repeat the upgrade process
291291

292292
{:.bs-callout-warning}
293293
If you have added a custom VCL snippet that has the same name as a default snippet, you may need to verify and update those snippets after you upgrade the Fastly module. We do not recommend replacing existing default snippets with custom snippets of the same name. For details on custom VCL, see [Custom Fastly VCL snippets]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html).
294+
295+
{:.bs-callout-tip}
296+
If you experience problems setting up your Fastly configuration, you can visit the _Support knowledge base_ and use the [Adobe Commerce Fastly troubleshooter](https://support.magento.com/hc/en-us/articles/360040759292-Magento-Fastly-troubleshooter).

src/cloud/deploy/scenario-based-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ To register a module with the {{site.data.var.ct}} package:
224224

225225
1. Create or extend the `registration.php` file in the root of your module.
226226

227-
```php
227+
```php?start_inline=1
228228
\Magento\MagentoCloud\ExtensionRegistrar::register('module-name', __DIR__);
229229
```
230230

src/cloud/env/variables-cloud.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ To [add environment variables to override configuration settings]({{ site.baseur
2929
Since values can change over time, it is best to inspect the variable at runtime and use it to configure your application. For example, we use the `MAGENTO_CLOUD_RELATIONSHIPS` variable to retrieve environment-related relationships as follows:
3030

3131
```php
32+
<?php
3233
/**
3334
* Get relationships information from cloud environment variable.
3435
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Configuring PHP settings improperly can cause issues. We recommend only advanced
1818

1919
To increase the PHP memory limit, add the following setting to the `php.ini` file:
2020

21-
```php
21+
```ini
2222
memory_limit = 1G
2323
```
2424

src/cloud/project/project-routes-more-ssi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ The following example shows how to insert a dynamic date control at the top of a
3232
3333
Add the following to any page, such as `/index.php`:
3434

35-
```php
35+
```php?start_inline=1
3636
echo date(DATE_RFC2822);
3737
<!--#include virtual="time.php" -->
3838
```
3939

4040
Add the following to `time.php`:
4141

42-
```php
42+
```php?start_inline=1
4343
header("Cache-Control: max-age=600");
4444
echo date(DATE_RFC2822);
4545
```

0 commit comments

Comments
 (0)