Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5b4822b

Browse files
dshevtsovdshevtsov
committed
Merge branch 'master' into pangolin-develop
2 parents 99601ae + c45c64a commit 5b4822b

39 files changed

+389
-710
lines changed

‎_data/toc/module-reference-guide.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@ pages:
88
include_versions: ["2.0"]
99

1010
- label: Open Source
11-
include_versions: ["2.1","2.2"]
11+
exclude_versions: ["2.0"]
1212
children:
1313

1414
- label: Analytics
1515
url: /mrg/ce/Analytics.html
16-
include_versions: ["2.2"]
16+
exclude_versions: ["2.1"]
1717

1818
- label: CatalogAnalytics
1919
url: /mrg/ce/CatalogAnalytics.html
20-
include_versions: ["2.2"]
20+
exclude_versions: ["2.1"]
2121

2222
- label: CustomerAnalytics
2323
url: /mrg/ce/CustomerAnalytics.html
24-
include_versions: ["2.2"]
24+
exclude_versions: ["2.1"]
2525

2626
- label: Instant Purchase
2727
url: /mrg/ce/instant-purchase/
28-
include_versions: ["2.2","2.3"]
28+
exclude_versions: ["2.1"]
2929

3030
- label: QuoteAnalytics
3131
url: /mrg/ce/QuoteAnalytics.html
32-
include_versions: ["2.2"]
32+
exclude_versions: ["2.1"]
3333

3434
- label: ReviewAnalytics
3535
url: /mrg/ce/ReviewAnalytics.html
36-
include_versions: ["2.2"]
36+
exclude_versions: ["2.1"]
3737

3838
- label: Sales
3939
url: /mrg/ce/Sales.html
4040
include_versions: ["2.1", "2.2"]
4141

4242
- label: SalesAnalytics
4343
url: /mrg/ce/SalesAnalytics.html
44-
include_versions: ["2.2"]
44+
exclude_versions: ["2.1"]
4545

4646
- label: Signifyd
4747
url: /mrg/ce/Signifyd.html
4848
include_versions: ["2.2"]
4949

5050
- label: WishlistAnalytics
5151
url: /mrg/ce/WishlistAnalytics.html
52-
include_versions: ["2.2"]
52+
exclude_versions: ["2.1"]
5353

5454
- label: Commerce
5555
include_versions: ["2.1","2.2"]

‎community/resources/resources.md

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ Does it fill gaps in our current docs and provide important information?
1616
[Let us know][1]!
1717

1818
{:.bs-callout .bs-callout-info}
19-
**Note:** Magento does not officially endorse any of the linked blogs, books, presentation, or podcasts linked below.
19+
Magento does not officially endorse any of the linked blogs, books, presentation, or podcasts linked below.
2020
They are listed here because the content has been well received within the Magento community.
2121

2222
## Best Practices
2323

24-
See our collection of best and leading practices, common solutions, and more in the [Best Practices]({{ site.baseurl }}/community/resources/best-practices.html) guide. This guide is open to contributions!
24+
See our collection of best and leading practices, common solutions, and more in the [Community contributed best practices]({{ site.baseurl }}/community/resources/best-practices.html) guide. If you have excellent best practices, tips and tricks, and work-arounds, feel free to [contribute][]!
2525

2626
## Community Engineering Slack
2727

28-
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us request at [[email protected]](mailto:[email protected]) or [self signup](https://tinyurl.com/engcom-slack).
28+
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack][]. If you are interested in joining Slack, or a specific channel, send us request at [[email protected]][] or [self signup][].
2929

3030

3131
We have channels for each project. These channels are recommended for new members:
3232

