Skip to content

Commit d51c5c3

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1645361w
2 parents 0c0cf6b + aa692e8 commit d51c5c3

36 files changed

+356
-86
lines changed

.openpublishing.redirection.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1942,11 +1942,6 @@
19421942
"redirect_url": "/azure/cosmos-db/sql-api-get-started",
19431943
"redirect_document_id": false
19441944
},
1945-
{
1946-
"source_path": "articles/search/search-traffic-analytics.md",
1947-
"redirect_url": "/azure/search/search-monitor-usage",
1948-
"redirect_document_id": false
1949-
},
19501945
{
19511946
"source_path": "articles/search/knowledge-store-howto.md",
19521947
"redirect_url": "/azure/search/knowledge-store-create-rest",

articles/active-directory/manage-apps/customize-application-attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ The SCIM RFC defines a core user and group schema, while also allowing for exten
135135
1. Sign in to the [Azure Active Directory portal](https://aad.portal.azure.com), select **Enterprise Applications**, select your application, and then select **Provisioning**.
136136
2. Under **Mappings**, select the object (user or group) for which you'd like to add a custom attribute.
137137
3. At the bottom of the page, select **Show advanced options**.
138-
4. Select **Edit attribute list for *application*.
138+
4. Select **Edit attribute list for AppName*.
139139
5. At the bottom of the attribute list, enter information about the custom attribute in the fields provided. Then select **Add Attribute**.
140140

141141
For SCIM applications, the attribute name must follow the pattern shown in the example below. The "CustomExtensionName" and "CustomAttribute" can be customized per your application's requirements, for example: urn:ietf:params:scim:schemas:extension:2.0:CustomExtensionName:CustomAttribute

articles/azure-government/compare-azure-government-global-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Compare Azure Government and global Azure | Microsoft Docs
3-
description: This article compares Azure Government and global Azure.
3+
description: Microsoft Azure Government uses same underlying technologies as global Azure, which includes the core components of Infrastructure-as-a-Service (IaaS), Platform-as-a-Service (PaaS), and Software-as-a-Service (SaaS). This article compares Azure Government and global Azure.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-aad-auth-qs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Government Integrate Azure AD Authentication | Microsoft Docs
3-
description: Integrating Azure AD Authentication on Azure Government Quickstart
3+
description: This article demonstrates how to integrating Azure AD Authentication on Azure Government.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-connect-ssms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Connect to Azure Government with SQL Server Management Studio | Microsoft Docs
3-
description: Manage your subscription in Azure Government by connecting with SSMS.
3+
description: Manage your subscription in Azure Government by connecting with SQL Server Management Studio (SSMS).
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Government extensions | Microsoft Docs
3-
description: This article lists virtual machine extensions available in Azure Government
3+
description: This article lists virtual machine extensions available in Azure Government.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-gpu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: GPUs on Azure Government | Microsoft Docs
3-
description: Getting Started with GPUs on Azure Government
3+
description: This article provides information on how to get started with GPUs on Azure Government.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-manage-marketplace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Government Marketplace | Microsoft Docs
3-
description: Provides guidance on how to use the Azure Government Marketplace.
3+
description: This article provides guidance on how to use the Azure Government Marketplace.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-manage-subscriptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Government Subscriptions | Microsoft Docs
3-
description: Information on managing your subscription in Azure Government
3+
description: This article provides information on managing your subscription in Azure Government.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''

articles/azure-government/documentation-government-plan-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Government Identity | Microsoft Docs
3-
description: Provides Planning Guidance for Identity in Azure Government
3+
description: Microsoft Azure Government provides the same ways to build applications and manage identities as Azure Public. This article provides Planning Guidance for Identity in Azure Government.
44
services: azure-government
55
cloud: gov
66
documentationcenter: ''
@@ -28,7 +28,7 @@ Before determining the identity approach for your application, you need to know
2828
|On-Premises Identity|Cloud Identity|Hybrid Identity
2929
|---|---|---|
3030
|On-Premises Identities belong to on-premises Active Directory environments that most customers use today.|Cloud identities originate, only exist, and are managed in Azure AD.|Hybrid identities originate as on-premises identities, but become hybrid through directory synchronization to Azure AD. After directory synchronization they exist both on-premises and in the cloud, hence hybrid.|
31-
31+
3232
>[!NOTE]
3333
>Hybrid comes with deployment options (Synchronized Identity, Federated Identity, etc.) that all rely on directory synchronization and mostly define how identities are authenticated as discussed in [Choose a Hybrid Identity Solution](../active-directory/choose-hybrid-identity-solution.md).
3434
>

0 commit comments

Comments
 (0)