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

Commit 13be92b

Browse files
authored
Merge pull request #4 from magento/master
Sync with upstream
2 parents f5429b0 + fa55887 commit 13be92b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+396
-272
lines changed

.imgbotconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"ignoredFiles": [
3+
"*.svg"
4+
],
5+
"aggressiveCompression": false
6+
}

Gemfile.lock

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: 84a3ed7f0df264a2c2086167efbd7d0545d329c4
3+
revision: 5e99a84dd5692d3ee4c1985b9f48824eeede8cfd
44
specs:
5-
devdocs (4)
5+
devdocs (5)
66
jekyll (>= 3.3)
77

88
GEM
@@ -95,10 +95,9 @@ GEM
9595
launchy (2.4.3)
9696
addressable (~> 2.3)
9797
liquid (4.0.3)
98-
listen (3.1.5)
99-
rb-fsevent (~> 0.9, >= 0.9.4)
100-
rb-inotify (~> 0.9, >= 0.9.7)
101-
ruby_dep (~> 1.2)
98+
listen (3.2.0)
99+
rb-fsevent (~> 0.10, >= 0.10.3)
100+
rb-inotify (~> 0.9, >= 0.9.10)
102101
mdl (0.5.0)
103102
kramdown (~> 1.12, >= 1.12.0)
104103
mixlib-cli (~> 1.7, >= 1.7.0)
@@ -124,8 +123,7 @@ GEM
124123
rb-fsevent (0.10.3)
125124
rb-inotify (0.10.0)
126125
ffi (~> 1.0)
127-
rouge (3.11.0)
128-
ruby_dep (1.5.0)
126+
rouge (3.12.0)
129127
safe_yaml (1.0.5)
130128
sass (3.7.4)
131129
sass-listen (~> 4.0.0)

_data/toc/ui-components-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ pages:
5050
- label: DynamicRows component
5151
url: /ui_comp_guide/components/ui-dynamicrows.html
5252

53+
- label: DynamicRowsRecord component
54+
url: /ui_comp_guide/components/ui-dynamicrows-record.html
55+
5356
- label: Email component
5457
url: /ui_comp_guide/components/ui-email.html
5558

_includes/config/setup-cron_2.3_how-to.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,3 @@ content='The `update/cron.php` file exists in [Composer](https://glossary.magent
4343

4444
In [Composer-based installations](https://glossary.magento.com/composer), Magento creates the `update/` directory when you run `composer create-project`. Running `composer install` does not create the `update/` directory (if it did not exist before). See [Recreate the Magento updater](https://devdocs.magento.com/guides/v2.3/comp-mgr/cli/cli-upgrade.html#recreate-magento-updater).'
4545
%}
46-
47-
Starting from Magento 2.3.4 mentioned crons have been grouped to `default` (`cron:run`, `update/cron.php`, `setup:cron:run` crons) and `non-optional` (`cron:run` cron only) groups.
48-
49-
Use `-d` or `--non-optional` to install non-optional CRON job:
50-
51-
```bash
52-
bin/magento cron:install --non-optional
53-
```
54-
55-
```terminal
56-
#~ MAGENTO START
57-
* * * * * /usr/bin/php /var/www/html/magento2/bin/magento cron:run | grep -v Ran jobs by schedule >> /var/www/html/magento2/var/log/magento.cron.log
58-
#~ MAGENTO END
59-
```
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
33
`id` | Int! | A unique ID assigned to the customizable option
4-
`value_string` | String! | A value assigned to the the customizable option
4+
`value_string` | String! | A value assigned to the customizable option

_includes/install/auth-tokens-get.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ You can also disable or delete authentication keys. For example, you can disable
2121
* To enable a previously disabled key: Click **Enable**.
2222
* To delete keys: Click **Delete**.
2323

24-
You cannot delete or disable keys you created by signing in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}. To manage those keys:
24+
### Manage SSH access token
25+
26+
To download Magento releases using SSH, you must generate a Downloads Access Token. To generate a token:
2527