33-
- [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
34-
- [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
35-
- [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
36-
- [devdocs](https://magentocommeng.slack.com/messages/CAN932A3H): Documentation contribution support
33+
- [general][]: Open chat for introductions and Magento 2 questions
34+
- [github][]: Support for GitHub issues, pull requests, and processes
35+
- [public-backlog][]: Discussions of the Magento 2 backlog
36+
- [devdocs][]: Documentation contribution support
3737

3838
## Resources and guides
3939

@@ -42,6 +42,8 @@ We have channels for each project. These channels are recommended for new member
4242
- *Podcast* [MageTalk][25] by [Phillip Jackson and Kalen][27]
4343
- *Vlog* [eCommerceAholic][26] by [TJ Gamble][28]
4444
- *Statistics* [Magestats][32] by [Marcel Hauri][33]
45+
- *Videos* [Magento Dev Channel with Max Pronko][34] by [Max Pronko][35]
46+
- *Courses* [Magento Courses][36] by [Max Pronko][35]
4547

4648
## Magento APIs
4749

@@ -61,7 +63,7 @@ We have channels for each project. These channels are recommended for new member
6163

6264
## Automated Testing
6365

64-
- *Presentation* [Writing testable code][10] by Vinai Kopp (**Bonus:** [Video Presentation][11]{:target="_blank"})
66+
- *Presentation* [Writing testable code][10] by Vinai Kopp (**Bonus:** [Video Presentation][11])
6567
- *Book* [Test Driven Magento Extension Development][12] by Allan MacGregor
6668
- *Blog post* [Integration Tests with Magento 2][19] by Andreas von Studnitz
6769

@@ -79,6 +81,14 @@ We have channels for each project. These channels are recommended for new member
7981

8082
- *Presentation* [Premium performance with PHP 7 and Varnish][15] by Miguel Balparda
8183

84+
[contribute]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
85+
[Magento Community Engineering Slack]: https://magentocommeng.slack.com
86+
[[email protected]]: mailto:[email protected]
87+
[self signup]: https://tinyurl.com/engcom-slack
88+
[general]: https://magentocommeng.slack.com/messages/C4YS78WE6
89+
[github]: https://magentocommeng.slack.com/messages/C7KB93M32
90+
[public-backlog]: https://magentocommeng.slack.com/messages/CCV3J3RV5
91+
[devdocs]: https://magentocommeng.slack.com/messages/CAN932A3H
8292
[0]: https://github.com/DavidLambauer/awesome-magento2
8393
[1]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
8494
[2]: http://www.slideshare.net/StaceyWhitney1/mage-titans-usa-2016-joshua-warren-magento-2-integrations
@@ -112,4 +122,7 @@ We have channels for each project. These channels are recommended for new member
112122
[30]: https://twitter.com/aleron75
113123
[31]: https://twitter.com/JoshuaSWarren
114124
[32]: https://magestats.net/
115-
[33]: https://twitter.com/mhauri
125+
[33]: https://twitter.com/mhauri
126+
[34]: https://www.youtube.com/maxpronko
127+
[35]: https://twitter.com/max_pronko
128+
[36]: https://www.maxpronko.com/all-courses/

‎guides/v2.0/config-guide/prod/prod_deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ The following is a list of recommended strategies for production deployment:
2424

2525
[0]: {{ page.baseurl }}/config-guide/prod/single-machine-deployment.html
2626
[1]: {{ page.baseurl }}/cloud/reference/discover-deploy.html
27-
[2]: {{ site.baseurl }}/community/resources/#installdeploy
27+
[2]: {{ site.baseurl }}/community/resources/resources.html#installdeploy

‎guides/v2.0/config-guide/prod/single-machine-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ In Magento 2.2, a near-zero downtime deployment model will be available for a va
9898
[8]: {{ page.baseurl }}/install-gde/prereq/integrator_install.html
9999
[9]: {{ page.baseurl }}/comp-mgr/upgrader/upgrade-start.html
100100
[10]: {{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html#magento-file-system-owner
101-
[11]: {{ site.baseurl }}/community/resources/#installdeploy
101+
[11]: {{ site.baseurl }}/community/resources/resources.html#installdeploy

‎guides/v2.0/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h2 class="title">Release Information</h2>
4444
<ul>
4545

4646
<li><a href="{{ page.baseurl }}/release-notes/bk-release-notes.html">Release Notes</a></li>
47-
<li><a href="{{ page.baseurl }}/magento-devdocs-whatsnew.html">What's New on DevDocs</a></li>
47+
<li><a href="{{ site.baseurl }}/whats-new.html">What's New on DevDocs</a></li>
4848
<li><a href="{{ page.baseurl }}/release-notes/backward-incompatible-changes/index.html">Backward Incompatible Changes</a></li>
4949
<li><a href="{{ page.baseurl }}/release-notes/tech_bull_parent.html">Technical Bulletins</a></li>
5050
</ul>

0 commit comments

Comments
 (0)