Merge pull request #6327 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/entra-docs (branch main)
MicrosoftDocs · Dec 16, 2024 · 4c9e01f · 4c9e01f
2 parents e1c2d69 + ba1c9ba
commit 4c9e01f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/identity/hybrid/connect/how-to-connect-install-prerequisites.md b/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.

diff --git a/docs/identity/saas-apps/toc.yml b/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