Merge branch 'release-intune-2112' of https://github.com/microsoftdocs/memdocs-pr into erikre-rel2112-12425933

Author: Erikre

memdocs/configmgr/comanage/overview.md

@@ -117,7 +117,7 @@ Enabling co-management itself doesn't require that you onboard your site with Az
 
 ### Windows
 
-Upgrade your devices to Windows 10, version 1709 or later. For more information, see [Adopting Windows as a service](../core/understand/configuration-manager-and-windows-as-service.md#key-articles-about-adopting-windows-as-a-service).
+Upgrade your devices to Windows 10, version 1709 or later. For more information, see [Adopting Windows as a service](../core/understand/configuration-manager-and-windows-as-service.md#windows-as-a-service).
 
 ### Permissions and roles
 

memdocs/configmgr/core/plan-design/hierarchy/accounts.md

@@ -650,7 +650,7 @@ Configuration Manager automatically creates and maintains the following role obj
 
 ### smsdbrole_AITool
 
-Configuration Manager grants this permission to users accounts based on role-based access to import volume license information for Asset Intelligence. This account could be added by a Full Administrator or Asset Manager role.
+Configuration Manager grants this permission to administrative user accounts based on role-based access to import volume license information for Asset Intelligence. This account could be added by a Full Administrator, Operations Administrator or Asset Manager role, or any role with 'Manage Asset Intelligence' permission.
 
 ### smsdbrole_AIUS
 

memdocs/configmgr/core/servers/manage/management-insights.md

@@ -130,7 +130,7 @@ Helps you integrate with many cloud services, which enable modern management of
 
 - **Sites that don't have proper HTTPS configuration**: This insight lists sites in your hierarchy that aren't properly configured for HTTPS. This configuration prevents the site from [synchronizing collection membership results to Azure AD groups](../../clients/manage/collections/create-collections.md#bkmk_aadcollsync). It may cause Azure AD sync to not upload all devices. Management of these clients may not function properly.<!--6268489--> Configure [Enhanced HTTP](../../plan-design/hierarchy/enhanced-http.md), or enable at least one management point for HTTPS. If you already configured the site for HTTPS communication, this insight doesn't appear.<!-- 73884047-3395-430E-B971-F853806D4349 -->
 
-- **Update clients to the latest Windows 10 version**: Windows 10, version 1709 or above improves and modernizes the computing experience of your users. For more information, see [Key articles about adopting Windows as a service](../../understand/configuration-manager-and-windows-as-service.md#key-articles-about-adopting-windows-as-a-service).<!-- FD2C7B93-E5C6-4DCB-89AF-9EFCFCD01524 -->
+- **Update clients to the latest Windows 10 version**: Windows 10, version 1709 or above improves and modernizes the computing experience of your users. For more information, see [Stay current with Windows as a service](../../understand/configuration-manager-and-windows-as-service.md#windows-as-a-service).<!-- FD2C7B93-E5C6-4DCB-89AF-9EFCFCD01524 -->
 
 ### Collections
 

memdocs/configmgr/core/understand/configuration-manager-and-windows-as-service.md

@@ -2,7 +2,7 @@
 title: Configuration Manager and Windows as a Service
 titleSuffix: Configuration Manager
 description: Get basic information on adopting Configuration Manager current branch to support Windows as a service.
-ms.date: 07/27/2021
+ms.date: 12/07/2021
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: overview
@@ -18,33 +18,54 @@ ms.localizationpriority: medium
 
 Configuration Manager provides comprehensive control over feature updates for Windows. To fully adopt the Windows as a service model, you also must adopt the Configuration Manager current branch model. To stay current with Windows, requires that you stay current with Configuration Manager for the best experience. New versions of Configuration Manager are required to take full advantage of the exciting new enterprise features for Windows. This article is intended to be a landing page for the key articles required to adopt Configuration Manager current branch. Configuration Manager current branch gets you on your way to Windows as a service.
 
-## Key articles about adopting Configuration Manager current branch
+## Configuration Manager current branch
 
 | Article | Description |
-| ------------- |-------------|
-|[Overview of Configuration Manager current branch](../plan-design/changes/whats-new-incremental-versions.md)|Provides a brief summary of the key points for the servicing model for Configuration Manager current branch|
-|[Support lifecycle](../servers/manage/current-branch-versions-supported.md)|Explains the current branch support and servicing model.|
-|[Removed and deprecated items](../plan-design/changes/deprecated/removed-and-deprecated.md)|Provides early notice about future changes that might affect your use of Configuration Manager.|
-|[Updates to Configuration Manager current branch](../servers/manage/updates.md)|Explains the easy in-console method of applying feature updates to Configuration Manager.|
-|[Get available updates](../servers/manage/prepare-in-console-updates.md#get-available-updates)|Explains the two modes available to get new Configuration Manager feature updates.|
-|[Update checklist](../servers/manage/prepare-in-console-updates.md#before-you-install-an-in-console-update)|Provides update version-specific checklists, if applicable.|
-|[Install new Configuration Manager feature updates](../servers/manage/install-in-console-updates.md)|Explains the simple installation steps for feature updates.|
-|[Support for Windows 11](../plan-design/configs/support-for-windows-11.md)|Provides a support matrix for Windows 11 versions.|
-|[Support for Windows 10](../plan-design/configs/support-for-windows-10.md)|Provides a support matrix for Windows 10 versions.|
-|[Support for Windows ADK](../plan-design/configs/support-for-windows-adk.md)|Provides a support matrix for the Windows Assessment and Deployment Kit (Windows ADK).|
-|[Technical Previews for Configuration Manager](../get-started/technical-preview.md)|Provides information about the Configuration Manager technical preview program.|
-
-## Key articles about adopting Windows as a service
+|--|--|
+| [Overview of Configuration Manager current branch](../plan-design/changes/whats-new-incremental-versions.md) | Provides a brief summary of the key points for the servicing model for Configuration Manager current branch |
+| [Support lifecycle](../servers/manage/current-branch-versions-supported.md) | Explains the current branch support and servicing model. |
+| [Removed and deprecated items](../plan-design/changes/deprecated/removed-and-deprecated.md) | Provides early notice about future changes that might affect your use of Configuration Manager. |
+| [Updates to Configuration Manager current branch](../servers/manage/updates.md) | Explains the easy in-console method of applying feature updates to Configuration Manager. |
+| [Get available updates](../servers/manage/prepare-in-console-updates.md#get-available-updates) | Explains the two modes available to get new Configuration Manager feature updates. |
+| [Update checklist](../servers/manage/prepare-in-console-updates.md#before-you-install-an-in-console-update) | Provides update version-specific checklists, if applicable. |
+| [Install new Configuration Manager feature updates](../servers/manage/install-in-console-updates.md) | Explains the simple installation steps for feature updates. |
+| [Support for Windows 11](../plan-design/configs/support-for-windows-11.md) | Provides a support matrix for Windows 11 versions. |
+| [Support for Windows 10](../plan-design/configs/support-for-windows-10.md) | Provides a support matrix for Windows 10 versions. |
+| [Support for Windows ADK](../plan-design/configs/support-for-windows-adk.md) | Provides a support matrix for the Windows Assessment and Deployment Kit (Windows ADK). |
+| [Technical Previews for Configuration Manager](../get-started/technical-preview.md) | Provides information about the Configuration Manager technical preview program. |
+
+## Windows as a service
 
 | Article | Description |
-| ------------- |-------------|
-|[Manage Windows as a service](../../osd/deploy-use/manage-windows-as-a-service.md)|Explains how to use servicing plans to deploy Windows feature updates.|
-|[Upgrade Windows via task sequence](../../osd/deploy-use/create-a-task-sequence-to-upgrade-an-operating-system.md)|The details of creating a task sequence to upgrade Windows with additional recommendations.|
-|[Phased deployments](../../osd/deploy-use/create-phased-deployment-for-task-sequence.md)|Phased deployments automate a coordinated, sequenced rollout of a task sequence across multiple collections.|
-|[Optimize Windows update delivery](../../sum/deploy-use/optimize-windows-10-update-delivery.md)|Use Configuration Manager to manage update content to stay current with Windows.|
-|[Use Desktop Analytics](../../desktop-analytics/overview.md)|Desktop Analytics allows you to assess and analyze the readiness of devices in your environment for an upgrade to Windows.|
-|[Windows Update for Business integration (optional)](../../sum/deploy-use/integrate-windows-update-for-business-windows-10.md)|Explains how to define and deploy Windows Update for Business (WUfB) policies using Configuration Manager.|
-|[Use co-management with Microsoft Intune and Windows Update for Business (optional)](../../comanage/overview.md)|Provides an overview of co-management.|
+|--|--|
+| [Manage Windows as a service](../../osd/deploy-use/manage-windows-as-a-service.md) | Explains how to use servicing plans to deploy Windows feature updates. |
+| [Upgrade Windows via task sequence](../../osd/deploy-use/create-a-task-sequence-to-upgrade-an-operating-system.md) | The details of creating a task sequence to upgrade Windows with additional recommendations. |
+| [Phased deployments](../../osd/deploy-use/create-phased-deployment-for-task-sequence.md) | Phased deployments automate a coordinated, sequenced rollout of a task sequence across multiple collections. |
+| [Optimize Windows update delivery](../../sum/deploy-use/optimize-windows-10-update-delivery.md) | Use Configuration Manager to manage update content to stay current with Windows. |
+| [Use Desktop Analytics](../../desktop-analytics/overview.md) | Desktop Analytics allows you to assess and analyze the readiness of devices in your environment for an upgrade to Windows. |
+| [Windows Update for Business integration (optional)](../../sum/deploy-use/integrate-windows-update-for-business-windows-10.md) | Explains how to define and deploy Windows Update for Business (WUfB) policies using Configuration Manager. |
+| [Use co-management with Microsoft Intune and Windows Update for Business (optional)](../../comanage/overview.md) | Provides an overview of co-management. |
+
+## Product lifecycle
+
+<!-- 10976295 -->
+
+Another important aspect of staying current with Windows and Configuration Manager is to monitor product lifecycles. Configuration Manager has built-in features to help:
+
+- Be proactive with dashboards for planning:
+  - [Product lifecycle dashboard](../clients/manage/asset-intelligence/product-lifecycle-dashboard.md): View the Microsoft Lifecycle Policy for applicable products.
+  - [Windows servicing dashboard](../../osd/deploy-use/manage-windows-as-a-service.md): Provides you with information about computers in your environment, servicing plans, and compliance information.
+
+- Be reactive with notifications, management insights, and reports:
+  - [Configuration Manager console notifications](../servers/manage/admin-console-notifications.md#new-notifications-in-version-2010): Look for in-console notifications about devices with operating systems that are past the end of support date and that are no longer eligible to receive security updates.
+  - Management insights
+    - [Security](../servers/manage/management-insights.md#security): Identify clients with unsupported antimalware client versions or clients running earlier versions of Windows that don't receive security updates by default.
+    - [Simplified management](../servers/manage/management-insights.md#simplified-management): Identify clients running an unsupported version of Windows or with an earlier version of the Configuration Manager client.
+  - Reports:
+    - [Data warehouse historical reporting](../servers/manage/list-of-reports.md#data-warehouse): View computers that are missing software updates.
+    - [OS reports](../servers/manage/list-of-reports.md#operating-system): View computers by OS versions and servicing details.
+    - [Software Updates compliance reports](../servers/manage/list-of-reports.md#software-updates---a-compliance): View software update compliance details.
+  - [Power BI sample reports for software updates](../servers/manage/powerbi-sample-reports.md): Use Power BI to view software update compliance status.
 
 ## Next steps
 

memdocs/configmgr/develop/adminservice/overview.md

@@ -2,7 +2,7 @@
 title: What is the administration service
 titleSuffix: Configuration Manager
 description: Use the Configuration Manager administration service REST API to interact with the site over an HTTPS OData connection.
-ms.date: 08/02/2021
+ms.date: 12/07/2021
 ms.prod: configuration-manager
 ms.technology: configmgr-sdk
 ms.topic: overview
@@ -63,12 +63,24 @@ Configure the following prerequisites on the server that hosts the SMS Provider
 
 - Starting in version 2107, the SMS Provider requires .NET version 4.6.2, and version 4.8 is recommended.<!--10402814--> In version 2103 and earlier, this role requires .NET 4.5 or later. For more information, [Site and site system prerequisites](../../core/plan-design/configs/site-and-site-system-prerequisites.md#net-version-requirements).
 
-- Enable secure HTTPS communication with a trusted certificate. For more information, see [Enable secure HTTPS communication](set-up.md#enable-secure-https-communication).
+- You may need to enable secure HTTPS communication with a trusted certificate. For more information, see [Enable secure HTTPS communication](set-up.md#enable-secure-https-communication).
 
 To access the administration service, your user account needs to be an administrative user in Configuration Manager. If you access the administration service via a cloud management gateway, you need to have an account in Azure Active Directory (Azure AD).
 
 For more information on scalability of the SMS Provider and administration service, see [Size and scale numbers](../../core/plan-design/configs/size-and-scale-numbers.md#sms-provider).
 
+> [!NOTE]
+> For any machine with the Configuration Manager console, if it's using a proxy server, the console fails to connect to the administration service. For example, when trying to access the **Security** nodes, you may see errors that the administration service isn't enabled or available. The **SmsAdminUI.log** file shows errors such as, `Failed to get a response for OData query.`<!-- known issue 12468490 -->
+>
+> To work around this issue, either remove the proxy configuration from the machine, or make the following configuration change:<!-- 12468037 -->
+>
+> 1. Manually edit the following XML file: `C:\Program Files (x86)\Microsoft Endpoint Manager\AdminConsole\bin\Microsoft.ConfigurationManagement.exe.config`
+> 1. Configure the `<defaultproxy>` behavior with one of the following options:
+>     1. Set `enabled="false"`
+>     1. Add the FQDN of the SMS Provider to the `<bypasslist>`.
+>
+>    For more information, see [`<defaultProxy>` Element (Network Settings)](/dotnet/framework/configure-apps/file-schema/network/defaultproxy-element-network-settings).
+
 ## Next steps
 
 > [!div class="nextstepaction"]