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

Commit b357c2a

Browse files
committed
Merge master
2 parents 5f9667a + 1780ebc commit b357c2a

Some content is hidden

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

42 files changed

+245
-205
lines changed

Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/magento-devdocs/devdocs-theme.git
3-
revision: e1a4ff6880d5047cb8e14ac44849aca8ffaecf2a
3+
revision: d72768697309f7f13af8a37073af776420f6c3a7
44
specs:
55
devdocs (7)
66
jekyll (>= 4.0)
@@ -17,7 +17,7 @@ GEM
1717
httpclient (~> 2.8, >= 2.8.3)
1818
json (>= 1.5.1)
1919
colorator (1.1.0)
20-
concurrent-ruby (1.1.5)
20+
concurrent-ruby (1.1.6)
2121
em-websocket (0.5.1)
2222
eventmachine (>= 0.12.9)
2323
http_parser.rb (~> 0.6.0)
@@ -27,7 +27,7 @@ GEM
2727
exifr (1.3.6)
2828
faraday (1.0.0)
2929
multipart-post (>= 1.2, < 3)
30-
ffi (1.12.1)
30+
ffi (1.12.2)
3131
filesize (0.2.0)
3232
forwardable-extended (2.6.0)
3333
fspath (3.1.2)
@@ -49,7 +49,7 @@ GEM
4949
image_size (>= 1.5, < 3)
5050
in_threads (~> 1.3)
5151
progress (~> 3.0, >= 3.0.1)
52-
image_optim_pack (0.6.0.20200116)
52+
image_optim_pack (0.6.0.20200215)
5353
fspath (>= 2.1, < 4)
5454
image_optim (~> 0.19)
5555
image_size (2.0.2)
@@ -84,7 +84,7 @@ GEM
8484
jekyll (>= 3.3, < 5.0)
8585
jekyll-relative-links (0.6.1)
8686
jekyll (>= 3.3, < 5.0)
87-
jekyll-sass-converter (2.0.1)
87+
jekyll-sass-converter (2.1.0)
8888
sassc (> 2.0.1, < 3.0)
8989
jekyll-sitemap (1.4.0)
9090
jekyll (>= 3.7, < 5.0)
@@ -96,8 +96,8 @@ GEM
9696
kramdown (2.1.0)
9797
kramdown-parser-gfm (1.1.0)
9898
kramdown (~> 2.0)
99-
launchy (2.4.3)
100-
addressable (~> 2.3)
99+
launchy (2.5.0)
100+
addressable (~> 2.7)
101101
liquid (4.0.3)
102102
listen (3.2.1)
103103
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -114,11 +114,11 @@ GEM
114114
tomlrb
115115
multipart-post (2.1.1)
116116
netrc (0.11.0)
117-
nokogiri (1.10.8)
117+
nokogiri (1.10.9)
118118
mini_portile2 (~> 2.4.0)
119119
nokogumbo (2.0.2)
120120
nokogiri (~> 1.8, >= 1.8.4)
121-
octokit (4.15.0)
121+
octokit (4.16.0)
122122
faraday (>= 0.9)
123123
sawyer (~> 0.8.0, >= 0.5.3)
124124
parallel (1.19.1)
@@ -132,7 +132,7 @@ GEM
132132
rb-fsevent (0.10.3)
133133
rb-inotify (0.10.1)
134134
ffi (~> 1.0)
135-
rouge (3.15.0)
135+
rouge (3.16.0)
136136
safe_yaml (1.0.5)
137137
sassc (2.2.1)
138138
ffi (~> 1.9)
@@ -152,7 +152,7 @@ GEM
152152
netrc (~> 0.10)
153153
octokit (~> 4.14)
154154
thor (~> 0.20)
155-
yell (2.2.1)
155+
yell (2.2.2)
156156

157157
PLATFORMS
158158
ruby

src/_data/toc/migration-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,8 @@ pages:
6060
- label: Data Migration Tool Technical Specification
6161
url: /migration/migration-tool-internal-spec.html
6262

63+
- label: Troubleshooting
64+
url: https://support.magento.com/hc/en-us/articles/360033020451
65+
6366
- label: Changelog
6467
url: https://github.com/magento/data-migration-tool/blob/2.3/CHANGELOG.md

