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

Commit 8cc8517

Browse files
authored
Merge branch 'master' into issue-6774
2 parents 8d251ad + 1d6e7ed commit 8cc8517

Some content is hidden

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

46 files changed

+351
-274
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/_includes/install/allowoverrides22.md

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/_includes/install/allowoverrides24.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Failure to enable these settings typically results in no styles displaying on yo
1919

2020
```terminal
2121
<Directory "/var/www/html">
22-
AllowOverride <value from Apache site>
22+
AllowOverride All
2323
</Directory>
2424
```
2525

8.71 KB
Loading

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

0 commit comments

Comments
 (0)