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

Small changes #8195

Merged
merged 29 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7cf4a06
Updated the broken template
srsathish92 Oct 27, 2020
fb14012
Fix spelling error
shrielenee Oct 27, 2020
3d5c305
Removed extra trailing comma from composer.json
Mercurieus Oct 28, 2020
d672690
Merge branch 'master' into shrielenee-patch-1
dobooth Oct 28, 2020
97b47e8
Merge pull request #8135 from magento/shrielenee-patch-1
dobooth Oct 28, 2020
a8b08f4
Merge branch 'master' into update/cloud-trouble-error-html-template
dobooth Oct 28, 2020
063004b
Merge pull request #8134 from srsathish92/update/cloud-trouble-error-…
dobooth Oct 28, 2020
7acca78
Merge pull request #8141 from zenfork/patch-1
dobooth Oct 28, 2020
5100df3
Layout overview small typo fix
gren236 Oct 30, 2020
9b81006
Update src/guides/v2.3/frontend-dev-guide/layouts/layout-overview.md
gren236 Oct 30, 2020
74f6d6a
Merge branch 'master' into small-changes
Nov 2, 2020
14b06db
Added comma
dobooth Nov 2, 2020
18fb357
Merge branch 'master' into patch-1
dobooth Nov 2, 2020
addff5a
Merge pull request #8160 from gren236/patch-1
dobooth Nov 2, 2020
c2f7026
Clarified code samples
dobooth Nov 2, 2020
0735f21
Merge pull request #8167 from magento/dobooth-patch-1
dobooth Nov 2, 2020
cbc1823
MQE-2354: [MFTF SVC] Change "<test> ref change" from MAJOR to a MINOR
soumyau Nov 4, 2020
1073619
pass "entity_type_code" instead of "entity_type_id"
dfelton Nov 5, 2020
f7899ac
Merge branch 'master' into small-changes
Nov 5, 2020
cfcee91
Merge pull request #8183 from magento-pangolin/MQE-2354
dobooth Nov 5, 2020
cb74d76
Port changes in two-level-cache article from 2.4
ihor-sviziev Nov 5, 2020
aa0ef3b
Added page var
dobooth Nov 6, 2020
670a63c
Merge branch 'master' into small-changes
Nov 6, 2020
42ba32d
Merge branch 'master' into patch-9
dobooth Nov 6, 2020
5e42927
Merge pull request #8186 from ihor-sviziev/patch-9
dobooth Nov 6, 2020
c11bbde
Merge branch 'master' into patch-1
dobooth Nov 6, 2020
15562dc
Merge pull request #8184 from dfelton/patch-1
dobooth Nov 6, 2020
0f4cf28
Fixed link
dobooth Nov 6, 2020
a24e2fa
Merge branch 'master' into small-changes
dobooth Nov 6, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cloud/project/project-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ To check the `auto-load:psr-4` configuration:
"Magento\\Framework\\": "lib/internal/Magento/Framework/",
"Magento\\Setup\\": "setup/src/Magento/Setup/",
"Magento\\": "app/code/Magento/",
"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/",
"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
},
```
{:.no-copy}
Expand Down
1 change: 1 addition & 0 deletions src/cloud/trouble/trouble-error-html-minification.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ As a work-around, complete the following:

```shell
update core_config_data set value=0 where path ='dev/template/minify_html'
```

1. Flush all caches.

Expand Down
11 changes: 6 additions & 5 deletions src/guides/v2.3/config-guide/cache/two-level-cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ functional_areas:
- Cache
---

Caching allows us to reduce network traffic between the remote cache storage and Magento. A standard Magento instance transfers around 300kb per request, and traffic may quickly grow to over ~1000 requests in some situations.
Caching enables a reduction in network traffic between the remote cache storage and Magento. A standard Magento instance transfers around 300kb per request, and traffic may quickly grow to over ~1000 requests in some situations.

To reduce the network bandwidth to Redis, we can store cache data locally on each web node and use the remote cache for two purposes:

- To check the cache data version, ensuring we have the latest cache stored locally.
- If the data is out of date, transfer the latest cache from the remote machine to the local machine.

Magento stores the hashed data version in Redis, with the suffix ':version' appended to the regular key. In case of an outdated local cache, we tranfer the data to the local machine with a cache adapter.
Magento stores the hashed data version in Redis, with the suffix ':version' appended to the regular key. In case of an outdated local cache, the data is transferred to the local machine with a cache adapter.

## Configuration example

Expand Down Expand Up @@ -51,10 +51,11 @@ Magento stores the hashed data version in Redis, with the suffix ':version' appe

Where:

- `backend` is our remote L2 cache implementation.
- `backend` is the remote L2 cache implementation.
- `remote_backend` is the remote cache implementation: Redis or MySQL.
- `remote_backend_options` are Redis or MySQL-specific options.
- `local_backend` is the local cache implementation: Cm_Cache_Backend_File or the APC adapter
- `local_backend` is the local cache implementation: `Cm_Cache_Backend_File` or the APC adapter.
- `cache_dir` is a directory where the local cache will be stored. It is suggested to use `/dev/shm/`.

We recommend the use of Redis for remote caching - `\Magento\Framework\Cache\Backend\Redis`, and the File cache implementation - `Cm_Cache_Backend_File` as the local cache.
We also recommend the use of the `cache preload` feature, as it will drastically decrease the pressure on Redis.
We also recommend the use of the [`cache preload`]({{page.baseurl}}/config-guide/redis/redis-pg-cache.html#redis-preload-feature) feature, as it will drastically decrease the pressure on Redis. Do not forget to add suffix ':version' for preload keys.
2 changes: 1 addition & 1 deletion src/guides/v2.3/extension-dev-guide/cli-cmds/cli-howto.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Following is a summary of the process:
```

