Skip to content

Commit 8010be0

Browse files
committed
fix conflict
2 parents 70696d1 + dc41122 commit 8010be0

126 files changed

Lines changed: 282 additions & 394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "memdocs/intune/apps/store-apps-windows-phone-8-1.md",
5+
"redirect_url": "/mem/intune/apps/apps-add",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "memdocs/intune/apps/lob-apps-windows-phone.md",
10+
"redirect_url": "/mem/intune/apps/apps-add",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "memdocs/intune/user-help/set-or-change-your-password-windows.md",
515
"redirect_url": "https://support.microsoft.com/windows/windows-sign-in-options-and-account-protection-7b34d4cf-794f-f6bd-ddcc-e73cdf1a6fbf",
Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
---
2-
author: mestew
3-
ms.author: mstewart
4-
ms.prod: configuration-manager
5-
ms.technology: configmgr-core
6-
ms.topic: include
2+
title: [Administrative Management option added in Azure Service]
3+
titleSuffix: Configuration Manager
4+
description: Configure Administrative Management to enhance security of the Administrative Service Azure AD endpoints.
75
ms.date: 04/29/2022
8-
ms.localizationpriority: medium
6+
ms.prod: configuration-manager
7+
author: banreet
8+
ms.author: banreetkaur
9+
ms.manager: apoorvseth
10+
ms.topic : include
911
---
12+
## <a name="bkmk_administration"></a> Administration Service Management option
13+
<!--12952905-->
14+
When configuring Azure Services, a new option called **Administration Service Management** is now added for enhanced security. Selecting this option allows administrators to segment their admin privileges between [cloud management gateway (CMG)](../../../../clients/manage/cmg/overview.md) and [administration service](../../../../../../configmgr/develop/adminservice/overview.md). By enabling this option, access is restricted to only administration service endpoints. Configuration Management clients will authenticate to the site using Azure Active Directory.
15+
16+
> [!NOTE]
17+
> Currently, the administration service management option can’t be used with CMG.
18+
19+
:::image type="content" source="../../media/12952905-administration-service-management-azure-services.png" alt-text="Screenshot of administration service management option in the Azure Service Wizard.":::
20+
21+
### Try it out!
1022

11-
## <a name="bkmk_anchor"></a> Feature Name
12-
<!--CMADO#-->
23+
Try to complete the tasks. Then send [Feedback](../../../../understand/product-feedback.md) with your thoughts on the feature.
1324

25+
Generate an Azure Active Directory (Azure AD) token and call the administration service by using a PowerShell script. The sample script and details can be found in the [Microsoft/configmgr-hub GitHub repository](https://aka.ms/cmadminservicetokensample).
54.3 KB
Loading

memdocs/configmgr/develop/apps/deployment-type-extension-versioning.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Deployment Type Extension Versioning"
3+
description: Configuration Manager supports in-place versioning for minor upgrades and out-of-place versioning for major upgrades.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"

memdocs/configmgr/develop/apps/how-to-create-the-windows-installer-file-msi.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "How to Create the Windows Installer File "
3+
description: After the Deployment Type Extension file (*.cmdtx) is created, you are expected to generate a Windows Installer file (\*.msi) which contains the \*.cmdtx file and the UX files.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"

memdocs/configmgr/develop/apps/how-to-define-the-client-side-handler.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "How to Define the Client-side Handler"
3+
description: The custom client-side handler needs to implement a public COM interface and methods. The below methods will be called by the Configuration Manager client framework.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"

memdocs/configmgr/develop/apps/how-to-define-the-create-deployment-type-wizard-xml-file.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "How to Define the Create Deployment Type Wizard XML File "
3+
description: To define the custom create deployment type wizard XML file, create an XML file based on the schema.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"

memdocs/configmgr/develop/apps/how-to-define-the-deployment-technology-registration-file.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "Define the Deployment Technology Registration File "
3+
description: To define a deployment technology registration file, create an XML file based on the AppMgmtDigest schema.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"

memdocs/configmgr/develop/apps/how-to-define-the-deployment-technology.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "How to Define the Deployment Technology"
3+
description: To define a custom application management deployment technology, implement the Microsoft.ConfigurationManagement.ApplicationManagement.DeploymentTechnology class.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"
@@ -19,7 +20,7 @@ To define a custom application management deployment technology, implement the `
1920

2021
The DeploymentTechnology class is the object that is registered with the Configuration Manager Application Model SDK. The DeploymentTechnology class contains references to three different types of objects that compose the technology. When implementing a new deployment technology you must implement a class that derives from this class.
2122

22-
In the Remote Desktop Protocol (RDP) sample project, a new deployment technology is required for Remote Desktop Protocol (RDP) files. Deployment support for RDP files is not built-in to Configuration Manager, so a custom deployment technology is required.
23+
In the Remote Desktop Protocol (RDP) sample project, a new deployment technology is required for Remote Desktop Protocol (RDP) files. Deployment support for RDP files is not built in to Configuration Manager, so a custom deployment technology is required.
2324

2425
> [!IMPORTANT]
2526
> The DeploymentTechnology class name must match the class specified in the DeploymentTechnology.xml file.

memdocs/configmgr/develop/compliance/about-configuration-baselines.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: "About Configuration Baselines"
3+
description: In Configuration Manager, baselines are used to define the configuration of a product or a system that is established at a specific point in time, capturing both structure and details.
34
titleSuffix: "Configuration Manager"
45
ms.date: "09/20/2016"
56
ms.prod: "configuration-manager"

0 commit comments

Comments
 (0)