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

Commit d074e14

Browse files
authored
Merge branch 'master' into ds_lint-md
2 parents 91993cb + 23c961f commit d074e14

File tree

21 files changed

+365
-62
lines changed

21 files changed

+365
-62
lines changed

_data/compatibility.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ extension:
1717
-
1818
name: Google Shopping ads Channel
1919
versions:
20+
-
21+
name: 3.0.0
22+
support:
23+
2.2.4+: general availability
24+
2.3.0: general availability
25+
2.3.1: general availability
26+
2.3.2: general availability
2027
-
2128
name: 2.0.2
2229
support:

_data/toc/javascript-developer-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,6 @@ pages:
9090

9191
- label: Tabs widget
9292
url: /javascript-dev-guide/widgets/widget_tabs.html
93+
94+
- label: ToggleAdvanced widget
95+
url: /javascript-dev-guide/widgets/widget_toggle.html

_data/whats-new.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,12 @@ entries:
3636
type: Major update
3737
date: June 28, 2019
3838
link: https://github.com/magento/devdocs/pull/4850
39-
- description: Added a [new way to upgrade the Magento CLI ](https://devdocs.magento.com/guides/v2.3/comp-mgr/cli/upgrade-with-plugin.html)(yet
40-
experimental) using the Magento composer root plugin to resolve conflicts in dependencies
41-
during the upgrade.
39+
- description: Added a [new command-line upgrade method](https://devdocs.magento.com/guides/v2.3/comp-mgr/cli/upgrade-with-plugin.html)
40+
(yet experimental) using the Magento composer root plugin to resolve conflicts
41+
in dependencies during the upgrade.
4242
versions: 2.3.x
4343
type: New topic
4444
date: June 28, 2019
45-
link: https://github.com/magento/devdocs/pull/4679
4645
- description: Updated the [Module Reference Guide](https://devdocs.magento.com/guides/v2.3/mrg/intro.html).
4746
versions: 2.3.2
4847
type: Major update

_includes/reference/cli-template.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
This reference contains {{ commands | size }} commands available through the `bin/magento` command-line tool.
1111
The initial list is auto generated using `bin/magento list` command at the {{ site.data.var.ce }} edition.
1212

13+
{: .bs-callout-info }
14+
You can call Magento CLI commands using shortcuts instead of the full command name. For example, you can call `bin/magento setup:upgrade` using `bin/magento s:up`, `bin/magento s:upg`, etc. See [shortcut syntax](https://symfony.com/doc/current/components/console/usage.html#shortcut-syntax) to understand how to use shortcuts with any Magento CLI command.
15+
1316
{% for command in commands %}
1417
{% assign arguments = command.definition.arguments %}
1518
{% assign options = command.definition.options %}
@@ -85,4 +88,4 @@ bin/magento {{ command.usage }}
8588
{% endfor %}
8689

8790
{% endunless %}
88-
{% endfor %}
91+
{% endfor %}
-1.45 KB
Loading
-14.1 KB
Loading
-2.15 KB
Loading
48.6 KB
Loading
51.2 KB
Loading

guides/v2.2/coding-standards/technical-guidelines.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,10 @@ class SampleEventObserverThatModifiesInputs implements ObserverInterface
882882

883883
16.1. Cron job SHOULD be an [idempotent method](https://tools.ietf.org/html/rfc7231#section-4.2.2).
884884

885+
## 17. Services
886+
887+
17.1. New features with limited customization scenarios SHOULD be implemented as a thin Magento extension that will communicate to a service that contains business logic. This allows developers to release features independently of Magento and makes feature upgrades easier.
888+
885889
<!-- LINKS: DEFINITIONS AND ADDRESSES -->
886890

887891
[RFC2119]: https://tools.ietf.org/html/rfc2119

0 commit comments

Comments
 (0)