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

Commit b119352

Browse files
committed
Merge branch 'master' into 2.3.4-develop
2 parents 51447ae + 28e69a6 commit b119352

File tree

24 files changed

+107
-57
lines changed

24 files changed

+107
-57
lines changed

_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ defaults:
8989
group: page-builder
9090
github_link: false
9191
feedback_link: false
92+
ee_only: true
9293

9394
-
9495
scope:
@@ -97,6 +98,7 @@ defaults:
9798
group: page-builder
9899
github_link: false
99100
feedback_link: false
101+
ee_only: true
100102

101103
-
102104
scope:

src/cloud/docker/docker-config.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,6 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
197197
./vendor/bin/ece-tools docker:build --mode="developer" --sync-engine=mutagen
198198
```
199199

200-
1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
201-
202-
```bash
203-
cp ./docker/config.php.dist ./docker/config.php
204-
```
205-
206200
1. _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [enable and configure Xdebug]({{ site.baseurl }}/cloud/docker/docker-development-debug.html).
207201

208202
1. Start the file synchronization.

src/cloud/project/project-conf-files_services-mysql.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ Accessing the MariaDB database directly requires you to use a SSH to log in to t
146146

147147
- For Starter, use the following command:
148148

149-
```bash
150-
mysql -h database.internal -u <username>
151-
```
149+
```bash
150+
mysql -h database.internal -u <username>
151+
```
152152

153153
- For Pro, use the following command with db, username, and password retrieved from the `$MAGENTO_CLOUD_RELATIONSHIPS` variable.
154154

155-
```bash
156-
mysql -h<db> -p<number> -u<username> -p<password>
157-
```
155+
```bash
156+
mysql -h<db> -P<number> -u<username> -p<password>
157+
```

src/cloud/project/sendgrid.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ s1.example.com IN CNAME <s1.example.sendgrid.net>
2121
s2.example.com IN CNAME <s2.example.sendgrid.net>
2222
```
2323

24+
{: .bs-callout-tip}
25+
You can find Sendgrid details for your account in the Onboarding UI. Use the `https://cloud.magento.com/project/_project-id_/setup/project_details` URL and select the **Project Details** > **Hosting Info** tab.
26+
2427
The CNAME records resolve to the Domain Keys Identified Mail (DKIM) and Sender Policy Framework (SPF) records managed by SendGrid, so that spam filters are less likely to inhibit your messages.
2528

