Merge pull request magento#2456 from magento-commerce/8_11-integration

8/11 Integration

src/_data/whats-new.yml

@@ -1979,8 +1979,8 @@ entries:
   contributor: jeff-matthews
   profile: https://github.com/jeff-matthews
 - description: Updated reference documentation for backward incompatible changes introduced
-    in the [2.4.1](http://127.0.0.1:4000/guides/v2.4/release-notes/backward-incompatible-changes/reference.html#240---241)
-    and [2.3.6](http://127.0.0.1:4000/guides/v2.3/release-notes/backward-incompatible-changes/reference.html#235---236)
+    in the [2.4.1](https://devdocs.magento.com/guides/v2.4/release-notes/backward-incompatible-changes/reference.html#240---241)
+    and [2.3.6](https://devdocs.magento.com/guides/v2.3/release-notes/backward-incompatible-changes/reference.html#235---236)
     releases.
   versions: 2.3.6, 2.4.1
   type: Major Update

src/guides/v2.3/ext-best-practices/tutorials/create-access-control-list-rule.md

@@ -96,26 +96,19 @@ The menu displays as follows:
 
 ### Restrict admin controllers
 
-We can restrict the access to admin controllers by overriding the `_isAllowed` method of the `\Magento\Backend\App\Action` class.
+We can restrict the access to admin controllers by setting the `ADMIN_RESOURCE` constant.
 
 Add the following to your module's `Controller/Adminhtml/Create/Index.php` file:
 
 ```php
-protected function _isAllowed()
-{
- return $this->_authorization->isAllowed('Vendor_MyModule::create');
-}
+const ADMIN_RESOURCE = 'Vendor_MyModule::create'
 ```
 
 Add the following to your module's `Controller/Adminhtml/Delete/Index.php` file:
 
 ```php
-protected function _isAllowed()
-{
- return $this->_authorization->isAllowed('Vendor_MyModule::delete');
-}
+const ADMIN_RESOURCE = 'Vendor_MyModule::delete';
 ```
-
 If the user does not have permission, the action page displays an "Access Denied" message.
 
 ### Content restrictions for admin users

src/guides/v2.3/frontend-dev-guide/translations/translate_practice.md

@@ -26,10 +26,10 @@ To override the strings, ExampleCorp plans to use the `en_US.csv` dictionary fil
 1. Run the [i18n (internationalization) tool] to generate the en_US dictionary for the `orange` theme:
 
    ```bash
-   php magento2/bin/magento i18n:collect-phrases --output="magento2/app/design/frontend/ExampleCorp/orange/i18n/en_US.csv" magento2/app/design/frontend/ExampleCorp/orange
+   bin/magento i18n:collect-phrases --output="app/design/frontend/ExampleCorp/orange/i18n/en_US.csv" app/design/frontend/ExampleCorp/orange
    ```
 
-1. Open the newly generated `magento2/app/design/frontend/ExampleCorp/orange/i18n/en_US.csv` file and add the following rows:
+1. Open the newly generated `app/design/frontend/ExampleCorp/orange/i18n/en_US.csv` file and add the following rows:
 
    ```text
    "Add to Cart", "Purchase"

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

@@ -98,7 +98,7 @@ In this example, the `max-length` value of the text-box in the `adminhtml` is al
     };
     ```
 
-1. Create an `input.html` file under `app/code/<Vendor_Name>/<Module_Name>/view/base/web/template/form/` and copy the contents of the `input.html` file from the `module_ui` template file.
+1. Create an `input.html` file under `app/code/<Vendor_Name>/<Module_Name>/view/base/web/template/form/element/` and copy the contents of the `input.html` file from the `module_ui` template file.
 1. Change the maxlength value to `512`, which was originally set to `256`.
 1. Upgrade the Magento application:
 

src/guides/v2.3/release-notes/2-3-7-p1.md

@@ -23,7 +23,7 @@ Security-only patches typically include all hotfixes that have been released for
 
 ## Installation and upgrade instructions
 
-For instructions on downloading and applying security-only patches (including patch 2.4.2-p1), see [Quick start install](http://127.0.0.1:4000/guides/v2.4/install-gde/composer.html).
+For instructions on downloading and applying security-only patches (including patch 2.4.2-p1), see [Quick start install]({{site.baseurl}}/guides/v2.4/install-gde/composer.html).
 
 ## More information?
 

src/guides/v2.3/rest/search-endpoint.md

@@ -72,7 +72,7 @@ Quick searches return aggreggations and buckets.
 The following example performs a quick search for `digital watch`:
 
 ```http
-GET <host>/rest/<store_code>/V1/search?searchCriteria[requestName]=<quick_search_container>&
+GET <host>/rest/<store_code>/V1/search?searchCriteria[requestName]=quick_search_container&
 searchCriteria[filter_groups][0][filters][0][field]=search_term&
 searchCriteria[filter_groups][0][filters][0][value]=digital watch
 ```

src/guides/v2.4/release-notes/2-4-2-p2.md

@@ -12,8 +12,8 @@ Security-only patches typically include all hotfixes that have been released for
 
 ## Installation and upgrade instructions
 
-For instructions on downloading and applying security-only patches (including patch 2.4.2-p2), see [Quick start install](http://127.0.0.1:4000/guides/v2.4/install-gde/composer.html).
+For instructions on downloading and applying security-only patches (including patch 2.4.2-p2), see [Quick start install]({{site.baseurl}}/guides/v2.4/install-gde/composer.html).
 
 ## More information?
 
-For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287).
+For general information about security-only patches, see the Magento DevBlog post [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287).