-
-
- | Parameter |
- Small profile |
- Medium profile |
- Medium multi-site profile |
- Large profile |
- Extra large profile |
-
-
-
- websites |
- 1 |
- 3 |
- 25 |
- 5 |
- 5 |
-
-
- store_groups |
- 1 |
- 3 |
- 25 |
- 5 |
- 5 |
-
-
- store_views |
- 1 |
- 3 |
- 50 |
- 5 |
- 5 |
-
-
- simple_products |
- 800 |
- 24,000 |
- 4,000 |
- 300,000 |
- 600,000 |
-
-
- configurable_products |
- 16 with 24 options |
- 640 with 24 options |
- 800 with 24 options & 79 with 200 options |
- 8,000 with 24 options |
- 16,000 with 24 options |
-
-
- product_images |
- 100 images / 3 images per product |
- 1000 images / 3 images per product |
- 1000 images / 3 images per product |
- 2000 images / 3 images per product |
- 2000 images / 3 images per product |
-
-
- categories |
- 30 |
- 300 |
- 100 |
- 3,000 |
- 6,000 |
-
-
- categories_nesting_level |
- 3 |
- 3 |
- 3 |
- 5 |
- 5 |
-
-
- catalog_price_rules |
- 20 |
- 20 |
- 20 |
- 20 |
- 20 |
-
-
- catalog_target_rules |
- 5 |
- 5 |
- 5 |
- 5 |
- 5 |
-
-
- cart_price_rules |
- 20 |
- 20 |
- 20 |
- 20 |
- 20 |
-
-
- cart_price_rules_floor |
- 2 |
- 2 |
- 2 |
- 2 |
- 2 |
-
-
- customers |
- 200 |
- 2,000 |
- 2,000 |
- 5,000 |
- 10,000 |
-
-
- tax rates |
- 130 |
- 40,000 |
- 40,000 |
- 40,000 |
- 40,000 |
-
-
- orders |
- 80 |
- 50,000 |
- 50,000 |
- 100,000 |
- 150,000 |
-
-
-
+| Parameter | Small profile | Medium profile | Medium multi-site profile | Large profile | Extra large profile |
+| --- | --- | --- | --- | --- | --- |
+| `websites` | 1 | 3 | 25 | 5 | 5 |
+| `store_groups` | 1 | 3 | 25 | 5 | 5 |
+| `store_views` | 1 | 3 | 50 | 5 | 5 |
+| `simple_products` | 800 | 24,000 | 4,000 | 300,000 | 600,000 |
+| `configurable_products` | 16 with 24 options | 640 with 24 options | 800 with 24 options & 79 with 200 options | 8,000 with 24 options | 16,000 with 24 options |
+| `product_images` | 100 images / 3 images per product | 1000 images / 3 images per product | 1000 images / 3 images per product | 2000 images / 3 images per product | 2000 images / 3 images per product |
+| `categories` | 30 | 300 | 100 | 3,000 | 6,000 |
+| `categories_nesting_level` | 3 | 3 | 3 | 5 | 5 |
+| `catalog_price_rules` | 20 | 20 | 20 | 20 | 20 |
+| `catalog_target_rules` | 5 | 5 | 5 | 5 | 5 |
+| `cart_price_rules` | 20 | 20 | 20 | 20 | 20 |
+| `cart_price_rules_floor` | 2 | 2 | 2 | 2 | 2 |
+| `customers` | 200 | 2,000 | 2,000 | 5,000 | 10,000 |
+| `tax rates` | 130 | 40,000 | 40,000 | 40,000 | 40,000 |
+| `orders` | 80 | 50,000 | 50,000 | 100,000 | 150,000 |
### Run the data generator {#config-cli-perf-run}
@@ -241,21 +125,25 @@ The following sections discuss additional details about the performance fixtures
Generates [admin](https://glossary.magento.com/admin) users. [XML](https://glossary.magento.com/xml) profile node:
-<!-- Number of admin users -->
-<admin_users>{int}
+```xml
+
+{int}
+```
### Attribute sets {#config-cli-gen-attrib}
Generates attribute sets with specified configuration. XML profile node:
-<!-- Number of product attribute sets -->
-<product_attribute_sets>{int}</product_attribute_sets>
+```xml
+
+{int}
-<!-- Number of attributes per set -->
-<product_attribute_sets_attributes>{int}</product_attribute_sets_attributes>
+
+{int}
- <!-- Number of values per attribute -->
-<product_attribute_sets_attributes_values>{int}</product_attribute_sets_attributes_values>
+
+{int}
+```
### Bundle products {#config-cli-gen-bundle}
@@ -263,31 +151,37 @@ Generates bundle products. Generated bundle selections are not displayed individ
XML profile node:
-<!-- Number of products -->
-<bundle_products>{int}</bundle_products>
+```xml
+
+{int}
-<!-- Number of options per each product -->
-<bundle_products_options>{int}</bundle_products_options>
+
+{int}
-<!-- Number of simple products per each option -->
-<bundle_products_variation>{int}</bundle_products_variation>
+
+{int}
+```
### Cart price rules {#config-cli-gen-cartrules}
Generates cart price rules. XML profile node:
-<!-- Number of cart price rules -->
-<cart_price_rules>{int}</cart_price_rules>
+```xml
+
+{int}
-<!-- Number of conditions per rule -->
-<cart_price_rules_floor>{int}</cart_price_rules_floor>
+
+{int}
+```
### Catalog price rules {#config-cli-gen-pricerules}
Generates catalog price rules. XML profile node:
-<!-- Number of catalog price rules -->
-<catalog_price_rules>{int}</catalog_price_rules>
+```xml
+
+{int}
+```
### Categories {#config-cli-gen-cat}
@@ -295,27 +189,31 @@ Generates categories. If `assign_entities_to_all_websites` is set to `0`, all ca
XML profile node:
-<!-- Number of categories to generate -->
-<categories>{int}</categories>
+```xml
+
+{int}
-<!-- Nesting level of categories -->
-<categories_nesting_level>{int}</categories_nesting_level>
+
+{int}
+```
### Configs {#config-cli-gen-config}
Sets values for config fields. XML profile node:
-<!-- Config variables and values for change -->
- <configs>
- <config>
- <path>{string}</path> <!-- e.g. admin/security/use_form_key -->
- <scope>{string}</scope> <!-- e.g. default -->
- <scopeId>{int}</scopeId>
- <value>{int|string}</value>
- </config>
-
- <!-- ... more entries ... -->
- </configs>
+```xml
+
+
+
+ {string}
+ {string}
+ {int}
+ {int|string}
+
+
+
+
+```
### Configurable products {#config-cli-gen-configprod}
@@ -325,94 +223,102 @@ We support the following XML node formats:
* Distribution per Default and pre-defined attribute sets:
- <!-- Number of configurable products -->
- <configurable_products>{int}</configurable_products>
+```xml
+
+{int}
+```
* Generate products based on an existing attribute set:
- <configurable_products>
-
- <config>
- <!-- Existing attribute set name -->
- <attributeSet>{string}</attributeSet>
+```xml
+
+
+
+
+ {string}
- <!-- Configurable sku pattern with %s -->
- <sku>{string}</sku>
+
+ {string}
- <!-- Number of configurable products -->
- <products>{int}</products>
+
+ {int}
- <!-- Category Name. Optional. By default category name from Categories fixture will be used -->
- <category>[{string}]</category>
+
+ [{string}]
- <!-- Type of Swatch attribute e.g. color|image -->
- <swatches>{string}</swatches>
- </config>
+
+ {string}
+
- <!-- ... more entries ... -->
- </configurable_products>
+
+
+```
* Generate products based on a dynamically created [attribute set](https://glossary.magento.com/attribute-set) with a specified amount of attributes and options:
- <configurable_products>
-
- <config>
- <!-- Number of attributes in configurable product -->
- <attributes>{int}</attributes>
+```xml
+
+
+
+
+ {int}
- <!-- Number of options per attribute -->
- <options>{int}</options>
+
+ {int}
- <!-- Configurable sku pattern with %s -->
- <sku>{string}</sku>
+
+ {string}
- <!-- Number of configurable products -->
- <products>{int}</products>
+
+ {int}
- <!-- Category Name. Optional. By default category name from Categories fixture will be used -->
- <category>[{string}]</category>
+
+ [{string}]
- <!-- Type of Swatch attribute e.g. color|image -->
- <swatches>{string}</swatches>
- </config>
+
+ {string}
+
- <!-- ... more entries ... -->
- </configurable_products>
+
+
+```
* Generate products based on a dynamically created attribute set with a specified configuration per each attribute:
- <configurable_products>
-
- <config>
- <attributes>
- <!-- Configuration for a first attribute -->
- <attribute>
- <!-- Amount of options per attribute -->
- <options>{int}</options>
+```xml
+
- <!-- Type of Swatch attribute -->
- <swatches>{string}</swatches>
- </attribute>
+
+
+
+
+
+ {int}
- <!-- Configuration for a second attribute -->
- <attribute>
- <!-- Amount of options per attribute -->
- <options>{int}</options>
- </attribute>
- </attributes>
+
+ {string}
+
- <!-- Configurable sku pattern with %s -->
- <sku>{string}</sku>
+
+
+
+ {int}
+
+
- <!-- Number of configurable products -->
- <products>{int}</products>
+
+ {string}
- <!-- Category Name. Optional. By default, the category name from Categories fixture will be used -->
- <category>[{string}]</category>
- </config>
+
+ {int}
- <!-- ... more entries ... -->
- </configurable_products>
+
+ [{string}]
+
+
+
+
+```
### Customers {#config-cli-gen-cust}
@@ -420,15 +326,19 @@ Generates customers. Customers have a normal distribution on all available websi
XML profile node:
-<!-- Number of customers to generate -->
-<customers>{int}</customers>
+```xml
+
+{int}
+```
You can also use the following XML to change the customer configuration:
-<customer-config>
- <!-- Number of addresses per each customer -->
- <addresses-count>{int}</addresses-count>
-</customer-config>
+```xml
+
+
+ {int}
+
+```
### Product images {#config-cli-gen-prodimg}
@@ -436,23 +346,27 @@ Generates product images. Generation does not include resizing.
XML profile node:
-<product-images>
- <!-- Number of images to generate -->
- <images-count>{int}</images-count>
+```xml
+
+
+ {int}
- <!-- Number of images to be assigned per each product -->
- <images-per-product>{int}</images-per-product>
-</product-images>
+
+ {int}
+
+```
### Indexers state {#config-cli-gen-index}
Updates indexers' state. XML profile node:
-<indexer>
- <!-- Name of indexer (e.g. catalogrule_product) -->
- <id>{string}</id>
- <set_scheduled>{bool}</set_scheduled>
-</indexer>
+```xml
+
+
+ {string}
+ {bool}
+
+```
### Orders {#config-cli-gen-orders}
@@ -460,29 +374,31 @@ Generates orders with configurable number of different types of order items. Opt
XML profile node:
-<!-- It is necessary to enable quotes for orders -->
-<order_quotes_enable>{bool}</order_quotes_enable>
+```xml
+
+{bool}
-<!-- Min number of simple products per each order -->
-<order_simple_product_count_from>{int}</order_simple_product_count_from>
+
+{int}
-<!-- Max number of simple products per each order -->
-<order_simple_product_count_to>{int}</order_simple_product_count_to>
+
+{int}
-<!-- Min number of configurable products per each order -->
-<order_configurable_product_count_from>{int}</order_configurable_product_count_from>
+
+{int}
-<!-- Max number of configurable products per each order -->
-<order_configurable_product_count_to>{int}</order_configurable_product_count_to>
+
+{int}
-<!-- Min number of big configurable products (with big amount of options) per each order -->
-<order_big_configurable_product_count_from>{int}</order_big_configurable_product_count_from>
+
+{int}
-<!-- Max number of big configurable products (with big amount of options) per each order -->
-<order_big_configurable_product_count_to>{int}</order_big_configurable_product_count_to>
+
+{int}
-<!-- Number of orders to generate -->
-<orders>{int}</orders>
+
+{int}
+```
### Simple products {#config-cli-gen-simp}
@@ -492,15 +408,19 @@ Products are uniformly distributed per categories and websites. If `assign_entit
XML profile node:
-<!-- Number of simple products to generate -->
-<simple_products>{int}</simple_products>
+```xml
+
+{int}
+```
### Websites {#config-cli-gen-websites}
Generates websites. XML profile node:
-<!-- Number of websites to be generated -->
-<websites>{int}</websites>
+```xml
+
+{int}
+```
### Store groups {#config-cli-gen-stores}
@@ -508,25 +428,31 @@ Generates store groups (referred to in the [Magento Admin](https://glossary.mage
XML profile node:
-<!-- Number of store groups to be generated -->
-<store_groups>{int}</store_groups>
+```xml
+
+{int}
+```
### Store views {#config-cli-gen-storeview}
Generates store views. Store views are distributed normally among store groups. XML profile node:
-<!-- Number of store views to be generated -->
-<store_views>{int}</store_views>
+```xml
+
+{int}
-<!-- 1 means that all stores will have the same root category, 0 means that all stores will have unique root category -->
-<assign_entities_to_all_websites>{0|1}<assign_entities_to_all_websites/>
+
+{0|1}
+```
### Tax rates {#config-cli-gen-taxrate}
Generates tax rates. XML profile node:
-<!-- Accepts name of [csv](https://glossary.magento.com/csv) file with tax rates (<path to magento folder>/setup/src/Magento/Setup/Fixtures/_files) -->
-<tax_rates_file>{csv file name}</tax_rates_file>
+```xml
+
+{csv file name}
+```
## Additional information
diff --git a/src/guides/v2.3/config-guide/prod/prod_file-sys-perms.md b/src/guides/v2.3/config-guide/prod/prod_file-sys-perms.md
index db736de357f..e2aba789592 100644
--- a/src/guides/v2.3/config-guide/prod/prod_file-sys-perms.md
+++ b/src/guides/v2.3/config-guide/prod/prod_file-sys-perms.md
@@ -75,7 +75,13 @@ To remove write permissions to files and directories from the web server user's
1. Remove write permissions to the following directories.
```bash
- find app/code var/view_preprocessed vendor pub/static app/etc generated/code generated/metadata \( -type f -or -type d \) -exec chmod u-w {} + && chmod o-rwx app/etc/env.php && chmod u+x bin/magento
+ find app/code var/view_preprocessed vendor pub/static app/etc generated/code generated/metadata \( -type f -or -type d \) -exec chmod u-w {} + && chmod o-rwx app/etc/env.php
+ ```
+
+1. Make the Magento command line tool executable.
+
+ ```bash
+ chmod u+x bin/magento
```
#### Make code files and directories writable {#make-files-writable-one-owner}
diff --git a/src/guides/v2.3/design-styleguide/color/color.md b/src/guides/v2.3/design-styleguide/color/color.md
index a08bfec4afc..a272ccd31cf 100644
--- a/src/guides/v2.3/design-styleguide/color/color.md
+++ b/src/guides/v2.3/design-styleguide/color/color.md
@@ -10,4 +10,3 @@ menu_node:
Our color palette reflects our brand personality. It meets accessibility standards and provides clear legibility, hierarchy, navigation, and messaging.
-
diff --git a/src/guides/v2.3/design-styleguide/typography/typography.md b/src/guides/v2.3/design-styleguide/typography/typography.md
index ce4200a52d9..f75abbd4a75 100644
--- a/src/guides/v2.3/design-styleguide/typography/typography.md
+++ b/src/guides/v2.3/design-styleguide/typography/typography.md
@@ -11,13 +11,11 @@ Typography is used to establish page hierarchy.
## Heading Types
-
-
-# H1 - Page title
+### H1 - Page title
Page titles use Open Sans font, regular weight, 28px font size, and 34px line height.
-## H2 - Section heading
+### H2 - Section heading
Section headings use Open Sans font, regular weight, 20px font size, and 25px line height.
diff --git a/src/guides/v2.3/extension-dev-guide/attributes.md b/src/guides/v2.3/extension-dev-guide/attributes.md
index 4977045e0a7..63c33c5a3ef 100644
--- a/src/guides/v2.3/extension-dev-guide/attributes.md
+++ b/src/guides/v2.3/extension-dev-guide/attributes.md
@@ -242,24 +242,24 @@ The following table is a reference for the `Magento\Eav\Setup\EavSetup::addAttri
{:.fixed}
|Key|Description|Default Value|
|--- |--- |--- |
-|apply_to|Catalog EAV Attribute apply_to||
+|apply_to|Catalog EAV Attribute - defines which product types the attribute can be applied to||
|attribute_model|EAV Attribute attribute_model||
|attribute_set|Name of the attribute set the new attribute will be assigned to. Works in combination with **group** or empty **user_defined**||
|backend|EAV Attribute backend_model||
-|comparable|Catalog EAV Attribute is_comparable|0|
+|comparable|Catalog EAV Attribute - defines if attribute can be used when comparing products|0|
|default|EAV Attribute default_value||
-|filterable_in_search|Catalog EAV Attribute is_filterable_in_search|0|
-|filterable|Catalog EAV Attribute is_filterable|0|
+|filterable_in_search|Catalog EAV Attribute is_filterable_in_search - defines if attribute can be used to filter search results|0|
+|filterable|Catalog EAV Attribute is_filterable - defines if attribute can be used to filter on navigation|0|
|frontend_class|EAV Attribute frontend_class||
|frontend|EAV Attribute frontend_model||
|global|Catalog EAV Attribute is_global field|1|
|group|Attribute group name or ID||
|input_renderer|Catalog EAV Attribute frontend_input_renderer||
|input|EAV Attribute frontend_input|text|
-|is_filterable_in_grid|Catalog EAV Attribute is_filterable_in_grid|0|
-|is_html_allowed_on_front|Catalog EAV Attribute is_html_allowed_on_front|0|
-|is_used_in_grid|Catalog EAV Attribute is_used_in_grid field|0|
-|is_visible_in_grid|Catalog EAV Attribute is_visible_in_grid field|0|
+|is_filterable_in_grid|Catalog EAV Attribute - defines if attribute can be used to filter on product grid in Admin|0|
+|is_html_allowed_on_front|Catalog EAV Attribute - defines if HTML needs to be escaped on the frontend|0|
+|is_used_in_grid|Catalog EAV Attribute - defines if attribute can be used on the product grid in Admin|0|
+|is_visible_in_grid|Catalog EAV Attribute is_visible_in_grid - defines if attribute will be visible on the product grid in Admin|0|
|label|EAV Attribute frontend_label||
|note|EAV Attribute note||
|option|EAV Attribute Option values||
@@ -276,7 +276,7 @@ The following table is a reference for the `Magento\Eav\Setup\EavSetup::addAttri
|used_for_sort_by|Catalog EAV Attribute used_for_sort_by|0|
|used_in_product_listing|Catalog EAV Attribute used_in_product_listing|0|
|user_defined|EAV Attribute is_user_defined|0|
-|visible_in_advanced_search|Catalog EAV Attribute is_visible_in_advanced_search|0|
-|visible_on_front|Catalog EAV Attribute is_visible_on_front|0|
-|visible|Catalog EAV Attribute is_visible|1|
-|wysiwyg_enabled|Catalog EAV Attribute is_wysiwyg_enabled|0|
+|visible_in_advanced_search|Catalog EAV Attribute is_visible_in_advanced_search - defines if attribute will appear on the Advanced Search form|0|
+|visible_on_front|Catalog EAV Attribute is_visible_on_front - defines attribute visibility on frontend|0|
+|visible|Catalog EAV Attribute is_visible - defines visibility in Admin, won't be available for changing a value in the admin interface if set to 0|1|
+|wysiwyg_enabled|Catalog EAV Attribute is_wysiwyg_enabled - used for enabling wysiwyg editor for an attribute. Works for textarea only|0|
diff --git a/src/guides/v2.3/extension-dev-guide/cache/partial-caching/database-caching.md b/src/guides/v2.3/extension-dev-guide/cache/partial-caching/database-caching.md
index 3b3f5759bf8..381b5288a8d 100644
--- a/src/guides/v2.3/extension-dev-guide/cache/partial-caching/database-caching.md
+++ b/src/guides/v2.3/extension-dev-guide/cache/partial-caching/database-caching.md
@@ -162,6 +162,7 @@ Use the following steps:
1. In a web browser, go to any cacheable page (such as the [storefront](https://glossary.magento.com/storefront) front door page).
If exceptions display, verify `di.xml` syntax and try again. (To see exceptions in the browser, you must [enable developer mode].)
+
1. Enter the following commands:
```bash
diff --git a/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md b/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md
index 1410e967d37..a02a30f7ec1 100644
--- a/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md
+++ b/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md
@@ -12,4 +12,3 @@ Your [module](https://glossary.magento.com/module) can optionally use Magento 2'
* [Command naming guidelines]({{ page.baseurl }}/extension-dev-guide/cli-cmds/cli-naming-guidelines.html)
* [How to add CLI commands]({{ page.baseurl }}/extension-dev-guide/cli-cmds/cli-howto.html)
* [List of Magento CLI commands]({{ page.baseurl }}/reference/cli/magento.html)
-
diff --git a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md
index 8d63f4b04fa..300f4a92297 100644
--- a/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md
+++ b/src/guides/v2.3/extension-dev-guide/service-contracts/service-to-web-service.md
@@ -175,7 +175,6 @@ To define web API components, set these attributes on these XML elements in the
Note:The Magento web API framework enables guest users to access resources that are configured with `anonymous` permission.
Any user that the framework cannot authenticate through existing authentication
mechanisms is considered a guest user.
-
diff --git a/src/guides/v2.3/extension-dev-guide/xss-protection.md b/src/guides/v2.3/extension-dev-guide/xss-protection.md
index cfbbf6f1830..416ed727e8f 100644
--- a/src/guides/v2.3/extension-dev-guide/xss-protection.md
+++ b/src/guides/v2.3/extension-dev-guide/xss-protection.md
@@ -190,9 +190,9 @@ This sniff finds all _echo_ calls in PHTML-templates and determines if the outpu
It covers the following cases:
-- /_ @noEscape _/ before output. Output does not require escaping. Test is green.
+- `/_ @noEscape _/` before output. Output does not require escaping. Test is green.
-- /_ @escapeNotVerified _/ before output. Output escaping is not checked and should be verified. Test is green.
+- `/_ @escapeNotVerified _/` before output. Output escaping is not checked and should be verified. Test is green.
- Methods which contain "html" in their names (for example echo $object->{suffix}Html{postfix}()). Data is ready for the HTML output. Test is green.
diff --git a/src/guides/v2.3/frontend-dev-guide/bk-frontend-dev-guide.md b/src/guides/v2.3/frontend-dev-guide/bk-frontend-dev-guide.md
index 3d036c12dae..9f6844e7ce7 100644
--- a/src/guides/v2.3/frontend-dev-guide/bk-frontend-dev-guide.md
+++ b/src/guides/v2.3/frontend-dev-guide/bk-frontend-dev-guide.md
@@ -68,4 +68,3 @@ Related topics
* [JavaScript coding standard]({{ page.baseurl }}/coding-standards/code-standard-javascript.html)
* [Responsive web design]({{ page.baseurl }}/frontend-dev-guide/responsive-web-design/rwd_overview.html)
* [Translations]({{ page.baseurl }}/frontend-dev-guide/translations/xlate.html)
-
diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/css-jquery.md b/src/guides/v2.3/frontend-dev-guide/css-topics/css-jquery.md
index 142d3499726..de2d5dae2bd 100644
--- a/src/guides/v2.3/frontend-dev-guide/css-topics/css-jquery.md
+++ b/src/guides/v2.3/frontend-dev-guide/css-topics/css-jquery.md
@@ -21,4 +21,3 @@ To use the jQuery styles, you need to define those which you need in your custom
- [Define what styles you need to change]({{ page.baseurl }}/frontend-dev-guide/themes/debug-theme.html#debug-theme-style)
- [Quick start guide to working with styles for a new theme]({{ page.baseurl }}/frontend-dev-guide/css-guide/css_quick_guide_overview.html)
-
diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/css_debug.md b/src/guides/v2.3/frontend-dev-guide/css-topics/css_debug.md
index 74330f48c7d..cad4ce6ae60 100644
--- a/src/guides/v2.3/frontend-dev-guide/css-topics/css_debug.md
+++ b/src/guides/v2.3/frontend-dev-guide/css-topics/css_debug.md
@@ -67,6 +67,8 @@ To compile `.less` files, add your theme to `module.exports` in the Grunt config
- ``: area code, can be either `frontend` or `adminhtml`.
- ``: path to the root source file, relative to the `app/design/frontend///web` directory. You need to specify all [root source files of the theme]({{ page.baseurl }}/frontend-dev-guide/css-topics/css-preprocess.html#css_preprocess_terms). If your theme [inherits] from a certain theme, and does not contain its own root source files, specify the root source files of the parent theme.
+ **IMPORTANT NOTE** : If grunt gives the error "Error: Cannot find module ....", check the path in your `grunt-config.json` file and correct as necessary.
+
1. (Optional) If you want to use Grunt for "watching" changes automatically, without reloading pages in a browser each time, install the [LiveReload extension] in your browser.
## Grunt commands {#grunt_commands}
diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md b/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md
index 5c867f942ff..8b34aee29cf 100644
--- a/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md
+++ b/src/guides/v2.3/frontend-dev-guide/css-topics/theme-ui-lib.md
@@ -250,4 +250,3 @@ The generated Magento UI library documentation is provided in a convenient [HTML
[ui_lib1.png]: {{ site.baseurl }}/common/images/ui_lib1.png
[ui_lib2.png]: {{ site.baseurl }}/common/images/ui_lib2.png
-
diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/layout-types.md b/src/guides/v2.3/frontend-dev-guide/layouts/layout-types.md
index f3e7a1c3797..2b5d301eb86 100644
--- a/src/guides/v2.3/frontend-dev-guide/layouts/layout-types.md
+++ b/src/guides/v2.3/frontend-dev-guide/layouts/layout-types.md
@@ -431,7 +431,6 @@ The following table describes the instructions specific for generic layout files
Mandatory root element. |
@@ -466,7 +465,6 @@ none
<container>
<referenceBlock>
<referenceContainer>
-
Mandatory element |
diff --git a/src/guides/v2.3/frontend-dev-guide/themes/product-video.md b/src/guides/v2.3/frontend-dev-guide/themes/product-video.md
index 360df9cc34c..efbe5046a91 100644
--- a/src/guides/v2.3/frontend-dev-guide/themes/product-video.md
+++ b/src/guides/v2.3/frontend-dev-guide/themes/product-video.md
@@ -43,7 +43,6 @@ You can set the following product video options:
Display related videos. |
Boolean
-
|
0
@@ -57,7 +56,6 @@ Boolean
| Auto re-play video. |
Boolean
-
|
0
diff --git a/src/guides/v2.3/frontend-dev-guide/themes/theme-images.md b/src/guides/v2.3/frontend-dev-guide/themes/theme-images.md
index 18a81d28bdc..514f1a03d70 100644
--- a/src/guides/v2.3/frontend-dev-guide/themes/theme-images.md
+++ b/src/guides/v2.3/frontend-dev-guide/themes/theme-images.md
@@ -82,7 +82,6 @@ Can have any value, but in out-of-the- box Magento themes id's are
swatch_thumb - corresponds to the Swatch Image role in the Magento Admin
thumbnail - corresponds to the Thumbnail Image role in the Magento Admin
-
|
diff --git a/src/guides/v2.3/frontend-dev-guide/themes/theme-overview.md b/src/guides/v2.3/frontend-dev-guide/themes/theme-overview.md
index 22a40700d16..97327d56504 100644
--- a/src/guides/v2.3/frontend-dev-guide/themes/theme-overview.md
+++ b/src/guides/v2.3/frontend-dev-guide/themes/theme-overview.md
@@ -25,4 +25,3 @@ Your new theme can be a standalone new theme, or it can inherit from the default
[inherit other required files from a parent theme]: {{page.baseurl}}/frontend-dev-guide/themes/theme-inherit.html
-
diff --git a/src/guides/v2.3/graphql/develop/extend-existing-schema.md b/src/guides/v2.3/graphql/develop/extend-existing-schema.md
index 5a523f5f773..b0316f7c80e 100644
--- a/src/guides/v2.3/graphql/develop/extend-existing-schema.md
+++ b/src/guides/v2.3/graphql/develop/extend-existing-schema.md
@@ -15,7 +15,7 @@ In the following example, we will change the description of an existing field (`
The simplified structure of the query schema to get products is:
-```text
+```graphql
schema {
query: Query
...
@@ -42,7 +42,8 @@ interface ProductInterface {
We need to extend the `ProductInterface`, since that is the schema object for a product. We can do this by creating a `schema.graphqls` file in our custom module's (`OrangeCo/CustomGQL`) `etc` directory.
`OrangeCo_CustomGQL/etc/schema.graphqls`
-```
+
+```graphql
interface ProductInterface {
attribute_set_id: Int
@doc(description: "ID of the attribute set assigned to the product")
diff --git a/src/guides/v2.3/graphql/interfaces/grouped-product.md b/src/guides/v2.3/graphql/interfaces/grouped-product.md
index cc32a8cc82d..ed331b79397 100644
--- a/src/guides/v2.3/graphql/interfaces/grouped-product.md
+++ b/src/guides/v2.3/graphql/interfaces/grouped-product.md
@@ -31,4 +31,3 @@ Attribute | Type | Description
The following query returns information about downloadable product `24-WG085_Group`, which is defined in the sample data.
{% include graphql/grouped-product-sample.md %}
-
diff --git a/src/guides/v2.3/graphql/queries/index.md b/src/guides/v2.3/graphql/queries/index.md
index 8bbb3d142c2..2f885e57a0e 100644
--- a/src/guides/v2.3/graphql/queries/index.md
+++ b/src/guides/v2.3/graphql/queries/index.md
@@ -432,6 +432,16 @@ Introspection queries allow you to return information about the schema. For exam
A Magento introspection query returns the same result whether or not you assign it an operation name, such as `IntrospectionQuery`.
+### Disable introspection querying
+
+Introspection querying is enabled by default. To disable it in production mode to improve security, add the following to your `app/etc/env.php` file.
+
+```php
+'graphql' => [
+ 'disable_introspection' => true,
+]
+```
+
### Example introspection queries
#### Return a list of Magento queries
@@ -564,4 +574,4 @@ query IntrospectionQuery {
}
}
}
-```
+```
\ No newline at end of file
diff --git a/src/guides/v2.3/howdoi/checkout/checkout_form.md b/src/guides/v2.3/howdoi/checkout/checkout_form.md
index 29cb0f4c3cc..30aa9d99460 100644
--- a/src/guides/v2.3/howdoi/checkout/checkout_form.md
+++ b/src/guides/v2.3/howdoi/checkout/checkout_form.md
@@ -123,13 +123,16 @@ It should be similar to the following:
-
-
-
-
-
+
-
- VendorName_ModuleName/js/view/custom-checkout-form
-
- VendorName_ModuleName/custom-checkout-form
+ -
+
+
@@ -162,101 +165,97 @@ The term static refers to the forms where all the fields are already known/prede
The fields of static forms are not generated dynamically, so they can be defined in a layout.
-The following code sample shows configuration of the form that contains four fields: text input, select, checkbox, and date. This form uses checkout data provider (`checkoutProvider`) that is introduced in the `Magento_Checkout` module:
+The following code sample shows the configuration of the `custom-checkout-form-container` form, defined in the previous step. It contains four fields: a text input, a select, a checkbox, and a date field. This form uses the checkout data provider (`checkoutProvider`) that was introduced in the `Magento_Checkout` module:
```xml
--
-
-
- %your_module_dir%/js/view/custom-checkout-form
- - checkoutProvider
- -
-
-
- %your_module_dir%/custom-checkout-form
-
- -
-
-
-
-
- uiComponent
-
- - custom-checkout-form-fields
- -
-
-
-
- Magento_Ui/js/form/element/abstract
- -
-
-
- customCheckoutForm
- - ui/form/field
- - ui/form/element/input
-
- - checkoutProvider
- - customCheckoutForm.text_field
- - Text Field
- - 1
- -
-
- true
-
-
- -
-
- Magento_Ui/js/form/element/boolean
- -
-
-
- customCheckoutForm
- - ui/form/field
- - ui/form/element/checkbox
-
- - checkoutProvider
- - customCheckoutForm.checkbox_field
- - Checkbox Field
- - 3
-
- -
-
- Magento_Ui/js/form/element/select
- -
-
-
- customCheckoutForm
- - ui/form/field
- - ui/form/element/select
-
- -
-
-
-
- Please select value
- -
+ ...
+
-
+
-
+
+
- uiComponent
+
+ - custom-checkout-form-fields
+ -
+
-
+
- Magento_Ui/js/form/element/abstract
+ -
+
+
- customCheckoutForm
+ - ui/form/field
+ - ui/form/element/input
- -
-
- Value 1
- - value_1
+ - checkoutProvider
+ - customCheckoutForm.text_field
+ - Text Field
+ - 1
+ -
+
- true
- -
-
- Value 2
- - value_2
+
+ -
+
- Magento_Ui/js/form/element/boolean
+ -
+
+
- customCheckoutForm
+ - ui/form/field
+ - ui/form/element/checkbox
+ - checkoutProvider
+ - customCheckoutForm.checkbox_field
+ - Checkbox Field
+ - 3
-
- - value_2
- - checkoutProvider
- - customCheckoutForm.select_field
- - Select Field
- - 2
-
- -
-
- Magento_Ui/js/form/element/date
- -
-
-
- customCheckoutForm
- - ui/form/field
- - ui/form/element/date
+ -
+
- Magento_Ui/js/form/element/select
+ -
+
+
- customCheckoutForm
+ - ui/form/field
+ - ui/form/element/select
+
+ -
+
-
+
- Please select value
+
+ -
+
- Value 1
+ - value_1
+
+ -
+
- Value 2
+ - value_2
+
+
+
+ - value_2
+ - checkoutProvider
+ - customCheckoutForm.select_field
+ - Select Field
+ - 2
- - checkoutProvider
- - customCheckoutForm.date_field
- - Date Field
- -
-
- true
+ -
+
- Magento_Ui/js/form/element/date
+ -
+
+
- customCheckoutForm
+ - ui/form/field
+ - ui/form/element/date
+
+ - checkoutProvider
+ - customCheckoutForm.date_field
+ - Date Field
+ -
+
- true
+
-
+...
```
### Dynamically defined forms {#dynamic_form}
diff --git a/src/guides/v2.3/howdoi/checkout/checkout_payment.md b/src/guides/v2.3/howdoi/checkout/checkout_payment.md
index c3a178909ec..7fae086a135 100644
--- a/src/guides/v2.3/howdoi/checkout/checkout_payment.md
+++ b/src/guides/v2.3/howdoi/checkout/checkout_payment.md
@@ -76,7 +76,6 @@ Usually, your component will extend the default payment method component (defaul
getBillingAddressFormName():string |
Gets the unique billing address name. |
-
disposeSubscriptions() |
Terminates the object's subscription. |
diff --git a/src/guides/v2.3/install-gde/continue-to-install.md b/src/guides/v2.3/install-gde/continue-to-install.md
index 4b8bebd94bb..403da931892 100644
--- a/src/guides/v2.3/install-gde/continue-to-install.md
+++ b/src/guides/v2.3/install-gde/continue-to-install.md
@@ -1,7 +1,7 @@
---
group: installation-guide
subgroup: Z_continue
-title:
+title: Installation Options
menu_title: Next—Installation part 2, installing
menu_node: parent
menu_order: 1
diff --git a/src/guides/v2.3/install-gde/install-resource-diagram.md b/src/guides/v2.3/install-gde/install-resource-diagram.md
index ffe762cd2f9..d13c23e5942 100644
--- a/src/guides/v2.3/install-gde/install-resource-diagram.md
+++ b/src/guides/v2.3/install-gde/install-resource-diagram.md
@@ -14,4 +14,3 @@ functional_areas:
The following diagram provides a high-level overview of installing the Magento software:
{% include install/flow-diagram.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/cli/install-cli-subcommands-store.md b/src/guides/v2.3/install-gde/install/cli/install-cli-subcommands-store.md
index 51088a1eb81..227a6e69cf4 100644
--- a/src/guides/v2.3/install-gde/install/cli/install-cli-subcommands-store.md
+++ b/src/guides/v2.3/install-gde/install/cli/install-cli-subcommands-store.md
@@ -42,4 +42,3 @@ where the following table defines parameters and values.
|`--use-secure-admin`|`1` means you use SSL to access the Magento Admin. Make sure your web server supports SSL before you select this option.
`0` means you do not use SSL with the Admin. This is the default.|No|
|`--admin-use-security-key`|`1` causes the Magento software to use a randomly generated key value to access pages in the Magento Admin and in forms. These key values help prevent cross-site script forgery attacks. This is the default.
`0` disables the use of the key.|No|
|`--magento-init-params`|Add to any command to customize Magento initialization parameters
For example: `MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/example.com&MAGE_DIRS[cache][path]=/var/tmp/cache`|No|
-
diff --git a/src/guides/v2.3/install-gde/install/get-help.md b/src/guides/v2.3/install-gde/install/get-help.md
index 18f4fc3a2ea..f89b185277e 100644
--- a/src/guides/v2.3/install-gde/install/get-help.md
+++ b/src/guides/v2.3/install-gde/install/get-help.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/get-help.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/hosted/hosted_install.md b/src/guides/v2.3/install-gde/install/hosted/hosted_install.md
index 39eb44f20bc..0664fc29e09 100644
--- a/src/guides/v2.3/install-gde/install/hosted/hosted_install.md
+++ b/src/guides/v2.3/install-gde/install/hosted/hosted_install.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/web/install-web.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/hosted/hosted_install_1_readiness.md b/src/guides/v2.3/install-gde/install/hosted/hosted_install_1_readiness.md
index 2d184654a6a..8df63128211 100644
--- a/src/guides/v2.3/install-gde/install/hosted/hosted_install_1_readiness.md
+++ b/src/guides/v2.3/install-gde/install/hosted/hosted_install_1_readiness.md
@@ -17,4 +17,3 @@ functional_areas:
Related topics
[Step 2. Add a database]({{ page.baseurl }}/install-gde/install/hosted/hosted_install_2_db.html)
-
diff --git a/src/guides/v2.3/install-gde/install/hosted/hosted_install_6_install.md b/src/guides/v2.3/install-gde/install/hosted/hosted_install_6_install.md
index a90860031e2..69f25453e60 100644
--- a/src/guides/v2.3/install-gde/install/hosted/hosted_install_6_install.md
+++ b/src/guides/v2.3/install-gde/install/hosted/hosted_install_6_install.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/web/install-web_6-install.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/sample-data-before-clone.md b/src/guides/v2.3/install-gde/install/sample-data-before-clone.md
index 267421f41cb..b4303b6c582 100644
--- a/src/guides/v2.3/install-gde/install/sample-data-before-clone.md
+++ b/src/guides/v2.3/install-gde/install/sample-data-before-clone.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/sampledata/sample-data-clone.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/sample-data-before-composer.md b/src/guides/v2.3/install-gde/install/sample-data-before-composer.md
index 3f448aa2675..af166122e49 100644
--- a/src/guides/v2.3/install-gde/install/sample-data-before-composer.md
+++ b/src/guides/v2.3/install-gde/install/sample-data-before-composer.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/sampledata/sample-data-composer.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/sample-data-other-cmds.md b/src/guides/v2.3/install-gde/install/sample-data-other-cmds.md
index 258613f6583..12d50b32193 100644
--- a/src/guides/v2.3/install-gde/install/sample-data-other-cmds.md
+++ b/src/guides/v2.3/install-gde/install/sample-data-other-cmds.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/sampledata/sample-data-other-cmds.md %}
-
diff --git a/src/guides/v2.3/install-gde/install/web/install-web_1-readiness.md b/src/guides/v2.3/install-gde/install/web/install-web_1-readiness.md
index bb2f75b0d15..991ae5294ec 100644
--- a/src/guides/v2.3/install-gde/install/web/install-web_1-readiness.md
+++ b/src/guides/v2.3/install-gde/install/web/install-web_1-readiness.md
@@ -20,4 +20,3 @@ functional_areas:
Related topics
[Step 2. Add a database]({{ page.baseurl }}/install-gde/install/web/install-web_2-db.html)
-
diff --git a/src/guides/v2.3/install-gde/install/web/install-web_6-install.md b/src/guides/v2.3/install-gde/install/web/install-web_6-install.md
index ebebcd1a4d4..88e9f0c94ba 100644
--- a/src/guides/v2.3/install-gde/install/web/install-web_6-install.md
+++ b/src/guides/v2.3/install-gde/install/web/install-web_6-install.md
@@ -12,4 +12,3 @@ functional_areas:
---
{% include install/web/install-web_6-install.md %}
-
diff --git a/src/guides/v2.3/install-gde/prereq/apache.md b/src/guides/v2.3/install-gde/prereq/apache.md
index 2a599e54868..66723d76049 100644
--- a/src/guides/v2.3/install-gde/prereq/apache.md
+++ b/src/guides/v2.3/install-gde/prereq/apache.md
@@ -22,14 +22,12 @@ If you are new to all this and need some help getting started, we suggest the fo
## Important: Apache required directives {#apache-required-directives}
-1. Set `AllowEncodedSlashes` in the server config (globally) or in the virtual host configurations to avoid decoding the encoded slashes that may cause issues for URLs. For instance, when retrieving products with a slash in the SKU via the API, you will not want that converted.
+1. Set `AllowEncodedSlashes` in the server config (globally) or in the virtual host configurations to avoid decoding the encoded slashes that may cause issues for URLs. For instance, when retrieving products with a slash in the SKU via the API, you will not want that converted. The sample block is not complete and other directives will be required.
```conf
- ...
# Allow encoded slashes
AllowEncodedSlashes NoDecode
- ...
```
diff --git a/src/guides/v2.3/install-gde/prereq/merch_install.md b/src/guides/v2.3/install-gde/prereq/merch_install.md
index daf30dea768..9435358e696 100644
--- a/src/guides/v2.3/install-gde/prereq/merch_install.md
+++ b/src/guides/v2.3/install-gde/prereq/merch_install.md
@@ -39,4 +39,3 @@ To start configuring your hosted system:
1. If necessary, log in to cPanel.
## Step 3: Configure a database and a database user {#newbie-db}
-
diff --git a/src/guides/v2.3/install-gde/system-requirements_tls1-2.md b/src/guides/v2.3/install-gde/system-requirements_tls1-2.md
index 0721429f606..bcf73752344 100644
--- a/src/guides/v2.3/install-gde/system-requirements_tls1-2.md
+++ b/src/guides/v2.3/install-gde/system-requirements_tls1-2.md
@@ -14,4 +14,3 @@ functional_areas:
---
{% include install/paypal-tls1-2.md %}
-
diff --git a/src/guides/v2.3/install-gde/trouble/tshoot_access-browser.md b/src/guides/v2.3/install-gde/trouble/tshoot_access-browser.md
index 25c58598a10..5d6b30f9c82 100644
--- a/src/guides/v2.3/install-gde/trouble/tshoot_access-browser.md
+++ b/src/guides/v2.3/install-gde/trouble/tshoot_access-browser.md
@@ -38,4 +38,3 @@ Try the following:
* Ubuntu: `service apache2 restart`
* CentOS: `service httpd restart`
-
diff --git a/src/guides/v2.3/javascript-dev-guide/back_to_guide.md b/src/guides/v2.3/javascript-dev-guide/back_to_guide.md
deleted file mode 100644
index 5e63d19af01..00000000000
--- a/src/guides/v2.3/javascript-dev-guide/back_to_guide.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-group: javascript
-subgroup: Back to JavaScript section
-title: Modal widget
----
-
-Go back to [JavaScript section of the Frontend Developer Guide]({{page.baseurl}}/javascript-dev-guide/javascript/js_overview.html).
diff --git a/src/guides/v2.3/javascript-dev-guide/bk-javascript-dev-guide.md b/src/guides/v2.3/javascript-dev-guide/bk-javascript-dev-guide.md
index 79d4c571aad..b0c10891cfe 100644
--- a/src/guides/v2.3/javascript-dev-guide/bk-javascript-dev-guide.md
+++ b/src/guides/v2.3/javascript-dev-guide/bk-javascript-dev-guide.md
@@ -46,4 +46,3 @@ JavaScript automatic testing is described in a separate [JavaScript unit testing
[Magento jQuery widgets]: {{page.baseurl}}/javascript-dev-guide/widgets/jquery-widgets-about.html
[Customizing JavaScript illustration]: {{page.baseurl}}/javascript-dev-guide/javascript/js_practice.html
[JavaScript unit testing]: {{page.baseurl}}/test/js/jasmine.html
-
diff --git a/src/guides/v2.3/payments-integrations/payment-gateway/payment-gateway-structure.md b/src/guides/v2.3/payments-integrations/payment-gateway/payment-gateway-structure.md
index b75e59a84ec..64b60b1d059 100644
--- a/src/guides/v2.3/payments-integrations/payment-gateway/payment-gateway-structure.md
+++ b/src/guides/v2.3/payments-integrations/payment-gateway/payment-gateway-structure.md
@@ -22,4 +22,3 @@ Each component from this scheme is described in the corresponding topic:
* [Gateway Client]({{ page.baseurl }}/payments-integrations/payment-gateway/gateway-client.html)
* [Response Validator]({{ page.baseurl }}/payments-integrations/payment-gateway/response-validator.html)
* [Response Handler]({{ page.baseurl }}/payments-integrations/payment-gateway/response-handler.html)
-
diff --git a/src/guides/v2.3/performance-best-practices/advanced-js-bundling.md b/src/guides/v2.3/performance-best-practices/advanced-js-bundling.md
index 2e61a4c8732..3aca0e4cf4e 100644
--- a/src/guides/v2.3/performance-best-practices/advanced-js-bundling.md
+++ b/src/guides/v2.3/performance-best-practices/advanced-js-bundling.md
@@ -7,13 +7,6 @@ functional_areas:
- Setup
---
- {:.bs-callout-info}
-Magento's **[`baler`][]** module is now open for _Alpha testing_.
-This is a custom AMD module bundler and preloader for Magento 2.
-It is designed to provide optimal bundles and be less error-prone than the built-in Magento bundler.
-
-[`baler`]: https://github.com/magento/baler
-
## Introduction
Bundling JavaScript modules for better performance is about reducing two things:
diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md
index c3cea1f177b..4e07b4a2c50 100644
--- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md
+++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0Commerce.md
@@ -33,8 +33,8 @@ Magento Commerce 2.3.0 includes a wealth of new features as well as hundreds of
* **Inventory Management (provided by [Magento Inventory (was MSI)](https://github.com/magento/inventory))** is now available with Magento 2.3.0. It lets merchants manage inventory for all product types in a single warehouse and across complex shipping networks. Merchants can manage these locations as sources, tracking on-hand inventory quantities per product. Stocks map these sources and sales channels (websites) to provide an accurate, salable quantity as inventory pools for concurrent checkout and product reservations. Inventory Management also updates order and shipment options, giving you full control over your stock.
Magento Inventory is a Magento Community Engineering special project open to contributors. To take part and contribute, see the [Magento Inventory GitHub](https://github.com/magento/inventory) repository and [wiki](https://github.com/magento/inventory/wiki) to get started. Join us in our [Slack](https://magentocommeng.slack.com/messages/C5FU5E2HY) channel (or [self signup](https://tinyurl.com/engcom-slack)) to discuss the project.
- * [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation
- * [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions
+ * [Inventory Management overview]({{ page.baseurl }}/inventory/index.html) for developer documentation
+ * [Managing Inventory](https://docs.magento.com/m2/ce/user_guide/catalog/inventory-management.html) for merchant information and instructions
* **CMS enhancements** include banner enhancements. You can now create banner content in native Magento WYSIWYG (or Page Builder. See the `Page Builder` discussion below. (Within the product interface, we now use the term *dynamic block* instead of *banner*.) We've also updated the WYSIWYG editor to use TinyMCE 4.6. (TinyMCE is now integrated into Magento through an adapter that allows it to be replaced with any other WYSIWYG editor.)
@@ -3268,7 +3268,7 @@ We've fixed hundreds of issues in the Magento 2.3.0 core code.
-* We've replaced `.size()` with `.length` to be compatible with jQuery 3.*. *Fix submitted by Kirill Morozov in pull request [13686](https://github.com/magento/magento2/pull/13686)*.
+* We've replaced `.size()` with `.length` to be compatible with jQuery 3. *Fix submitted by Kirill Morozov in pull request [13686](https://github.com/magento/magento2/pull/13686)*.
@@ -3705,4 +3705,3 @@ You can install Magento Commerce 2.3.0 using Composer.
The Data Migration Tool helps transfer existing Magento 1.x store data to Magento 2.x. This command-line interface includes verification, progress tracking, logging, and testing functions. For installation instructions, see [Install the Data Migration Tool]({{page.baseurl}}/migration/migration-tool-install.html). Consider exploring or contributing to the [Magento Data Migration repository](https://github.com/magento/data-migration-tool).
The [Code Migration Toolkit](https://github.com/magento/code-migration) helps transfer existing Magento 1.x store extensions and customizations to Magento 2.0.x. The command-line interface includes scripts for converting Magento 1.x modules and layouts.
-
diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md
index 47fcf7cfba5..8bbe4ee9fec 100644
--- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md
+++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.0OpenSource.md
@@ -3119,7 +3119,7 @@ See [Magento Security Center](https://magento.com/security/patches/magento-2.2.7
-* We've replaced `.size()` with `.length` to be compatible with jQuery 3.*. *Fix submitted by Kirill Morozov in pull request [13686](https://github.com/magento/magento2/pull/13686)*.
+* We've replaced `.size()` with `.length` to be compatible with jQuery 3. *Fix submitted by Kirill Morozov in pull request [13686](https://github.com/magento/magento2/pull/13686)*.
@@ -3554,4 +3554,3 @@ You can install {{site.data.var.ce}} 2.3 Beta using Composer.
The Data Migration Tool helps transfer existing Magento 1.x store data to Magento 2.x. This command-line interface includes verification, progress tracking, logging, and testing functions. For installation instructions, see [Install the Data Migration Tool]({{page.baseurl}}/migration/migration-tool-install.html). Consider exploring or contributing to the [Magento Data Migration repository](https://github.com/magento/data-migration-tool).
The [Code Migration Toolkit](https://github.com/magento/code-migration) helps transfer existing Magento 1.x store extensions and customizations to Magento 2.0.x. The command-line interface includes scripts for converting Magento 1.x modules and layouts.
-
diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md
index 118cf87dc09..9a7502ca63b 100644
--- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md
+++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1Commerce.md
@@ -2402,4 +2402,3 @@ You can install {{site.data.var.ee}} 2.3.1 using Composer.
The Data Migration Tool helps transfer existing Magento 1.x store data to Magento 2.x. This command-line interface includes verification, progress tracking, logging, and testing functions. For installation instructions, see [Install the Data Migration Tool]({{page.baseurl}}/migration/migration-tool-install.html). Consider exploring or contributing to the [Magento Data Migration repository](https://github.com/magento/data-migration-tool).
The [Code Migration Toolkit](https://github.com/magento/code-migration) helps transfer existing Magento 1.x store extensions and customizations to Magento 2.0.x. The command-line interface includes scripts for converting Magento 1.x modules and layouts.
-
diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md
index 43870a9caa5..820e1559803 100644
--- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md
+++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.1OpenSource.md
@@ -2232,4 +2232,3 @@ You can install {{site.data.var.ce}} 2.3.1 using Composer.
The Data Migration Tool helps transfer existing Magento 1.x store data to Magento 2.x. This command-line interface includes verification, progress tracking, logging, and testing functions. For installation instructions, see [Install the Data Migration Tool]({{page.baseurl}}/migration/migration-tool-install.html). Consider exploring or contributing to the [Magento Data Migration repository](https://github.com/magento/data-migration-tool).
The [Code Migration Toolkit](https://github.com/magento/code-migration) helps transfer existing Magento 1.x store extensions and customizations to Magento 2.0.x. The command-line interface includes scripts for converting Magento 1.x modules and layouts.
-
diff --git a/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md b/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md
index 82de8c353d6..9939720d754 100644
--- a/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md
+++ b/src/guides/v2.3/release-notes/ReleaseNotes2.3.2OpenSource.md
@@ -1286,4 +1286,3 @@ You can install {{site.data.var.ee}} 2.3.2 using Composer.
The Data Migration Tool helps transfer existing Magento 1.x store data to Magento 2.x. This command-line interface includes verification, progress tracking, logging, and testing functions. For installation instructions, see [Install the Data Migration Tool]({{page.baseurl}}/migration/migration-tool-install.html). Consider exploring or contributing to the [Magento Data Migration repository](https://github.com/magento/data-migration-tool).
The [Code Migration Toolkit](https://github.com/magento/code-migration) helps transfer existing Magento 1.x store extensions and customizations to Magento 2.0.x. The command-line interface includes scripts for converting Magento 1.x modules and layouts.
-
diff --git a/src/guides/v2.3/release-notes/component-status.md b/src/guides/v2.3/release-notes/component-status.md
index 7234dbf2e88..6af23fa4e19 100644
--- a/src/guides/v2.3/release-notes/component-status.md
+++ b/src/guides/v2.3/release-notes/component-status.md
@@ -209,4 +209,3 @@ Issues that are not related to the 2.3.0 beta release are not part of this repor
| Module/ Sales | Yellow |
| None | Green |
| Tools/ Utilities | Green |
-
diff --git a/src/guides/v2.3/rest/anonymous-api-security.md b/src/guides/v2.3/rest/anonymous-api-security.md
index cb98b0bf3e1..8e4c2f2df2b 100644
--- a/src/guides/v2.3/rest/anonymous-api-security.md
+++ b/src/guides/v2.3/rest/anonymous-api-security.md
@@ -104,4 +104,3 @@ The following APIs remain accessible to anonymous users. Most of these must rema
| Commerce | GiftCardAccount | /V1/carts/guest-carts/:cartId/checkGiftCard/:giftCardCode | GET |
| Commerce | GiftRegistry | /V1/guest-giftregistry/:cartId/estimate-shipping-methods | POST |
| Commerce | WorldPay | /V1/worldpay-guest-carts/:cartId/payment-information | POST
-
diff --git a/src/guides/v2.3/rest/operation-status-endpoints.md b/src/guides/v2.3/rest/operation-status-endpoints.md
index dce40b4f284..b9f7a54de90 100644
--- a/src/guides/v2.3/rest/operation-status-endpoints.md
+++ b/src/guides/v2.3/rest/operation-status-endpoints.md
@@ -21,10 +21,10 @@ Field name | Data type | Description
--- | --- | ---
`operations_list` | Object | An array containing information about each operation in a bulk or asynchronous request.
`id` | Integer | Identifies the bulk or asynchronous request.
-`status` | Integer | The operation status
* `1` = Complete
* `2` = The operation failed, but you can try to perform it again
* `3` = The operation failed. You must change something to retry it.
* `4` = Open
* `5` = Rejected
+`status` | Integer | The operation status
\* `1` = Complete
\* `2` = The operation failed, but you can try to perform it again
\* `3` = The operation failed. You must change something to retry it.
\* `4` = Open
\* `5` = Rejected
`result_message` | String | Describes the result of the operation. If successful, the value contains the string `Service execution success` as well as the method that executed the operation.
`error_code` | Integer | If applicable, an error code associated with the operation.
-`user_type` | Integer | Type of user who made this request. Possible values are:
* `1` = Integration
* `2` = Administrator
* `3` = Customer
* `4` = Guest User
+`user_type` | Integer | Type of user who made this request. Possible values are:
\* `1` = Integration
\* `2` = Administrator
\* `3` = Customer
\* `4` = Guest User
`bulk_id` | String | UUID generated by an [asynchronous API request]({{ page.baseurl }}/rest/asynchronous-web-endpoints.html) or [Bulk API request]({{ page.baseurl }}/rest/bulk-endpoints.html).
`description` | String | Contains the message queue topic.
`start_time` | String | The time that a bulk or asynchronous operation started.
@@ -86,10 +86,10 @@ Field name | Data type | Description
`topic_name` | String | The name of the message queue topic, in the format `async..`. The service contract path is lowercase, and the method is either `post`, `put`, or `delete`.
`serialized_data` | String | An array of serialized input data. It contains serialized JSON with the following keys: `entity_id` - `null`, `entity_link` - an empty string, `meta_info` - the body of the API request that was executed.
`result_serialized_data` | String | Contains serialized output of the corresponding synchronous API call. For example, if you call `POST /async/V1/products`, this field contains serialized response from `POST /V1/products`.
-`status` | Integer | The operation status
* `1` = Complete
* `2` = The operation failed, but you can try to perform it again
* `3` = The operation failed. You must change something to retry it.
* `4` = Open
* `5` = Rejected
+`status` | Integer | The operation status
\* `1` = Complete
\* `2` = The operation failed, but you can try to perform it again
\* `3` = The operation failed. You must change something to retry it.
\* `4` = Open
\* `5` = Rejected
`result_message` | String | Describes the result of the operation. If successful, the value contains the string `Service execution success` as well as the method that executed the operation.
`error_code` | Integer | If applicable, an error code associated with the operation.
-`user_type` | Integer | Type of user who made this request. Possible values are:
* `1` = Integration
* `2` = Administrator
* `3` = Customer
* `4` = Guest User
+`user_type` | Integer | Type of user who made this request. Possible values are:
\* `1` = Integration
\* `2` = Administrator
\* `3` = Customer
\* `4` = Guest User
`bulk_id` | String | UUID generated by an [asynchronous API request]({{ page.baseurl }}/rest/asynchronous-web-endpoints.html) or [Bulk API request]({{ page.baseurl }}/rest/bulk-endpoints.html).
`description` | String | Contains the message queue topic name.
`start_time` | String | The time that a bulk or asynchronous operation started.
diff --git a/src/guides/v2.3/rest/retrieve-filtered-responses.md b/src/guides/v2.3/rest/retrieve-filtered-responses.md
index db920f52238..87325dfbd4b 100644
--- a/src/guides/v2.3/rest/retrieve-filtered-responses.md
+++ b/src/guides/v2.3/rest/retrieve-filtered-responses.md
@@ -19,7 +19,7 @@ Separate each field or object with a comma.
On POST and PUT requests, Magento ignores the `fields` parameter as input, but the response includes only the requested fields and objects.
-# Examples
+## Examples
{:.no_toc}
All examples use {{site.data.var.ce}} sample data.
diff --git a/src/guides/v2.3/ui_comp_guide/components/basic-attributes.md b/src/guides/v2.3/ui_comp_guide/components/basic-attributes.md
index 07125c3e7f6..a22ab8af865 100644
--- a/src/guides/v2.3/ui_comp_guide/components/basic-attributes.md
+++ b/src/guides/v2.3/ui_comp_guide/components/basic-attributes.md
@@ -65,4 +65,3 @@ The following options are available for all basic components:
String |
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-button.md b/src/guides/v2.3/ui_comp_guide/components/ui-button.md
index 181961d736a..e94879e7549 100644
--- a/src/guides/v2.3/ui_comp_guide/components/ui-button.md
+++ b/src/guides/v2.3/ui_comp_guide/components/ui-button.md
@@ -126,4 +126,3 @@ Here is an example of how the Button component integrates with the [Form]({{ pag
#### Result
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-bulk.md b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-bulk.md
index 868ce9c8a67..93633750f8b 100644
--- a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-bulk.md
+++ b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-bulk.md
@@ -69,4 +69,3 @@ This is an example of how the ColumnsEditingBulk component disables the [Columns
```
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-client.md b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-client.md
index 76af7f7c7c7..1008d3ef2ab 100644
--- a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-client.md
+++ b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editing-client.md
@@ -69,5 +69,3 @@ This is an example of how to disable validation before saving data:
```
-
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor-view.md b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor-view.md
index 65a35a5d201..3396279bb0e 100644
--- a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor-view.md
+++ b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor-view.md
@@ -88,4 +88,3 @@ This is an example of how the ColumnsEditorView component integrates with the [C
#### Result
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor.md b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor.md
index fda183afbc4..85e60f13c41 100644
--- a/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor.md
+++ b/src/guides/v2.3/ui_comp_guide/components/ui-columns-editor.md
@@ -84,4 +84,3 @@ This is an example of how the ColumnsEditor component integrates with the [Colum
#### Result
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/ui-columnscontrols.md b/src/guides/v2.3/ui_comp_guide/components/ui-columnscontrols.md
index 69b380cd893..6eb99214216 100644
--- a/src/guides/v2.3/ui_comp_guide/components/ui-columnscontrols.md
+++ b/src/guides/v2.3/ui_comp_guide/components/ui-columnscontrols.md
@@ -46,4 +46,3 @@ Extends [`uiCollection`]({{ page.baseurl }}/ui_comp_guide/concepts/ui_comp_uicol
#### Result
-
diff --git a/src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/_code-samples/ckeditor4Adapter.md b/src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/code-samples/ckeditor4Adapter.md
similarity index 100%
rename from src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/_code-samples/ckeditor4Adapter.md
rename to src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/code-samples/ckeditor4Adapter.md
diff --git a/src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/index.md b/src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/index.md
index 47d9b01de1c..4233d4ada98 100644
--- a/src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/index.md
+++ b/src/guides/v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/index.md
@@ -94,7 +94,7 @@ If you are integrating Magento entities such as variable and widget as plugins,
**Example:** CKEditor/CKEditor4/view/base/web/ckeditor4Adapter.js
{% collapsible Show file content %}
-{% include_relative _code-samples/ckeditor4Adapter.md %}
+{% include_relative code-samples/ckeditor4Adapter.md %}
{% endcollapsible %}
## Step 4. Load editor library
diff --git a/src/guides/v2.3/ui_comp_guide/components/wysiwyg/extension-points/index.md b/src/guides/v2.3/ui_comp_guide/components/wysiwyg/extension-points/index.md
index ccf86f1c823..fb878fd232c 100644
--- a/src/guides/v2.3/ui_comp_guide/components/wysiwyg/extension-points/index.md
+++ b/src/guides/v2.3/ui_comp_guide/components/wysiwyg/extension-points/index.md
@@ -128,6 +128,7 @@ public function getVariablesWysiwygActionUrl()
return $this->_url->getUrl('mui/index/render', ['namespace' => 'variables_modal']);
}
```
+
* htmlId of the WYSIWYG editor.
For CKEditor4, you can get this by calling `editor.element.getId()`.
diff --git a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.md b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.md
index 2d068ac2ef4..867a5d4b304 100644
--- a/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.md
+++ b/src/guides/v2.3/ui_comp_guide/concepts/ui_comp_data_source.md
@@ -61,7 +61,7 @@ A good way to keep configuration data out of the javascript is to declare a "pro
This example declares the name of the data provider class and will be output in the JSON that contains the UI component's configuration. It can then be used to locate the data source component. This is essentially declaring a variable that will be available to a javascript class.
-# Javascript Template Literals
+## Javascript Template Literals
Throughout Magento's core Javascript components there are strings like this: `'${ $.provider }:data.totalRecords'`. These are ES2015 [template literals](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals). The `${ }` surrounds an expression that will be parsed as Javascript. `$.provider` is the expression, in this example.
@@ -71,7 +71,7 @@ When the component is initialized, it will automatically evaluate all string lit
But, XML is static and while that gets us the name of the data provider component, it still does not actually provide data. There is one more important step in providing data to Javascript components.
-# Javascript Component Linking
+## Javascript Component Linking
Every Javascript component should extend the core Element class in some way (mapped to [`uiElement`]({{ page.baseurl }}/ui_comp_guide/concepts/ui_comp_uielement_concept.html) with RequireJS and located in [`Magento/Ui/view/base/web/js/lib/core/element/element.js`]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Ui/view/base/web/js/lib/core/element/element.js). When this class initializes it runs an `initLinks()` method. That method, in turn, passes a few class properties into a method that handles linking components together. This file (`lib/core/element/link.js`) binds the values of those parameters to actual components.
diff --git a/src/guides/v2.4/extension-dev-guide/xss-protection.md b/src/guides/v2.4/extension-dev-guide/xss-protection.md
index 785fb42e4a5..5c6be2857b6 100644
--- a/src/guides/v2.4/extension-dev-guide/xss-protection.md
+++ b/src/guides/v2.4/extension-dev-guide/xss-protection.md
@@ -193,8 +193,8 @@ To check your .phtml template for XSS vulnerabilities, use the _Magento2.Securit
This sniff finds all _echo_ calls in PHTML-templates and determines if the output is properly escaped.
It covers the following cases:
-- /_ @noEscape _/ before output. Output does not require escaping. Test is green.
-- /_ @escapeNotVerified _/ before output. Output escaping is not checked and should be verified. Test is green.
+- `/_ @noEscape _/` before output. Output does not require escaping. Test is green.
+- `/_ @escapeNotVerified _/` before output. Output escaping is not checked and should be verified. Test is green.
- Methods which contain "html" in their names (for example echo $object->{suffix}Html{postfix}()). Data is ready for the HTML output. Test is green.
- AbstractBlock methods `escapeHtml`, `escapeHtmlAttr`, `escapeUrl`, `escapeJs` are allowed. Test is green.
- Type casting and php function `count()` are allowed (for example `echo (int)$var`, `(bool)$var`, `count($var)`). Test is green.
diff --git a/src/guides/v2.4/frontend-dev-guide/bk-frontend-dev-guide.md b/src/guides/v2.4/frontend-dev-guide/bk-frontend-dev-guide.md
index c511ff236f2..7458720bb9d 100644
--- a/src/guides/v2.4/frontend-dev-guide/bk-frontend-dev-guide.md
+++ b/src/guides/v2.4/frontend-dev-guide/bk-frontend-dev-guide.md
@@ -68,4 +68,3 @@ Related topics
* [JavaScript coding standard]({{ page.baseurl }}/coding-standards/code-standard-javascript.html)
* [Responsive web design]({{ page.baseurl }}/frontend-dev-guide/responsive-web-design/rwd_overview.html)
* [Translations]({{ page.baseurl }}/frontend-dev-guide/translations/xlate.html)
-
diff --git a/src/guides/v2.4/frontend-dev-guide/themes/theme-images.md b/src/guides/v2.4/frontend-dev-guide/themes/theme-images.md
index 5f9cb59ef82..7f447a2921b 100644
--- a/src/guides/v2.4/frontend-dev-guide/themes/theme-images.md
+++ b/src/guides/v2.4/frontend-dev-guide/themes/theme-images.md
@@ -82,7 +82,6 @@ Can have any value, but in out-of-the- box Magento themes id's are
swatch_thumb - corresponds to the Swatch Image role in the [Magento Admin](https://glossary.magento.com/magento-admin).
thumbnail - corresponds to the Thumbnail Image role in the Magento Admin
-
diff --git a/src/guides/v2.4/graphql/interfaces/grouped-product.md b/src/guides/v2.4/graphql/interfaces/grouped-product.md
index c5ac54e3708..2729145aece 100644
--- a/src/guides/v2.4/graphql/interfaces/grouped-product.md
+++ b/src/guides/v2.4/graphql/interfaces/grouped-product.md
@@ -30,4 +30,3 @@ Attribute | Type | Description
The following query returns information about downloadable product `24-WG085_Group`, which is defined in the sample data.
{% include graphql/grouped-product-sample.md %}
-
diff --git a/src/guides/v2.4/graphql/queries/index.md b/src/guides/v2.4/graphql/queries/index.md
index 687b3f0add1..3091dbd39f2 100644
--- a/src/guides/v2.4/graphql/queries/index.md
+++ b/src/guides/v2.4/graphql/queries/index.md
@@ -432,6 +432,16 @@ Introspection queries allow you to return information about the schema. For exam
A Magento introspection query returns the same result whether or not you assign it an operation name, such as `IntrospectionQuery`.
+### Disable introspection querying
+
+Introspection querying is enabled by default. To disable it in production mode to improve security, add the following to your `app/etc/env.php` file.
+
+```php
+'graphql' => [
+ 'disable_introspection' => true,
+]
+```
+
### Example introspection queries
#### Return a list of Magento queries
@@ -564,4 +574,4 @@ query IntrospectionQuery {
}
}
}
-```
+```
\ No newline at end of file
diff --git a/src/guides/v2.4/howdoi/checkout/checkout_payment.md b/src/guides/v2.4/howdoi/checkout/checkout_payment.md
index 53a78b442c8..955d12e39c5 100644
--- a/src/guides/v2.4/howdoi/checkout/checkout_payment.md
+++ b/src/guides/v2.4/howdoi/checkout/checkout_payment.md
@@ -76,7 +76,6 @@ Usually, your component will extend the default payment method component (defaul
getBillingAddressFormName():string |
Gets the unique billing address name. |
-
disposeSubscriptions() |
Terminates the object's subscription. |
diff --git a/src/guides/v2.4/install-gde/bk-install-guide.md b/src/guides/v2.4/install-gde/bk-install-guide.md
index 856f267cde5..8aab650d3f0 100644
--- a/src/guides/v2.4/install-gde/bk-install-guide.md
+++ b/src/guides/v2.4/install-gde/bk-install-guide.md
@@ -6,6 +6,8 @@ functional_areas:
- Install
- System
- Setup
+redirect_from:
+ - /guides/v2.4/install-gde/continue-to-install.html
---
You are among the 240,000 merchants worldwide who put their trust in our eCommerce software. We've gathered some information to help you get started with Magento and with your Magento installation.
diff --git a/src/guides/v2.4/install-gde/continue-to-install.md b/src/guides/v2.4/install-gde/continue-to-install.md
deleted file mode 100644
index 1eaaf1f4df0..00000000000
--- a/src/guides/v2.4/install-gde/continue-to-install.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-group: installation-guide
-title:
-functional_areas:
- - Install
- - System
- - Setup
----
-
-{:.bs-callout-tip}
-Totally lost? Need a helping hand? Try our [installation quick reference (tutorial)]({{ page.baseurl }}/install-gde/install-quick-ref.html) or [installation roadmap (reference)]({{ page.baseurl }}/install-gde/install-roadmap_part1.html).
-
-## Installation
-
-Now that you've installed prerequisites and taken the first steps (merchant, system integrator, or developer), you're ready to install the Magento software. You must use the [command line]({{ page.baseurl }}/install-gde/install/cli/install-cli.html) to install Magento.
-
-## Already installed the Magento software?
-
-You might want to manage Magento components or to upgrade. See the [Upgrade Guide]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html).
diff --git a/src/guides/v2.4/javascript-dev-guide/back_to_guide.md b/src/guides/v2.4/javascript-dev-guide/back_to_guide.md
deleted file mode 120000
index d732e49d3b9..00000000000
--- a/src/guides/v2.4/javascript-dev-guide/back_to_guide.md
+++ /dev/null
@@ -1 +0,0 @@
-../../v2.3/javascript-dev-guide/back_to_guide.md
\ No newline at end of file
diff --git a/src/guides/v2.4/release-notes/b2b-release-notes.md b/src/guides/v2.4/release-notes/b2b-release-notes.md
index 0cc0e119c42..f8c5a56c60d 100644
--- a/src/guides/v2.4/release-notes/b2b-release-notes.md
+++ b/src/guides/v2.4/release-notes/b2b-release-notes.md
@@ -46,4 +46,3 @@ These release notes can include:
- Magento throws an exception during upgrade to B2B 1.2.0 in a multi-website deployment. When `setup:upgrade` runs, this error occurs on the `PurchaseOrder` module: `Module Magento_PurchaseOrder: Unable to apply data patch Magento\PurchaseOrder\Setup\Patch\Data\InitPurchaseOrderSalesSequence for moduleMagento_PurchaseOrder`. **Workaround**: Install the **B2B-716 Add NonTransactionableInterface interface to the InitPurchaseOrderSalesSequence data patch** hotfix, which is now available from the **My Account** > **Downloads** section of `magento.com`.
- If a discount code expires before a Purchase Order (PO) is approved, the PO continues to display the discounted amount, but once the PO is approved, the order is placed at the non-discounted total. **Workaround**: Install the **B2B-709 Purchase Order Discount patch** hotfix for this issue, which is now available from the **My Account** > **Downloads** section of `magento.com`.
- If items in a purchase order are out-of-stock, or of insufficient quantity when the purchase order is converted into an actual order, an error will occur. If backorders are enabled, the order will be processed normally.
-
diff --git a/src/guides/v2.4/test/testing.md b/src/guides/v2.4/test/testing.md
index e83e1667ea9..9f27ca0fa99 100644
--- a/src/guides/v2.4/test/testing.md
+++ b/src/guides/v2.4/test/testing.md
@@ -102,7 +102,7 @@ It is run on changed `*.php` files using rule strictness [level 1][] and detects
- Array has N duplicate keys
- Call to an undefined method
- Possibly undefined variables
-- Unknown magic methods and properties on classes with __call and __get (supports DataObject's magic methods: get/set/has/uns)
+- Unknown magic methods and properties on classes with `__call` and `__get` (supports DataObject's magic methods: get/set/has/uns)
#### Suppressing errors
diff --git a/src/guides/v2.4/ui_comp_guide/components/wysiwyg/add-custom-editor/_code-samples/ckeditor4Adapter.md b/src/guides/v2.4/ui_comp_guide/components/wysiwyg/add-custom-editor/_code-samples/ckeditor4Adapter.md
deleted file mode 120000
index 97a261f0c8f..00000000000
--- a/src/guides/v2.4/ui_comp_guide/components/wysiwyg/add-custom-editor/_code-samples/ckeditor4Adapter.md
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/_code-samples/ckeditor4Adapter.md
\ No newline at end of file
diff --git a/src/guides/v2.4/ui_comp_guide/components/wysiwyg/add-custom-editor/code-samples/ckeditor4Adapter.md b/src/guides/v2.4/ui_comp_guide/components/wysiwyg/add-custom-editor/code-samples/ckeditor4Adapter.md
new file mode 120000
index 00000000000..9572008b48e
--- /dev/null
+++ b/src/guides/v2.4/ui_comp_guide/components/wysiwyg/add-custom-editor/code-samples/ckeditor4Adapter.md
@@ -0,0 +1 @@
+../../../../../../v2.3/ui_comp_guide/components/wysiwyg/add-custom-editor/code-samples/ckeditor4Adapter.md
\ No newline at end of file
diff --git a/src/marketplace/sellers/product-descriptions.md b/src/marketplace/sellers/product-descriptions.md
index 7d634d1ceb8..be4184e0e53 100644
--- a/src/marketplace/sellers/product-descriptions.md
+++ b/src/marketplace/sellers/product-descriptions.md
@@ -17,7 +17,7 @@ A detailed opening paragraph that describes the extension.
### List of features (required)
- Add a “Features” heading, using H3 or H2 tags.
-- List features vertically with bullet points.
+- List features vertically with bullet points (minimum 5).
- Only use the bullet point button in the Admin to create the bullet points.
### Demo links (recommended)
@@ -27,7 +27,7 @@ A detailed opening paragraph that describes the extension.
### Heading Levels
-Use headings for any additional sections. (H3 or H2 tags)
+Use headings for any additional sections. Use only after "Features" section. (H3 or H2 tags)
- Headings can be Black or Orange only.
- Provide hyperlinks to functioning demos.
@@ -96,4 +96,4 @@ _Example 3:_
ATTENTION: Use this extension at your own risk. Sensitive customer payment data is stored on your server. Merchants are expected to take every precaution that they are fully PCI certified. Please only purchase this extension if you have an environment where storing credit card information is permitted by law.
-[1]: https://marketplacesupport.magento.com/hc/en-us
\ No newline at end of file
+[1]: https://marketplacesupport.magento.com/hc/en-us
diff --git a/src/quality-patches/release-notes.md b/src/quality-patches/release-notes.md
index adecd8a2186..75b699743df 100644
--- a/src/quality-patches/release-notes.md
+++ b/src/quality-patches/release-notes.md
@@ -18,6 +18,21 @@ The [Magento Quality Patches](https://github.com/magento/quality-patches) packag
{:.bs-callout-info}
See [Apply patches]({{ site.baseurl }}/guides/v2.4/comp-mgr/patching.html) for instructions on applying patches to your Magento projects.
+## v1.0.5
+
+- **MDVA-30841** _(for Magento `>=2.3.4 <2.3.6 || 2.4.0`)_—Fixes the issue with layered navigation, where the 'No' value for boolean type product attributes was not included in layered navigation if Elasticsearch was used as a search engine.
+- **MDVA-28191** _(for Magento `>=2.3.3 <2.4.2`)_—Fixes the issue where no payment methods are loaded during order creation via Magento Admin panel.
+- **MDVA-29959** _(for Magento B2B `>=1.1.0 <=1.1.3-p1`)_—Fixes the issue where restricted admin user with 'Companies' permissions is not allowed to delete company account.
+- **MDVA-30265** _(for Magento `>=2.3.3 <2.4.2`)_—Fixes the issue where shipment tracking link stops working after Invoice creation.
+- **MDVA-28409** _(for Magento `>=2.3.4 <2.3.6 || 2.4.0`)_—Fixes the issue where the "sales_clean_quotes" cron job fails with out-of-memory error when the number of expired quotes in the database is huge.
+- **MDVA-30593** _(for Magento `>=2.3.0 <2.3.4`)_—Fixes the issue where quotes, that expired according to the Quote Lifetime setting, are not cleaned up.
+- **MDVA-30107** _(for Magento `>=2.3.0 <2.3.6`)_—Fixes the issue where store switcher doesn't work as expected if different base URLs are used for store views.
+- **MDVA-28763** _(for Magento `>=2.3.2 <2.3.4`)_—Fixes the issue where product image is getting duplicated after updating product information using REST API more than once.
+- **MDVA-30284** _(for Magento `>=2.3.0 <2.4.2`)_—Fixes the issue where Catalog Search indexer fails due to the following Elasticsearch error: limit of total fields in index has been exceeded.
+- **MDVA-29042** _(for Magento B2B `>=1.1.3 <=1.1.4-p2`)_—Fixes the issue where Catalog permissions were changed to Allow automatically after new product was added to the shared catalog.
+- **MDVA-30428** _(for Magento `>=2.3.3 <2.4.2`)_—Fixes the issue where customers cannot add a product to wishlist if this product is assigned to a custom inventory source.
+- **MDVA-28661** _(for Magento B2B `>=1.1.0 <1.2.2`)_—Fixes the issue where an error is thrown in the Company Users company account section after company admin is changed.
+
## v1.0.4
- **MDVA-30195** _(for Magento `2.3.1 - 2.3.4-p2`)_—Fixes the issue where cron jobs fail if database name is too long, resulting in categories not being updated on the frontend.
diff --git a/src/recommendations/install-configure.md b/src/recommendations/install-configure.md
index 0e5ff0fd986..da1ea69e6a0 100644
--- a/src/recommendations/install-configure.md
+++ b/src/recommendations/install-configure.md
@@ -56,7 +56,7 @@ Like all of Magento, Product Recommendations uses Composer for installation and
composer update magento/product-recommendations --with-dependencies
```
-If you need to update to a major version, such as from 2.0 to 3.0, you need to edit your project's root `composer.json` file. For example, let's open the main `composer.json` file and search for the `magento/product-recommendations` module:
+To update to a major version, such as from 2.0 to 3.0, you must edit your project's root `composer.json` file. (See the [release notes]({{ page.baseurl }}/recommendations/release-notes.html) for information about the latest version.) For example, let's open the main `composer.json` file and search for the `magento/product-recommendations` module:
```json
"require": {
diff --git a/src/release/index.md b/src/release/index.md
index 2ac21bd08aa..667b01e2785 100644
--- a/src/release/index.md
+++ b/src/release/index.md
@@ -11,14 +11,14 @@ Magento releases security and functional patches for each supported release line
The following table provides the dates for scheduled releases in 2020 and 2021 (dates are subject to change):
-| Quarter | Versions | General Availability | Pre-release | Beta |
-|---------------------|----------------------------|----------------------|--------------------|--------------------|
-| 2020 Q3 | 2.4.0
2.3.5-p2 | July 28, 2020 | None | June 8, 2020 |
-| 2020 Q4 | 2.4.1
2.4.0-p1
2.3.6 | October 15, 2020 | October 1, 2020 | September 10, 2020 |
-| 2021 Q1 | 2.4.2
2.4.1-p1
2.3.7 | February 9, 2021 | January 26, 2021 | January 5, 2021 |
-| 2021 Q2 | 2.4.3
2.4.2-p1
2.3.8 | May 11, 2021 | April 27, 2021 | April 6, 2021 |
-| 2021 Q3 | 2.4.4
2.4.3-p1
2.3.9 | August 10, 2021 | July 27, 2021 | July 6, 2021 |
-| 2021 Q4* | 2.4.4-p1
2.3.10 | October 12, 2021 | September 28, 2021 | None |
+| Quarter | Versions | General Availability | Pre-release | Beta |
+|---------------------|----------------------------|----------------------|--------------------|-------------------------------------------|
+| 2020 Q3 | 2.4.0
2.3.5-p2 | July 28, 2020 | None | June 8, 2020 |
+| 2020 Q4 | 2.4.1
2.4.0-p1
2.3.6 | October 15, 2020 | October 1, 2020 | September 10, 2020
Available for 2.4.1 |
+| 2021 Q1 | 2.4.2
2.4.1-p1
2.3.7 | February 9, 2021 | January 26, 2021 | January 5, 2021 |
+| 2021 Q2 | 2.4.3
2.4.2-p1
2.3.8 | May 11, 2021 | April 27, 2021 | April 6, 2021 |
+| 2021 Q3 | 2.4.4
2.4.3-p1
2.3.9 | August 10, 2021 | July 27, 2021 | July 6, 2021 |
+| 2021 Q4* | 2.4.4-p1
2.3.10 | October 12, 2021 | September 28, 2021 | None |
_*There will not be a 2.4.5 release in 2021 Q4._
diff --git a/src/release/lifecycle-policy.md b/src/release/lifecycle-policy.md
new file mode 100644
index 00000000000..28d894ad68f
--- /dev/null
+++ b/src/release/lifecycle-policy.md
@@ -0,0 +1,27 @@
+---
+title: Lifecycle policy
+group: release
+---
+
+For {{site.data.var.ece}} 2.3 and subsequent releases:
+
+- Magento will provide quality fixes for a minor release for a minimum of 12 months from the general availability announcement date of the next minor software release.
+
+- Magento will provide security fixes for a minor release for a minimum of 18 months from the general availability announcement date of the next minor software release.
+
+- Magento will provide security fixes through patch releases for currently supported minor release versions only. Security fixes will not be backported to previous minor releases, nor to previous patch releases within supported minor releases.
+
+ For example, while 2.3 and 2.4 are currently supported minor releases, security fixes will be released as 2.3.X and 2.4.Y, where X and Y represent the next incremental patch release cumulative of all prior patches. Patch releases will not be released for prior minor releases that have reached end of support (for example, 2.2.Z), or as patches to prior patch releases (for example, 2.3.1.X).
+
+- Magento will provide quality fixes through patch release for the latest supported minor release version only. Quality fixes will be available as individual patches for all other currently supported minor release versions. Quality fixes will not be backported to other previous minor releases, nor to previous patch releases within supported minor releases.
+
+ For example, while 2.3 and 2.4 are currently supported minor releases, individual patches will be released as 2.3.X and release patches will be released as 2.4.Y, where X and Y represent the next incremental patch release cumulative of all prior patches. Neither patch releases nor individual patches will be released for prior minor releases that have reached end of support (e.g. 2.2.2).
+
+| Release | Release Date | End of Quality Fixes | End of Security Fixes/
End of Software Support |
+|---------------------------|---------------|----------------------|---------------------------------------------------|
+| {{site.data.var.ece}} 2.3 | November 2018 | July 2021 | April 2022* |
+| {{site.data.var.ece}} 2.4 | July 2020 | | |
+
+** The End of Software Support date for {{site.data.vr.ece}} 2.3 has been extended to April 2022 due to impacts from COVID-19.*
+
+See [Magento Software Lifecycle Policy](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf).