Merge master

dobooth · dobooth · commit 0eb71a137c29 · 2020-01-03T09:11:03.000-06:00
diff --git a/src/_includes/layout/page-header.html b/src/_includes/layout/page-header.html
@@ -2,8 +2,7 @@
 <section class="page-intro">
 {% if page.guide_version != nil and page.guide_version != site.version %}
   <div class="message-banner version-banner">
-    You are reading the documentation for version {{page.guide_version}}. Magento {{site.version}} is the latest version available.
-    Ensure you are reading the documentation for your version of Magento.
+    This is archived documentation for Magento v2.2 and is [no longer supported](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf). Go to the [latest documentation](https://devdocs.magento.com).
   </div>
 {% endif %}
 
diff --git a/src/cloud/cdn/configure-fastly.md b/src/cloud/cdn/configure-fastly.md
@@ -184,7 +184,7 @@ For more information, see the Magento 2 [Backend settings guide](https://github.
 
 ### Configure purge options {#purge}
 
-Fastly provides multiple types of purge options on your Magento Cache Management page including purging product category, product assets, and content. When enabled, Fastly watches for events to automatically purge those caches. If you disable a purge option, you can manually purge Fastly aches after finishing updates through the Cache Management page.
+Fastly provides multiple types of purge options on your Magento Cache Management page including purging product category, product assets, and content. When enabled, Fastly watches for events to automatically purge those caches. If you disable a purge option, you can manually purge Fastly caches after finishing updates through the Cache Management page.
 
 The options include:
 
diff --git a/src/cloud/docker/docker-config.md b/src/cloud/docker/docker-config.md
@@ -107,16 +107,16 @@ For example, the following command starts the Docker configuration generator for
 
 Continue launching your Docker environment in the default _production_ mode.
 
-1. In your local environment, start the Docker configuration generator. You can use the service keys, such as `--php`, to [specify a version](#service-versions).
+1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
 
    ```bash
-   ./vendor/bin/ece-tools docker:build
+   cp ./docker/config.php.dist ./docker/config.php
    ```
 
-1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
+1. In your local environment, start the Docker configuration generator. You can use the service keys, such as `--php`, to [specify a version](#service-versions).
 
    ```bash
-   cp ./docker/config.php.dist ./docker/config.php
+   ./vendor/bin/ece-tools docker:build
    ```
 
 1. _Optional_: Configure the Docker global variables in the `docker-compose.yml` file. For example, you can [configure Xdebug]({{ site.baseurl }}/cloud/docker/docker-development-debug.html#configure-xdebug).
@@ -179,6 +179,12 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
 
    If you have it installed, continue to the next step.
 
+1. _Optional_: If you have a custom PHP configuration file, copy the default configuration DIST file to your custom configuration file and make any necessary changes.
+
+   ```bash
+   cp ./docker/config.php.dist ./docker/config.php
+   ```
+
 1. In your local environment, start the Docker configuration generator. You can use the service keys, such as `--php`, to [specify a version](#service-versions).
 
    ```bash
diff --git a/src/cloud/project/project-patch.md b/src/cloud/project/project-patch.md
@@ -5,7 +5,8 @@ functional_areas:
   - Cloud
   - Upgrade
 ---
-Sometimes we provide a custom patch to address a specific issue. Also, third-party extension developers can provide a custom patch. Copy the custom patch to the `/m2-hotfixes` directory and test it on your local workstation.
+
+Sometimes we provide a [custom patch]({{ site.baseurl }}/guides/v2.3/comp-mgr/patching.html#custom-patches) to address a specific issue. Also, third-party extension developers can provide a custom patch. Copy the custom patch to the `/m2-hotfixes` directory and test it on your local workstation.
 
 {% include cloud/note-upgrade.md %}
 
diff --git a/src/cloud/project/project-upgrade.md b/src/cloud/project/project-upgrade.md
@@ -201,7 +201,7 @@ We also recommend upgrading to the latest version of the Fastly CDN module for M
 
 ## Troubleshoot upgrade
 
-If the upgrade failed, you receive an error message in the browser indicating that you cannot access your storefront or the Magento Admin pane:
+If the upgrade failed, you receive an error message in the browser indicating that you cannot access your storefront or the Magento Admin panel:
 
 ```terminal
 There has been an error processing your request
@@ -220,4 +220,4 @@ To resolve the error:
 
    ```bash
    git add -A && git commit -m "Fixed deployment failure" && git push magento <branch-name>
-   ```
+   ```
diff --git a/src/common/images/ui_comps/image-preview-result.png b/src/common/images/ui_comps/image-preview-result.png
diff --git a/src/guides/v2.3/frontend-dev-guide/cache_for_frontdevs.md b/src/guides/v2.3/frontend-dev-guide/cache_for_frontdevs.md
@@ -26,7 +26,7 @@ The full list of cache types can be found in the [Overview of cache types]({{ pa
 To clean cache, run
 
 ```bash
-magento cache:clean <type> ... <type>
+bin/magento cache:clean <type> ... <type>
 ```
 
 To view the status of the cache, run:
diff --git a/src/guides/v2.3/frontend-dev-guide/css-guide/css_quick_guide_approach.md b/src/guides/v2.3/frontend-dev-guide/css-guide/css_quick_guide_approach.md
@@ -96,6 +96,48 @@ To override the parent theme's styles for buttons in your theme:
 
 1. Add your styles for the button component. If the file is left blank, then no styles are applied for the component.
 
+### Extend module styles
+
+To extend a Module's styles in your theme:
+
+1. In your theme directory, create a `Module_Name/web/css/source` directory.
+1. Create an `_extend.less` file in the theme directory. For example:
+
+   ```tree
+   <theme_dir>/
+   ├── <module_dir>/
+   │   ├── web/
+   │   │   ├── css/
+   │   │   │   ├── source/
+               ├──_extend.less
+   ...
+   ```
+1. Add additional styles in the `_extend.less` file.
+
+For example, to extend the Magento_Review module's style, the directory path should be `<your_theme_dir>/Magento_Review/web/css/source/_extend.less`.
+
+### Override module styles
+
+To override module styles in your theme:
+
+1. In your theme directory, create a `Module_Name/web/css/source` directory.
+1. Create a `_module.less` file in the theme directory. For example:
+
+   ```tree
+   <theme_dir>/
+   ├── <module_dir>/
+   │   ├── web/
+   │   │   ├── css/
+   │   │   │   ├── source/
+               ├──_module.less
+   ...
+   ```
+   This file overrides the `_module.less` file of the specific module.
+
+1. Add your styles in the `_module.less` file.
+
+For example, to override the Magento_Review module's style, the directory path should be `<your_theme_dir>/Magento_Review/web/css/source/_module.less`.
+
 ## Recommended reading
 
 -  [Compile Less with Grunt]({{page.baseurl}}/frontend-dev-guide/css-topics/css_debug.html)
diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/css-preprocess.md b/src/guides/v2.3/frontend-dev-guide/css-topics/css-preprocess.md
@@ -134,7 +134,7 @@ The client-side compilation flow is similar to [server-side](#server-side). The
 
 -  root source (.less) files with resolved `@magento_import` directive
 -  [symlinks](http://en.wikipedia.org/wiki/Symbolic_link) to the root source file that do not contain `@magento_import`
--  symlinks to all other \`.less\` files imported recursively by the `@magento_import` and `@import` directives
+-  symlinks to all other `.less` files imported recursively by the `@magento_import` and `@import` directives
 
 {:.bs-callout-info}
 Symlink is not created, and a copy of the processed file is published to `pub/static` instead, if the source file differs from the processed one. One of the reasons of this difference might be the usage of the `@import` directive without file extension in the source file. See [The @import directive usage](#fedg_css-import) for more details.
diff --git a/src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md b/src/guides/v2.3/frontend-dev-guide/css-topics/using-fonts.md
@@ -76,7 +76,13 @@ For Example:
 
 See the [magento2-ui-library](https://magento-devdocs.github.io/magento2-ui-library/icons.html) for an icon list and implementation.
 
-To customize a font you import, consider using [IcoMoon](https://icomoon.io/app/).
+To customize a font you import, consider using [IcoMoon](https://icomoon.io/app/). To override Luma or Blank theme icon fonts, change the font path in the `_theme.less` file. For example:
+
+```css
+//  Fonts
+@icons__font-path: '@{baseDir}fonts/Theme-Icons'; //  Add you fonts in your-theme/web/fonts
+@icons__font-name: 'Theme-Icons';
+```
 
 {:.bs-callout-info}
 If your theme does not use the Magento UI library, include the font in your theme's CSS files using the `@font-face` CSS rule.
diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/product-layouts.md b/src/guides/v2.3/frontend-dev-guide/layouts/product-layouts.md
@@ -42,3 +42,5 @@ Layout file | Description
 `wishlist_index_configure_type_downloadable.xml` | Layout from this file is applied to `downloadable` product only
 `wishlist_index_configure_type_grouped.xml` | Layout from this file is applied to `grouped` product only
 `wishlist_index_configure_type_simple.xml` | Layout from this file is applied to `simple` product only
+
+For setting a custom layout on specific category, product, and CMS pages, see [Common layout customization tasks]({{ page.baseurl }}/frontend-dev-guide/layouts/xml-manage.html#create-cms-pageproductcategory-specific-layouts).
diff --git a/src/guides/v2.3/javascript-dev-guide/widgets/widget_alert.md b/src/guides/v2.3/javascript-dev-guide/widgets/widget_alert.md
@@ -4,7 +4,7 @@ subgroup: 3_Widgets
 title: Alert widget
 ---
 
-The Magento alert widget implements a modal pop-up window with a confirmation button. It extends the [Magento modal widget].
+The Magento alert widget implements a modal pop-up window with a confirmation button. It extends the [Magento confirmation widget] which in turn extends the [Magento modal widget].
 
 The alert widget source is [`<Magento_Ui_module_dir>/view/base/web/js/modal/alert.js`].
 
@@ -31,7 +31,8 @@ $('#init_element').alert({
 ```javascript
 require([
     'Magento_Ui/js/modal/alert'
-], function(alert) { // Variable that represents the `alert` function
+    'jquery'
+], function(alert, $) { // Variable that represents the `alert` function
 
     alert({
         title: $.mage.__('Some title'),
@@ -249,6 +250,7 @@ require([
 
 ![Alert Widget]({{ site.baseurl }}/common/images/widget/alert-widget-result.png)
 
+[Magento confirmation widget]: {{ page.baseurl }}/javascript-dev-guide/widgets/widget_confirm.html
 [Magento modal widget]: {{ page.baseurl }}/javascript-dev-guide/widgets/widget_modal.html
 [`<Magento_Ui_module_dir>/view/base/web/js/modal/alert.js`]: {{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Ui/view/base/web/js/modal/alert.js
 [Magento Admin Pattern Library, the Slide-out Panels, Modal Windows, and Overlays topic.]: {{ page.baseurl }}/pattern-library/containers/slideouts-modals-overlays/slideouts-modals-overalys.html#modals
diff --git a/src/guides/v2.3/javascript-dev-guide/widgets/widget_password_strength_indicator.md b/src/guides/v2.3/javascript-dev-guide/widgets/widget_password_strength_indicator.md
@@ -112,7 +112,7 @@ The password strength indicator widget listens for `change`, `keyup`, and `paste
 The following example shows how to initialize the password strength indicator widget and pass options during the initialization.
 
 ```html
-<form action="BACKEND_ACTION" method="post">
+<form action="BACKEND_ACTION" method="post" data-mage-init='{"validation":{}}'>
     <fieldset class="fieldset">
         <div class="field password required" data-mage-init='{"passwordStrengthIndicator": {
             "passwordStrengthMeterSelector":"[data-role=strength-meter]",