src/_data/whats-new.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,45 @@ description: |
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: /whats-new.html
66
thread: /whatsnew-feed.xml
7-
updated: Mon Feb 24 12:34:55 2020
7+
updated: Wed Mar 4 10:30:29 2020
88
entries:
9+
- description: Updated the [Magento Cloud reference topic](https://devdocs.magento.com/cloud/reference/cli-ref-topic.html)
10+
in the Cloud guide.
11+
versions: 2.x
12+
type: Technical changes
13+
date: February 28, 2020
14+
link: https://github.com/magento/devdocs/pull/6737
15+
- description: Added an example of how to add a custom field type to the [ColumnsEditorRecord
16+
component](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-editor-record.html).
17+
versions: 2.3.x
18+
type: Major update
19+
date: February 28, 2020
20+
link: https://github.com/magento/devdocs/pull/6726
21+
- description: Added information about how to [add a parameter](https://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/xml-instructions.html)
22+
to URL argument type.
23+
versions: 2.3.x
24+
type: Technical changes
25+
date: February 28, 2020
26+
link: https://github.com/magento/devdocs/pull/6747
27+
- description: 'Added release notes for the following Magento Cloud Suite packages: [ece-tools
28+
v2002.0.23](https://devdocs.magento.com/cloud/release-notes/ece-release-notes.html),<br/>[Magento
29+
Cloud Patches v1.0.2](https://devdocs.magento.com/cloud/release-notes/mcc-release-notes.html),
30+
and [Magento Cloud Components v1.0.3](https://devdocs.magento.com/cloud/release-notes/mcc-release-notes.html).'
31+
versions: 2.x
32+
type: Technical changes
33+
date: February 27, 2020
34+
link: https://github.com/magento/devdocs/pull/6700
35+
- description: Added topic for [GridDataProvider UI component](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-grid-data-provider.html).
36+
versions: 2.3.x
37+
type: New topic
38+
date: February 26, 2020
39+
link: https://github.com/magento/devdocs/pull/6728
40+
- description: Added topic for the [ColumnsEditorRecord](https://devdocs.magento.com/guides/v2.3/ui_comp_guide/components/ui-columns-editor-view.html)
41+
UI component.
42+
versions: 2.3.x
43+
type: New topic
44+
date: February 25, 2020
45+
link: https://github.com/magento/devdocs/pull/6716
946
- description: Added the [Extend an existing GraphQL schema](https://devdocs.magento.com/guides/v2.3/graphql/develop/extend-existing-schema.html)
1047
topic to the _GraphQL Developer Guide_.
1148
versions: 2.3.x

src/compliance/industry-compliance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ Merchants are obligated to meet industry guidelines for maintaining a secure env
77

88
This compliance documentation provides the technical information to ensure that Magento Commerce installations comply with the requirements of specific privacy legislation. Some of these requirements require merchants to complete additional development work to achieve compliance. See the following topics for details:
99

10-
- [California Consumer Privacy Act (CCPA)]({% link compliance/privacy/ccpa.md %})
11-
- [General Data Protection Regulation (GDPR)]({% link compliance/privacy/gdpr.md %})
10+
- [California Consumer Privacy Act (CCPA)]({{ site.baseurl }}/compliance/privacy/ccpa.html)
11+
- [General Data Protection Regulation (GDPR)]({{ site.baseurl }}/compliance/privacy/gdpr.html)

src/compliance/privacy/ccpa.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Developing and implementing a CCPA compliance plan requires a coordinated effort
3939

4040
For technical information, see the data flow diagrams and database entity mappings in the Personal Information Reference that applies to each version of Magento that you support.
4141

42-
- [Personal Information Reference (Magento 2.x)]({% link compliance/privacy/pi-data-reference-m2.md %})
43-
- [Personal Information Reference (Magento 1.x)]({% link compliance/privacy/pi-data-reference-m1.md %})
42+
- [Personal Information Reference (Magento 2.x)]({{ site.baseurl }}/compliance/privacy/pi-data-reference-m2.html)
43+
- [Personal Information Reference (Magento 1.x)]({{ site.baseurl }}/compliance/privacy/pi-data-reference-m1.html)
4444

4545
[1]: https://oag.ca.gov/privacy/ccpa
4646
[2]: https://docs.magento.com/m2/ee/user_guide/stores/compliance-ccpa-guide.html

src/compliance/privacy/gdpr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ System integrators can use the data flow diagrams and database information in th
2222

2323
For technical information, see the data flow diagrams and database entity mappings in the Personal Information Reference that applies to each version of Magento that you support.
2424

25-
- [Personal Information Reference (Magento 2.x)]({% link compliance/privacy/pi-data-reference-m2.md %})
26-
- [Personal Information Reference Magento 1.x)]({% link compliance/privacy/pi-data-reference-m1.md %})
25+
- [Personal Information Reference (Magento 2.x)]({{ site.baseurl }}/compliance/privacy/pi-data-reference-m2.html)
26+
- [Personal Information Reference Magento 1.x)]({{ site.baseurl }}/compliance/privacy/pi-data-reference-m1.html)
2727

2828
For more information about how Magento helps merchants comply with GDPR, see the following:
2929

src/compliance/privacy/pi-data-reference-m1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ This is one in a series of topics to help Magento merchants and developers prepa
88

99
Use the following data flow diagrams and database entity mappings for reference when developing compliance programs for privacy regulations such as:
1010

11-
- [GDPR]({% link compliance/privacy/gdpr.md %})
12-
- [CCPA]({% link compliance/privacy/ccpa.md %})
11+
- [GDPR]({{ site.baseurl }}/compliance/privacy/gdpr.html)
12+
- [CCPA]({{ site.baseurl }}/compliance/privacy/ccpa.html)
1313

1414
## Dataflow diagrams
1515

src/compliance/privacy/pi-data-reference-m2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ This is one in a series of topics to help Magento merchants and developers prepa
88

99
Use the following data flow diagrams and database entity mappings for reference when developing compliance programs for privacy regulations such as:
1010

11-
- [GDPR]({% link compliance/privacy/gdpr.md %})
12-
- [CCPA]({% link compliance/privacy/ccpa.md %})
11+
- [GDPR]({{ site.baseurl }}/compliance/privacy/gdpr.html)
12+
- [CCPA]({{ site.baseurl }}/compliance/privacy/ccpa.html)
1313

1414
## Data flow diagrams
1515

src/guides/v2.3/extension-dev-guide/validate/test-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ See these resources for testing in [PHP](https://glossary.magento.com/php) and v
4848
4949
* The [Magento Coding Standard] provides a set of rules and sniffs for the [PHP_CodeSniffer] tool
5050
* [Technical Deep Dive: How to Pass the Magento Marketplace Extension Quality Program] (video) from Magento Imagine 2017
51-
* [Extension Quality Program]({% link marketplace/sellers/extension-quality-program.md %}) in the Magento User Guide
51+
* [Extension Quality Program]({{ site.baseurl }}/marketplace/sellers/extension-quality-program.html) in the Magento User Guide
5252
* [01 The Module Skeleton Kata] (video) by [Mage2Katas]
5353
5454
[Magento Testing Overview]: {{ page.baseurl }}/test/testing.html

src/guides/v2.3/ui_comp_guide/components/ui-input.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ This example integrates the Input component with the [Form]({{ page.baseurl }}/u
3939
...
4040
<fieldset>
4141
...
42-
<input name="input_example" formElement="text">
42+
<field name="input_example" formElement="input" sortOrder="10">
4343
<settings>
4444
<visible>true</visible>
4545
<elementTmpl>ui/form/element/input</elementTmpl>
4646
<label translate="true">Input field example</label>
4747
</settings>
48-
</input>
48+
</field>
4949
</fieldset>
5050
</form>
5151
```

src/marketplace/eqp/v1/packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Packages
44
---
55

66
Use this resource to initiate and manage all aspects of submitting a package to the
7-
[Magento Extension Quality Program (EQP)]({% link marketplace/sellers/extension-quality-program.md %}).
7+
[Magento Extension Quality Program (EQP)]({{ site.baseurl }}/marketplace/sellers/extension-quality-program.html).
88
You can provide all metadata associated with a package, both the technical and the marketing information, in a single step, or in several steps, using incremental updates.
99

1010
* **Technical information** - References to code artifacts, such as Magento 1 TGZ files or Composer-compliant Magento 2 ZIP files, version compatibility, and release notes.

src/marketplace/sellers/account-setup-process.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ redirect_from: /marketplace/sellers/set-up-your-account.html
66

77
## Step 1: Log in or register for a developer account.
88

9-
If you have an existing Magento account, simply log in and complete the [developer registration]({% link marketplace/sellers/developer-register.md %}) process. If you are new to Magento, you can sign up for a new account and register as a developer at the same time.
9+
If you have an existing Magento account, simply log in and complete the [developer registration]({{ site.baseurl }}/marketplace/sellers/developer-register.html) process. If you are new to Magento, you can sign up for a new account and register as a developer at the same time.
1010

1111
## Step 2: Agree to the terms of service.
1212

1313
Read the Magento Marketplace [terms of service](https://magento.com/legal/terms/marketplace-xcelerate). Then, select the checkbox to agree with the terms and continue.
1414

1515
## Step 3: Complete your personal profile.
1616

17-
The information in your [personal profile]({% link marketplace/sellers/developer-register.md %}) identifies you as an individual vendor in Magento Marketplace, and includes your background, image, contact information, and social network addresses.
17+
The information in your [personal profile]({{ site.baseurl }}/marketplace/sellers/developer-register.html) identifies you as an individual vendor in Magento Marketplace, and includes your background, image, contact information, and social network addresses.
1818

1919
## Step 4: Complete your company profile.
2020

21-
Your [company profile]({% link marketplace/sellers/developer-register.md %}) is similar to your personal profile, and provides the information about your company and brand that appears in your Magento Marketplace listing.
21+
Your [company profile]({{ site.baseurl }}/marketplace/sellers/developer-register.html) is similar to your personal profile, and provides the information about your company and brand that appears in your Magento Marketplace listing.

src/marketplace/sellers/account-setup.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ redirect_from: /marketplace/sellers/account-setup-overview.html
66

77
Create a new Marketplace account, or use your existing Magento account. Then, use the Marketplace Developer Portal to manage your profile information, product submissions, and the monthly payments you receive from sales on Magento Marketplace.
88

9-
- [Process overview]({% link marketplace/sellers/account-setup-process.md %})
10-
- [Register as a developer]({% link marketplace/sellers/developer-register.md %})
11-
- [Marketplace developer portal]({% link marketplace/sellers/developer-portal.md %})
9+
- [Process overview]({{ site.baseurl }}/marketplace/sellers/account-setup-process.html)
10+
- [Register as a developer]({{ site.baseurl }}/marketplace/sellers/developer-register.html)
11+
- [Marketplace developer portal]({{ site.baseurl }}/marketplace/sellers/developer-portal.html)

src/marketplace/sellers/analytics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can view data about the performance of your extension in the marketplace.
99

1010
In the top navigation of the Marketplace Developer portal, go to **Reports** > **Analytics**.
1111

12-
![]({% link marketplace/sellers/images/reports-analytics.png %}){: .zoom}
12+
![]({{ site.baseurl }}/marketplace/sellers/images/reports-analytics.png){: .zoom}
1313
_Marketplace Traffic Performance Metrics_
1414

1515
## Traffic overview

src/marketplace/sellers/before-you-begin.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ Before you begin the extension submission process, you need to have the followin
77

88
## Technical items
99

10-
- The [extension code package]({% link marketplace/sellers/technical-review-guidelines.md %})
11-
- A [user guide, reference manual, or installation guide]({% link marketplace/sellers/content.md %})/a> (at least one is required)
12-
- [Release notes]({% link marketplace/sellers/submit-for-technical-review.md %})
13-
- [License information]({% link marketplace/sellers/submit-for-technical-review.md %}) (license type or custom license name and link)
14-
- [Magento version compatibility]({% link marketplace/sellers/extension-version.md %})
15-
- [Extension version number]({% link marketplace/sellers/extension-version.md %})
10+
- The [extension code package]({{ site.baseurl }}/marketplace/sellers/technical-review-guidelines.html)
11+
- A [user guide, reference manual, or installation guide]({{ site.baseurl }}/marketplace/sellers/content.html)/a> (at least one is required)
12+
- [Release notes]({{ site.baseurl }}/marketplace/sellers/submit-for-technical-review.html)
13+
- [License information]({{ site.baseurl }}/marketplace/sellers/submit-for-technical-review.html) (license type or custom license name and link)
14+
- [Magento version compatibility]({{ site.baseurl }}/marketplace/sellers/extension-version.html)
15+
- [Extension version number]({{ site.baseurl }}/marketplace/sellers/extension-version.html)
1616

1717
## Marketing items
1818

19-
- A [product icon]({% link marketplace/sellers/submit-for-marketing-review.md %})
20-
- A [short description]({% link marketplace/sellers/content.md %}) of your extension
21-
- A [detailed description]({% link marketplace/sellers/content.md %}) of your extension
22-
- [Video links]({% link marketplace/sellers/submit-for-marketing-review.md %})
23-
- [Magento version compatibility]({% link marketplace/sellers/submit-for-marketing-review.md %}) information
24-
- [Pricing information]({% link marketplace/sellers/submit-for-marketing-review.md %}) for your extension
19+
- A [product icon]({{ site.baseurl }}/marketplace/sellers/submit-for-marketing-review.html)
20+
- A [short description]({{ site.baseurl }}/marketplace/sellers/content.html) of your extension
21+
- A [detailed description]({{ site.baseurl }}/marketplace/sellers/content.html) of your extension
22+
- [Video links]({{ site.baseurl }}/marketplace/sellers/submit-for-marketing-review.html)
23+
- [Magento version compatibility]({{ site.baseurl }}/marketplace/sellers/submit-for-marketing-review.html) information
24+
- [Pricing information]({{ site.baseurl }}/marketplace/sellers/submit-for-marketing-review.html) for your extension

src/marketplace/sellers/content.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: Extension content
66
The content that accompanies your extension listing is derived from the profile of the extension or theme, and information in the developer\'s company profile.
77

88
- All content that is associated with a Magento Marketplace listing must be free of offensive or discriminatory language, sexual content, or nudity.
9-
- Your content must not misuse the Magento name and its trademarks, or misrepresent the Magento brand. To learn more, see our [branding guidelines]({% link marketplace/sellers/branding.md %}).
9+
- Your content must not misuse the Magento name and its trademarks, or misrepresent the Magento brand. To learn more, see our [branding guidelines]({{ site.baseurl }}/marketplace/sellers/branding.html).
1010
- Do not promote additional services and extensions in your Marketplace listing and Company Bio.
1111
- The extension listing must accurately describe the product, including the description and overview information, version compatibility, and category selection.
1212
- Use English as the primary language for the Extension Title, Short Description, Long Description, and Company Bio. You are welcome to include a second language in the Long Description after the English description, separated by a horizontal line. The content, links, and images should be the same in both languages.
@@ -28,7 +28,7 @@ Maximum character length: 10,000 characters (including text, numbers, symbols, a
2828
- Make sure to convert all URLs to functioning hyperlinks.
2929
- You are welcome to include a second language in the long description below the English description. Separate the two languages with a horizontal line. Both languages should contain the same content, links and images, if applicable.
3030

31-
For examples of long descriptions, see [Product Descriptions]({% link marketplace/sellers/product-descriptions.md %}).
31+
For examples of long descriptions, see [Product Descriptions]({{ site.baseurl }}/marketplace/sellers/product-descriptions.html).
3232

3333
### Short description
3434

src/marketplace/sellers/developer-portal.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ redirect_from: /marketplace/sellers/marketplace-developer-dashboard.html
66

77
From the Marketplace Developer Portal you can access your product submissions and reports, as well as Marketplace support information and extension guidelines.
88

9-
![]({% link marketplace/sellers/images/developer-portal.png %}){: .zoom}
9+
![]({{ site.baseurl }}/marketplace/sellers/images/developer-portal.png){: .zoom}
1010
_Marketplace Developer Portal_
1111

1212
|Menu item|Description|
1313
|--- |--- |
14-
|[Extensions]({% link marketplace/sellers/extensions.md %})|Takes you to the Your Extensions page.|
15-
|[Themes]({% link marketplace/sellers/themes.md %})|Takes you to the Your Themes page.|
16-
|[Shared Packages]({% link marketplace/sellers/shared-packages.md %})|Takes you to the Your Shared Packages page.|
17-
|[Reports]({% link marketplace/sellers/sales.md %})|[Sales]({% link marketplace/sellers/sales.md %}) - Takes you to your Sales reports.<br/>[Analytics]({% link marketplace/sellers/analytics.md %}) - Takes you to your sales Analytics reports.|
14+
|[Extensions]({{ site.baseurl }}/marketplace/sellers/extensions.html)|Takes you to the Your Extensions page.|
15+
|[Themes]({{ site.baseurl }}/marketplace/sellers/themes.html)|Takes you to the Your Themes page.|
16+
|[Shared Packages]({{ site.baseurl }}/marketplace/sellers/shared-packages.html)|Takes you to the Your Shared Packages page.|
17+
|[Reports]({{ site.baseurl }}/marketplace/sellers/sales.html)|[Sales]({{ site.baseurl }}/marketplace/sellers/sales.html) - Takes you to your Sales reports.<br/>[Analytics]({{ site.baseurl }}/marketplace/sellers/analytics.html) - Takes you to your sales Analytics reports.|
1818
|[Support](https://marketplacesupport.magento.com/hc/en-us)|Opens the [Marketplace Help Center](https://marketplacesupport.magento.com/hc/en-us).|
1919
|Guidelines|Opens the extension development guidelines.|
20-
|[Profile Information]({% link marketplace/sellers/profile-information.md %})|Account Information<br/>Marketplace Profile<br/>Sign Out|
20+
|[Profile Information]({{ site.baseurl }}/marketplace/sellers/profile-information.html)|Account Information<br/>Marketplace Profile<br/>Sign Out|

0 commit comments

Comments
 (0)