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

Commit 815507f

Browse files
authored
Merge branch 'master' into improvement-add-js-init-info
2 parents 9bd6b07 + 34680a2 commit 815507f

File tree

12 files changed

+12
-14
lines changed

12 files changed

+12
-14
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
Magento supports PHP 7.3.
22

33
{:.bs-callout-warning}
4-
PHP 7.1 has reached [End of Life](https://www.php.net/supported-versions.php). To maintain PCI compliance, Magento should not be run on unsupported software.
5-
Installing from GitHub will no longer work with Magento 2.3.4/PHP 7.1.
6-
The only way to install 2.3.4 with PHP 7.1.x is with Composer.
4+
PHP 7.1 and 7.2 have reached [End of Life](https://www.php.net/supported-versions.php). To maintain PCI compliance, Magento should not be run on unsupported software. Magento 2.3.x supports PHP 7.3 only and has not been tested with PHP 7.1 or 7.2.

src/cloud/docker/docker-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following table shows the options to customize service container configurati
4444
| Name | Service | Key & options | Available Versions | Notes
4545
| ------------- | ---------- | ---------- | ------------------ |------------------
4646
| [db] | MariaDB or MySQL<br> | `--db`, `--db-image` (MySQL)<br>`--expose-db-port`<br>`--db-increment`<br>`--db-offset`<br>`--with-entrypoint`<br>`--with-mariadb-config`|10.0, 10.1, 10.2<br>5.6, 5.7 | Use the increment and offset options to customize the [auto-increment settings][Using AUTO_INCREMENT] for replication.<br><br>Use the `--with-entrypoint` and `--with-mariadb-config` options to automatically configure database directories in the Docker environment<br><br>*Example build commands:*<br>`ece-docker build:compose --db <mariadb-version>`<br>`ece-docker build:compose --db <mysql-version> --db-image`
47-
| [elasticsearch] | Elasticsearch | `--es`<br>`--es-env-var`<br>`--no-es` | 1.7, 2.4, 5.2, 6.5, 6.8, 7.5, 7.6, 7.7 | Use the options to specify the Elasticsearch version, customize Elasticsearch configuration options, or to build a Docker environment without Elasticsearch.
47+
| [elasticsearch] | Elasticsearch | `--es`<br>`--es-env-var`<br>`--no-es` | 1.7, 2.4, 5.2, 6.5, 6.8, 7.5, 7.6, 7.7, 7.9 | Use the options to specify the Elasticsearch version, customize Elasticsearch configuration options, or to build a Docker environment without Elasticsearch.
4848
| [fpm][fpm-container] | PHP FPM | `--php`<br>`--with-xdebug` | 7.0, 7.1, 7.2, 7.3, 7.4 | Used for all incoming requests. Optionally, install a specific php version or add Xdebug to debug PHP code in the Docker environment.
4949
| [fpm_xdebug][fpm_xdebug-container] | Xdebug | `--set-docker-host` | latest | Optional container for PHP debugging<br>On Linux systems, `--set-docker-host` sets the `.host.docker.internal` value in the container `/etc/hosts` file.
5050
| [mailhog][mailhog-container] | MailHog | `--no-mailhog`<br>`--mailhog-http-port`<br>`--mailhog-smtp-port` | latest | Email service to replace Sendmail service, which can cause issues in Docker environment

src/cloud/project/new-relic.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ To use the New Relic Logs application:
227227
{:.bs-callout-tip}
228228
You can also access the New Relic Logs application from the New Relic ONE home page. See [New Relic ONE core UI components][New Relic One UI].
229229

230-
1. To review infrastructure log data for cloud services, enter the query string `has: "ident"` in the _Find logs where_ field. Then, click **Query logs**.
230+
1. To review infrastructure log data for cloud services, enter the query string `has: "filePath"` in the _Find logs where_ field. Then, click **Query logs**.
231+
The names of the log files are stored in the `filePath` field, with full paths to the log file.
231232

232233
![Cloud project New Relic service log data]({{ site.baseurl }}/common/images/cloud/cloud_new-relic-log-query-has-ident.png){:width="650px"}
233234

Loading

src/guides/v2.3/config-guide/prod/config-reference-envphp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ You can learn more about it at [Encryption Key][encryption-key].
112112

113113
## db
114114

115-
All database configurations are availble in this node.
115+
All database configurations are available in this node.
116116

117117
```conf
118118
'db' => [
@@ -181,7 +181,7 @@ Learn more about [Magento Modes][magento-modes].
181181

182182
## queue
183183

184-
Message queue releated configurations are availble in this node.
184+
Message queue releated configurations are available in this node.
185185

186186
```conf
187187
'queue' => [

src/guides/v2.3/extension-dev-guide/declarative-schema/db-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ When creating a new table, remember to [generate]({{ page.baseurl}}/extension-de
245245

246246
### Drop a table
247247

248-
In the following example, the `declarative_table` table was completely removed from the `db-schema.xml` file.
248+
In the following example, the `declarative_table` table was completely removed from the `db_schema.xml` file.
249249

250250
```diff
251251
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

src/guides/v2.3/javascript-dev-guide/widgets/widget_gallery.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,6 @@ This example shows a use case for a gallery widget on any page:
587587

588588
```html
589589
<div class="image-gallery"></div>
590-
591590
<script>
592591
require ([
593592
'jquery',

src/upgrade-compatibility-tool/developer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
group: software-update-guide
33
title: Developer information
44
ee_only: True
5-
redirect from:
5+
redirect_from:
66
- /safe-upgrade-tool/developer.html
77
functional_areas:
88
- Upgrade

src/upgrade-compatibility-tool/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
group: software-update-guide
33
title: Install
44
ee_only: True
5-
redirect from:
5+
redirect_from:
66
- /safe-upgrade-tool/install.html
77
functional_areas:
88
- Upgrade

src/upgrade-compatibility-tool/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
group: software-update-guide
33
title: Introduction
44
ee_only: True
5-
redirect from:
5+
redirect_from:
66
- /safe-upgrade-tool/introduction.html
77
functional_areas:
88
- Upgrade

src/upgrade-compatibility-tool/prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
group: software-update-guide
33
title: Prerequisites
44
ee_only: True
5-
redirect from:
5+
redirect_from:
66
- /safe-upgrade-tool/prerequisites.html
77
functional_areas:
88
- Upgrade

src/upgrade-compatibility-tool/run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
group: software-update-guide
33
title: Run the tool
44
ee_only: True
5-
redirect from:
5+
redirect_from:
66
- /safe-upgrade-tool/run.html
77
functional_areas:
88
- Upgrade

0 commit comments

Comments
 (0)