2628
1. Log in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}.
2729
1. Click **My Account** at the top of the page.
@@ -30,3 +32,11 @@ You cannot delete or disable keys you created by signing in to your [magento.com
3032
![Access your keys]({{ site.baseurl }}/common/images/connect_keys1.png){:width="200px"}
3133

3234
1. Click **Generate new token** to replace and disable an existing token.
35+
36+
You must use your MAGEID plus your token to download a release. Your MAGEID is displayed at the top-left of your account page.
37+
38+
For example:
39+
40+
```bash
41+
curl -k https://MAGEID:[email protected]/products/downloads/info/help
42+
```

common/images/graphql/authorize-net.svg

Lines changed: 3 additions & 0 deletions
Loading

common/images/graphql/braintree-vault.svg

Lines changed: 3 additions & 1 deletion
Loading

common/images/graphql/braintree.svg

Lines changed: 3 additions & 1 deletion
Loading

common/images/graphql/paypal-express-checkout.svg

Lines changed: 3 additions & 1 deletion
Loading

common/images/graphql/paypal-hosted-pro.svg

Lines changed: 3 additions & 1 deletion
Loading

common/images/graphql/paypal-payflow-link.svg

Lines changed: 3 additions & 1 deletion
Loading

common/images/graphql/paypal-payflow-pro.svg

Lines changed: 3 additions & 1 deletion
Loading
Loading

guides/v2.2/b2b/shared-cat-product-assign.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Unassigning a product does not remove it from its category or categories.
216216

217217
`true`, indicating the operation was successful
218218

219-
### List the shared catalog categories
219+
### List the shared catalog products
220220

221221
The `GET` call returns an array of SKUs.
222222

guides/v2.2/cloud/cdn/configure-fastly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Fastly sets a 180 second-timeout for HTTPS requests to the Magento Admin, so you
220220

221221
1. In the *Fastly Configuration* section, expand **Advanced**.
222222

223-
1. Set the **Admin path timeout** value in seconds. This value cannot be more than one hour (3600 seconds).
223+
1. Set the **Admin path timeout** value in seconds. This value cannot be more than 10 minutes (600 seconds).
224224

225225
1. Click **Save Config** at the top of the page.
226226

guides/v2.2/cloud/project/log-locations.md

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ You can [set up log-based Slack and email notifications][slacklog] when configur
1818

1919
## Viewing logs
2020

21-
There are three ways to view logs: file system, project web UI, or magento-cloud CLI.
21+
There are three ways to view logs: file system, project web UI, or the `magento-cloud` CLI.
2222

23-
- **Log directories**—The `var/log` directory contains logs for all environments. You must use an SSH connection to access the `var/log` directory in the remote server environment.
24-
- **Project web UI**—You can see build and post-deploy log information in the environment messages list.
23+
- **Log directories**—The `/var/log` system directory contains logs for all environments. The `var/log/` Magento directory contains app-specific logs unique to a particular environment. You must use an SSH connection to access logs in a remote server environment. These directories are not shared between nodes in a cluster.
24+
- **Project web UI**—You can see build and post-deploy log information in the environment _messages_ list.
2525
- **Magento Cloud CLI**—You can view logs using the `magento-cloud log` command.
2626

2727
### Log command
@@ -45,7 +45,6 @@ Enter a number to choose a log:
4545
[6] post-deploy
4646
>
4747
```
48-
{:.no-copy}
4948

5049
By default, the command displays the log from the Integration environment. For the Pro Staging logs, you need to specify the log location using the project ID.
5150

@@ -73,23 +72,22 @@ Re-deploying environment project-integration-ID
7372
[2019-01-03 19:44:32] INFO: Warming up failed: http://integration-id-project.us.magentosite.cloud/
7473
[2019-01-03 19:44:32] NOTICE: Post-deploy is complete.
7574
```
76-
{: .no-copy}
7775

7876
The following logs have a common location for all Cloud projects:
7977

8078
- **Build log**: `var/log/cloud.log`
8179
- **Debug log**: `var/log/debug.log`
8280
- **Exception log**: `var/log/exception.log`
83-
- **Support report log**: `var/log/support_report.log`
81+
- **Reports**: `var/reports/`
8482

85-
Logs from the deploy hook are unique for each environment. The deploy log is in the following directories:
83+
Though the `cloud.log` file contains feedback from each stage of the deployment process, logs from the deploy hook are unique to each environment. The environment-specific deploy log is in the following directories:
8684

87-
- **Starter and Pro Integration**: `var/log/deploy.log`
88-
- **Pro Staging**: `var/log/platform/<project_id>_stg/deploy.log`
89-
- **Pro Production**: `var/log/platform/<project_id>/deploy.log`
85+
- **Starter and Pro Integration**: `/var/log/deploy.log`
86+
- **Pro Staging**: `/var/log/platform/<project_id>_stg/deploy.log`
87+
- **Pro Production**: `/var/log/platform/<project_id>/deploy.log`
9088

9189
The value of `<project_id>` depends on the project ID and whether the environment is Staging or Production. For example, with a project ID of `yw1unoukjcawe`, the Staging environment user is `yw1unoukjcawe_stg` and the Production environment user is `yw1unoukjcawe`.
92-
Using that example, the deploy log is: `var/log/platform/yw1unoukjcawe_stg/deploy.log`
90+
Using that example, the deploy log is: `/var/log/platform/yw1unoukjcawe_stg/deploy.log`
9391

9492
The log for each deployment concatenates to the specific `deploy.log` file. The following example prints the deploy log in the terminal:
9593

@@ -119,28 +117,31 @@ magento-cloud log platform/<project_id>_stg/deploy
119117

120118
## Application logs
121119

122-
Similar to deploy logs, application logs are unique for each environment. The following table lists application log locations on each environment:
120+
Similar to deploy logs, application logs are unique for each environment. For Pro Staging and Production environments, the Deploy, Post-deploy, and Cron logs are available only on the first node in the cluster.
121+
122+
The following table lists application log locations on each environment:
123123

124124
Log file | Starter and Pro Integration | Pro Staging | Pro Production
125125
------------------- | --------------------------- | ------------------------------------------------- | -------------------------------------------
126-
**Deploy log** | `var/log/deploy.log` | `var/log/platform/<project_id>_stg/deploy.log` | `/var/log/platform/<project_id>/deploy.log`
127-
**Cron log** | `var/log/cron.log` | `var/log/platform/<project_id>_stg/cron.log` | `var/log/platform/<project_id>/cron.log`
128-
**Nginx access log**| `var/log/access.log` | `var/log/platform/<project_id>_stg/access.log` | `/var/log/platform/<project_id>/access.log`
129-
**Nginx error log** | `var/log/error.log` | `var/log/platform/<project_id>_stg/error.log` | `/var/log/platform/<project_id>/error.log`
130-
**PHP access log** | `var/log/php.access.log` | `var/log/platform/<project_id>_stg/php.access.log` | `/var/log/platform/<project_id>/php.access.log`
131-
**PHP FPM log** | `var/log/app.log` | `var/log/platform/<project_id>_stg/php5-fpm.log` | `var/log/platform/<project_id>/php5-fpm.log`
126+
**Deploy log** | `/var/log/deploy.log` | First node only:<br>`/var/log/platform/<project_id>_stg/deploy.log` | First node only:<br>`/var/log/platform/<project_id>/deploy.log`
127+
**Post-deploy log** | `/var/log/post_deploy.log` | First node only:<br>`/var/log/platform/<project_id>_stg/post_deploy.log` | First node only:<br>`/var/log/platform/<project_id>/post_deploy.log`
128+
**Cron log** | `/var/log/cron.log` | First node only:<br>`/var/log/platform/<project_id>_stg/cron.log` | First node only:<br>`/var/log/platform/<project_id>/cron.log`
129+
**Nginx access log**| `/var/log/access.log` | `/var/log/platform/<project_id>_stg/access.log` | `/var/log/platform/<project_id>/access.log`
130+
**Nginx error log** | `/var/log/error.log` | `/var/log/platform/<project_id>_stg/error.log` | `/var/log/platform/<project_id>/error.log`
131+
**PHP access log** | `/var/log/php.access.log` | `/var/log/platform/<project_id>_stg/php.access.log` | `/var/log/platform/<project_id>/php.access.log`
132+
**PHP FPM log** | `/var/log/app.log` | `/var/log/platform/<project_id>_stg/php5-fpm.log` | `/var/log/platform/<project_id>/php5-fpm.log`
132133

133134
## Service logs
134135

135136
Because each service runs in a separate container, the service logs are not available in the Integration environment. {{site.data.var.ece}} provides access to the web server container in the Integration environment only. The following service log locations are for the Pro Staging and Production environments:
136137

137-
- **Redis log**: `var/log/platform/<project_id>_stg/redis-server-<project_id>_stg.log`
138-
- **Elasticseach log**: `var/log/elasticsearch/elasticsearch.log`
139-
- **Mail log**: `var/log/mail.log`
140-
- **MySQL error log**: `var/log/mysql/mysql-error.log`
141-
- **MySQL slow log**: `var/log/mysql/mysql-slow.log`
142-
- **RabbitMQ log**: `var/log/rabbitmq/[email protected]`
138+
- **Redis log**: `/var/log/platform/<project_id>_stg/redis-server-<project_id>_stg.log`
139+
- **Elasticseach log**: `/var/log/elasticsearch/elasticsearch.log`
140+
- **Mail log**: `/var/log/mail.log`
141+
- **MySQL error log**: `/var/log/mysql/mysql-error.log`
142+
- **MySQL slow log**: `/var/log/mysql/mysql-slow.log`
143+
- **RabbitMQ log**: `/var/log/rabbitmq/[email protected]`
143144

144145
[hook]: {{page.baseurl}}/cloud/project/project-conf-files_magento-app.html#hooks
145146
[configlog]: {{page.baseurl}}/config-guide/cli/logging.html
146-
[slacklog]: {{page.baseurl}}/cloud/env/setup-notifications.html
147+
[slacklog]: {{page.baseurl}}/cloud/env/setup-notifications.html

guides/v2.2/cloud/trouble/trouble_ce-creds.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ To resolve the issue with credentials:
9595

9696
A snippet of messages for a successful deployment follows:
9797

98-
{% collapsible Click to show/hide snippet %}
99-
100-
```xml
98+
```terminal
10199
Building application 'mymagento' (runtime type: php:7.0, tree: e8450f9)
102100
Generating runtime configuration.
103101
@@ -163,8 +161,6 @@ To resolve the issue with credentials:
163161
34afd91..98c2166 master -> master
164162
```
165163

166-
{% endcollapsible %}
167-
168164
#### Verify the deployment
169165

170166
To verify the deployment was successful, enter one of the URLs displayed under `Environment routes:` in a web browser.

guides/v2.2/extension-dev-guide/cache/page-caching/private-content.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The section source class is responsible for retrieving data for the section. As
2121

2222
The public method `getSectionData` must return an array with data for private block.
2323

24-
[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/CustomerData/CompareProducts.php#L36-L45){:target="_blank"}
24+
[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/CustomerData/CompareProducts.php#L45-L54){:target="_blank"}
2525

2626
Add the following to your component's [dependency injection](https://glossary.magento.com/dependency-injection) configuration (`di.xml`):
2727

@@ -52,7 +52,7 @@ Initialize the component as follows:
5252
</script>
5353
```
5454
55-
[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml#L46-L48){:target="_blank"}
55+
[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml#L50-L52){:target="_blank"}
5656
5757
## Configure a UI component {#config-cache-priv-how-ui}
5858
@@ -62,7 +62,7 @@ The UI component renders block data on the Magento [storefront](https://glossary
6262
6363
All properties are available in the template.
6464
65-
[Example of defining a UI component in a layout]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/layout/default.xml#L11-L22){:target="_blank"}
65+
[Example of defining a UI component in a layout]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/layout/default.xml#L11-L32){:target="_blank"}
6666
6767
## Invalidate private content
6868

guides/v2.2/extension-dev-guide/test/test_object-mgr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The ObjectManager public interface methods are:
2828
<p><b>Syntax:</b></p>
2929
<pre>
3030
public function getObject($className,
31-
array $arguments = array());
31+
array $arguments = []);
3232
</pre>
3333
<p><b>Example:</b></p>
3434
<pre>
@@ -61,7 +61,7 @@ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
6161
$option = $this->getMock(
6262
'Magento\Bundle\Model\Option',
6363
array('getSelections', '__wakeup', 'getData'),
64-
array(),
64+
[],
6565
'',
6666
false
6767
);
@@ -76,7 +76,7 @@ $optionCollection =
7676
<p><b>Syntax:</b></p>
7777
<pre>
7878
public function getConstructArguments($className,
79-
array $arguments = array());
79+
array $arguments = []);
8080
</pre>
8181
<p>In the Magento system, several tests introduced mocks for abstract models and blocks.</p>
8282
<p><b>Example:</b></p>

0 commit comments

Comments
 (0)