Merge pull request #6328 from MicrosoftDocs/main

12/16/2024 AM Publish

.docutune/dictionaries/known-guids.json

@@ -3854,5 +3854,7 @@
   "1P Microsoft Entra application" : "4e1f8dc5-5a42-45ce-a096-700fa485ba20",
   "View ID for import data in model-driven apps" : "a2927069-e4dc-4e8f-8fb1-d2f6c40c427e",
   "Azure Storage" : "e406a681-f3d4-42a8-90b6-c2b029497af1",
-  "Power Platform API" : "8578e004-a5c6-46e7-913e-12f58912df43"
+  "Power Platform API" : "8578e004-a5c6-46e7-913e-12f58912df43",
+  "api.powerplatform.com" : "49676daf-ff23-4aac-adcc-55472d4e2ce0",
+  "Office 365 Groups" : "2f17f077-4175-4d82-b82b-17cd8950b74f"
 }

docs/identity/conditional-access/policy-all-users-device-registration.md

@@ -45,6 +45,7 @@ After administrators confirm the settings using [report-only mode](howto-conditi
 > 
 > :::image type="content" source="media/policy-all-users-device-registration/device-settings-require-mfa-to-register-or-join.png" alt-text="Screenshot of the Require Multifactor Authentication to register or join devices with Microsoft Entra control to be disabled." lightbox="media/policy-all-users-device-registration/device-settings-require-mfa-to-register-or-join.png":::
 
+<!---
 ### Block access to register or join devices outside of trusted networks and locations
 
 Organizations might choose to incorporate known network locations known as **Named locations** in their Conditional Access policies. These named locations might include trusted IP networks like those for a main office location. For more information about configuring named locations, see the article [What is the location condition in Microsoft Entra Conditional Access?](concept-assignment-network.md#ipv4-and-ipv6-address-ranges)
@@ -67,6 +68,8 @@ Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at
 1. Confirm your settings and set **Enable policy** to **Report-only**.
 1. Select **Create** to create to enable your policy.
 
+--->
+
 ## Related content
 
 - [Conditional Access authentication strength](../authentication/concept-authentication-strengths.md)

docs/identity/enterprise-apps/migrate-ad-fs-application-howto.md

@@ -191,7 +191,7 @@ These are the users and groups you can view on the configuration wizard. This is
 
 This tab shows the basic SAML properties that are used for the Single sign-on settings of the Microsoft Entra application. Currently, only required properties are mapped which are Identifier and Reply URL only.
 
-These settings are directly implemented from your AD FS relying party application and can't be modified from this tab. However, after configuring application, you can modify these from the Microsoft Entra admin center's Single sing-on pane of your enterprise application.
+These settings are directly implemented from your AD FS relying party application and can't be modified from this tab. However, after configuring application, you can modify these from the Microsoft Entra admin center's Single sign-on pane of your enterprise application.
 
 :::image type="content" source="media/migrate-ad-fs-application-howto/saml-configurations-on-premises.png" alt-text="Screenshot of the AD FS SAML configurations pane.":::
 

docs/identity/hybrid/connect/how-to-connect-install-prerequisites.md

@@ -105,6 +105,10 @@ We recommend that you harden your Microsoft Entra Connect server to decrease the
   * You can have only one sync engine per SQL instance. Sharing a SQL instance with MIM Sync, DirSync, or Azure AD Sync *isn't supported*.
   * Maintain ODBC Driver for SQL Server version 17 and OLE DB Driver for SQL Server version 18 that are bundled with Microsoft Entra Connect. Upgrading ODBC/OLE DB drivers’s major or minor version aren't supported. Microsoft Entra Connect product group team will include new ODBC/OLE DB drivers as these become available and have a requirement to be updated.
 
+> [!NOTE]
+> If you're installing SQL on the same server as Microsoft Entra Connect, we recommend to configure SQL to limit the maximum memory that it can use from the system.
+> Follow [SQL best practices](/sql/database-engine/configure-windows/server-memory-server-configuration-options?view=sql-server-ver16#recommendations) for memory configuration.
+
 ### Accounts
 * You must have a Microsoft Entra Global Administrator account or Hybrid Identity Administrator account for the Microsoft Entra tenant you want to integrate with. This account must be a *school or organization account* and can't be a *Microsoft account*.
 * If you use [express settings](reference-connect-accounts-permissions.md#express-settings-installation) or upgrade from DirSync, you must have an Enterprise Administrator account for your on-premises Active Directory.

docs/identity/saas-apps/toc.yml

@@ -3914,7 +3914,7 @@
         href: uber-provisioning-tutorial.md
       - name: UNIFI
         href: unifi-provisioning-tutorial.md
-      - name: uniFlow Online
+      - name: uniFLOW Online
         href: uniflow-online-provisioning-tutorial.md
       - name: Uni-tel A/S
         href: uni-tel-as-provisioning-tutorial.md