Skip to content

Commit 969d055

Browse files
yegu-msyegu-ms
committed
Resolved conflict
2 parents b16562d + 7325750 commit 969d055

File tree

166 files changed

+1729
-832
lines changed

Some content is hidden

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

166 files changed

+1729
-832
lines changed

‎.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"redirect_url": "/azure/storage/common/storage-use-azcopy-v10",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path": "articles/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-storage.md",
30+
"redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
31+
"redirect_document_id": false
32+
},
2833
{
2934
"source_path": "articles/machine-learning/service/how-to-load-data.md",
3035
"redirect_url": "/azure/machine-learning/service/how-to-create-register-datasets",
@@ -42567,6 +42572,21 @@
4256742572
"source_path": "articles/aks/consul-install.md",
4256842573
"redirect_url": "/azure/aks/servicemesh-consul-install",
4256942574
"redirect_document_id": false
42575+
},
42576+
{
42577+
"source_path": "articles/security/fundamentals/iot-overview.md",
42578+
"redirect_url": "/azure/iot-fundamentals/iot-security-architecture",
42579+
"redirect_document_id": false
42580+
},
42581+
{
42582+
"source_path": "articles/security/fundamentals/service-fabric-overview.md",
42583+
"redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
42584+
"redirect_document_id": false
42585+
},
42586+
{
42587+
"source_path": "articles/security/fundamentals/service-fabric-checklist.md",
42588+
"redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
42589+
"redirect_document_id": false
4257042590
}
4257142591
]
4257242592
}

‎articles/active-directory-b2c/active-directory-b2c-setup-commonaad-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ You can define Azure AD as a claims provider by adding Azure AD to the **ClaimsP
8383
<!-- Update the Client ID below to the Application ID -->
8484
<Item Key="client_id">00000000-0000-0000-0000-000000000000</Item>
8585
<Item Key="response_types">code</Item>
86-
<Item Key="scope">openid</Item>
86+
<Item Key="scope">openid profile</Item>
8787
<Item Key="response_mode">form_post</Item>
8888
<Item Key="HttpBinding">POST</Item>
8989
<Item Key="UsePolicyInRedirectUri">false</Item>

‎articles/active-directory-domain-services/compatible-software.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Azure Active Directory Domain Services: Compatible third party software | Microsoft Docs'
2+
title: Compatible third party software for Azure AD Domain Services | Microsoft Docs
33
description: Third party software that works with Azure Active Directory Domain Services
44
services: active-directory-ds
55
documentationcenter: ''

‎articles/active-directory-domain-services/csp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Azure Active Directory Domain Services for Azure Cloud Solution Providers | Microsoft Docs'
2+
title: Azure AD Domain Services for Cloud Solution Providers | Microsoft Docs
33
description: Azure Active Directory Domain Services for Azure Cloud Solution Providers.
44
services: active-directory-ds
55
documentationcenter: ''

‎articles/active-directory-domain-services/deploy-azure-app-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Azure Active Directory Domain Services: Deploy Azure AD Application Proxy | Microsoft Docs'
2+
title: Deploy Azure AD Application Proxy for Azure AD Domain Services | Microsoft Docs
33
description: Use Azure AD Application Proxy on Azure Active Directory Domain Services managed domains
44
services: active-directory-ds
55
documentationcenter: ''

‎articles/active-directory-domain-services/join-centos-linux-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Join a CentOS VM to Azure AD Domain Services | Microsoft Docs'
2+
title: Join a CentOS VM to Azure AD Domain Services | Microsoft Docs
33
description: Learn how to configure and join a CentOS Linux virtual machine to an Azure AD Domain Services managed domain.
44
services: active-directory-ds
55
author: iainfoulds

‎articles/active-directory-domain-services/join-coreos-linux-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Join a CoreOS VM to Azure AD Domain Services | Microsoft Docs'
2+
title: Join a CoreOS VM to Azure AD Domain Services | Microsoft Docs
33
description: Learn how to configure and join a CoreOS virtual machine to an Azure AD Domain Services managed domain.
44
services: active-directory-ds
55
author: iainfoulds

‎articles/active-directory-domain-services/join-rhel-linux-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Join a RHEL VM to Azure AD Domain Services | Microsoft Docs'
2+
title: Join a RHEL VM to Azure AD Domain Services | Microsoft Docs
33
description: Learn how to configure and join a Red Hat Enterprise Linux virtual machine to an Azure AD Domain Services managed domain.
44
services: active-directory-ds
55
author: iainfoulds

‎articles/active-directory-domain-services/join-ubuntu-linux-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Join an Ubuntu VM to Azure AD Domain Services | Microsoft Docs'
2+
title: Join an Ubuntu VM to Azure AD Domain Services | Microsoft Docs
33
description: Learn how to configure and join an Ubuntu Linux virtual machine to an Azure AD Domain Services managed domain.
44
services: active-directory-ds
55
author: iainfoulds

‎articles/active-directory-domain-services/join-windows-vm-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use a template to join a Windows Server VM to Azure AD DS | Microsoft Docs
2+
title: Use a template to join a Windows VM to Azure AD DS | Microsoft Docs
33
description: Learn how to use Azure Resource Manager templates to join a new or existing Windows Server VM to an Azure Active Directory Domain Services managed domain.
44
services: active-directory-ds
55
author: iainfoulds

0 commit comments

Comments
 (0)