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

Commit fd73aa6

Browse files
authored
Merge pull request #5575 from magento/small-changes
Small changes
2 parents 5130413 + 3bb2424 commit fd73aa6

File tree

7 files changed

+10
-13
lines changed

7 files changed

+10
-13
lines changed

community/resources/support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ menu_order: 100
88
menu_node: parent
99
---
1010

11-
If you have issues, receive error messages, or need additional How Tos, see our [Magento Support Knowledge Base](https://support.magento.com). The knowledge base includes a growing number of troubleshooting, how to, and FAQ articles for Magento 2 Commerce, Commerce (Cloud), and Open Source. We are constantly adding new content for Magento platform, services, modules, and much more.
11+
If you have issues, receive error messages, or need additional How To's, see our [Magento Support Knowledge Base](https://support.magento.com). The knowledge base includes a growing amount of troubleshooting, how to, and FAQ articles for Magento 2 Commerce, Commerce (Cloud), and Open Source. We are constantly adding new content for Magento platform, services, modules, and much more.
1212

1313
* Search using keywords to find answers and help
1414
* Browse through various categories
15-
* Watch videos for more Information
15+
* Watch videos for more information
1616
* Provide feedback as you read articles
1717

1818
New to knowledge bases? See the [Magento Help Center User Guide](https://support.magento.com/hc/en-us/articles/360000913794).

guides/v2.2/cloud/project/project-conf-files_magento-app.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ For details about a specific PHP extension, see the [PHP Extension List](https:/
403403
- `imagick`
404404
- `imap`
405405
- `intl`
406+
- `ioncube`
406407
- `ldap`
407408
- `mailparse`
408409
- `mcrypt`

guides/v2.2/config-guide/cli/config-cli-subcommands-mode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ When you change from production to developer mode, you should clear generated cl
144144

145145
```terminal
146146
Enabled developer mode.
147-
```Â
147+
```
148148

149149
### Change to default mode
150150

guides/v2.2/frontend-dev-guide/css-topics/css-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ There are a couple options to help with CSS and site performance.
3232

3333
* Minification of CSS files reduces the file size being sent. It does this by stripping white space within the file.
3434

35-
To enable / disable these settings, go into Admin > **Stores** > Setting > **Configuration** > **Advanced** > **Developer** > **CSS Settings**.
35+
To enable or disable these settings, go to _Admin_ panel, click **Stores** > Settings > **Configuration** > **Advanced** > **Developer** > **CSS Settings**.
3636

3737
## Change styles: walkthrough {#css_walk}
3838

@@ -44,7 +44,7 @@ In the Blank theme, the buttons of the `.action.primary` class, so called *prima
4444
OrangeCo wants to change the color of the primary buttons to orange. To achieve this, they do the following:
4545

4646
1. Create a new Orange theme, which inherits from the Blank [theme](https://glossary.magento.com/theme).
47-
2. In the Orange theme directory add the overriding `app/design/frontend/OrangeCo/orange/web/css/source/_theme.less` file with the following code:
47+
1. In the Orange theme directory add the overriding `app/design/frontend/OrangeCo/orange/web/css/source/_theme.less` file with the following code:
4848

4949
```less
5050
// Primary button

guides/v2.2/javascript-dev-guide/widgets/widget_sticky.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ $('.sticky-element').sticky({
5555
Element selector, who's height will be used to restrict the maximum offsetTop
5656
position of the sticky element. Default uses document `body`.
5757

58-
**Type**:
59-
60-
- String
58+
**Type**: String
6159

6260
**Default value**: `''`
6361

@@ -87,9 +85,7 @@ Allows the postponing of sticking, until element goes off the screen for the num
8785

8886
CSS class for active sticky state.
8987

90-
**Type**:
91-
92-
- String
88+
**Type**: String
9389

9490
**Default value**: `_sticky`
9591

guides/v2.3/architecture/security_intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ menu_order:
88

99
## Enhanced password management
1010

11-
Magento has strengthened the hashing algorithms (SHA-256) used in password management. In addition, we added support for Argon2ID13, which is used by default in PHP 7.2 or if you have installed the Libsodium extension for PHP.
11+
Magento has strengthened the hashing algorithms (SHA-256) used in password management. Magento now supports Argon2ID13 through the PHP sodium extension, which requires the libsodium library version 1.0.13 or higher.
1212

1313
## Improved prevention of cross-site scripting (XSS) attacks by making escaped data the default
1414

guides/v2.3/inventory/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The following diagram illustrates the relationship between source stocks, aggreg
3535

3636
![Source and aggregate stock](images/inventory-diagram-stock.png)
3737

38-
In this diagram, a bicycle merchant has inventory for a touring bike in a warehouse and two stores. He has three stocks with configured website sales channels and sources. When a customer shops through the UK website, Magento aggregates bike inventory from the warehouse and flagship store sources for a salable quantity of 95. The touring bike can be shipped from either the warehouse or the flagship store, but not the US store. Amazon Marketplace web store same stock draws from the same aggregate stock as the UK web store.
38+
In this diagram, a bicycle merchant has inventory for a mountain bike in two warehouses and a drop shipper. He has two stocks with configured website sales channels and sources. When a customer shops through the UK website, Magento aggregates bike inventory from the UK warehouse and the drop shipper sources, for a salable quantity of 95. The bike can be shipped from either the warehouse or the drop shipper, but not the NY warehouse. Amazon Marketplace has the same stock, drawing from the same aggregate stock as the UK website.
3939

4040
## Important {{site.data.var.im}} objects
4141

0 commit comments

Comments
 (0)