Merge branch 'main' into patch-1

memdocs/configmgr/apps/deploy-use/manage-apps-from-the-windows-store-for-business.md

@@ -29,7 +29,7 @@ The Microsoft Store for Business and Education supports two types of app:
 
 - **Offline**: This type lets you cache apps and licenses to deploy directly within your on-premises network. Devices don't need to connect to the store or have a connection to the internet.
 
-For more information, see the [Microsoft Store for Business and Education overview](/microsoft-store/microsoft-store-for-business-overview).
+For more information, see the [Microsoft Store for Business and Education overview](/mem/configmgr/apps/deploy-use/manage-apps-from-the-windows-store-for-business).
 
 ### Summary of capabilities
 
@@ -64,21 +64,21 @@ Before deploying Microsoft Store for Business and Education apps to devices that
 
 - When the local Administrator account signs in on the device, it can't access Microsoft Store for Business and Education apps.
 
-- Devices need a live internet connection to the Microsoft Store for Business and Education. For more information including proxy configuration, see [Prerequisites](/microsoft-store/prerequisites-microsoft-store-for-business).
+- Devices need a live internet connection to the Microsoft Store for Business and Education. For more information including proxy configuration, see [Prerequisites](/mem/intune/apps/store-apps-microsoft).
 
 ## Set up synchronization
 
 When you synchronize the list of Microsoft Store for Business and Education apps that your organization acquired, you see these apps in the Configuration Manager console.
 
 Connect your Configuration Manager site to Microsoft Entra ID and the Microsoft Store for Business and Education. For more information and details of this process, see [Configure Azure services](../../core/servers/deploy/configure/azure-services-wizard.md). Create a connection to the **Microsoft Store for Business** service.
 
