Merge branch 'master' into patch-57

dobooth · web-flow · commit b51a1d1dfd70 · 2020-10-05T13:09:34.000-04:00
diff --git a/src/_includes/layout/footer-scripts.html b/src/_includes/layout/footer-scripts.html
@@ -25,8 +25,6 @@
     })();
 </script>
 
-<script type="text/javascript">_satellite.pageBottom();</script>
-
 {% endif %}
 
 <script type="text/javascript" src="{{ site.baseurl }}/common/js/glossary-link-enhancer.js"></script>
diff --git a/src/cloud/cdn/cloud-fastly.md b/src/cloud/cdn/cloud-fastly.md
@@ -35,7 +35,7 @@ Fastly provides the following services to optimize and secure content delivery o
 
    -  **SSL/TLS certificates**–The Fastly service requires an SSL/TLS certificate to serve secure traffic over HTTPS. Magento provides a Domain-validated Let's Encrypt SSL/TLS certificate for each Staging and Production environment. Magento completes domain validation and certificate provisioning during the Fastly set up process. See [TLS and Fastly].
 
-   -  **Origin cloaking**–Magento can enable Origin Cloaking for all Magento Commerce projects hosted on the Cloud platform. This option hides the IP addresses of your origin servers to protect them from direct attack. When this feature is enabled, all traffic to your Cloud infrastructure must route through the Fastly CDN or another secure channel. Any traffic sent directly to the Origin servers is blocked. If you have traffic that does not require caching, you can customize the Fastly service configuration to allow requests to [bypass the Fastly cache].
+   -  **Origin cloaking**–Magento can enable Origin Cloaking for all Magento Commerce projects hosted on the Cloud platform. This option hides the IP addresses of your origin servers to protect them from direct access. When this feature is enabled, all traffic to your Cloud infrastructure must route through the Fastly CDN or another secure channel. Any traffic sent directly to the Origin servers is blocked. If you have traffic that does not require caching, you can customize the Fastly service configuration to allow requests to [bypass the Fastly cache].
 
 -  **Image optimization**—Offloads image processing and resizing load to the Fastly service freeing servers to process orders and conversions efficiently. See [Fastly image optimization].
 
diff --git a/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md b/src/guides/v2.3/frontend-dev-guide/layouts/xml-manage.md
@@ -360,16 +360,17 @@ There are two ways to set the template for a block:
 
 -  using the `template` attribute
 -  using the `<argument>` instruction
+-  using the `<action method="setTemplate">` instruction
 
 Both approaches are demonstrated in the following examples of changing the template of the page title block.
 
-**Example 1:**
+**Example 1:** using the `template` attribute
 
 ```xml
  <referenceBlock name="page.main.title" template="%Namespace_Module::new_template.phtml%"/>
 ```
 
-**Example 2:**
+**Example 2:** using the `<argument>` instruction
 
 ```xml
  <referenceBlock name="page.main.title">
@@ -379,13 +380,25 @@ Both approaches are demonstrated in the following examples of changing the templ
  </referenceBlock>
 ```
 
-In both examples, the template is specified according to the following:
+**Example 3:** using the `<action method="setTemplate">` instruction
+
+```xml
+ <referenceBlock name="page.main.title">
+   <action method="setTemplate">
+     <argument name="template" xsi:type="string">%Namespace_Module::new_template.phtml%</argument>
+   </action>
+ </referenceBlock>
+```
+
+In the above examples, the template is specified according to the following:
 
 -  `Namespace_Module:` defines the module the template belongs to. For example, `Magento_Catalog`.
--  `new_template.phtml`: the path to the template relatively to the `templates` directory. It might be `<module_dir>/view/<area>/templates` or `<theme_dir>/<Namespace_Module>/templates`.
+-  `new_template.phtml`: the path to the template relative to the `templates` directory. For example: `<module_dir>/view/<area>/templates` or `<theme_dir>/<Namespace_Module>/templates`.
 
 {:.bs-callout-info}
-Template values specified as attributes have higher priority during layout generation, than the ones specified using `<argument>`. It means, that if for a certain block, a template is set as attribute, it will override the value you specify in `<argument>` for the same block.
+The highest priority template is one with setTemplate action `<action method="setTemplate">`. Second priority has the attribute specified as `<referenceBlock name="..." template="..."/>`, and the lowest priority has the template using `<argument>`.
+
+It means, that if for a certain block, a template is set as an attribute, it will override the value you specify in `<argument>` for the same block. In the case where we have `<action method="setTemplate">` construction - it will override the values that you specified in the template attribute `<referenceBlock name="..." template="..."/>` and the value you specified using `<argument>`.
 
 ## Modify block arguments {#layout_markup_modify-block}
 
