From 242a44f9687107fb832c808ac7d1d6a31bd3f08f Mon Sep 17 00:00:00 2001 From: Arnoud Beekman Date: Fri, 7 Aug 2020 16:00:20 +0200 Subject: [PATCH 1/8] Use updated way on how echo is done in phtml --- .../v2.3/frontend-dev-guide/translations/translate_theory.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guides/v2.3/frontend-dev-guide/translations/translate_theory.md b/src/guides/v2.3/frontend-dev-guide/translations/translate_theory.md index d1b82b9560c..c02e394d8c7 100644 --- a/src/guides/v2.3/frontend-dev-guide/translations/translate_theory.md +++ b/src/guides/v2.3/frontend-dev-guide/translations/translate_theory.md @@ -18,13 +18,13 @@ To ensure that your new string is added to the dictionary and translated, use th For example: ```php - + ``` If your string contains a variable, to add a placeholder for this variable in the dictionary, use syntax similar to the following: ```php - + ``` In this example, the _'Hello %1'_ string is added to the dictionary when the i18n tool is run. From 8c90df4744dbad9a26bd864c5be91e1001ef9e6c Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 7 Aug 2020 10:43:39 -0500 Subject: [PATCH 2/8] Added link to public Slack workspace invite --- src/marketplace/eqp/v1/help.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/marketplace/eqp/v1/help.md b/src/marketplace/eqp/v1/help.md index 467697321db..c6cfc65b072 100644 --- a/src/marketplace/eqp/v1/help.md +++ b/src/marketplace/eqp/v1/help.md @@ -7,7 +7,7 @@ Use these resources if you need additional help. **Slack:** -- workspace: Magento Community Engineering +- workspace: [Magento Community Engineering](https://opensource.magento.com/slack) - channel: **# marketplace-eqp-api** **Email:** From 2f36b2adb479024b1684962c36c8bae0fbc249d2 Mon Sep 17 00:00:00 2001 From: Ejaz Alam Date: Sat, 8 Aug 2020 02:49:17 +0500 Subject: [PATCH 3/8] Typing mistake Corrected Typing mistake. --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index de6819ecbc0..1d0aa0e5ecf 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -456,7 +456,7 @@ Extending layout: In layout files you can change the elements order on a page. This can be done using one of the following: - [`` instruction]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_layout_xml-instruc_ex_mv): allows changing elements' order and parent. -- [`before` and `after` attributes of ``]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): allows changing elements' order within one parent. +- [`before` and `after` attributes of ``]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): allows changing element's order within one parent. **Example of `` usage:** put the stock availability and SKU blocks next to the product price on a product page. From 974a7cdd263b508741f35bf2967dd56376c211e7 Mon Sep 17 00:00:00 2001 From: Chandru Rajendran Date: Mon, 10 Aug 2020 00:52:07 +0530 Subject: [PATCH 4/8] Update Composer.json examples --- .../v2.3/extension-dev-guide/build/composer-integration.md | 2 +- src/guides/v2.3/extension-dev-guide/build/create_component.md | 2 +- src/guides/v2.3/extension-dev-guide/package/package_module.md | 4 ++-- src/guides/v2.3/frontend-dev-guide/themes/theme-create.md | 2 +- src/guides/v2.3/get-started/create-integration.md | 2 +- .../v2.3/howdoi/checkout/checkout-add-custom-carrier.md | 2 +- src/guides/v2.4/extension-dev-guide/build/create_component.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/guides/v2.3/extension-dev-guide/build/composer-integration.md b/src/guides/v2.3/extension-dev-guide/build/composer-integration.md index ea6b6ebe708..41202aa4595 100644 --- a/src/guides/v2.3/extension-dev-guide/build/composer-integration.md +++ b/src/guides/v2.3/extension-dev-guide/build/composer-integration.md @@ -35,7 +35,7 @@ Here is the example of composer.json file. "AFL-3.0" ], "require": { - "php": "~7.1.3||~7.2.0||~7.3.0" + "php": "~7.2.0||~7.3.0" }, "autoload": { "files": [ "registration.php" ], diff --git a/src/guides/v2.3/extension-dev-guide/build/create_component.md b/src/guides/v2.3/extension-dev-guide/build/create_component.md index 35cc4a81d79..585a6905ad9 100644 --- a/src/guides/v2.3/extension-dev-guide/build/create_component.md +++ b/src/guides/v2.3/extension-dev-guide/build/create_component.md @@ -51,7 +51,7 @@ Refer to [Module version dependencies]({{ page.baseurl }}/extension-dev-guide/ve "name": "your-name/module-Acme", "description": "Test component for Magento 2", "require": { - "php": "~7.1.3||~7.2.0", + "php": "~7.2.0||~7.3.0", "magento/module-store": "102.1", "magento/module-catalog": "102.1", "magento/module-catalog-inventory": "102.1", diff --git a/src/guides/v2.3/extension-dev-guide/package/package_module.md b/src/guides/v2.3/extension-dev-guide/package/package_module.md index e744de538a3..05c6c9c1c27 100644 --- a/src/guides/v2.3/extension-dev-guide/package/package_module.md +++ b/src/guides/v2.3/extension-dev-guide/package/package_module.md @@ -49,7 +49,7 @@ The following example is a `composer.json` for a metapackage: "version": "2.0.0", "type": "metapackage", "require": { - "php": "~7.1.3|~7.2.0", + "php": "~7.2.0||~7.3.0", "zendframework/zend-stdlib": "~2.4.6", "zendframework/zend-code": "~2.4.6", "zendframework/zend-server": "~2.4.6", @@ -99,7 +99,7 @@ The following example is a `composer.json` file for a module: "AFL-3.0" ], "require": { - "php": "~7.1.3|~7.2.0", + "php": "~7.2.0||~7.3.0", "magento/framework": "~100.0.4" }, "autoload": { diff --git a/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md b/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md index 22617d41f9c..a622183d06f 100644 --- a/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md +++ b/src/guides/v2.3/frontend-dev-guide/themes/theme-create.md @@ -99,7 +99,7 @@ Example of a theme `composer.json` file: "sort-packages": true }, "require": { - "php": "~7.1.3||~7.2.0", + "php": "~7.2.0||~7.3.0", "magento/framework": "*", "magento/theme-frontend-blank": "*" }, diff --git a/src/guides/v2.3/get-started/create-integration.md b/src/guides/v2.3/get-started/create-integration.md index b930db08b92..5bee9ed6093 100644 --- a/src/guides/v2.3/get-started/create-integration.md +++ b/src/guides/v2.3/get-started/create-integration.md @@ -92,7 +92,7 @@ To develop a module, you must: "name": "Vendor1_Module1", "description": "create integration from config", "require": { - "php": "~7.1.3|~7.2.0|~7.3.0", + "php": "~7.2.0|~7.3.0", "magento/framework": "2.0.0", "magento/module-integration": "2.0.0" }, diff --git a/src/guides/v2.3/howdoi/checkout/checkout-add-custom-carrier.md b/src/guides/v2.3/howdoi/checkout/checkout-add-custom-carrier.md index c36e738233f..8cfb842da6b 100644 --- a/src/guides/v2.3/howdoi/checkout/checkout-add-custom-carrier.md +++ b/src/guides/v2.3/howdoi/checkout/checkout-add-custom-carrier.md @@ -47,7 +47,7 @@ ComponentRegistrar::register( "name": "vendor/custom-shipping", "description": "Custom shipping module", "require": { - "php": "~7.1.3||~7.2.0", + "php": "~7.2.0||~7.3.0", "magento/framework": "102.0.*", "magento/module-backend": "101.0.*", "magento/module-catalog": "103.0.*", diff --git a/src/guides/v2.4/extension-dev-guide/build/create_component.md b/src/guides/v2.4/extension-dev-guide/build/create_component.md index 674eaa57e61..1c7dcb2d217 100644 --- a/src/guides/v2.4/extension-dev-guide/build/create_component.md +++ b/src/guides/v2.4/extension-dev-guide/build/create_component.md @@ -46,7 +46,7 @@ Refer to [Module version dependencies]({{ page.baseurl }}/extension-dev-guide/ve "name": "your-name/module-Acme", "description": "Test component for Magento 2", "require": { - "php": "~7.1.3||~7.2.0", + "php": "~7.3.0||~7.4.0", "magento/module-store": "102.1", "magento/module-catalog": "102.1", "magento/module-catalog-inventory": "102.1", From f09cfe5b6c477fcb05bb819584107b4e7ab0a3d3 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Mon, 10 Aug 2020 15:39:31 -0500 Subject: [PATCH 5/8] Grammar fix --- src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md index 1d0aa0e5ecf..d0854cc8d46 100644 --- a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md +++ b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md @@ -456,7 +456,7 @@ Extending layout: In layout files you can change the elements order on a page. This can be done using one of the following: - [`` instruction]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_layout_xml-instruc_ex_mv): allows changing elements' order and parent. -- [`before` and `after` attributes of ``]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): allows changing element's order within one parent. +- [`before` and `after` attributes of ``]({{page.baseurl}}/frontend-dev-guide/layouts/xml-instructions.html#fedg_xml-instrux_before-after): sets the order of elements within a parent. **Example of `` usage:** put the stock availability and SKU blocks next to the product price on a product page. From 4bab278aea0b321f88c7b4331c0d69a0bb151e12 Mon Sep 17 00:00:00 2001 From: DominicWatts Date: Mon, 10 Aug 2020 22:10:45 +0100 Subject: [PATCH 6/8] Export option typo --- src/guides/v2.3/ui_comp_guide/components/ui-exportbutton.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-exportbutton.md b/src/guides/v2.3/ui_comp_guide/components/ui-exportbutton.md index 9226653854d..3d5279811fc 100644 --- a/src/guides/v2.3/ui_comp_guide/components/ui-exportbutton.md +++ b/src/guides/v2.3/ui_comp_guide/components/ui-exportbutton.md @@ -3,7 +3,7 @@ group: ui-components-guide title: ExportButton component --- -The ExportButton component implements the ability to export grid data to the specified data format (cvs, xml, and so on). +The ExportButton component implements the ability to export grid data to the specified data format (csv, xml, and so on). ## Configuration options From 7c03dc894433a198f3206010b99870939f687d05 Mon Sep 17 00:00:00 2001 From: Donald Booth Date: Wed, 12 Aug 2020 11:59:06 -0500 Subject: [PATCH 7/8] Added release notes link to B2B Guide --- src/_data/toc/b2b-developer-guide.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/_data/toc/b2b-developer-guide.yml b/src/_data/toc/b2b-developer-guide.yml index 90f3132fd81..c6cd81498a8 100644 --- a/src/_data/toc/b2b-developer-guide.yml +++ b/src/_data/toc/b2b-developer-guide.yml @@ -71,3 +71,5 @@ pages: - label: Develop B2B extensions url: /b2b/extensions.html + - label: B2B Release Notes + url: /release-notes/b2b-release-notes.html From b232c4a1cd8ac7a7a857a2fa9255326651e796ed Mon Sep 17 00:00:00 2001 From: Hardy Johnson Date: Wed, 12 Aug 2020 11:57:29 -0700 Subject: [PATCH 8/8] Fix proper menu label Catalog vs Product --- src/guides/v2.3/config-guide/multi-site/ms_websites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guides/v2.3/config-guide/multi-site/ms_websites.md b/src/guides/v2.3/config-guide/multi-site/ms_websites.md index 9ab81a186b5..dcf2ebff11f 100644 --- a/src/guides/v2.3/config-guide/multi-site/ms_websites.md +++ b/src/guides/v2.3/config-guide/multi-site/ms_websites.md @@ -24,7 +24,7 @@ Creating a root category is optional, but we show how to do it in this tutorial {% collapsible To create a root category: %} 1. Log in to the Magento Admin as a user authorized to create categories. -1. Click **Products** > **Categories**. +1. Click **Catalog** > **Categories**. 1. Click **Add Root Category**. 1. In the **Category Name** field, enter a unique name to identify this category. 1. Make sure **Enable Category** is set to **Yes**.