-Make sure the service connection point and targeted devices can access the cloud service. For more information, see [Prerequisites for Microsoft Store for Business and Education - Proxy configuration](/microsoft-store/prerequisites-microsoft-store-for-business#proxy-configuration).
+Make sure the service connection point and targeted devices can access the cloud service. For more information, see [Prerequisites for Microsoft Store for Business and Education - Proxy configuration](/mem/intune/apps/store-apps-microsoft).
 
 ### Supplemental information and configuration
 
 On the **App** page of the Azure Services Wizard, first configure the **Azure environment** and **Web app**. Then read the **More Information** section at the bottom of the page. This information includes the following other actions in the Microsoft Store for Business and Education portal:
 
-- Configure Configuration Manager as the store management tool. For more information, see [Configure management provider](/microsoft-store/configure-mdm-provider-microsoft-store-for-business).
+- Configure Configuration Manager as the store management tool. For more information, see [Configure management provider](/windows/client-management/azure-active-directory-integration-with-mdm).
 
 - Enable support for offline licensed apps. For more information, see [Distribute offline apps](/microsoft-store/distribute-offline-apps).
 

memdocs/configmgr/comanage/autopilot-enrollment.md

@@ -131,6 +131,8 @@ Use these recommendations for a more successful deployment:
 
 ## Limitations
 
+- [Windows Autopilot device preparation](/autopilot/device-preparation/overview) policy doesn't support Autopilot into co-management. As a result, attempting to install co-management during the device preparation flow might result in failed deployments.
+
  - For Windows 11 devices in Microsoft Entra hybrid joined scenario, the management authority will be set to Microsoft Intune during the Windows Autopilot process. Installing Configuration Manager client as Win32 app does not change management authority to Configuration Manager and Microsoft Intune will continue to manage all the co-management workloads.
 
     To change the management authority to Configuration Manager, set the following registry key value:<br>

memdocs/configmgr/comanage/company-portal.md

@@ -83,7 +83,7 @@ For more information on client settings, see the following articles:
 
 - To require the app on co-managed devices, the deployment process depends upon the state of the [Client apps](workloads.md#client-apps) co-management workload:
 
-  - If the client apps workload is with Configuration Manager, [create and deploy an application with Configuration Manager](../apps/get-started/create-and-deploy-an-application.md). Download the offline Company Portal app from the [Microsoft Store for Business](https://www.microsoft.com/business-store).
+  - If the client apps workload is with Configuration Manager, [create and deploy an application with Configuration Manager](../apps/get-started/create-and-deploy-an-application.md).
 
   - If the client apps workload is with Intune, you can deploy it via Configuration Manager or [add the Company Portal app by using Microsoft Intune](../../intune/apps/store-apps-company-portal-app.md).
 

memdocs/configmgr/core/get-started/2020/includes/2001/3721603.md

@@ -19,7 +19,7 @@ Save Power BI Desktop report files (.PBIX) and deploy them to the Power BI Repor
 
 - Power BI Report Server license. For more information, see [Licensing Power BI Report Server](/power-bi/report-server/get-started#licensing-power-bi-report-server).
 
-- Download [Microsoft Power BI Report Server-September 2019](https://www.microsoft.com/download/details.aspx?id=57270).
+- Download [Microsoft Power BI Report Server-September 2024](https://www.microsoft.com/download/details.aspx?id=105945).
 
 - Download [Microsoft Power BI Desktop (Optimized for Power BI Report Server - September 2019)](https://www.microsoft.com/download/details.aspx?id=58494).
 

memdocs/configmgr/core/get-started/capabilities-in-technical-preview-1604.md

@@ -23,7 +23,7 @@ This article introduces the features that are available in the Technical Preview
  The following are new features you can try out with this version.  
 
 ##  <a name="BKMK_WindowsVPP"></a> Manage volume-purchased apps from the Windows Store for Business  
- The [Windows Store for Business](https://www.microsoft.com/business-store) is where you can find and purchase apps for your organization, individually or in volume. By connecting the store to Configuration Manager, you can manage volume-purchased apps from the Configuration Manager console, for example:  
+ The Windows Store for Business is where you can find and purchase apps for your organization, individually or in volume. By connecting the store to Configuration Manager, you can manage volume-purchased apps from the Configuration Manager console, for example:  
 
 -   You can synchronize the list of purchased apps with Configuration Manager  
 
@@ -35,27 +35,27 @@ This article introduces the features that are available in the Technical Preview
 
 ##### Scenario 1: Set up Windows Store for Business synchronization  
 
-1.  In Microsoft Entra ID, register Configuration Manager as a "Web Application and/or Web API" management tool. This will give you a client ID that you will need later.  
+1.  In Microsoft Entra ID, register Configuration Manager as a "Web Application and/or Web API" management tool. This will give you a client ID that you'll need later.  
 
     1.  In the **Active Directory** node of [https://portal.azure.com](https://portal.azure.com), select your Microsoft Entra ID, then click **Applications** > **Add**.  
 
     2.  Click **Add an application my organization is developing**.  
 
     3.  Enter a name for the application, select **Web application** and/or **Web API**, then click the Next arrow.  
 
-    4.  Enter the same URL for both the **Sign-on URL** and **App ID URI**.  The URL can be anything and does not need to resolve to a real address. For example, you can enter **https://&lt;yourdomain\>/sccm**.  
+    4.  Enter the same URL for both the **Sign-on URL** and **App ID URI**.  The URL can be anything and doesn't need to resolve to a real address. For example, you can enter **https://&lt;yourdomain\>/sccm**.  
 
     5.  Complete the wizard.  
 
 2.  In Microsoft Entra ID, create a client key for the registered management tool.  
 
     1.  Highlight the application you just created and click **Configure**.  
 
-    2.  Under **Keys**, select a duration from the list, and click **Save**.  This will create a new client key.  Do not navigate away from this page until you have successfully onboarded Windows Store for Business to Configuration Manager.  
+    2.  Under **Keys**, select a duration from the list, and click **Save**.  This will create a new client key.  Don't navigate away from this page until you have successfully onboarded Windows Store for Business to Configuration Manager.  
 
 3.  In the Windows Store for Business, configure Configuration Manager as the store management tool.  
 
-    1.  Open [https://businessstore.microsoft.com/en-us/managementtools](https://businessstore.microsoft.com/en-us/managementtools) and sign-in if prompted.  
+    1.  Open Windows Store for Business and sign-in if prompted.  
 
     2.  Accept the terms of use if required.  
 
@@ -73,9 +73,9 @@ This article introduces the features that are available in the Technical Preview
 
 6.  On the **Home** tab, in the **Create** group, click **Add Windows Store for Business Account**.  
 
-7.  Add your tenant ID, client id, and client key from Microsoft Entra ID, then complete the wizard.  
+7.  Add your tenant ID, client ID, and client key from Microsoft Entra ID, then complete the wizard.  
 
-8.  Once you are done, you will see the account you configured in the **Windows Store for Business Accounts** list in the Configuration Manager console.  
+8.  Once you're done, you'll see the account you configured in the **Windows Store for Business Accounts** list in the Configuration Manager console.  
 
 ##### Scenario 2: Create and deploy a Configuration Manager application from a Windows Store for Business offline licensed app  
 
@@ -103,7 +103,7 @@ This article introduces the features that are available in the Technical Preview
 ##  <a name="bkmk_peercache"></a> Client settings to manage Client Cache Settings and client Peer Cache  
  Technical preview version 1604 introduces two new device  client settings that affect the use of a client's cache. Both can be used individually but are configured on the same property sheet for client settings and combine to help you manage deployment of content to your clients in remote locations.  
 
--   First is **client Peer Cache**, a built-in Configuration Manager solution for clients to share content with other clients directly from their local cache. For Peer Cache clients to share content, they must be members of the same boundary group. Peer Cache does not replace the use of other solutions like BracnchCache but instead works side-by-side to give you more options to extend traditional content deployment solutions like distribution points.  
+-   First is **client Peer Cache**, a built-in Configuration Manager solution for clients to share content with other clients directly from their local cache. For Peer Cache clients to share content, they must be members of the same boundary group. Peer Cache doesn't replace the use of other solutions like BracnchCache but instead works side-by-side to give you more options to extend traditional content deployment solutions like distribution points.  
 
      After you deploy client settings that enable Peer Cache to a collection, members of that collection can act as a peer content source for other clients in its boundary group.  The client that operates as a peer content source will submit a list of available content it has cached to its management point. Then, when the next client in that boundary group requests that content, the peer cache source is offered as a potential content source along with all distribution points that are configured to be fast. The client selects a random content source from this combined pool of content sources. Clients will only seek content from a distribution point that is configured to be slow when no fast distribution points or peer cache sources are present in the boundary group.  
 
@@ -116,7 +116,7 @@ To help you understand the use of client Peer Cache, you can view the **Client D
 
 -   You must configure your site with a **Network Access Account** that has **Full Control** to the cache folder on each client. By default, this is  **%windir%\ccmcache**  
 
--   Clients can only transfer content using Peer Cache when they  are members of the same boundary group.  
+-   Clients can only transfer content using Peer Cache when they're members of the same boundary group.  
 
 #### To configure Client Peer Cache client settings  
 
@@ -142,9 +142,9 @@ To help you understand the use of client Peer Cache, you can view the **Client D
 
 ##  <a name="bkmk_passport"></a> Support for Passport for Work as a KSP  
  Configuration Manager lets you integrate with Microsoft Passport for Work which is an alternative sign-in method that uses Active Directory, or a Microsoft Entra account to replace a password, smart card, or virtual smart card.  
-Passport lets you use a user gesture to login, instead of a password. A user gesture might be a simple PIN, biometric authentication such as Windows Hello, or an external device such as a fingerprint reader.  
+Passport lets you use a user gesture to log in, instead of a password. A user gesture might be a simple PIN, biometric authentication such as Windows Hello, or an external device such as a fingerprint reader.  
 
--   You can use Configuration Manager to control which gestures users can and cannot use to login, and to configure PIN complexity requirements.  
+-   You can use Configuration Manager to control which gestures users can and can't use to log in, and to configure PIN complexity requirements.  
 
 -   You can store authentication certificates in the Passport for Work key storage provider (KSP).  
 
@@ -162,4 +162,4 @@ When a user creates a Passport PIN, Windows sends a notification which Configura
 To try it out, configure on-premises Health Attestation Service using client agent settings.  
 
 ##  <a name="BKMK_Smart"></a> SmartLock setting for Android devices  
- A new setting, **Allow SmartLock and other trust agents** has been added to the **Android and Samsung KNOX** configuration item that lets you control the SmartLock feature on compatible Android devices. This phone capability, sometimes known as trust agents lets you disable or bypass the device lock screen password if the device is in a trusted location such as when it is connected to a specific Bluetooth device, or when it is near to an NFC tag. You can use this setting to prevent end users from configuring SmartLock.  
+ A new setting, **Allow SmartLock and other trust agents** has been added to the **Android and Samsung KNOX** configuration item that lets you control the SmartLock feature on compatible Android devices. This phone capability, sometimes known as trust agents lets you disable or bypass the device lock screen password if the device is in a trusted location such as when it's connected to a specific Bluetooth device, or when it's near to an NFC tag. You can use this setting to prevent end users from configuring SmartLock.  

memdocs/configmgr/core/get-started/capabilities-in-technical-preview-1605.md

@@ -48,7 +48,7 @@ This article introduces the features that are available in the Technical Preview
  The Prepare ConfigMgr Client step will now completely remove the Configuration Manager client, instead of only removing key information. When the task sequence deploys the captured operating system image it will install a new Configuration Manager client each time.  
 
 ##  <a name="BKMK_Grace"></a> Grace period for required application deployments  
- In some cases, you might want give users more time to install required application deployments beyond any deadlines you configured. For example, if an end user has just returned from vacation, they might have to wait for a long while as overdue application deployments are installed. However, they can still immediately install the application at any time they want.  
+ In some cases, you might want to give users more time to install required application deployments beyond any deadlines you configured. For example, if an end user has just returned from vacation, they might have to wait for a long while as overdue application deployments are installed. However, they can still immediately install the application at any time they want.  
 
  To help solve this problem, you can now define a **grace period** by deploying Configuration Manager client settings to a collection.  
 
@@ -79,7 +79,7 @@ Common actions such as **Retire/Wipe**, **Reset Passcode**, **Remote Lock**, and
 - On the main page of the **Devices** node (not all columns might be visible by default).  
 
 ##  <a name="BKMK_WSFB"></a> Windows Store for Business apps  
- The [Windows Store for Business](https://www.microsoft.com/business-store) is where you can find and purchase apps for your organization, individually or in volume. By connecting the store to Configuration Manager, you can manage volume-purchased apps from the Configuration Manager console, for example:  
+ The Windows Store for Business is where you can find and purchase apps for your organization, individually or in volume. By connecting the store to Configuration Manager, you can manage volume-purchased apps from the Configuration Manager console, for example:  
 
 - You can synchronize the list of purchased apps with Configuration Manager  
 
@@ -111,7 +111,7 @@ Common actions such as **Retire/Wipe**, **Reset Passcode**, **Remote Lock**, and
 
 3.  In the Windows Store for Business, configure Configuration Manager as the store management tool.  
 
-    1.  Open [https://businessstore.microsoft.com](https://businessstore.microsoft.com/) and sign-in if prompted.  
+    1.  Open Windows Store for Business and sign-in if prompted.  
 
     2.  Accept the terms of use if necessary.