From b57c44fef53a9e2d2e2ac600b3b673860c80df97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= Date: Tue, 1 Oct 2019 14:27:39 -0300 Subject: [PATCH 01/27] Adjusting syntax --- guides/v2.2/javascript-dev-guide/javascript/custom_js.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md index 89fe315193b..a068ca2b0e0 100644 --- a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md +++ b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md @@ -144,7 +144,12 @@ For information about how to initialize your custom JS component in a `.phtml` t To disable the auto-loading of default Magento JS components and widget initialization: -1. Create a `requirejs-config.js` file with the following content: `var config = { deps: [ ] };` +1. Create a `requirejs-config.js` file with the following content: + +```javascript +var config = { deps: [ ] }; +``` + 2. Put the `requirejs-config.js` file in one of the following locations: - Your custom theme files: `` From 226e4933f2e50cdc8479fb644b9464be96bdb561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= Date: Sat, 5 Oct 2019 10:59:24 -0500 Subject: [PATCH 02/27] Fix advanced reporting overview typos --- guides/v2.2/advanced-reporting/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/advanced-reporting/overview.md b/guides/v2.2/advanced-reporting/overview.md index 5023219b88e..e14074dfb95 100644 --- a/guides/v2.2/advanced-reporting/overview.md +++ b/guides/v2.2/advanced-reporting/overview.md @@ -28,7 +28,7 @@ To avoid system overload during its prime time, you can set the preferable time ## Extensibility -Though the Analytics module provides API, it is used specifically to interchange data with the MBI. We do not recommend to extend the advanced reporting functionality in this version. +Though the Analytics module provides an API, it is used specifically to interchange data with the MBI. We do not recommend to extend the advanced reporting functionality in this version. {:.ref-header} Related topics From 900a1f9cb621254b4628a7a880dd2fbab1653352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= Date: Sat, 5 Oct 2019 11:07:40 -0500 Subject: [PATCH 03/27] Fix typos in frontend_custom_strategies.md --- guides/v2.2/architecture/frontend_custom_strategies.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guides/v2.2/architecture/frontend_custom_strategies.md b/guides/v2.2/architecture/frontend_custom_strategies.md index 7a71d1ee0a7..8ae3f0d2a84 100644 --- a/guides/v2.2/architecture/frontend_custom_strategies.md +++ b/guides/v2.2/architecture/frontend_custom_strategies.md @@ -67,11 +67,11 @@ Magento supplies a default [theme](https://glossary.magento.com/theme) and a Les ### Replace PHTML template files -In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or an add an extra `
` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript/) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams. +In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or add an extra `
` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript/) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams. ### Replace Magento-Provided CSS -Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.) +Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows the use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.) In addition to replacing CSS files, you might need to replace small amounts of HTML and JavaScript. @@ -105,4 +105,4 @@ Related topics [Overview of UI components]: {{page.baseurl}}/ui_comp_guide/bk-ui_comps.html [Frontend Developer Guide]: {{page.baseurl}}/frontend-dev-guide/bk-frontend-dev-guide.html [JavaScript Developer Guide]: {{page.baseurl}}/javascript-dev-guide/bk-javascript-dev-guide.html -[Magento Marketplace]: https://marketplace.magento.com/ \ No newline at end of file +[Magento Marketplace]: https://marketplace.magento.com/ From f8d9b79bf3def7472a69fbfb60d31dc7f6d1fac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= Date: Sat, 5 Oct 2019 11:12:39 -0500 Subject: [PATCH 04/27] Fix typos in storefront_customization.md --- guides/v2.2/architecture/storefront_customization.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guides/v2.2/architecture/storefront_customization.md b/guides/v2.2/architecture/storefront_customization.md index 36ae09680d8..4f958caecad 100644 --- a/guides/v2.2/architecture/storefront_customization.md +++ b/guides/v2.2/architecture/storefront_customization.md @@ -18,11 +18,11 @@ Magento supplies a default [theme](https://glossary.magento.com/theme) and a Les ### Replace PHTML template files -In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or an add an extra `
` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams. +In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or add an extra `
` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams. ### Replace Magento-Provided CSS -Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.) +Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows the use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.) In addition to replacing CSS files, you might need to replace small amounts of HTML and JavaScript. From 11fbaf1578fd0b142b8b835472474eb042fecbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= Date: Sat, 5 Oct 2019 11:24:25 -0500 Subject: [PATCH 05/27] Fix typo in discover-deploy.md --- guides/v2.2/cloud/reference/discover-deploy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/cloud/reference/discover-deploy.md b/guides/v2.2/cloud/reference/discover-deploy.md index 67d2f5098d8..45f2c85eaed 100644 --- a/guides/v2.2/cloud/reference/discover-deploy.md +++ b/guides/v2.2/cloud/reference/discover-deploy.md @@ -76,7 +76,7 @@ For detailed instructions, see [Build and deploy full steps](#steps). ### Phase 1: Code and configuration validation {#cloud-deploy-over-phases-conf} -When you initially set up a project from a template, we retrieve the code from the [the {{site.data.var.ee}} template](https://github.com/magento/magento-cloud). This code repo is cloned to your project as the `master` branch. +When you initially set up a project from a template, we retrieve the code from [the {{site.data.var.ee}} template](https://github.com/magento/magento-cloud). This code repo is cloned to your project as the `master` branch. - **For Starter**—`master` branch is your Production environment. - **For Pro**—`master` begins as origin branch for the Integration environment. From 3b9ebd129abf00c20f9ced7cd18caea457740e0f Mon Sep 17 00:00:00 2001 From: Roman Snitko Date: Sat, 5 Oct 2019 22:32:03 +0300 Subject: [PATCH 06/27] Unified heading formatting (h3 + code) --- .../concepts/knockout-bindings.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/guides/v2.2/ui_comp_guide/concepts/knockout-bindings.md b/guides/v2.2/ui_comp_guide/concepts/knockout-bindings.md index ce2101e38c2..ca659416222 100644 --- a/guides/v2.2/ui_comp_guide/concepts/knockout-bindings.md +++ b/guides/v2.2/ui_comp_guide/concepts/knockout-bindings.md @@ -219,7 +219,7 @@ The `i18n` binding is used to translate a string according to the currently enab ``` -### keyboard +### `keyboard` The keyboard binding allows setting up listeners for the `keypress` event of a specific key. @@ -241,7 +241,7 @@ A collection in which keys represent keyboard keys codes and values are callback }"/> ``` -### mageInit +### `mageInit` The `mageInit` binding is an adapter for the `[data-mage-init]` attribute that is used to initialize jQuery widgets on the associated element. @@ -264,7 +264,7 @@ The `mageInit` binding is an adapter for the `[data-mage-init]` attribute that i }">
``` -### optgroup +### `optgroup` The `optgroup` binding is a decorator for the standard Knockout's options binding which adds the support of nested options, and renders them as the `` element. @@ -298,7 +298,7 @@ The `optgroup` binding is a decorator for the standard Knockout's options bindin }]"> ``` -### outerClick +### `outerClick` The `outerClick` binding allows to subscribe for the "click" event that happens outside of the boundaries of the associated element. @@ -319,7 +319,7 @@ Callback that is invoked when user clicks outside of the element.
``` -### range +### `range` The `range` binding is an adapter for the [jQuery UI Slider widget](https://jqueryui.com/slider/). It also implements necessary handlers to work with mobile devices. @@ -344,7 +344,7 @@ Configuration that is passed to the Slider widget. }">
``` -### resizable +### `resizable` The `resizable` binding is an adapter for the [jQuery UI Resizable](http://api.jqueryui.com/resizable/) widget. @@ -387,7 +387,7 @@ Component's name by which to perform a lookup in the registry. ``` -### staticChecked +### `staticChecked` The `staticChecked` binding implements the behavior similar to the standard [`checked`](http://knockoutjs.com/documentation/checked-binding.html) binding. The difference is that `staticChecked` doesn't change the array of the already selected elements if the value of the associated DOM element changes. @@ -401,7 +401,7 @@ The `staticChecked` binding implements the behavior similar to the standard [`ch ``` -### template +### `template` Magento `template` binding is a customization of the existing Knockout [`template` binding](http://knockoutjs.com/documentation/template-binding.html). It is used to render a template inside of the associated element. The original Knockout's implementation was overridden to support asynchronous loading of templates by the provided path, instead of searching for them on the page. @@ -419,7 +419,7 @@ Configuration for the `template` binding. If the provided value is a string, it
``` -### tooltip +### `tooltip` Magento custom knockout binding for displaying a tooltip. From c679fbb8a0c00ce7d66021f3bc5cb3129fce9603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Sun, 6 Oct 2019 20:33:19 +0200 Subject: [PATCH 07/27] added note that mcrypt and php 7.2 as php 7.2 depracted the mcrypt extension the recommendation here should only apply for 7.1. While it is still possible to compile mcrypt for php 7.2 this is not recomandated. Instead, for 7.2 magento the mcrypt_compat php extension is included which supplies the mcrypt functionality. --- guides/v2.3/install-gde/system-requirements-tech.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.3/install-gde/system-requirements-tech.md b/guides/v2.3/install-gde/system-requirements-tech.md index 14b8ccf84b8..423d23fa706 100644 --- a/guides/v2.3/install-gde/system-requirements-tech.md +++ b/guides/v2.3/install-gde/system-requirements-tech.md @@ -134,7 +134,7 @@ Mail Transfer Agent (MTA) or an SMTP server {:.bs-callout .bs-callout-info} There is a known issue with `xdebug` that can affect Magento installations or access to the storefront or Magento Admin after installation. For details, see [Known issue with xdebug]({{page.baseurl}}/install-gde/trouble/tshoot_install-issues.html). -* [`mcrypt`](http://php.net/manual/en/book.mcrypt.php){:target="_blank"} +* [`mcrypt`](http://php.net/manual/en/book.mcrypt.php){:target="_blank"} (online for php < 7.2) * PHPUnit (as a command-line tool) 6.2.0 [bash]: https://www.gnu.org/software/bash/ From 702e8b54cf7ec7b029e4d73ae7d61b8708f38230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Sun, 6 Oct 2019 20:40:57 +0200 Subject: [PATCH 08/27] update TLS Requirements This page states, that TLS 1.1 is required, but for both paypal and repo.magento.com TLS 1.2 is required. For Paypal, the information is stated here https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements_tls1-2.html For repo.magento.com this ssl test: https://www.ssllabs.com/ssltest/analyze.html?d=repo.magento.com&hideResults=on shows, that TLS 1.2 is required as well. --- guides/v2.3/install-gde/system-requirements-tech.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.3/install-gde/system-requirements-tech.md b/guides/v2.3/install-gde/system-requirements-tech.md index 14b8ccf84b8..be6460e27df 100644 --- a/guides/v2.3/install-gde/system-requirements-tech.md +++ b/guides/v2.3/install-gde/system-requirements-tech.md @@ -77,7 +77,7 @@ For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde * A valid [security certificate](https://glossary.magento.com/security-certificate) is required for HTTPS. * Self-signed SSL certificates are not supported. -* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.1 or later: +* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.2 or later: * [More information about PayPal]({{page.baseurl}}/install-gde/system-requirements_tls1-2.html) From 7a6254b244534fbbd11151638523761029c40c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Sun, 6 Oct 2019 20:45:36 +0200 Subject: [PATCH 09/27] add information about nginx magento has s upport for nginx as well (see https://devdocs.magento.com/guides/v2.3/install-gde/prereq/nginx.html and https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html so it should be stated here. --- guides/v2.2/install-gde/basics/basics_software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/install-gde/basics/basics_software.md b/guides/v2.2/install-gde/basics/basics_software.md index 84da98be402..68d0fcfa071 100644 --- a/guides/v2.2/install-gde/basics/basics_software.md +++ b/guides/v2.2/install-gde/basics/basics_software.md @@ -18,7 +18,7 @@ functional_areas: The full list of software is listed in [System Requirements]({{ page.baseurl }}/install-gde/system-requirements.html) but here are the essentials: -* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and plan to document other web servers in the near future. +* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://de.wikipedia.org/wiki/Nginx){:target="_blank"}. We also plan to document other web servers in the near future. * Database management system for long-term data storage and retrieval - We support [MySQL](http://dev.mysql.com/doc/refman/4.1/en/what-is-mysql.html){:target="_blank"}. From f225c154371230430ea2d22f11d86bd92fd3dd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Sun, 6 Oct 2019 21:04:55 +0200 Subject: [PATCH 10/27] ad recomandation for using ip adree over hostname hostname can cause an additional delay on each connect depending on your dns setup as the hostname needs to be resolved on each request. Using the IP address should be recommended because of this. --- _includes/install/web/install-web_2-db.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/install/web/install-web_2-db.md b/_includes/install/web/install-web_2-db.md index 96d4f1d7a85..ef3a14254fb 100644 --- a/_includes/install/web/install-web_2-db.md +++ b/_includes/install/web/install-web_2-db.md @@ -10,7 +10,7 @@ Database Server Host - If the web server and database server are located on the same host, enter localhost. If the database server is located on a different host, enter its fully qualified hostname or IP address. + If the web server and database server are located on the same host, enter localhost. If the database server is located on a different host, enter its fully qualified hostname or IP address. Using the IP adress is recomanded when possible, as using hostnames can causes additional time on each requests for DNS lookups Database Server Username From 61335a05a3f4024311ba5682189df06dcff40ed0 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Mon, 7 Oct 2019 09:55:49 +0200 Subject: [PATCH 11/27] Minor adjustments --- guides/v2.3/install-gde/system-requirements-tech.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.3/install-gde/system-requirements-tech.md b/guides/v2.3/install-gde/system-requirements-tech.md index 423d23fa706..95b416f349c 100644 --- a/guides/v2.3/install-gde/system-requirements-tech.md +++ b/guides/v2.3/install-gde/system-requirements-tech.md @@ -134,7 +134,7 @@ Mail Transfer Agent (MTA) or an SMTP server {:.bs-callout .bs-callout-info} There is a known issue with `xdebug` that can affect Magento installations or access to the storefront or Magento Admin after installation. For details, see [Known issue with xdebug]({{page.baseurl}}/install-gde/trouble/tshoot_install-issues.html). -* [`mcrypt`](http://php.net/manual/en/book.mcrypt.php){:target="_blank"} (online for php < 7.2) +* [`mcrypt`](http://php.net/manual/en/book.mcrypt.php){:target="_blank"} (for PHP < 7.2) * PHPUnit (as a command-line tool) 6.2.0 [bash]: https://www.gnu.org/software/bash/ From 5bfd12632ab999718397e0a556d84e3fe239f28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Mon, 7 Oct 2019 12:41:47 +0200 Subject: [PATCH 12/27] Update guides/v2.2/install-gde/basics/basics_software.md Co-Authored-By: Yaroslav Rogoza --- guides/v2.2/install-gde/basics/basics_software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/install-gde/basics/basics_software.md b/guides/v2.2/install-gde/basics/basics_software.md index 68d0fcfa071..5afd4975135 100644 --- a/guides/v2.2/install-gde/basics/basics_software.md +++ b/guides/v2.2/install-gde/basics/basics_software.md @@ -18,7 +18,7 @@ functional_areas: The full list of software is listed in [System Requirements]({{ page.baseurl }}/install-gde/system-requirements.html) but here are the essentials: -* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://de.wikipedia.org/wiki/Nginx){:target="_blank"}. We also plan to document other web servers in the near future. +* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://de.wikipedia.org/wiki/Nginx){:target="_blank"}. * Database management system for long-term data storage and retrieval - We support [MySQL](http://dev.mysql.com/doc/refman/4.1/en/what-is-mysql.html){:target="_blank"}. From 64aab397a17546674594179cf222e0c115c9f027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Mon, 7 Oct 2019 12:46:50 +0200 Subject: [PATCH 13/27] fix wikipedia url fix wikipedia url --- guides/v2.2/install-gde/basics/basics_software.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/install-gde/basics/basics_software.md b/guides/v2.2/install-gde/basics/basics_software.md index 5afd4975135..819dd2baf11 100644 --- a/guides/v2.2/install-gde/basics/basics_software.md +++ b/guides/v2.2/install-gde/basics/basics_software.md @@ -18,7 +18,7 @@ functional_areas: The full list of software is listed in [System Requirements]({{ page.baseurl }}/install-gde/system-requirements.html) but here are the essentials: -* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://de.wikipedia.org/wiki/Nginx){:target="_blank"}. +* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://en.wikipedia.org/wiki/Nginx){:target="_blank"}. * Database management system for long-term data storage and retrieval - We support [MySQL](http://dev.mysql.com/doc/refman/4.1/en/what-is-mysql.html){:target="_blank"}. From a3b672f169e1aa965d56787e57071505c17ccf21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCnig?= Date: Mon, 7 Oct 2019 12:51:55 +0200 Subject: [PATCH 14/27] backport to 2.2 backport to 2.2 --- guides/v2.2/install-gde/system-requirements-tech.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guides/v2.2/install-gde/system-requirements-tech.md b/guides/v2.2/install-gde/system-requirements-tech.md index 052e878096d..c4e8ffa9cb5 100644 --- a/guides/v2.2/install-gde/system-requirements-tech.md +++ b/guides/v2.2/install-gde/system-requirements-tech.md @@ -65,7 +65,7 @@ For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde * A valid [security certificate](https://glossary.magento.com/security-certificate) is required for HTTPS. * Self-signed SSL certificates are not supported. -* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.1 or later: +* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.2 or later: * [More information about PayPal]({{ page.baseurl }}/install-gde/system-requirements_tls1-2.html) @@ -113,4 +113,4 @@ For details, see [Known issues that affect installation]({{ page.baseurl }}/inst ### Documentation -[Install Magento prerequisites]({{ page.baseurl }}/install-gde/prereq/prereq-overview.html) \ No newline at end of file +[Install Magento prerequisites]({{ page.baseurl }}/install-gde/prereq/prereq-overview.html) From b0321a289f909261d336fa458d92cf4741542217 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Mon, 7 Oct 2019 15:04:30 +0200 Subject: [PATCH 15/27] Minor spelling fixes --- _includes/install/web/install-web_2-db.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/install/web/install-web_2-db.md b/_includes/install/web/install-web_2-db.md index ef3a14254fb..1c703d65c94 100644 --- a/_includes/install/web/install-web_2-db.md +++ b/_includes/install/web/install-web_2-db.md @@ -10,7 +10,7 @@ Database Server Host - If the web server and database server are located on the same host, enter localhost. If the database server is located on a different host, enter its fully qualified hostname or IP address. Using the IP adress is recomanded when possible, as using hostnames can causes additional time on each requests for DNS lookups + If the web server and database server are located on the same host, enter localhost. If the database server is located on a different host, enter its fully qualified hostname or IP address. Using the IP address is preferable since using a hostname can cause additional time on each request for DNS lookup Database Server Username From 2440c144de58e28c752ec2299c04be68e745907c Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Mon, 7 Oct 2019 15:05:02 +0200 Subject: [PATCH 16/27] Missing period --- _includes/install/web/install-web_2-db.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/install/web/install-web_2-db.md b/_includes/install/web/install-web_2-db.md index 1c703d65c94..f2e7a36c66c 100644 --- a/_includes/install/web/install-web_2-db.md +++ b/_includes/install/web/install-web_2-db.md @@ -10,7 +10,7 @@ Database Server Host - If the web server and database server are located on the same host, enter localhost. If the database server is located on a different host, enter its fully qualified hostname or IP address. Using the IP address is preferable since using a hostname can cause additional time on each request for DNS lookup + If the web server and database server are located on the same host, enter localhost. If the database server is located on a different host, enter its fully qualified hostname or IP address. Using the IP address is preferable since using a hostname can cause additional time on each request for DNS lookup. Database Server Username From b541ce81cd47a8d68c2a471b5cc961fd984da185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= Date: Mon, 7 Oct 2019 15:22:49 -0500 Subject: [PATCH 17/27] Fix typo in CONTRIBUTING.md (#5583) --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 85c058b01c4..63239d3c454 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -137,7 +137,7 @@ cd ln -s guides/v2.2/install-gde/new-doc-topic.md guides/v2.3/install-gde/new-doc-topic.md ``` -If you have an image that is identical between versions, it is should placed in `/common/images`. Please optimize images before committing them to the repository. +If you have an image that is identical between versions, it should placed in `/common/images`. Please optimize images before committing them to the repository. If done correctly, the symbolic link path will start with 3 or 4 instances of `../`, as the above example shows. ### Remove a symbolic link From 4e061ed4f892128dbf721072740165862144ba9b Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 8 Oct 2019 10:17:33 -0500 Subject: [PATCH 18/27] Sussed out the trailing space. --- guides/v2.2/javascript-dev-guide/javascript/custom_js.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md index 639bf43f2b7..d1f642f3e35 100644 --- a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md +++ b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md @@ -142,10 +142,9 @@ For information about how to initialize your custom JS component in a `.phtml` t ## Disable default Magento JS {#disable_default_js} -To disable the auto-loading of default Magento JS components and widget -initialization: +To disable the auto-loading of default Magento JS components and widget initialization: -1. Create a `requirejs-config.js` file with the following content: +1. Create a `requirejs-config.js` file with the following content: ```javascript var config = { deps: [ ] }; From 16ae5468c47d0c997d64fe3a30f8e3ee9d86e30d Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Tue, 8 Oct 2019 10:57:01 -0500 Subject: [PATCH 19/27] Fix link for U2F Keys --- guides/v2.3/security/two-factor-authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.3/security/two-factor-authentication.md b/guides/v2.3/security/two-factor-authentication.md index 2b0e4ffaf31..75310a6bcc0 100644 --- a/guides/v2.3/security/two-factor-authentication.md +++ b/guides/v2.3/security/two-factor-authentication.md @@ -43,7 +43,7 @@ After enabling and configuring 2FA for your Magento instance, Magento Admin user | : --------- | : --------- | : ------- | | [Google Authenticator](https://support.google.com/accounts/answer/1066447?co=GENIE.Platform%3DAndroid&hl=en) | Generate and enter code from mobile app Requirements: Enable in Admin | `google`| | [Authy](https://authy.com/) | SMS, call, token, and one touch
Requirements: Enable in Admin and API keys | `authy` | -| [U2F Keys](https://docs.magento.com/m2/2.1/ee/user_guide/stores/security-two-factor-authentication-use.html) | Physical device to authenticate, like [YubiKey](https://www.yubico.com/).
Requirements: Enable in Admin | `u2fkey` | +| [U2F Keys](https://docs.magento.com/m2/ee/user_guide/stores/security-two-factor-authentication-use.html?#u2f-key) | Physical device to authenticate, like [YubiKey](https://www.yubico.com/).
Requirements: Enable in Admin | `u2fkey` | | [Duo Security](https://duo.com/) | SMS and push notification.
Requirements: Enable in Admin, Integration and Secret keys, API hostname | `duo` | ## Troubleshooting From 1530b975616d10f5b8703be9b81c5980444cd59c Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 8 Oct 2019 11:02:21 -0500 Subject: [PATCH 20/27] small addition per request. --- guides/v2.2/migration/migration-migrate-delta.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/migration/migration-migrate-delta.md b/guides/v2.2/migration/migration-migrate-delta.md index 6141c6d580a..bb587ed6199 100644 --- a/guides/v2.2/migration/migration-migrate-delta.md +++ b/guides/v2.2/migration/migration-migrate-delta.md @@ -15,7 +15,7 @@ The incremental migration tool installs deltalog tables (with prefix `m2_cl_*`) * All operations with orders, products, and categories in the [Magento Admin](https://glossary.magento.com/magento-admin) panel {: .bs-callout-info } -All new or updated entities entered through the Admin panel, such as attributes or CMS pages, are not included in the incremental migration and will not be migrated. +All other new or updated entities entered through the Admin panel, such as attributes or CMS pages, are not included in the incremental migration and will not be migrated. ## Before you start: routine preparations From 99df8147e01a1ec2d5a0c4dba5093377bfcfa52d Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Tue, 8 Oct 2019 12:11:38 -0500 Subject: [PATCH 21/27] Grammar fixes --- guides/v2.2/install-gde/basics/basics_software.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guides/v2.2/install-gde/basics/basics_software.md b/guides/v2.2/install-gde/basics/basics_software.md index 819dd2baf11..9a6d68ebddf 100644 --- a/guides/v2.2/install-gde/basics/basics_software.md +++ b/guides/v2.2/install-gde/basics/basics_software.md @@ -18,7 +18,7 @@ functional_areas: The full list of software is listed in [System Requirements]({{ page.baseurl }}/install-gde/system-requirements.html) but here are the essentials: -* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://en.wikipedia.org/wiki/Nginx){:target="_blank"}. +* Web server for providing access to web pages - Currently, we have documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://en.wikipedia.org/wiki/Nginx){:target="_blank"}. * Database management system for long-term data storage and retrieval - We support [MySQL](http://dev.mysql.com/doc/refman/4.1/en/what-is-mysql.html){:target="_blank"}. @@ -27,4 +27,4 @@ The full list of software is listed in [System Requirements]({{ page.baseurl }}/ For more information, see the [PHP manual](http://php.net/manual/en/intro-whatis.php){:target="_blank"} or the [PHP Wikipedia page](http://en.wikipedia.org/wiki/PHP){:target="_blank"}. {: .bs-callout-info } -If you use a hosting provider, they might already have installed this software. Contact them if you're not sure. +If you use a hosting provider, they might already have installed this software. Contact them if you are not sure. From 592158fbf992f604f23d1e652169c387e27a3039 Mon Sep 17 00:00:00 2001 From: Jeff Matthews Date: Thu, 10 Oct 2019 07:30:05 -0500 Subject: [PATCH 22/27] Fixed formatting --- guides/v2.2/architecture/archi_perspectives/service_layer.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guides/v2.2/architecture/archi_perspectives/service_layer.md b/guides/v2.2/architecture/archi_perspectives/service_layer.md index 6de031c3628..d2c893860b8 100644 --- a/guides/v2.2/architecture/archi_perspectives/service_layer.md +++ b/guides/v2.2/architecture/archi_perspectives/service_layer.md @@ -73,7 +73,8 @@ However, if the client code uses the interface definition only, no class change {:.ref-header} Related topics -[Architectural diagrams]({{page.baseurl}}/architecture/archi_perspectives/arch_diagrams.html) -[Architectural layers overview]({{page.baseurl}}/architecture/archi_perspectives/ALayers_intro.html) +* [Architectural diagrams]({{page.baseurl}}/architecture/archi_perspectives/arch_diagrams.html) +* [Architectural layers overview]({{page.baseurl}}/architecture/archi_perspectives/ALayers_intro.html) + [catalog-api]: {{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Customer/Api [catalog-api-data]: {{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Customer/Api/Data From 7b793e00f722244d69fd73ba35260c900f9e7cd9 Mon Sep 17 00:00:00 2001 From: Simon Sprankel Date: Thu, 10 Oct 2019 14:39:51 +0200 Subject: [PATCH 23/27] fixed MFTF version number --- guides/v2.3/comp-mgr/cli/cli-upgrade.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.3/comp-mgr/cli/cli-upgrade.md b/guides/v2.3/comp-mgr/cli/cli-upgrade.md index 1a5d0a801f5..d8510107cea 100644 --- a/guides/v2.3/comp-mgr/cli/cli-upgrade.md +++ b/guides/v2.3/comp-mgr/cli/cli-upgrade.md @@ -89,7 +89,7 @@ See the examples at the end of this section for help specifying different releas 1. Specify additional packages. ```bash - composer require --dev allure-framework/allure-phpunit:~1.2.0 friendsofphp/php-cs-fixer:~2.14.0 lusitanian/oauth:~0.8.10 magento/magento-coding-standard:~3.0.0 magento/magento2-functional-testing-framework:2.4.3 pdepend/pdepend:2.5.2 phpmd/phpmd:@stable phpunit/phpunit:~6.5.0 sebastian/phpcpd:~3.0.0 squizlabs/php_codesniffer:~3.4.0 --sort-packages --no-update + composer require --dev allure-framework/allure-phpunit:~1.2.0 friendsofphp/php-cs-fixer:~2.14.0 lusitanian/oauth:~0.8.10 magento/magento-coding-standard:~3.0.0 magento/magento2-functional-testing-framework:2.4.5 pdepend/pdepend:2.5.2 phpmd/phpmd:@stable phpunit/phpunit:~6.5.0 sebastian/phpcpd:~3.0.0 squizlabs/php_codesniffer:~3.4.0 --sort-packages --no-update ``` 1. Remove unused packages. From a83fa37a955afe9fb7d3ed8bd839a20b64c6454b Mon Sep 17 00:00:00 2001 From: Jeanne Frontain Date: Thu, 10 Oct 2019 10:44:12 -0500 Subject: [PATCH 24/27] corrected community contributor acknowledgement and added link to CSS article --- _includes/release-notes/engcomm-2-3-3-issues.md | 2 +- guides/v2.3/release-notes/release-notes-2-3-3-commerce.md | 4 ++-- guides/v2.3/release-notes/release-notes-2-3-3-open-source.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_includes/release-notes/engcomm-2-3-3-issues.md b/_includes/release-notes/engcomm-2-3-3-issues.md index af8608dbb62..4b3ac423541 100644 --- a/_includes/release-notes/engcomm-2-3-3-issues.md +++ b/_includes/release-notes/engcomm-2-3-3-issues.md @@ -2,7 +2,7 @@ | ------- | ------- | ------- | | [airbone42](https://github.com/airbone42) | [#533](https://github.com/magento/magento2/issues/533) | [magento/graphql-ce#578](https://github.com/magento/graphql-ce/pull/578) | | [tzyganu](https://github.com/tzyganu) | [#601](https://github.com/magento/magento2/issues/601) | [magento/graphql-ce#632](https://github.com/magento/graphql-ce/pull/632) | -| [bsstaveley](https://github.com/bsstaveley) | [#631](https://github.com/magento/magento2/issues/631) | [magento/graphql-ce#634](https://github.com/magento/graphql-ce/pull/634) | +| [pmclain](https://github.com/pmclain) | [#631](https://github.com/magento/magento2/issues/631) | [magento/graphql-ce#634](https://github.com/magento/graphql-ce/pull/634) | | [dipti2jcommerce](https://github.com/dipti2jcommerce) | [#20124](https://github.com/magento/magento2/issues/20124) | [magento/magento2#20135](https://github.com/magento/magento2/pull/20135) | | [WalterSmulders](https://github.com/WalterSmulders) | [#21978](https://github.com/magento/magento2/issues/21978) | [magento/magento2#22020](https://github.com/magento/magento2/pull/22020) | | [afavata](https://github.com/afavata) | [#22045](https://github.com/magento/magento2/issues/22045) | [magento/magento2#22260](https://github.com/magento/magento2/pull/22260) | diff --git a/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md b/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md index 5cd94350f85..39cab36de07 100644 --- a/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md +++ b/guides/v2.3/release-notes/release-notes-2-3-3-commerce.md @@ -74,7 +74,7 @@ The following upgrades to core platform components boost platform security and s * Merchants now have the ability to turn off the automatic URL rewrite generation that occurs by default on products when the category they belong to is saved. The new **Generate "category/product" URL Rewrites** configuration option controls this behavior. When this feature is enabled, Magento will generate a lot of data when saving a category that contains many assigned products. This generated data is saved into rewrite tables that can degrade Magento performance. -* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. +* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. For more information, see [CSS critical path documentation]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-critical-path.html). * The `jQuery/ui` library has been refactored into separate widgets so that core modules load only the widgets they need. This update improves the performance of core storefront tasks including the loading of category, configurable product, home, and checkout pages. @@ -1021,7 +1021,7 @@ This release includes the following changes to integrations for core payment met * Merchants now have the ability to turn off the automatic URL rewrite generation that occurs by default on products when the category they belong to is saved. The new **Generate "category/product" URL Rewrites** configuration option controls this behavior. When this feature is enabled, Magento will generate a lot of data when saving a category that contains many assigned products. This generated data is saved into rewrite tables that can degrade Magento performance. -* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. +* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. For more information, see [CSS critical path documentation]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-critical-path.html). * The `jQuery/ui` library has been refactored into separate widgets so that core modules load only the widgets they need. This update improves the performance of core storefront tasks including the loading of category, configurable product, home, and checkout pages. diff --git a/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md b/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md index e84135d3ef2..cd0365370d3 100644 --- a/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md +++ b/guides/v2.3/release-notes/release-notes-2-3-3-open-source.md @@ -72,7 +72,7 @@ The following upgrades to core platform components boost platform security and s * Merchants now have the ability to turn off the automatic URL rewrite generation that occurs by default on products when the category they belong to is saved. The new **Generate "category/product" URL Rewrites** configuration option controls this behavior. When this feature is enabled, Magento will generate a lot of data when saving a category that contains many assigned products. This generated data is saved into rewrite tables that can degrade Magento performance. -* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. +* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. For more information, see [CSS critical path documentation]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-critical-path.html). * The `jQuery/ui` library has been refactored into separate widgets so that core modules load only the widgets they need. This update improves the performance of core storefront tasks including the loading of category, configurable product, home, and checkout pages. @@ -866,7 +866,7 @@ This release includes the following changes to integrations for core payment met * Merchants now have the ability to turn off the automatic URL rewrite generation that occurs by default on products when the category they belong to is saved. The new **Generate "category/product" URL Rewrites** configuration option controls this behavior. When this feature is enabled, Magento will generate a lot of data when saving a category that contains many assigned products. This generated data is saved into rewrite tables that can degrade Magento performance. -* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. +* Page load speeds have been improved by moving non-critical CSS elements to the bottom of the page. This enables the browser to render and display a storefront page more quickly. This setting is disabled by default, but you can enable it using **Stores** > **Configuration** > **Advanced** > **Developer** > **CSS Settings** > **Use CSS critical path**. For more information, see [CSS critical path documentation]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-critical-path.html). * The `jQuery/ui` library has been refactored into separate widgets so that core modules load only the widgets they need. This update improves the performance of core storefront tasks including the loading of category, configurable product, home, and checkout pages. From b1be7fae1ae98d3249d51e1ff409c50478acd7fb Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Thu, 10 Oct 2019 14:05:25 -0500 Subject: [PATCH 25/27] cleaned up URL --- guides/v2.3/security/two-factor-authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.3/security/two-factor-authentication.md b/guides/v2.3/security/two-factor-authentication.md index 75310a6bcc0..6327b84b2e9 100644 --- a/guides/v2.3/security/two-factor-authentication.md +++ b/guides/v2.3/security/two-factor-authentication.md @@ -43,7 +43,7 @@ After enabling and configuring 2FA for your Magento instance, Magento Admin user | : --------- | : --------- | : ------- | | [Google Authenticator](https://support.google.com/accounts/answer/1066447?co=GENIE.Platform%3DAndroid&hl=en) | Generate and enter code from mobile app Requirements: Enable in Admin | `google`| | [Authy](https://authy.com/) | SMS, call, token, and one touch
Requirements: Enable in Admin and API keys | `authy` | -| [U2F Keys](https://docs.magento.com/m2/ee/user_guide/stores/security-two-factor-authentication-use.html?#u2f-key) | Physical device to authenticate, like [YubiKey](https://www.yubico.com/).
Requirements: Enable in Admin | `u2fkey` | +| [U2F Keys](https://docs.magento.com/m2/ee/user_guide/stores/security-two-factor-authentication-use.html#u2f-key) | Physical device to authenticate, like [YubiKey](https://www.yubico.com/).
Requirements: Enable in Admin | `u2fkey` | | [Duo Security](https://duo.com/) | SMS and push notification.
Requirements: Enable in Admin, Integration and Secret keys, API hostname | `duo` | ## Troubleshooting From 1a018b646eb28a276eaef8ebb1c69b84a58b08c8 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Thu, 10 Oct 2019 14:06:37 -0500 Subject: [PATCH 26/27] Linting fixes --- .../v2.2/javascript-dev-guide/javascript/custom_js.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md index d1f642f3e35..2be3acb6bb3 100644 --- a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md +++ b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md @@ -120,8 +120,8 @@ define([ Where the following notation is used: -- ``: path to the default component that you extend -- ``: variable containing the default component that you extend +- ``: path to the default component that you extend +- ``: variable containing the default component that you extend For example, `Filters.js` script extends the default `filters.js`: @@ -146,12 +146,13 @@ To disable the auto-loading of default Magento JS components and widget initiali 1. Create a `requirejs-config.js` file with the following content: -```javascript -var config = { deps: [ ] }; -``` + ```javascript + var config = { deps: [ ] }; + ``` 2. Put the `requirejs-config.js` file in one of the following locations: + - Your custom theme files: `` - Your custom module files: `/view/frontend` From b09b62cf9fb5f74bb3e77f891abbcc3060fd617e Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Thu, 10 Oct 2019 14:18:40 -0500 Subject: [PATCH 27/27] Trailing spaces --- guides/v2.2/javascript-dev-guide/javascript/custom_js.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md index 2be3acb6bb3..fa81cac0811 100644 --- a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md +++ b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md @@ -152,7 +152,7 @@ To disable the auto-loading of default Magento JS components and widget initiali 2. Put the `requirejs-config.js` file in one of the following locations: - + - Your custom theme files: `` - Your custom module files: `/view/frontend`