Merge pull request #2515 from magento-commerce/9-7_integration

9 7 integration

src/_videos/fundamentals/create-a-new-module.md

@@ -66,8 +66,10 @@ Then put the following code into it:
 ```xml
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-<module name="Learning_FirstUnit" setup_version="0.0.1"> <sequence>
-<module name="Magento_Catalog"/> </sequence>
+    <module name="Learning_FirstUnit" setup_version="0.0.1">
+        <sequence>
+            <module name="Magento_Catalog"/>
+        </sequence>
     </module>
 </config>
 ```

src/guides/v2.3/extension-dev-guide/plugins.md

@@ -21,6 +21,7 @@ Plugins can not be used on following:
 *  `__construct` and `__destruct`
 *  Virtual types
 *  Objects that are instantiated before `Magento\Framework\Interception` is bootstrapped
+*  Objects that implement `Magento\Framework\ObjectManager\NoninterceptableInterface`
 
 ## Declaring a plugin
 

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

@@ -94,7 +94,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 ```
 
-Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+Type `help` or `\h` for help. Type `\c` to clear the current input statement.
 
 Enter `exit` at the `mysql>` prompt to exit.
 

src/guides/v2.4/ext-best-practices/extension-coding/security-performance-data-bp.md

@@ -38,6 +38,9 @@ We recommend using the InnoDB storage engine because other storage engines are n
 
 Raw SQL queries can lead to potential security vulnerabilities and database portability issues. Use data adapter capabilities ([`Magento\Framework\DB\Adapter\Pdo\Mysql`]({{ site.mage2bloburl }}/{{ page.guide_version }}/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php){:target="_blank"} by default) to build and execute queries and move all data access code to a resource model. Use prepared statements to make sure that queries are safe to execute.
 
+{:.bs-callout-warning}
+Building and executing custom queries with the Magento data adapter does not automatically make them secure. Always use sanitization methods on dynamic data in your queries.
+
 ## Use Primary Key
 
 A Primary Key is required for any DB cluster to run effectively. Without a Primary Key, you _will_ see performance issues during table replication.

src/guides/v2.4/install-gde/prereq/prereq-overview.md

@@ -90,7 +90,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 ```
 
-Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
+Type `help` or `\h` for help. Type `\c` to clear the current input statement.
 
 Enter `exit` at the `mysql>` prompt to exit.
 

src/guides/v2.4/security/security-txt.md

@@ -17,7 +17,7 @@ Magento merchants can enter their contact information for [security issue report
 
 A valid `security.txt` file might look like the following:
 
- ```bash
+ ```text
 Contact: mailto:security@example.com
 Contact: tel:+1-201-555-0123
 Encryption: https://example.com/pgp.asc