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

Commit 44e1384

Browse files
committed
Merge master
2 parents 7dd5417 + 6dfbfe2 commit 44e1384

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ To ensure the stability of your customizations and prevent upgrades from overwri
4747
}
4848
```
4949

50+
1. You must edit the `app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml` file to declare your fonts; otherwise, Magento 2.3 is not able to create the `static/web/fonts/` directory. See `app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml`.
51+
5052
`@font-display: swap` is declared by default for Magento Blank theme in `app/design/frontend/Magento/blank/web/css/source/_typography.less`.
5153

5254
Fallback web fonts that are used by default in Magento are located in `lib/web/css/source/lib/variables/_typography.less`.

src/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ where
3434
* `-f` or `--force` to force a module to be enabled or disabled despite dependencies. Before you use this option, see [About enabling and disabling modules](#instgde-cli-subcommands-enable-modules).
3535
* `-c` or `--clear-static-content` cleans [generated static view files]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html#config-cli-static-overview).
3636

37-
Failure to clear static view files might result in issues if there are multiple files with the same name and you don't clear all of them.
37+
Failure to clear static view files might result in issues if there are multiple files with the same name and you do not clear all of them.
3838

39-
In other words, because of [static file fallback]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html) rules, if you do not clear static files and there is more than one file named `logo.gif` that are different, fallback might cause the wrong file to display.
39+
In other words, because of the [static file fallback]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html) rules, if you do not clear static files and there is more than one file named `logo.svg` that are different, fallback might cause the wrong file to display.
4040

4141
Use the following command to list enabled and disabled modules:
4242

src/guides/v2.3/install-gde/prereq/apache.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ Magento uses server rewrites and `.htaccess` to provide directory-level instruct
3737
{:.bs-callout-info}
3838
Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
3939

40+
## Apache required modules {#apache-required-modules}
41+
42+
Magento requires the following Apache modules be installed:
43+
44+
* [mod_deflate.c](https://httpd.apache.org/docs/2.4/mod/mod_deflate.html)
45+
* [mod_expires.c](https://httpd.apache.org/docs/2.4/mod/mod_expires.html)
46+
* [mod_headers.c](https://httpd.apache.org/docs/2.4/mod/mod_headers.html)
47+
* [mod_rewrite.c](https://httpd.apache.org/docs/2.4/mod/mod_rewrite.html)
48+
* [mod_security.c](https://modsecurity.org)
49+
* [mod_ssl.c](https://httpd.apache.org/docs/2.4/mod/mod_ssl.html)
50+
4051
## Verify the Apache version {#install-prereq-apache-verify}
4152

4253
To verify the Apache version you're currently running, enter:

src/guides/v2.3/javascript-dev-guide/javascript/js_init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ require([
135135
136136
## Calling JS components requiring initialization in JS files {#js_widget_init}
137137
138-
To call a widget in JS code, use a notation similar to the following ([accordion]({{ page.baseurl }}/javascript-dev-guide/widgets/widget_accordion.html) widget is intiialized on the `[data-role=example]` element as illustration):
138+
To call a widget with JS code, use a notation similar to the ([accordion]({{ page.baseurl }}/javascript-dev-guide/widgets/widget_accordion.html) widget. It is initialized on the `[data-role=example]` element as below):
139139
140140
```javascript
141141
$('[data-role=example]').accordion();

0 commit comments

Comments
 (0)