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:TOKEN@www.magentocommerce.com/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

0 commit comments

Comments
 (0)