Merge branch 'master' into reference-name-correction

Author: dobooth

guides/v2.2/cloud/release-notes/cloud-tools.md

@@ -26,6 +26,8 @@ The `{{ site.data.var.ct }}` 2002.0.22 release changes the structure of the `{{
 
    -  {:.new}Updated the `composer.json` file for the `{{ site.data.var.ct }}` package to add a dependency for the `magento/magento-cloud-patches` v1.0.0 package.
 
+   -  {:.fix}<!--MAGECLOUD-4661-->Fixed an issue that caused the `{{ site.data.var.ct }}` patching process to break when applying patch sets on top of security-only releases, starting with Magento version 2.3.2-p2 and later. This issue was introduced by the new versioning scheme adopted for [security-only patches]({{ site.baseurl }}/guides/v2.3/release-notes/bk-release-notes.html#security-only-patches).
+
 -  {:.fix}**Patches and critical fixes**–Update your Cloud environments with `{{ site.data.var.ct }}` version 2002.0.22 to apply the following patches and critical fixes. These patches are included in the `magento/magento-cloud-patches` v1.0.0 package.
 
    -  {:.fix}<!--MAGECLOUD-4649-->**Page Builder security patches for 2.3.1.x and 2.3.2.x releases**–Fixes an issue in Page Builder preview that allows unauthenticated users to access some templating methods that can be used to trigger arbitrary code execution over the network (RCE) resulting in global information leaks. This issue can occur when using unsupported versions of Page Builder with {{ site.data.var.ee }} versions 2.3.1 and 2.3.2.

guides/v2.3/config-guide/elasticsearch/es-config-stopwords.md

@@ -33,6 +33,7 @@ See one of the following topics for more information:
 
 *  [Edit stopwords for an existing locale](#config-edit-stopwords)
 *  [Create stopwords for a new locale](#config-create-stopwords)
+*  [To change the directory from your module](#to-change-directory-stopwords)
 
 ### Edit stopwords for an existing locale {#config-edit-stopwords}
 
@@ -126,3 +127,21 @@ To change the directory:
     ```
 
 Save your changes to `di.xml` and exit the text editor.
+
+## To change the directory from your module {#to-change-directory-stopwords}
+
+1. [Create a new module](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/build/module-file-structure.html){:target="_blank"}
+1. In your module `etc/di.xml` add instructions:
+
+    ```xml
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords">
+        <arguments>
+           <argument name="stopwordsModule" xsi:type="string">Your_Module</argument>
+           <argument name="stopwordsDirectory" xsi:type="string">stopwords</argument>
+        </arguments>
+    </type>
+    ```
+
+1. In your module, create the directory `etc/stopwords`, with the corresponding `.csv`.
+
+Save your changes to `di.xml` and exit the text editor.

guides/v2.3/security/google-recaptcha.md

@@ -21,6 +21,9 @@ The Google reCAPTCHA extension is bundled and installed with {{site.data.var.ce}
 
 ## Configure reCAPTCHA
 
+{:.bs-callout .bs-callout-warning}
+Before reCAPTCHA can be configured, ensure that your `PHP.ini` file includes this setting: `allow_url_fopen = 1`. See [Required PHP Settings]({{page.baseurl}}/install-gde/prereq/php-settings.html).
+
 See the Magento Admin User Guide [Open Source](https://docs.magento.com/m2/ce/user_guide/stores/security-google-recaptcha.html) and [Commerce](https://docs.magento.com/m2/ee/user_guide/stores/security-google-recaptcha.html) for configuration options in the Magento Admin and storefront.
 
 ## Troubleshooting