Skip to content

Commit 454ea4c

Browse files
authored
Merge branch 'main' into Android8Support
2 parents d0e7b43 + b7d112e commit 454ea4c

28 files changed

Lines changed: 312 additions & 141 deletions

memdocs/analytics/enroll-configmgr.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ Before you start this tutorial, make sure you have the following prerequisites:
3333
3434
### Licensing Prerequisites
3535

36-
Endpoint analytics is included in the following plans:
37-
38-
- [Enterprise Mobility + Security E3](https://www.microsoftvolumelicensing.com/ProductResults.aspx?doc=Product%20Terms,OST&fid=51) or higher
39-
- [Microsoft 365 Enterprise E3](https://www.microsoft.com/en-us/microsoft-365/enterprise?rtc=1) or higher.
36+
Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
4037

4138
## Endpoint analytics permissions
4239

memdocs/analytics/enroll-intune.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ To enroll devices to Endpoint analytics, they need to send required functional d
4343

4444
### Licensing Prerequisites
4545

46-
Endpoint analytics is included in the following plans:
47-
48-
- [Enterprise Mobility + Security E3](https://www.microsoftvolumelicensing.com/ProductResults.aspx?doc=Product%20Terms,OST&fid=51) or higher
49-
- [Microsoft 365 Enterprise E3](https://www.microsoft.com/en-us/microsoft-365/enterprise?rtc=1) or higher.
46+
Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
5047

5148
### Endpoint analytics permissions
5249

memdocs/configmgr/hotfix/2010/5001600.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ ms.localizationpriority: medium
1616
*Applies to: Configuration Manager (current branch, versions 1910 - 2010)*
1717

1818
## Summary of KB5001600
19+
> [!NOTE]
20+
> This update is replaced by the following newer version effective January 21, 2022
21+
>
22+
> [KB 12819689 Connected cache update for Microsoft Endpoint Configuration Manager version 2111](../../hotfix/2111/12819689.md)
23+
>
24+
1925
Due to content delivery network changes, the Microsoft Connected Cache (MCC) server component installation fails when enabled for distribution points *after* **March 5, 2021**.
2026
This component is enabled by selecting the **Enable this distribution point to be used as Microsoft Connected Cache server** option in a distribution point's properties.
2127
After March 5, 2021, once enabled, the component will retry installation three times before stopping.

memdocs/configmgr/hotfix/2111/12709700.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The following major components are updated to the versions specified:
6969

7070
|Component |Version |
7171
|---|---|
72-
| Site | 5.00.9060.1000 |
72+
| Full Version | 5.00.9068.1008 |
7373
| Configuration Manager console | 5.2111.1052.1700 |
7474
| Client | 5.00.9068.1008 |
7575

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
title: Connected cache update for Microsoft Endpoint Configuration Manager version 2111
3+
titleSuffix: Configuration Manager
4+
description: Console update for 2111
5+
ms.date: 1/21/2022
6+
ms.prod: configuration-manager
7+
ms.technology: configmgr-core
8+
ms.topic: reference
9+
ms.assetid: 41afa274-7561-4c0e-80af-2d0fe01699ef
10+
author: bhuney
11+
ms.author: brianhun
12+
manager: dougeby
13+
---
14+
15+
# Connected cache update for Microsoft Endpoint Configuration Manager version 2111
16+
17+
*Applies to: Configuration Manager (current branch, version 2111)*
18+
## Summary of KB12819689
19+
20+
An update is available to resolve the following issue with Configuration Manager current branch, version 2111.
21+
22+
- The Microsoft Connected Cache (MCC) feature is not used as expected for Win32 apps deployed through Microsoft Intune in a co-managed environment.
23+
Review of the IntuneManagementExtension.log file shows an internet-based **DownloadURL** value.
24+
The MCC component is enabled by selecting the **Enable this distribution point to be used as Microsoft Connected Cache server** option in a distribution point's properties.
25+
26+
27+
## Update information for Microsoft Endpoint Configuration Manager, version 2111
28+
The following hotfix to resolve this problem is available for download from the Microsoft Download Center:
29+
30+
[Download this hotfix now](https://download.microsoft.com/download/a/3/a/a3af1ea3-79ba-4600-8953-c2a4b6b8b970/DoincInstall.exe).
31+
32+
After you download this hotfix, refer to the following installation instructions.
33+
34+
## Installation instructions
35+
1. Confirm there is not currently an installation of the MCC component in progress. This is done by checking for status message **9522**, generated by the `SMS_DISTRIBUTION_MANAGER` component. The 9522 message indicates that installation is no longer being retried.
36+
2. Copy the new version of `DoincInstall.exe`, version **1.5.5.9002**, to the `{SMSInstallDir}\bin\x64` folder on all site servers, including the Central Administration Site (CAS) if present, and any passive sites.
37+
3. Uncheck the **Enable this distribution point to be used as Microsoft Connected Cache server** option in the affected distribution point’s properties.
38+
4. Wait for the uninstall of MCC to complete on the distribution point. This can be confirmed by looking for a **9152** success status message, combined with the following entry in `distmgr.log`.
39+
```text
40+
Finished waiting for DoincInstall. InvocationState: UninstallCompleted. InvocationExitCode: 0. InvocationMessage: .
41+
```
42+
5. Recheck the **Enable this distribution point to be used as Microsoft Connected Cache server** option for the affected distribution point.
43+
44+
> [!TIP]
45+
> For sites with a large number of distribution points, replace steps 4 - 5 above with the following.
46+
> - Create an empty file named `resetdps.trn` and place it in the `{SMSInstallDir}\inboxes\distmgr.box` folder. This will reinstall all distribution points for that site using the latest version of `DoincInstall.exe` copied in step 3. above.
47+
48+
## Prerequisites
49+
To apply this hotfix, you must be using Microsoft Endpoint Configuration Manager, versions 1910 through versions 2111.
50+
51+
## Restart information
52+
You don't have to restart the computer after you apply this hotfix.
53+
54+
## Hotfix replacement information
55+
This hotfix replaces the following previously released hotfix.
56+
57+
[KB5001600 Microsoft Connected Cache component fails to install on Configuration Manager current branch](../../hotfix/2010/5001600.md)
58+
59+
## File information
60+
File information is available in the downloadable [KB12819689_FileList.txt](https://aka.ms/KB12819689_FileList) text file.
61+
62+
## Release history
63+
- January 21, 2022: Initial hotfix release

memdocs/configmgr/hotfix/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ items:
99
href: 2111/12709700.md
1010
- name: KB 12959506 Client update for Configuration Manager 2111
1111
href: 2111/12959506.md
12+
- name: KB 12819689 Connected cache update for Microsoft Endpoint Configuration Manager version 2111
13+
href: 2111/12819689.md
1214
- name: Version 2107
1315
items:
1416
- name: KB 10096997 Summary of changes in 2107

memdocs/intune/configuration/preference-file-settings-macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.technology:
1919

2020
#ROBOTS:
2121
#audience:
22-
ms.reviewer: annovich
22+
ms.reviewer: beflamm
2323
ms.suite: ems
2424
search.appverid: MET150
2525
#ms.tgt_pltfrm:

memdocs/intune/configuration/settings-catalog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# required metadata
33

44
title: Create a policy using settings catalog in Microsoft Intune
5-
description: Use settings catalog in Microsoft Intune and Endpoint Manager to configure thousands of settings for Windows 10 devices, and configure Microsoft Edge on macOS devices. Add these settings in a device configuration profile to secure devices, and control different programs and features.
5+
description: Use settings catalog in Microsoft Intune and Endpoint Manager to configure thousands of settings for Windows 10/11 client devices, and configure Microsoft Edge on macOS devices. Add these settings in a device configuration profile to secure devices, and control different programs and features.
66
keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 12/16/2021
10+
ms.date: 01/20/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -42,7 +42,7 @@ This feature applies to:
4242
- **Configure Microsoft Edge version 77 and newer**. Previously, you had to [use a property list (plist) file](/deployedge/configure-microsoft-edge-on-mac) (opens another Microsoft website). For a list of the settings you can configure, see [Microsoft Edge - Policies](/DeployEdge/microsoft-edge-policies) (opens another Microsoft website). Be sure macOS is listed as a supported platform. If some settings aren't available in the settings catalog, then it's recommended to continue using the [preference file](preference-file-settings-macos.md).
4343
- **Configure Microsoft Defender for Endpoint**. Previously, you had to [use a property list (plist) file](/microsoft-365/security/defender-endpoint/mac-install-with-intune) (opens another Microsoft website). For a list of the settings you can configure, see [Set preferences for Microsoft Defender for Endpoint on macOS](/microsoft-365/security/defender-endpoint/mac-preferences) (opens another Microsoft website). Be sure macOS is listed as a supported platform. If some settings aren't available in the settings catalog, then it's recommended to continue using the [preference file](preference-file-settings-macos.md).
4444

45-
- **Windows 10 and newer**
45+
- **Windows 10/11**
4646

4747
There are thousands of settings to choose, including settings that haven't been available before. These settings are directly generated from the Windows configuration service providers (CSPs). You can also configure Administrative Templates, and have more Administrative Template settings available. As Windows adds or exposes more settings to MDM providers, these settings are added quicker to Microsoft Intune for you to configure.
4848

memdocs/intune/configuration/shared-user-device-settings-windows-holographic.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ For more information on this feature in Intune, see [Control access, accounts, a
4141

4242
## Before your begin
4343

44-
[Create a Windows 10 shared multi-user device configuration profile](shared-user-device-settings.md).
44+
[Create a Windows 10/11 shared multi-user device configuration profile](shared-user-device-settings.md).
4545

46-
When you create a Windows 10 shared user device configuration profile, there are more settings than what's listed in this article. The settings in this article are supported on Windows Holographic for Business devices.
46+
When you create a Windows 10/11 shared user device configuration profile, there are more settings than what's listed in this article. The settings in this article are supported on Windows Holographic for Business devices.
4747

4848
## Shared multi-user device settings
4949

@@ -70,4 +70,4 @@ When you create a Windows 10 shared user device configuration profile, there are
7070
## Next steps
7171

7272
- [Assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).
73-
- See the shared user device settings for [Windows 10 and newer](shared-user-device-settings-windows.md).
73+
- See the shared user device settings for [Windows 10/11](shared-user-device-settings-windows.md).

memdocs/intune/configuration/shared-user-device-settings-windows.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
# required metadata
33

4-
title: Windows 10 shared device settings - Microsoft Intune
5-
description: Add and use Windows 10 to configure devices that are shared, or used by multiple users in Microsoft Intune. See a list of all the settings and what they do on the devices, including Microsoft Surface. Control guest accounts, manage accounts and delete inactive accounts, allow or prevent saving to local storage, set power and sleep options, choose when updates are installed, and use devices in education environments in a device configuration profile.
4+
title: Windows 10/11 shared device settings - Microsoft Intune
5+
description: Add and use Windows 10/11 to configure devices that are shared, or used by multiple users in Microsoft Intune. See a list of all the settings and what they do on the devices, including Microsoft Surface. Control guest accounts, manage accounts and delete inactive accounts, allow or prevent saving to local storage, set power and sleep options, choose when updates are installed, and use devices in education environments in a device configuration profile.
66
keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 03/01/2021
10+
ms.date: 01/20/2022
1111
ms.topic: conceptual
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -28,22 +28,22 @@ ms.custom: intune-azure; seodec18
2828
ms.collection: M365-identity-device-management
2929
---
3030

31-
# Windows 10 and newer settings to manage shared devices using Intune
31+
# Windows 10/11 and newer settings to manage shared devices using Intune
3232

3333
> [!NOTE]
3434
> [!INCLUDE [not-all-settings-are-documented](../includes/not-all-settings-are-documented.md)]
3535
36-
Windows 10 and newer devices, such as the Microsoft Surface, can be used by many users. Devices that have multiple users are called shared devices, and are a part of mobile device management (MDM) solutions.
36+
Windows 10/11 client devices, such as the Microsoft Surface, can be used by many users. Devices that have multiple users are called shared devices, and are a part of mobile device management (MDM) solutions.
3737

38-
Using Microsoft Intune, end-users can sign in to these shared devices with a guest account. As they use the device, they only get access to features you allow. As the Intune administrator, you configure access, choose when accounts are deleted, control power management settings, and more for your shared Windows 10 devices.
38+
Using Microsoft Intune, end-users can sign in to these shared devices with a guest account. As they use the device, they only get access to features you allow. As the Intune administrator, you configure access, choose when accounts are deleted, control power management settings, and more for your shared Windows client devices.
3939

4040
This article describes some of the settings you can configure in a device configuration profile. When the profile is created in Intune, you deploy or assign the profile to device groups in your organization. You can also assign this profile to device groups with mixed device types and Windows OS versions.
4141

4242
For more information on this feature in Intune, see [Control access, accounts, and power features on shared PC or multi-user devices](shared-user-device-settings.md). For more information on the Windows CSP, see [SharedPC CSP](/windows/client-management/mdm/sharedpc-csp).
4343

4444
## Before your begin
4545

46-
Create a [Windows 10 shared multi-user device configuration profile](shared-user-device-settings.md).
46+
Create a [Windows 10/11 shared multi-user device configuration profile](shared-user-device-settings.md).
4747

4848
## Shared multi-user device settings
4949

@@ -102,7 +102,7 @@ These settings use the [SharedPC CSP](/windows/client-management/mdm/sharedpc-cs
102102
For more information on what the education policies do, see [Windows 10 configuration recommendations for education customers](/education/windows/configure-windows-for-education).
103103

104104
> [!TIP]
105-
> [Set up a shared or guest PC](/windows/configuration/set-up-shared-or-guest-pc) (opens another docs web site) is a great resource on this Windows 10 feature, including concepts and group policies that can be set in shared mode.
105+
> [Set up a shared or guest PC](/windows/configuration/set-up-shared-or-guest-pc) (opens another docs web site) is a great resource on this Windows client feature, including concepts and group policies that can be set in shared mode.
106106
107107
## Next steps
108108

0 commit comments

Comments
 (0)