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

Commit 3219d98

Browse files
authored
Merge branch 'master' into Amazon-3-Release-Notes
2 parents fa85277 + 5cf5d0d commit 3219d98

File tree

433 files changed

+62147
-72300
lines changed

Some content is hidden

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

433 files changed

+62147
-72300
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Markdown linting test
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
- develop
8+
paths:
9+
- '*.md'
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v1
17+
- name: Set up Ruby
18+
uses: actions/setup-ruby@v1
19+
with:
20+
ruby-version: 2.6
21+
- name: Install gems
22+
run: bundle install
23+
- name: Run mdl
24+
run: rake test:md

README.md

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Our goal is to provide the Magento community with comprehensive and quality tech
1212

1313
You can build this site locally in the following ways:
1414

15-
- [Installing the project dependencies locally](#build-using-jekyll) (Mac, Linux)
16-
- [Using a Vagrant virtual machine](#build-using-vagrant) (Mac, Linux, Windows)
17-
- [Build DevDocs in Windows](#build-devdocs-in-windows) (Windows 7 & 10)
15+
- [Installing the project dependencies locally](#build-using-jekyll) (Mac, Linux)
16+
- [Using a Vagrant virtual machine](#build-using-vagrant) (Mac, Linux, Windows)
17+
- [Build DevDocs in Windows](#build-devdocs-in-windows) (Windows 7 & 10)
1818

1919
## Build using Jekyll
2020

@@ -142,9 +142,9 @@ If rake fails on your environment, generate the preview [using jekyll](#using-je
142142

143143
This command:
144144

145-
* Checks your environment according to the dependencies in `Gemfile.lock`.
146-
* Removes the `_site/` directory, which contains previously generated preview files.
147-
* Generates a new preview and opens the landing page in a web browser.
145+
- Checks your environment according to the dependencies in `Gemfile.lock`.
146+
- Removes the `_site/` directory, which contains previously generated preview files.
147+
- Generates a new preview and opens the landing page in a web browser.
148148

149149
If you don't have the `_config.local.yml` file at the root of your `devdocs/` directory, the rake will generate all versions of the documentation.
150150

@@ -220,11 +220,11 @@ You can deploy the devdocs site locally using [this Vagrant project](https://git
220220

221221
If you have questions, open an issue and ask us. We're looking forward to hearing from you!
222222

223-
* <a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
223+
- <a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
224224

225-
* <a href="mailto:DL-Magento-Doc-Feedback@magento.com">E-mail us</a>
225+
- <a href="mailto:DL-Magento-Doc-Feedback@magento.com">E-mail us</a>
226226

227-
* <a href="https://devdocs.magento.com">Visit our documentation site</a>, built using [GitHub pages](https://pages.github.com/).
227+
- <a href="https://devdocs.magento.com">Visit our documentation site</a>, built using [GitHub pages](https://pages.github.com/).
228228

229229
## Build DevDocs in Windows
230230

@@ -239,41 +239,41 @@ Download software:
239239

240240
Only Administrators can use Chocolatey features. You can use the Administrator account, or you can use the "Run as Administrator" function on the shortcut menu.
241241

242-
1. Open the **Command Prompt** using **Run as Administrator** in the shortcut menu.
242+
1. Open the **Command Prompt** using **Run as Administrator** in the shortcut menu.
243243

244-
1. [Install Chocolatey](https://chocolatey.org/install).
244+
1. [Install Chocolatey](https://chocolatey.org/install).
245245

246-
```cmd
247-
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
248-
```
246+
```cmd
247+
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
248+
```
249249

250-
1. Verify Chocolatey was added to the environment variables:
250+
1. Verify Chocolatey was added to the environment variables:
251251

252-
- In the Windows UI, open search and type `path`.
253-
- In the Windows CMD console, type `echo %path%`.
252+
- In the Windows UI, open search and type `path`.
253+
- In the Windows CMD console, type `echo %path%`.
254254

255-
You should see `C:\ProgramData\chocolatey\bin` in the path.
255+
You should see `C:\ProgramData\chocolatey\bin` in the path.
256256

257-
1. Close and reopen the command prompt before using `choco` commands.
257+
1. Close and reopen the command prompt before using `choco` commands.
258258

259259
After running the script at the command line, you can install any required extensions. Chocolately has many extensions available, similar to Homebrew for MacOS. As a best practice, only use extensions labeled as a "trusted package". You can install editors, such as Nano and Notepad++, using Chocolatey, as well.
260260

261261
#### Install Ruby extension
262262

263263
If you have Ruby installed on the workstation, then you can skip this installation.
264264

265-
1. Open the **Command Prompt** using **Run as Administrator** in the shortcut menu.
265+
1. Open the **Command Prompt** using **Run as Administrator** in the shortcut menu.
266266

267-
1. Install the ruby extension:
267+
1. Install the ruby extension:
268268

269-
```cmd
270-
choco install ruby
271-
```
269+
```cmd
270+
choco install ruby
271+
```
272272

273-
1. Verify the environment variables were added properly:
273+
1. Verify the environment variables were added properly:
274274

275-
- In the Windows UI, open search and type `path`.
276-
- In the Windows CMD console, type `echo %path%`.
275+
- In the Windows UI, open search and type `path`.
276+
- In the Windows CMD console, type `echo %path%`.
277277

278278
> **NOTE**
279279
> If you encounter problems with Ruby, or the `gem` command is not recognized, you can install the `rubyinstaller-devkit.exe` development kit located in the `c:\ProgramData\chocolatey\bin` folder.
@@ -293,59 +293,59 @@ Although you can install Git using Chocolatey, we chose to install _Git for Wind
293293

294294
#### Set up SSH key
295295

296-
1. Open Git Bash. The **Git Bash** executable is on the shortcut menu.
296+
1. Open Git Bash. The **Git Bash** executable is on the shortcut menu.
297297

298-
1. Create a working directory for your Git repositories and change to the new directory.
298+
1. Create a working directory for your Git repositories and change to the new directory.
299299

300-
```bash
301-
mkdir <directory-name>
302-
```
300+
```bash
301+
mkdir <directory-name>
302+
```
303303

304-
1. Follow the [Generating a new SSH](https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/) instructions.
304+
1. Follow the [Generating a new SSH](https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/) instructions.
305305

306306
### Clone and build the DevDocs repository
307307

308308
You may have to close and reopen the Git Bash application after the Choco installations.
309309

310-
1. Open Git Bash. The **Git Bash** executable is on the shortcut menu.
310+
1. Open Git Bash. The **Git Bash** executable is on the shortcut menu.
311311

312-
1. Change to the directory you created for Git repositories and clone the DevDocs repository.
312+
1. Change to the directory you created for Git repositories and clone the DevDocs repository.
313313

314-
```bash
315-
git clone git@github.com:magento/devdocs.git
316-
```
314+
```bash
315+
git clone git@github.com:magento/devdocs.git
316+
```
317317

318-
1. Change to the `devdocs` directory.
318+
1. Change to the `devdocs` directory.
319319

320-
1. Install [Bundler](https://bundler.io).
320+
1. Install [Bundler](https://bundler.io).
321321

322-
```bash
323-
gem install bundle
324-
```
322+
```bash
323+
gem install bundle
324+
```
325325

326-
1. Install gem executables required for building the site.
326+
1. Install gem executables required for building the site.
327327

328-
```bash
329-
bundle install
330-
```
328+
```bash
329+
bundle install
330+
```
331331

332-
1. Build site.
332+
1. Build site.
333333

334-
```bash
335-
bundle exec jekyll serve
336-
```
334+
```bash
335+
bundle exec jekyll serve
336+
```
337337

338-
```terminal
339-
Configuration file: C:/Users/Administrator/mage/devdocs/_config.yml
340-
Source: C:/Users/Administrator/mage/devdocs
341-
Destination: C:/Users/Administrator/mage/devdocs/_site
342-
Incremental build: disabled. Enable with --incremental
343-
Generating...
344-
done in 643.551 seconds.
345-
Auto-regeneration: enabled for 'C:/Users/Administrator/mage/devdocs'
346-
Server address: http://127.0.0.1:4000/
347-
Server running... press ctrl-c to stop.
348-
```
338+
```terminal
339+
Configuration file: C:/Users/Administrator/mage/devdocs/_config.yml
340+
Source: C:/Users/Administrator/mage/devdocs
341+
Destination: C:/Users/Administrator/mage/devdocs/_site
342+
Incremental build: disabled. Enable with --incremental
343+
Generating...
344+
done in 643.551 seconds.
345+
Auto-regeneration: enabled for 'C:/Users/Administrator/mage/devdocs'
346+
Server address: http://127.0.0.1:4000/
347+
Server running... press ctrl-c to stop.
348+
```
349349

350350
> **NOTE**
351351
> The `.bash_profile` file CAN be created and managed using Git Bash, which is useful for aliases and other customizations, This file is in the `users/Administrator` folder.

_checks/styles/style-rules-prod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rule 'MD001'
22
exclude_rule 'MD002'
33
rule 'MD003', :style => :atx
4-
exclude_rule 'MD004'
4+
rule 'MD004'
55
exclude_rule 'MD005'
66
exclude_rule 'MD006'
77
exclude_rule 'MD007'

_data/codebase/mrg/b2b/B2b.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_B2b
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/B2b/README.md
66
last_modified_at: '2017-02-15 17:02:23 +0300'
77
content: "## Overview\n\nThe Magento_b2b module is the base module for B2B. It must

_data/codebase/mrg/b2b/BundleNegotiableQuote.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_BundleNegotiableQuote
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/BundleNegotiableQuote/README.md
66
last_modified_at: '2017-04-10 10:33:01 +0300'
77
content: "## Overview\n\nThe Magento_BundleNegotiableQuote module enables bundle products

_data/codebase/mrg/b2b/BundleRequisitionList.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_BundleRequisitionList
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/BundleRequisitionList/README.md
66
last_modified_at: '2017-04-10 10:33:01 +0300'
77
content: "## Overview\n\nThe Magento_BundleRequisitionList module enables bundle products

_data/codebase/mrg/b2b/BundleSharedCatalog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_BundleSharedCatalog
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/BundleSharedCatalog/README.md
66
last_modified_at: '2017-02-15 17:02:23 +0300'
77
content: "## Overview\n\nThe Magento_BundleSharedCatalog module enables bundle products

_data/codebase/mrg/b2b/CheckoutAddressSearchNegotiableQuote.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_CheckoutAddressSearchNegotiableQuote
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/CheckoutAddressSearchNegotiableQuote/README.md
66
last_modified_at: '2019-04-10 17:47:51 -0500'
77
content: |

_data/codebase/mrg/b2b/Company.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_Company
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/Company/README.md
66
last_modified_at: '2017-02-15 17:02:23 +0300'
77
content: "## Overview\n\nThe Magento_Company module allows a merchant to create a

_data/codebase/mrg/b2b/CompanyCredit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Magento_CompanyCredit
33
source_repo: magento2b2b
4-
release: 1.1.2
4+
release: 1.1.3
55
github_path: app/code/Magento/CompanyCredit/README.md
66
last_modified_at: '2017-02-15 17:02:23 +0300'
77
content: "## Overview\n\nThe Magento_CompanyCredit module adds the \"Payment on Account\"

0 commit comments

Comments
 (0)