diff --git a/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md index cb1db35d6e..aeb7575b4c 100644 --- a/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md +++ b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md @@ -32,7 +32,7 @@ You can use Internet Information Services' (IIS) network load balancing (NLB) to Review the following articles to learn more about configuring IIS and NLB for computers running Windows Server operating systems: -* [Achieving High Availability and Scalability - ARR and NLB](https://www.iis.net/learn/extensions/configuring-application-request-routing-arr/achieving-high-availability-and-scalability-arr-and-nlb) describes how to configure IIS 7.0. +* [Achieving High Availability and Scalability - ARR and NLB](/iis/extensions/configuring-application-request-routing-arr/achieving-high-availability-and-scalability-arr-and-nlb) describes how to configure IIS 7.0. * [Network load balancing overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831698(v=ws.11)) will tell you more about how to configure Microsoft Windows Server. @@ -88,13 +88,13 @@ Use the following steps to modify the connection string to include ```failover p 3. Modify the **MANAGEMENT\_SQL\_CONNECTION\_STRING** value with the ```failover partner = ``` value. 4. Restart management service using the IIS console. > [!NOTE] - >Database Mirroring is on the list of [deprecated database engine features in SQL Server 2012]() due to the **AlwaysOn** feature available starting with Microsoft SQL Server 2012. + >Database Mirroring is on the list of [deprecated database engine features in SQL Server 2012](/previous-versions/sql/sql-server-2012/ms143729(v=sql.110)) due to the **AlwaysOn** feature available starting with Microsoft SQL Server 2012. -Click any of the following links for more information: +For more information, see the following articles: * [Prepare a mirror database for mirroring (SQL Server)](/sql/database-engine/database-mirroring/prepare-a-mirror-database-for-mirroring-sql-server). * [Establish a database mirroring session using Windows Authentication (SQL Server Management Studio)](/sql/database-engine/database-mirroring/establish-database-mirroring-session-windows-authentication). -* [Deprecated database engine features in SQL Server 2012](). +* [Deprecated database engine features in SQL Server 2012](/previous-versions/sql/sql-server-2012/ms143729(v=sql.110)). ## Support for Microsoft SQL Server Always On configuration diff --git a/windows/client-management/manage-windows-copilot.md b/windows/client-management/manage-windows-copilot.md index 24110d05f3..918fe88905 100644 --- a/windows/client-management/manage-windows-copilot.md +++ b/windows/client-management/manage-windows-copilot.md @@ -6,7 +6,9 @@ ms.subservice: windows-copilot ms.date: 03/21/2024 ms.author: mstewart author: mestew -ms.collection: windows-copilot +ms.collection: + - windows-copilot + - magic-ai-copilot appliesto: - ✅ Windows 11, version 22H2 or later --- diff --git a/windows/configuration/taskbar/images/pin-add-11.png b/windows/configuration/taskbar/images/pin-add-11.png index de84d0154c..48c0a2a00f 100644 Binary files a/windows/configuration/taskbar/images/pin-add-11.png and b/windows/configuration/taskbar/images/pin-add-11.png differ diff --git a/windows/configuration/taskbar/images/pin-layout-11.png b/windows/configuration/taskbar/images/pin-layout-11.png index 717f210776..5df7a8bfda 100644 Binary files a/windows/configuration/taskbar/images/pin-layout-11.png and b/windows/configuration/taskbar/images/pin-layout-11.png differ diff --git a/windows/configuration/taskbar/images/pin-remove-11.png b/windows/configuration/taskbar/images/pin-remove-11.png index d815923516..8915aedaf6 100644 Binary files a/windows/configuration/taskbar/images/pin-remove-11.png and b/windows/configuration/taskbar/images/pin-remove-11.png differ diff --git a/windows/configuration/taskbar/images/pin-replace-11.png b/windows/configuration/taskbar/images/pin-replace-11.png index ce90eebcad..9d57facb80 100644 Binary files a/windows/configuration/taskbar/images/pin-replace-11.png and b/windows/configuration/taskbar/images/pin-replace-11.png differ diff --git a/windows/configuration/taskbar/images/taskbar-11.png b/windows/configuration/taskbar/images/taskbar-11.png index accd2c6f8f..0e24fb2679 100644 Binary files a/windows/configuration/taskbar/images/taskbar-11.png and b/windows/configuration/taskbar/images/taskbar-11.png differ diff --git a/windows/configuration/taskbar/images/taskbar-sections-11.png b/windows/configuration/taskbar/images/taskbar-sections-11.png index 3e14e85b9d..68e6ce31c5 100644 Binary files a/windows/configuration/taskbar/images/taskbar-sections-11.png and b/windows/configuration/taskbar/images/taskbar-sections-11.png differ diff --git a/windows/configuration/taskbar/includes/turn-off-windows-copilot.md b/windows/configuration/taskbar/includes/turn-off-windows-copilot.md deleted file mode 100644 index 69b9f7fd71..0000000000 --- a/windows/configuration/taskbar/includes/turn-off-windows-copilot.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/11/2024 -ms.topic: include ---- - -### Turn off Windows Copilot - -This policy setting allows you to turn off Windows Copilot. - -- If you enable this policy setting, users can't use Copilot. The Copilot icon doesn't appear on the taskbar either -- If you disable or don't configure this policy setting, users can use Copilot, if available - -| | Path | -|--|--| -| **CSP** | `./User/Vendor/MSFT/Policy/Config/WindowsAI/`[TurnOffWindowsCopilot](/windows/client-management/mdm/policy-csp-windowsai#turnoffwindowscopilot) | -| **GPO** | **User Configuration** > **Administrative Templates** > **Windows Components** > **Windows Copilot** | diff --git a/windows/configuration/taskbar/index.md b/windows/configuration/taskbar/index.md index 04b5c9de37..a0a2c4deaa 100644 --- a/windows/configuration/taskbar/index.md +++ b/windows/configuration/taskbar/index.md @@ -50,7 +50,6 @@ Let's review the components of the Windows taskbar by dividing it into three are 1. Quick Actions 1. Calendar 1. Action Center - 1. Copilot :::image type="content" source="images/taskbar-sections-11.png" alt-text="Screenshot of the Windows 11 taskbar with the three areas highlighted." border="false" lightbox="./images/taskbar-sections-11.png"::: @@ -73,7 +72,6 @@ Let's review the components of the Windows taskbar by dividing it into two areas - The system tray, which displays icons like the pen menu, touch keyboard, virtual touchpad, power, network, volume, and any application icons that are running in the background like OneDrive, Teams, or antivirus software - Calendar - Action center - - Copilot :::image type="content" source="images/taskbar-sections-10.png" alt-text="Screenshot of the Windows 11 taskbar with the two areas highlighted." border="false" lightbox="./images/taskbar-sections-10.png"::: diff --git a/windows/configuration/taskbar/policy-settings.md b/windows/configuration/taskbar/policy-settings.md index cf9fa4a5ea..72ca73538b 100644 --- a/windows/configuration/taskbar/policy-settings.md +++ b/windows/configuration/taskbar/policy-settings.md @@ -37,7 +37,6 @@ Select one of the tabs to see the list of available settings: |[Show additional calendar](#show-additional-calendar)|❌|✅| |[Simplify Quick Settings Layout](#simplify-quick-settings-layout)|✅|✅| |[Turn off automatic promotion of notification icons to the taskbar](#turn-off-automatic-promotion-of-notification-icons-to-the-taskbar)|❌|✅| -|[Turn off Windows Copilot](#turn-off-windows-copilot)|✅|✅| ::: zone-end @@ -62,7 +61,6 @@ Select one of the tabs to see the list of available settings: |[Show additional calendar](#show-additional-calendar)|❌|✅| |[Turn off automatic promotion of notification icons to the taskbar](#turn-off-automatic-promotion-of-notification-icons-to-the-taskbar)|❌|✅| |[Turn off notification area cleanup](#turn-off-notification-area-cleanup)|❌|✅| -|[Turn off Windows Copilot](#turn-off-windows-copilot)|✅|✅| ::: zone-end @@ -109,8 +107,6 @@ Select one of the tabs to see the list of available settings: [!INCLUDE [turn-off-notification-area-cleanup](includes/turn-off-notification-area-cleanup.md)] ::: zone-end -[!INCLUDE [turn-off-windows-copilot](includes/turn-off-windows-copilot.md)] - #### [:::image type="icon" source="../images/icons/touch.svg"::: **Taskbar behaviors**](#tab/actions) ::: zone pivot="windows-11" diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-aadj-sso-cert.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-aadj-sso-cert.md index ff9bf8c522..805091b707 100644 --- a/windows/security/identity-protection/hello-for-business/hello-hybrid-aadj-sso-cert.md +++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-aadj-sso-cert.md @@ -1,7 +1,7 @@ --- title: Use Certificates to enable SSO for Microsoft Entra join devices description: If you want to use certificates for on-premises single-sign on for Microsoft Entra joined devices, then follow these additional steps. -ms.date: 08/19/2018 +ms.date: 04/24/2024 ms.topic: how-to ---