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

Commit b8df5ee

Browse files
jeff-matthewskeharper
authored andcommitted
Sync develop with master (#5741)
* Resolved issue #5179 * Update guides/v2.2/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update guides/v2.2/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update guides/v2.3/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update guides/v2.3/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update identity-class.md * Import the correct `Magento\Framework\GraphQl\Query\Resolver\IdentityInterface`. * Clarify what is required and what is an implementation detail. * magento/devdocs#: Add a custom payment method to checkout. Fix Step 4 https://devdocs.magento.com/guides/v2.2/howdoi/checkout/checkout_payment.html https://devdocs.magento.com/guides/v2.3/howdoi/checkout/checkout_payment.html * Fixed infobox * Getting infobox correct * Trying to fix infobox * More finessing. * Debugging * Pipe in command was breaking infobox formatting * Escaped pipe in command * Pipe in command broke formatting. * Removed pipes from command * Trailing space. * trailing space * trailing space * MAGETWO-49336: Publication of breaking changes * Update BICs for 2.2.10 Convert included files to Markdown Add includes to the topic * Fix heading id * MAGETWO-49336: Publication of breaking changes * Update BICs for 2.3.3 Convert included files to Markdown Add the includes to main topic * Fix links (#5690) * fix links add parans * remove duplicate topic * add symlink * remove duplicate projects topic * create symlink * found another problem with a link * magento/devdocs#: Fix links in How Magento implements indexing (#5656) https://devdocs.magento.com/guides/v2.2/extension-dev-guide/indexing.html https://devdocs.magento.com/guides/v2.3/extension-dev-guide/indexing.html * added link to devblog post andfixed broken links in include files * magento/devdocs#: Describes changeCustomerPassword mutation errors - https://devdocs.magento.com/guides/v2.3/graphql/mutations/change-customer-password.html * Markdown linting: Enable rule MD029 (#5698) * Fixed errors in rest, test, and ui comps * Fix errors in release notes * Fixed errors in pattern-library and payment integrations * Fixed errors in marketplace, migration, mrg, and mtf * Fixed errors in install, js-dev, and inventory * Applied peer review edits * Applied peer review edits * Removed forced numbering class * Fixed errors in howdoi * Fixed errors in get-started, graphql * Fixed errors in frontend-dev-guide * Fixed errors in ext-dev * Fixed some errors in config * Fixed some errors in config * Applied edits from peer review * Removed redundant TOC * Fixed errors in config * Fixed errors in coding standards, comp-mgr, contributor * Disable rule * Fixed errors in _vidoes, reporting, arch * Fixed errors in includes (not cloud) * Enable rule * Fixed errors in cloud includes * Fixed errors in cloud * Added page-builder-types to gitignore file (#5708) * spaces of course * move categoryinterface out of category query (#5718) * Fix syntax for paths to run Actions on See https://help.github.com/en/articles/workflow-syntax-for-github-actions#example-including-paths
1 parent d576279 commit b8df5ee

File tree

283 files changed

+5141
-4869
lines changed

Some content is hidden

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

283 files changed

+5141
-4869
lines changed

.github/ISSUE_TEMPLATE/BUG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ about: Create an issue about a bug on the devdocs website
1414
<!-- (OPTIONAL) What needs to be done to replicate this issue? (provide Gist if needed) -->
1515

1616
1. First Step
17-
2. Second Step
18-
3. Etc.
17+
1. Second Step
18+
1. Etc.
1919

2020
## Expected result
2121

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
- develop
88
paths:
9-
- '*.md'
9+
- '**.md'
1010

1111
jobs:
1212
test:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ _algolia_api_key
2626
/mbi/
2727
/page-builder/
2828
/page-builder-migration/
29+
/page-builder-types/
2930
/guides/m1x/
3031
/mftf/
3132

_checks/styles/style-rules-prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rule 'MD025'
2222
exclude_rule 'MD026'
2323
exclude_rule 'MD027'
2424
exclude_rule 'MD028'
25-
exclude_rule 'MD029'
25+
rule 'MD029'
2626
exclude_rule 'MD030'
2727
exclude_rule 'MD031'
2828
exclude_rule 'MD032'

_data/toc/graphql.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ pages:
234234
- label: ProductInterface attributes
235235
url: /graphql/product/product-interface.html
236236

237+
- label: CategoryInterface attributes
238+
url: /graphql/product/category-interface.html
239+
237240
- label: CustomizableOptionInterface
238241
url: /graphql/product/customizable-option-interface.html
239242

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
### ({{ site.data.var.ee }} only) Class API membership changes {#ee-class-api-membership-229-2210}
2+
3+
| What changed | How it changed |
4+
| --- | --- |
5+
| Magento\CustomerCustomAttributes\Block\Adminhtml\Customer\ValidationMessages | Class was added. |
6+
| Magento\Banner\Model\Banner | Class was added. |
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
### {{ site.data.var.ee }} only changes in classes {#ee-class-232-233}
2+
3+
| What changed | How it changed |
4+
| --- | --- |
5+
| Magento\SalesArchive\Block\Adminhtml\Sales\Order\View\Buttons::\_\_construct | [public] Method parameter typing changed. |
6+
| Magento\Rma\Block\Adminhtml\Order\View\Buttons::\_\_construct | [public] Method parameter typing changed. |
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
### Class changes {#class-229-2210}
2+
3+
| What changed | How it changed |
4+
| --- | --- |
5+
| Magento\Tax\Block\Adminhtml\Rate\Form::\_construct | [protected] Method return typing changed. |
6+
| Magento\Sales\Block\Adminhtml\Items\Column\Name::truncateString | [public] Method parameter typing removed. |
7+
| Magento\Review\Block\Customer\View::\_toHtml | [protected] Method return typing changed. |
8+
| Magento\Eav\Model\Entity\Attribute\Source\Store::getAllOptions | [public] Method return typing changed. |
9+
| Magento\Directory\Model\Config\Source\Country\Full::toOptionArray | [public] Method return typing changed. |
10+
| Magento\Config\Console\Command\ConfigSetCommand::execute | [protected] Method return typing changed. |
11+
| Magento\Reports\Block\Adminhtml\Grid::\_\_construct | [public] Method has been added. |
12+
| Magento\Eav\Model\ResourceModel\Entity\Attribute::\_beforeDelete | [protected] Method has been added. |
13+
| Magento\Eav\Model\Entity\Attribute\Source\Store::getAllOptions | [public] Added optional parameter(s). |
14+
| Magento\Directory\Model\ResourceModel\Country::\_\_construct | [public] Method has been added. |
15+
| Magento\Directory\Model\Config\Source\Country\Full::toOptionArray | [public] Added optional parameter(s). |
16+
17+
### Interface changes {#interface-229-2210}
18+
19+
| What changed | How it changed |
20+
| --- | --- |
21+
| Magento\Vault\Api\PaymentTokenManagementInterface::getListByCustomerId | [public] Method return typing changed. |
22+
| Magento\Sales\Api\CreditmemoCommentRepositoryInterface::getList | [public] Method return typing changed. |
23+
| Magento\Sales\Api\CreditmemoManagementInterface::getCommentsList | [public] Method return typing changed. |
24+
| Magento\Sales\Api\OrderManagementInterface::getCommentsList | [public] Method return typing changed. |
25+
| Magento\Sales\Api\OrderStatusHistoryRepositoryInterface::getList | [public] Method return typing changed. |
26+
| Magento\Sales\Api\Data\CreditmemoInterface::getComments | [public] Method return typing changed. |
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
### Class changes {#class-232-233}
2+
3+
| What changed | How it changed |
4+
| --- | --- |
5+
| Magento\Framework\Mail\Template\TransportBuilder::getTransport | [public] Method return typing changed. |
6+
| Magento\Framework\Mail\Template\TransportBuilder::getTemplate | [protected] Method return typing changed. |
7+
| Magento\Framework\DataObject\Copy::copyFieldsetToTarget | [public] Method return typing changed. |
8+
| Magento\Framework\Data\Collection\AbstractDb::\_renderFiltersBefore | [protected] Method return typing changed. |
9+
| Magento\Tax\Block\Adminhtml\Rate\Form::\_construct | [protected] Method return typing changed. |
10+
| Magento\Swatches\Block\Product\Renderer\Configurable::getHtmlOutput | [protected] Method return typing changed. |
11+
| Magento\Sales\Model\Order\Config::getStateDefaultStatus | [public] Method return typing changed. |
12+
| Magento\Sales\Model\Order\Config::getStatusFrontendLabel | [public] Method return typing changed. |
13+
| Magento\Sales\Block\Order\History::\_construct | [protected] Method return typing changed. |
14+
| Magento\Sales\Block\Order\History::\_prepareLayout | [protected] Method return typing changed. |
15+
| Magento\Sales\Block\Order\Recent::\_construct | [protected] Method return typing changed. |
16+
| Magento\Sales\Block\Order\Recent::\_toHtml | [protected] Method return typing changed. |
17+
| Magento\Sales\Block\Adminhtml\Order\View::\_\_construct | [public] Method parameter typing changed. |
18+
| Magento\Review\Block\Customer\View::\_toHtml | [protected] Method return typing changed. |
19+
| Magento\Newsletter\Model\Subscriber::received | [public] Method return typing changed. |
20+
| Magento\Newsletter\Block\Adminhtml\Problem::\_construct | [protected] Method return typing changed. |
21+
| Magento\Newsletter\Block\Adminhtml\Problem::getUnsubscribeButtonHtml | [public] Method return typing changed. |
22+
| Magento\Newsletter\Block\Adminhtml\Problem::getDeleteButtonHtml | [public] Method return typing changed. |
23+
| Magento\GraphQl\Controller\GraphQl::dispatch | [public] Method return typing changed. |
24+
| Magento\Config\Console\Command\ConfigSetCommand::execute | [protected] Method return typing changed. |
25+
| Magento\Checkout\Block\Cart\Totals::\_\_construct | [public] Method parameter typing changed. |
26+
| Magento\CatalogRule\Model\Indexer\IndexBuilder::getActiveRules | [protected] Method return typing changed. |
27+
| Magento\CatalogRule\Model\Indexer\IndexBuilder::getAllRules | [protected] Method return typing changed. |
28+
| Magento\Catalog\Model\ResourceModel\Product::getCategoryCollection | [public] Method return typing changed. |
29+
| Magento\Catalog\Model\Product\Visibility::getVisibleInCatalogIds | [public] Method return typing changed. |
30+
| Magento\Catalog\Model\Product\Visibility::getVisibleInSearchIds | [public] Method return typing changed. |
31+
| Magento\Catalog\Model\Product\Visibility::getVisibleInSiteIds | [public] Method return typing changed. |
32+
| Magento\Catalog\Block\Adminhtml\Product\Grid::\_construct | [protected] Method return typing changed. |
33+
| Magento\Catalog\Block\Adminhtml\Product\Grid::\_prepareCollection | [protected] Method return typing changed. |
34+
| Magento\Catalog\Block\Adminhtml\Product\Grid::\_addColumnFilterToCollection | [protected] Method return typing changed. |
35+
| Magento\Catalog\Block\Adminhtml\Product\Grid::\_prepareColumns | [protected] Method return typing changed. |
36+
| Magento\Catalog\Block\Adminhtml\Product\Grid::\_prepareMassaction | [protected] Method return typing changed. |
37+
| Magento\Catalog\Block\Adminhtml\Product\Grid::getGridUrl | [public] Method return typing changed. |
38+
| Magento\Catalog\Block\Adminhtml\Product\Grid::getRowUrl | [public] Method return typing changed. |
39+
| Magento\Backend\Block\Store\Switcher::\_construct | [protected] Method return typing changed. |
40+
| Magento\Wishlist\Model\ResourceModel\Item\Collection::\_renderFiltersBefore | [protected] Method has been added. |
41+
| Magento\Sales\Model\Order\Address::beforeSave | [public] Method has been added. |
42+
| Magento\Reports\Block\Adminhtml\Grid::\_\_construct | [public] Method has been added. |
43+
| Magento\PageCache\Model\Config::VARNISH\_6\_CONFIGURATION\_PATH | Constant has been added. |
44+
| Magento\Eav\Model\ResourceModel\Entity\Attribute::\_beforeDelete | [protected] Method has been added. |
45+
| Magento\Directory\Model\ResourceModel\Country::\_\_construct | [public] Method has been added. |
46+
| Magento\Backend\Model\Url::setScope | [public] Method has been added. |
47+
48+
### Interface changes {#interface-232-233}
49+
50+
| What changed | How it changed |
51+
| --- | --- |
52+
| Magento\Vault\Api\PaymentTokenManagementInterface::getListByCustomerId | [public] Method return typing changed. |
53+

_includes/cloud/backup-db.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ We recommend creating a backup of your project before an upgrade. Use the follow
33
{:.procedure}
44
To back up your Integration environment database and code:
55

6-
1. Create a local backup of the remote database.
6+
1. Create a local backup of the remote database.
77

8-
```bash
9-
magento-cloud db:dump
10-
```
8+
```bash
9+
magento-cloud db:dump
10+
```
1111

12-
{: .bs-callout-info }
13-
The `magento-cloud db:dump` command runs the [mysqldump](https://dev.mysql.com/doc/refman/8.0/en/mysqldump.html) command with the `--single-transaction` flag, which allows you to back up your database without locking the tables.
12+
{: .bs-callout-info }
13+
The `magento-cloud db:dump` command runs the [mysqldump](https://dev.mysql.com/doc/refman/8.0/en/mysqldump.html) command with the `--single-transaction` flag, which allows you to back up your database without locking the tables.
1414

15-
1. Back up code and media.
15+
1. Back up code and media.
1616

17-
```bash
18-
php bin/magento setup:backup --code [--media]
19-
```
17+
```bash
18+
php bin/magento setup:backup --code [--media]
19+
```
2020

21-
Optionally, you can omit `[--media]` if you have a large number of static files that are already in source control.
21+
Optionally, you can omit `[--media]` if you have a large number of static files that are already in source control.
2222

2323
{:.procedure}
2424
To back up your Staging or Production environment database before deploying:
2525

26-
1. Use SSH to log in to the remote server.
26+
1. Use SSH to log in to the remote server.
2727

28-
2. Create a database dump.
28+
1. Create a database dump.
2929

30-
```bash
31-
vendor/bin/ece-tools db-dump
32-
```
30+
```bash
31+
vendor/bin/ece-tools db-dump
32+
```
3333

34-
- We recommend setting the application in maintenance mode before doing a database dump in Production environments.
35-
- This creates an `dump-<timestamp>.sql.gz` archive file in your local project directory. See [Snapshot and backup management]({{ site.baseurl }}/guides/v2.2/cloud/project/project-webint-snap.html#db-dump).
34+
- We recommend setting the application in maintenance mode before doing a database dump in Production environments.
35+
- This creates an `dump-<timestamp>.sql.gz` archive file in your local project directory. See [Snapshot and backup management]({{ site.baseurl }}/guides/v2.2/cloud/project/project-webint-snap.html#db-dump).

_includes/cloud/enable-ssh.md

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ You must create an SSH key pair on every machine and workspace you and your team
22

33
The SSH keys require the following:
44

5-
* Set up SSH keys as the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
6-
* Create the keys using the email address used for the GitHub account.
5+
* Set up SSH keys as the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
6+
* Create the keys using the email address used for the GitHub account.
77

88
For more information on SSH keys, see the following:
99

@@ -33,8 +33,8 @@ If you do not have SSH keys, you need to generate the keys for adding to your Ma
3333

3434
If you already have SSH keys, continue to:
3535

36-
* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
37-
* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
36+
* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
37+
* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
3838

3939
## Create a new SSH key pair {#ssh-create-new-key-pair}
4040

@@ -43,70 +43,70 @@ Use the `ssh-keygen` command to create an SSH key pair. `ssh-keygen` is typicall
4343
{:.procedure}
4444
To create an SSH key pair:
4545

46-
1. The command syntax follows, entering the email used for your GitHub account:
46+
1. The command syntax follows, entering the email used for your GitHub account:
4747

48-
```bash
49-
ssh-keygen -t rsa
50-
```
48+
```bash
49+
ssh-keygen -t rsa
50+
```
5151

52-
GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.
52+
GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.
5353

54-
1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.
54+
1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.
5555

56-
1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.
56+
1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.
5757

58-
1. After creating the SSH key pair, start the ssh-agent:
58+
1. After creating the SSH key pair, start the ssh-agent:
5959

60-
For Mac or Linux:
60+
For Mac or Linux:
6161

62-
```bash
63-
eval "$(ssh-agent -s)"
64-
```
62+
```bash
63+
eval "$(ssh-agent -s)"
64+
```
6565

66-
For Mac, you can edit the `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain.
66+
For Mac, you can edit the `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain.
6767

68-
```conf
69-
Host *
70-
AddKeysToAgent yes
71-
UseKeychain yes
72-
IdentityFile ~/.ssh/id_rsa
73-
```
68+
```conf
69+
Host *
70+
AddKeysToAgent yes
71+
UseKeychain yes
72+
IdentityFile ~/.ssh/id_rsa
73+
```
7474

7575
For Windows:
7676

7777
```shell
7878
eval $(ssh-agent -s)
7979
```
8080

81-
1. Add the SSH key to the ssh-agent. If you used a different name for the key file name, replace `id_rsa` with that file name.
81+
1. Add the SSH key to the ssh-agent. If you used a different name for the key file name, replace `id_rsa` with that file name.
8282

83-
For Mac:
83+
For Mac:
8484

85-
```bash
86-
ssh-add -K ~/.ssh/id_rsa
87-
```
85+
```bash
86+
ssh-add -K ~/.ssh/id_rsa
87+
```
8888

89-
For Windows or Linux:
89+
For Windows or Linux:
9090

91-
```shell
92-
ssh-add ~/.ssh/id_rsa
93-
```
91+
```shell
92+
ssh-add ~/.ssh/id_rsa
93+
```
9494

95-
1. [Add your SSH key to your GitHub account.](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) The instructions include Mac, Windows, and Linux.
95+
1. [Add your SSH key to your GitHub account.](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) The instructions include Mac, Windows, and Linux.
9696

9797
### Test the SSH keys {#test}
9898

9999
After adding the SSH keys, test the SSH connection to GitHub:
100100

101101
1. In the terminal, enter the following command:
102102

103-
```bash
104-
105-
```
103+
```bash
104+
105+
```
106106

107-
2. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
107+
1. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
108108
109-
3. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
109+
1. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
110110
111111
## Add a public SSH key to your Magento account {#ssh-add-to-account}
112112
@@ -120,43 +120,43 @@ You can add SSH keys to your account in any of the following ways:
120120
To add an SSH key using the CLI:
121121
122122
1. Open a terminal application on your local.
123-
2. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.
123+
1. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.
124124

125-
3. Log in to your project:
125+
1. Log in to your project:
126126

127-
```bash
128-
magento-cloud login
129-
```
127+
```bash
128+
magento-cloud login
129+
```
130130

131-
3. Add the key:
131+
1. Add the key:
132132

133-
```bash
134-
magento-cloud ssh-key:add ~/.ssh/id_rsa.pub
135-
```
133+
```bash
134+
magento-cloud ssh-key:add ~/.ssh/id_rsa.pub
135+
```
136136

137137
#### Add a key using the Project Web Interface {#add-key-web}
138138

139139
You will select and add your SSH public key to each environment in your account.
140140

141-
* Starter: Add to Master (Production) and any environments you create by branching from Master
142-
* Pro: Add to Master Integration environment. After your Staging and Production environments are provisioned, you can add the SSH keys to those environments.
141+
* Starter: Add to Master (Production) and any environments you create by branching from Master
142+
* Pro: Add to Master Integration environment. After your Staging and Production environments are provisioned, you can add the SSH keys to those environments.
143143

144144
To add an SSH key using the Project Web Interface:
145145

146146
1. Copy your SSH public key to the clipboard.
147147

148148
If you do not already have SSH keys on that machine, see [GitHub documentation](https://help.github.com/articles/generating-an-ssh-key) to create them.
149149

150-
2. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
151-
3. In your selected branch, an icon displays if you do not have an SSH key added.
150+
1. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
151+
1. In your selected branch, an icon displays if you do not have an SSH key added.
152152

153153
![No SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-install.png)
154154

155-
4. Copy and paste the content of your public SSH key in the screen.
155+
1. Copy and paste the content of your public SSH key in the screen.
156156

157157
![Add SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-add.png)
158158

159-
5. Follow the prompts on your screen to complete the task.
159+
1. Follow the prompts on your screen to complete the task.
160160

161161
## Set global Git variables
162162

0 commit comments

Comments
 (0)