{:.bs-callout-info}
Style the output text by using `<error>`, `<info>`, or `<comment>` tags. See [Symfony](https://symfony.com/doc/master/console/coloring.html){:target="_blank"} docummentation for more information about styling.
Style the output text by using `<error>`, `<info>`, or `<comment>` tags. See [Symfony](https://symfony.com/doc/master/console/coloring.html){:target="_blank"} documentation for more information about styling.

1. Declare your Command class in `Magento\Framework\Console\CommandListInterface` and configure the command name using dependency injection (`<your component root dir>/etc/di.xml`):

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This article describes the basic concepts you need to know to create layouts for

In Magento, the basic components of page design are layouts, containers, and blocks. A *layout* represents the structure of a web page (1). *Containers* represent the placeholders within that web page structure (2). And *blocks* represent the UI controls or components within the container placeholders (3). These terms are illustrated and defined below.

The objective is to create a structured, common set of layout instructions to render pages. Most pages on a website can be categorized as a 1 column, 2 column, or 3 column layout. These page layouts can applied to a page from within the admin panel.
The objective is to create a structured, common set of layout instructions to render pages. Most pages on a website can be categorized as a 1 column, 2 column, or 3 column layout. These page layouts can be applied to a page from within the admin panel.

![web page sample layout][layout]

Expand Down
4 changes: 2 additions & 2 deletions src/guides/v2.3/graphql/queries/custom-attribute-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ The following query returns the attribute type for various custom and EAV attrib
attributes: [
{
attribute_code: "size"
entity_type: "4"
entity_type: "catalog_product"
}
{
attribute_code: "color"
entity_type: "4"
entity_type: "catalog_product"
}
]
) {
Expand Down
4 changes: 2 additions & 2 deletions src/guides/v2.3/ui_comp_guide/concepts/ui_comp_uiregistry.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ var registry = require('uiRegistry');
Now we have `uiRegistry` instance in the `registry` variable. We can use it to get an instance of any component.

```js
var component = registry.get('%componentName%');
var component = registry.get('componentName');
```

The `uiRegistry` instance allows you to search for components using property values.
If you know a unique property value of a component that you need to find, you can use the following code to get the component:

```js
var component = registry.get('%property% = %propertyValue%');
var component = registry.get('property = propertyValue');
```

**Examples:**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ It MAY include minor and patch level changes. Patch and minor version MUST be re
| |`<test>` `<action>` changed|PATCH
| |`<test>` `<action>` sequence changed|MAJOR
| |`<test>` `<action>` type (`click`, `fillField`, etc) changed|PATCH
| |`<test>` `<actionGroup>` `ref` changed|MAJOR
| |`<test>` `<actionGroup>` `ref` changed|MINOR
| |`<test>` `<before/after>` `<action>` added|MINOR
| |`<test>` `<before/after>` `<action>` removed|MAJOR
| |`<test>` `<before/after>` `<action>` changed|PATCH
| |`<test>` `<before/after>` `<action>` sequence changed|MAJOR
| |`<test>` `<before/after>` `<action>` type (`click`, `fillField`, etc) changed|PATCH
| |`<test>` `<before/after>` `<actionGroup>` `ref` changed|MAJOR
| |`<test>` `<before/after>` `<actionGroup>` `ref` changed|MINOR
| |`<test>` `<annotations>` `<annotation>` added|PATCH
| |`<test>` `<annotations>` `<annotation>` changed|PATCH
| |`<test>` `<annotations>` `<annotation>` GROUP removed|MAJOR
Expand All @@ -134,7 +134,7 @@ It MAY include minor and patch level changes. Patch and minor version MUST be re
| |`<suite>` `<before/after>` `<action>` changed|PATCH
| |`<suite>` `<before/after>` `<action>` sequence changed|MAJOR
| |`<suite>` `<before/after>` `<action>` type (`click`, `fillField`, etc) changed|PATCH
| |`<suite>` `<before/after>` `<actionGroup>` `ref` changed|MAJOR
| |`<suite>` `<before/after>` `<actionGroup>` `ref` changed|MINOR

---------------------------

Expand Down