2629
Magento does not support whitelisting, but you can review the [Sender Policy Framework (SPF)](https://sendgrid.com/docs/Glossary/spf.html) guidelines to improve delivery.

src/guides/v2.3/config-guide/cron/custom-cron-tut.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,21 @@ Create `crontab.xml` as follows in the `/var/www/html/magento2/app/code/Magento/
174174

175175
The preceding `crontab.xml` runs the `Magento/SampleMinimal/Cron/Test.php` class once per minute, resulting in a row being added to the `cron_schedule` table.
176176

177+
In order to make the cron schedule configurable from the admin panel, use the configuration path of your system configuration field.
178+
179+
```xml
180+
<?xml version="1.0"?>
181+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
182+
<group id="default">
183+
<job name="custom_cronjob" instance="Magento\SampleMinimal\Cron\Test" method="execute">
184+
<config_path>system/config/path</config_path>
185+
</job>
186+
</group>
187+
</config>
188+
```
189+
190+
Where, `system/config/path` is a system configuration path defined in `etc/adminhtml/system.xml` of a module.
191+
177192
{% endcollapsible %}
178193

179194
## Step 5: Compile and cache clean

src/guides/v2.3/config-guide/varnish/config-varnish-advanced.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You should designate one machine as the primary installation. On this machine, i
7070

7171
On all other machines, the Magento instance must have access the primary machine's mySQL database. The secondary machines should also have access to the files of the primary Magento instance.
7272

73-
Alternatively, [static files](https://glossary.magento.com/static-files) versioning can be turned off on all machines. This can be accessed from the Admin under **Stores > Settings > Configuration > Advanced > Developer > Static Files Settings > Sign Static Files** = **No**.
73+
Alternatively, [static files](https://glossary.magento.com/static-files) versioning can be turned off on all machines. This can be accessed from the Admin under **Stores** > Settings > **Configuration** > **Advanced** > **Developer** > **Static Files Settings** > **Sign Static Files** = **No**.
7474

7575
Finally, all Magento instances must be in production mode. Before Varnish starts, clear the cache on each instance. In Admin, go to **System** > Tools > **Cache Management** and click **Flush Magento Cache**. You can also run the following command to clear the cache:
7676

src/guides/v2.3/config-guide/varnish/config-varnish-magento.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ functional_areas:
1111
To configure Magento to use Varnish:
1212

1313
1. Log in to the [Magento Admin](https://glossary.magento.com/magento-admin) as an administrator.
14-
1. Click **STORES** > **Settings** > **Configuration** > **ADVANCED** > **System** > **Full Page Cache**.
14+
1. Click **Stores** > Settings > **Configuration** > **Advanced** > **System** > **Full Page Cache**.
1515
1. From the **Caching Application** list, click **Varnish Caching**.
1616
1. Enter a value in the **TTL for public content** field.
1717
1. Expand **Varnish Configuration** and enter the following information:

src/guides/v2.3/design-styleguide/iconography/iconography.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In the Magento Admin, icons have a simple, flat, single-color, and two-dimension
3535

3636
### Instructions
3737

38-
* Start by selecting an icon library file - download either the [Sketch (SKETCH)](src/magento_icon_library.sketch) or <a href="src/Magento-icon-library.ai">Illustrator (AI)/a> files.
38+
* Start by selecting an icon library file - download either the [Sketch (SKETCH)](src/magento_icon_library.sketch) or [Illustrator (AI)](src/Magento-icon-library.ai) files.
3939

4040
* Use our standard 300 x 300 pixel icon grid - see the guidance that follows in the "Create With the Icon Grid" section.
4141

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ The following example creates the `declarative_table` table with four columns. T
241241
</schema>
242242
```
243243

244+
{:.bs-callout-info}
244245
When creating a new table, remember to [generate]({{ page.baseurl}}/extension-dev-guide/declarative-schema/migration-commands.html#create-whitelist) the `db_schema_whitelist.json` file.
245246

246247
### Drop a table
@@ -292,6 +293,7 @@ This declarative process of renaming a table is not fast. If you need to migrate
292293
</schema>
293294
```
294295

296+
{:.bs-callout-info}
295297
When renaming a table, remember to regenerate the `db_schema_whitelist.json` file so it contains the new name in addition to the old one.
296298

297299
### Add a column to table
@@ -314,6 +316,7 @@ The following example adds the `date_closed` column.
314316
</schema>
315317
```
316318

319+
{:.bs-callout-info}
317320
When adding a new column into table, remember to [generate]({{ page.baseurl}}/extension-dev-guide/declarative-schema/migration-commands.html#create-whitelist) the `db_schema_whitelist.json` file.
318321

319322
### Drop a column from a table
@@ -335,6 +338,7 @@ The following example removes the `date_closed` column by deleting its `column`
335338
</table>
336339
</schema>
337340
```
341+
338342
{:.bs-callout-info}
339343
It is possible to drop a column only if it exists in the `db_schema_whitelist.json` file.
340344

@@ -365,6 +369,8 @@ To rename a column, delete the original column declaration and create a new one.
365369
```xml
366370
onCreate="migrateDataFrom(entity_id)"
367371
```
372+
373+
{:.bs-callout-info}
368374
When renaming a column, remember to regenerate the `db_schema_whitelist.json` file so it contains the new name in addition to the old one.
369375

370376
### Add an index

src/guides/v2.3/extension-dev-guide/message-queues/bulk-operations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ try {
8989
}
9090
```
9191

92-
See [Create a publisher]( {{page.baseurl}}/extension-dev-guide/message-queues/implement-bulk.html#createconsumer) for a detailed example of a consumer.
92+
See [Create a consumer]( {{page.baseurl}}/extension-dev-guide/message-queues/implement-bulk.html#createconsumer) for a detailed example of a consumer.
9393

9494
### Get the status of operations
9595

@@ -99,7 +99,7 @@ Value | Constant
9999
--- | ---
100100
0 | NOT_STARTED
101101
1 | IN_PROGRESS
102-
2 | FINISHED_SUCCESFULLY
102+
2 | FINISHED_SUCCESSFULLY
103103
3 | FINISHED_WITH_FAILURE
104104

105105
#### Related Topic

0 commit comments

Comments
 (0)