Merge pull request #2556 from magento-commerce/9-29_integration

9 29 integration

Author: dobooth

src/guides/v2.3/comp-mgr/cli/cli-upgrade.md

@@ -76,6 +76,8 @@ See the examples at the end of this section for help specifying different releas
    The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
    To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
 
+   To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
+
    {:.bs-callout-tip}
    Use `composer require --help` to learn more about available options.
    To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).

src/guides/v2.3/comp-mgr/upgrade-best-practices.md

@@ -16,7 +16,7 @@ It is important to understand the variables that determine the complexity of an
 
 The level of effort to upgrade your {{site.data.var.ee}} instance depends upon these factors:
 
-*  **How you have built your site?** The amount of custom work and the number of installed 3rd-party modules strongly affects the complexity of an upgrade. The quality of the custom work and modules also can also determine whether an upgrade will go smoothly.
+*  **How did you build your site?** The amount of custom work and the number of installed 3rd-party modules strongly affects the complexity of an upgrade. The quality of the custom work and modules can determine whether an upgrade will go smoothly.
 
 *  **Are you skipping multiple releases?** Skipping releases will makes the next upgrade more complex, upgrading from consequent versions will make the process easier and cheaper.
 

src/guides/v2.3/extension-dev-guide/extension_attributes/adding-attributes.md

@@ -115,7 +115,7 @@ public function afterSave
     $ourCustomData = $extensionAttributes->getOurCustomData();
     $this->customDataRepository->save($ourCustomData);
 
-    $resultAttributes = $result->getExtentionAttributes(); /** get extension attributes as they exist after save **/
+    $resultAttributes = $result->getExtensionAttributes(); /** get extension attributes as they exist after save **/
     $resultAttributes->setOurCustomData($ourCustomData); /** update the extension attributes with correct data **/
     $result->setExtensionAttributes($resultAttributes);
 

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

@@ -64,15 +64,6 @@ The locale dictionary would use the default values (keys) in the left column fol
 "Card Verification Number", <translation>
 ```
 
-## Element translations per module
-
-You can translate the same element in different ways for different modules:
-
-```text
-"Add to Cart", "Add to Cart", module, Magento_Review
-"Add to Cart", "Add to Shopping Cart", module, Magento_Catalog
-```
-
 ## Additional information
 
 -  [Translations overview]

src/guides/v2.3/ui_comp_guide/components/ui-fileuploader.md

@@ -29,22 +29,24 @@ Here is an example of how File Uploader component integrates with [Form]({{ page
     ...
     <fieldset name="foo">
         ...
-        <argument name="data" xsi:type="array">
-            <item name="config" xsi:type="array">
-                <item name="label" xsi:type="string"/>
-            </item>
-        </argument>
-        <field name="bar">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="label" xsi:type="string">Sound Check</item>
-                    <item name="visible" xsi:type="boolean">true</item>
-                    <item name="formElement" xsi:type="string">fileUploader</item>
-                    <item name="uploaderConfig" xsi:type="array">
-                        <item name="url" xsi:type="url" path="path/to/controller"/>
-                    </item>
-                </item>
-            </argument>
+        <settings>
+            <label translate="true">Foo</label>
+            <collapsible>true</collapsible>
+            <opened>true</opened>
+        </settings>
+        <field name="bar" formElement="fileUploader">
+            <settings>
+                <label translate="true">Sound Check</label>
+            </settings>
+            <formElements>
+                <fileUploader>
+                    <settings>
+                        <uploaderConfig>
+                            <param xsi:type="string" name="url">path/to/controller</param>
+                        </uploaderConfig>
+                    </settings>
+                </fileUploader>
+            </formElements>
         </field>
     </fieldset>
 </form>

src/guides/v2.4/comp-mgr/cli/cli-upgrade.md

@@ -78,6 +78,8 @@ See the examples at the end of this section for help specifying different releas
    The first time you upgrade using the plugin, you can interactively view and update any out-of-date values that may be remaining from previous versions.
    To enable this, use the `--interactive-magento-conflicts` option on the `composer require` commands.
 
+   To override all conflicting custom values with the expected Magento values, re-run the `composer require` command with the `--use-default-magento-values` option.
+
    {:.bs-callout-tip}
    Use `composer require --help` to learn more about available options.
    To learn more about usage of the plugin, refer to the [Plugin Usage](https://github.com/magento/composer-root-update-plugin/blob/0.1/src/Magento/ComposerRootUpdatePlugin/README.md#usage).

src/guides/v2.4/install-gde/system-requirements.md

@@ -6,6 +6,7 @@ functional_areas:
   - Setup
 redirect_from:
   - /guides/v2.4/install-gde/system-requirements-tech.html
+  - /guides/v2.4/architecture/tech-stack.html
 ---
 
 {:.bs-callout-info}

src/recommendations/test.md

@@ -31,7 +31,7 @@ See the [user guide](https://docs.magento.com/user-guide/marketing/recommendatio
 
 1. Deploy the `magento/product-recommendations` module to a non-production environment where the catalog data is similar to your production catalog.
 
-1. Use one of the non-production SaaS Environment IDs for [configuration](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) in the Admin.
+1. Use one of the non-production Data Space IDs for [configuration](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) in the Admin.
 
 1. Generate the data yourself by clicking around your storefront to mimic the behavior of actual shoppers (or create an automation script to do this). Through your testing, you will generate behavioral events on your non-production environment. Those events will be used to produce the product affinities that power recommendations. For testing, Magento suggests you interact with the following recommendation types:
 

src/recommendations/troubleshooting.md

@@ -11,7 +11,7 @@ If you have configured the `product-recommendations` module correctly, but you a
 
 -  If you are not seeing the recommendations that you configured, it is possible there is not yet sufficient data to build recommendations for the user.
 
--  Ensure the SaaS Environment ID or API Key are valid. If you get an error after specifying your SaaS Environment ID or your API key during the product recommendations initialization, check to make sure you have entered the [SaaS Environment ID and API key](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) correctly. To ensure the MageID and API key are linked, the user who owns the MageID, typically the user who owns the Magento license, needs to be the same user who generates the API key. If you must change the MageID that was used, [contact support](https://support.magento.com/hc/en-us).
+-  Ensure the Data Space ID or API Key are valid. If you get an error after specifying your Data Space ID or your API key during the product recommendations initialization, check to make sure you have entered the [Data Space ID and API key](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) correctly. To ensure the MageID and API key are linked, the user who owns the MageID, typically the user who owns the Magento license, needs to be the same user who generates the API key. If you must change the MageID that was used, [contact support](https://support.magento.com/hc/en-us).
 
 ### Catalog SaaS Export module
 

src/recommendations/verify.md

@@ -44,7 +44,7 @@ Install the [Snowplow Analytics Debugger extension for Chrome](https://chrome.go
 
 1. Scroll down until you see **Context Data _n_**. Look for the storefront instance in the **Schema**.
 
-1. Verify that the [SaaS Environment ID](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) is set correctly.
+1. Verify that the [SaaS Data Space ID](https://docs.magento.com/m2/ce/user_guide/configuration/services/saas.html) is set correctly.
 
     ![Snowplow filter]({{ page.baseurl }}/recommendations/images/snowplow-filter.png)