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

Skip to content

Commit 1c9c5a7

Browse files
doboothdobooth
authored
Merge branch 'master' into imported-magento-devdocs-8807
2 parents 0aa19db + 29f67b5 commit 1c9c5a7

26 files changed

+766
-62
lines changed

‎src/_data/toc/community.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ pages:
1818
url: /community/resources/multi-repo-docs.html
1919
versionless: true
2020

21+
- label: Contribution Day Organizer's Handbook
22+
url: /community/resources/contribution-day-organizer-handbook.html
23+
versionless: true

‎src/_data/whats-new.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ entries:
10841084
link: https://github.com/magento/devdocs/pull/7714
10851085
contributor: keharper
10861086
profile: https://github.com/keharper
1087-
- description: Added a [deprecation notice](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#technologies-magento-can-use)
1087+
- description: Added a [deprecation notice](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#recommended-technologies)
10881088
for Elasticsearch 6.x.
10891089
versions: 2.3.6
10901090
type: Technical
@@ -4476,7 +4476,7 @@ entries:
44764476
- description: Added information about [Elasticsearch 6](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-overview.html#es-spt-versions)
44774477
support.<br/>Added Elasticsearch 6 information to [Configure Magento to use Elasticsearch](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/configure-magento.html)<br/>Added
44784478
[Change Elasticsearch Client](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-downgrade.html)
4479-
topic.<br/>Updated the [Technologies Magento can use](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#technologies-magento-can-use)
4479+
topic.<br/>Updated the [Technologies Magento can use](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html#recommended-technologies)
44804480
topic with new Elasticsearch 6 support.
44814481
versions: 2.2.x, 2.3.x
44824482
type: Major update

‎src/cloud/live/stage-prod-migrate.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,18 @@ To migrate a database:
252252

253253
1. Create a database dump file in `gzip` format:
254254

255-
For Starter environments and Pro Integration environments:
256-
257255
```bash
258-
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers main | gzip - > /tmp/database.sql.gz
256+
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers <database name> | gzip - > /tmp/database.sql.gz
259257
```
260258

261-
For Pro Staging and Production environments, the name of the database is in the `MAGENTO_CLOUD_RELATIONSHIPS` variable (typically the same as the application name and username):
259+
For Starter environments and Pro Integration environments, use `main` as the name of the database.
260+
261+
For Pro Staging and Production environments, the name of the database is in the `MAGENTO_CLOUD_RELATIONSHIPS` variable (typically the same as the application name and username).
262+
263+
If you have configured two-factor authentication on the target environment, it is better to exclude related 2FA tables to avoid reconfiguring it after database migration:
262264

263265
```bash
264-
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers <database name> | gzip - > /tmp/database.sql.gz
266+
mysqldump -h <database host> --user=<database username> --password=<password> --single-transaction --triggers --ignore-table=tfa_user_config --ignore-table=tfa_country_codes <database name> | gzip - > /tmp/database.sql.gz
265267
```
266268

267269
1. Transfer the database dump to another remote environment with the `rsync` command:

‎src/cloud/project/sendgrid.md

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

10-
The SendGrid-based SMTP proxy service provides email authentication, reputation monitoring, and dedicated IP addresses. A basic set up includes 12,000 emails per month and excludes use in marketing campaigns. See [SendGrid and Magento—Email Delivery. Simplified](https://sendgrid.com/partners/magento/).
10+
The SendGrid-based SMTP proxy service provides email authentication and reputation monitoring. A basic set up includes 12,000 emails per month and excludes use in marketing campaigns. See [SendGrid and Magento—Email Delivery. Simplified](https://sendgrid.com/partners/magento/).
1111

1212
Magento automates the SendGrid integration for Starter and Pro Integration environments. The Pro Production and Staging environments require manual provisioning and configuration during the IaaS hardware provisioning process.
1313

‎src/common/images/clear_cache.png

-61.2 KB
Loading

‎src/common/images/logo.png

-44.6 KB
Loading

‎src/common/images/set_store_email.png

-45.7 KB
Loading

‎src/community/resources/contribution-day-organizer-handbook.md

Lines changed: 165 additions & 0 deletions
Large diffs are not rendered by default.

‎src/guides/v2.3/frontend-dev-guide/images/email-order-items-render.png

-5.18 KB
Loading

‎src/guides/v2.3/install-gde/system-requirements.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Magento requires the following system tools for some of its operations:
100100

101101
Mail Transfer Agent (MTA) or an SMTP server
102102

103-
## Technologies Magento can use
103+
## Recommended technologies
104104

105105
* [Redis][] version 5.0 is recommended and used in testing for page caching and session storage.
106106
* [Varnish]({{page.baseurl}}/config-guide/varnish/config-varnish.html) version 6.x (tested with 6.3.1)
@@ -112,12 +112,6 @@ Mail Transfer Agent (MTA) or an SMTP server
112112

113113
[RabbitMQ][]{:target="_blank"} can be used to publish messages to queue and to define the consumers that receive the messages asynchronously.
114114

115-
### {{site.data.var.ee}} only
116-
117-
* Three master databases
118-
119-
These [master databases][] provide scalability advantages for different functional areas of the Magento application such as checkout, orders, and all remaining Magento2 application tables.
120-
121115
### Optional but recommended
122116

123117
* [php_xdebug 2.5.x][]{:target="_blank"} or later (development environments only; can have an adverse effect on performance)

‎src/guides/v2.3/migration/migration-tool-internal-spec.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,42 @@ Change prefix option in case Magento was installed with prefix in database table
165165

166166
Configuration data is accessible via \Migration\Config class.
167167

168+
### Steps available operations {#steps}
169+
170+
|Document|Field|
171+
|---|---|
172+
|`step`|Second level node inside the Steps node. Description of the relevant step must be specified in the `title` attribute.|
173+
|`integrity`|Specifies the PHP class responsible for the integrity check. Compares the table field names, types, and other info to verify compatibility between Magento 1 and 2 data structures.|
174+
|`data`|Specifies the PHP class responsible for the data check. Transfers the data, table by table from Magento 1 to Magento 2.|
175+
|`volume`|Specifies the PHP class responsible for the volume check. Compares the number of records between tables to verify that the transfer was successful.|
176+
|`delta`|Specifies the PHP class responsible for the delta check. Transfers the delta from Magento 1 to Magento 2 after the full data migration.|
177+
178+
### Source database attributes {#source}
179+
180+
|Document|Field|Required?|
181+
|---|---|---|
182+
|`name`|Database name of the Magento 1 server.|yes|
183+
|`host`|Host IP address of the Magento 1 server.|yes|
184+
|`port`|Port number of the Magento 1 server.|no|
185+
|`user`|Username of the Magento 1 database server.|yes|
186+
|`password`|Password of the Magento 1 database server.|yes|
187+
|`ssl_ca`|Path to SSL Certificate Authority file.|no|
188+
|`ssl_cert`|Path to SSL Certificate file.|no|
189+
|`ssl_key`|Path to SSL Key file.|no|
190+
191+
### Destination database attributes {#destination}
192+
193+
|Document|Field|Required?|
194+
|---|---|---|
195+
|`name`|Database name of the Magento 2 server.|yes|
196+
|`host`|Host IP address of the Magento 2 server.|yes|
197+
|`port`|Port number of the Magento 2 server.|no|
198+
|`user`|Username of the Magento 2 database server.|yes|
199+
|`password`|Password of the Magento 2 database server.|yes|
200+
|`ssl_ca`|Path to SSL Certificate Authority file.|no|
201+
|`ssl_cert`|Path to SSL Certificate file.|no|
202+
|`ssl_key`|Path to SSL Key file.|no|
203+
168204
### Connect using the TLS protocol
169205

170206
You can also connect to a database using the TLS protocol (i.e., using public/private cryptographic keys). Add the following optional attributes to the `database` element:

‎src/guides/v2.3/ui_comp_guide/concepts/ui_comp_xmldeclaration_concept.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ The `name` attribute value must be a unique among the other components on the sa
109109

110110
All other child nodes are declared as items. `<item name="config"> ...</item>` contains the children nodes that describe the configuration of the current UI component. Please note that although configuration for all components is different, there are base properties that are mostly the same for different components. For example, we can use `<item name="component">...</item>` to define which JS file will be used as the Model for the Fieldset UI component in the above example. Reference to this JS file can be either be the full path to this file or the alias which is defined in [`require.js`]({{ page.baseurl }}/javascript-dev-guide/javascript/js-resources.html) configuration.
111111

112-
In our example, the `<item name="component">...</item>` node within `<fieldset>` is omitted, because this property of the Fieldset UI component is already defined in `definition.xml`.
113-
114112
In this example we showed only a small part of the possible configuration.
115113

116114
The default configuration of a UI component is declared in one of the following ways:
@@ -119,6 +117,20 @@ The default configuration of a UI component is declared in one of the following
119117
* in the [`definition.xml` file]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml)
120118
* in both places, in which case the configurations merge (the UI component `.js` file has priority).
121119

122-
In the above example, the Fieldset UI component uses a merged configuration from both the `definition.xml` file and from the UI component's `.js` file.
120+
In the example, the `<item name="component">...</item>` node within `<fieldset>` is omitted, because this property of the Fieldset UI component is already defined in `definition.xml`.
121+
122+
### Example of the `fieldset` node configuration in the `definition.xml`
123+
124+
```xml
125+
<fieldset class="Magento\Ui\Component\Form\Fieldset">
126+
<argument name="data" xsi:type="array">
127+
<item name="js_config" xsi:type="array">
128+
<item name="component" xsi:type="string">Magento_Ui/js/form/components/fieldset</item>
129+
</item>
130+
</argument>
131+
</fieldset>
132+
```
133+
134+
In the example of a basic component's configuration file, the Fieldset UI component uses a merged configuration from both the `xml` file and from the UI component's `.js` file.
123135

124136
For more information about the configuration flow, refer to the [Configuration Flow of UI Components]({{ page.baseurl }}/ui_comp_guide/concepts/ui_comp_config_flow_concept.html) topic.

‎src/guides/v2.4/extension-dev-guide/framework/datetime.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/guides/v2.4/extension-dev-guide/framework/datetime.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../v2.3/extension-dev-guide/framework/datetime.md

‎src/guides/v2.4/get-started/gs-web-api-request.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)