Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into asb-b4-container-instances

Author: msmbaldwin

.openpublishing.redirection.json

@@ -17255,24 +17255,144 @@
       "redirect_url": "/azure/security/azure-disk-encryption-linux-powershell-quickstart",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/service-bus-relay/diagnostic-logs.md",
+      "redirect_url": "/azure/azure-relay/diagnostic-logs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/ip-firewall-virtual-networks.md",
+      "redirect_url": "/azure/azure-relay/ip-firewall-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/network-security.md",
+      "redirect_url": "/azure/azure-relay/network-security",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path": "articles/service-bus-relay/private-link-service.md",
+      "redirect_url": "/azure/azure-relay/private-link-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-api-overview.md",
+      "redirect_url": "/azure/azure-relay/relay-api-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-authentication-and-authorization.md",
+      "redirect_url": "/azure/azure-relay/relay-authentication-and-authorization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-create-namespace-portal.md",
+      "redirect_url": "/azure/azure-relay/relay-create-namespace-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-exceptions.md",
+      "redirect_url": "/azure/azure-relay/relay-exceptions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-faq.md",
+      "redirect_url": "/azure/azure-relay/relay-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-dotnet-api-overview.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-dotnet-api-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-dotnet-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-dotnet-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-http-requests-dotnet-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-http-requests-dotnet-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-http-requests-node-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-http-requests-node-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-node-get-started.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-node-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-node-ws-api-overview.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-node-ws-api-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-hybrid-connections-protocol.md",
+      "redirect_url": "/azure/azure-relay/relay-hybrid-connections-protocol",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-metrics-azure-monitor.md",
+      "redirect_url": "/azure/azure-relay/relay-metrics-azure-monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/relay-migrate-acs-sas.md",
+      "redirect_url": "/azure/azure-relay/relay-migrate-acs-sas",
+      "redirect_document_id": false
+    },            
+    {
+      "source_path": "articles/service-bus-relay/relay-port-settings.md",
+      "redirect_url": "/azure/azure-relay/relay-port-settings",
+      "redirect_document_id": false
+    },            
+    {
+      "source_path": "articles/service-bus-relay/relay-what-is-it.md",
+      "redirect_url": "/azure/azure-relay/relay-what-is-it",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay.md",
+      "redirect_url": "/azure/azure-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay",
+      "redirect_document_id": false
+    },                
+    {
+      "source_path": "articles/service-bus-relay/service-bus-relay-rest-tutorial.md",
+      "redirect_url": "/azure/azure-relay/service-bus-relay-rest-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/service-bus-relay-security-controls.md",
+      "redirect_url": "/azure/azure-relay/service-bus-relay-security-controls",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/service-bus-relay/service-bus-relay-tutorial.md",
+      "redirect_url": "/azure/azure-relay/service-bus-relay-tutorial",
+      "redirect_document_id": false
+    },                            
     {
       "source_path": "articles/service-bus-relay/relay-wcf-dotnet-get-started.md",
-      "redirect_url": "/azure/service-bus-relay/service-bus-relay-tutorial",
+      "redirect_url": "/azure/azure-relay/azure-relay-tutorial",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-dotnet-how-to-use-relay.md",
-      "redirect_url": "/azure/service-bus-relay/relay-wcf-dotnet-get-started",
+      "redirect_url": "/azure/azure-relay/relay-wcf-dotnet-get-started",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-overview.md",
-      "redirect_url": "/azure/service-bus-relay/relay-what-is-it",
+      "redirect_url": "/azure/azure-relay/relay-what-is-it",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-port-settings.md",
-      "redirect_url": "/azure/service-bus-relay/relay-port-settings",
+      "redirect_url": "/azure/azure-relay/relay-port-settings",
       "redirect_document_id": false
     },
     {
@@ -32617,7 +32737,7 @@
     },
     {
       "source_path": "articles/service-bus-relay/service-bus-relay-security-attributes.md",
-      "redirect_url": "/azure/service-bus-relay/service-bus-relay-security-controls",
+      "redirect_url": "/azure/azure-relay/azure-relay-security-controls",
       "redirect_document_id": false
     },
     {

articles/active-directory/authentication/howto-mfa-nps-extension.md

@@ -14,6 +14,7 @@ manager: daveba
 ms.reviewer: michmcla
 
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 ---
 # Integrate your existing NPS infrastructure with Azure Multi-Factor Authentication
 

articles/active-directory/conditional-access/faqs.md

@@ -14,6 +14,7 @@ manager: daveba
 ms.reviewer: calebb
 
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 ---
 # Azure Active Directory Conditional Access FAQs
 

articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md

@@ -14,6 +14,7 @@ manager: daveba
 ms.reviewer: rogoya
 
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 ---
 # Blocking legacy authentication
 

articles/active-directory/fundamentals/whats-new-archive.md

@@ -12,7 +12,7 @@ ms.topic: conceptual
 ms.date: 04/30/2020
 ms.author: mimart
 ms.reviewer: dhanyahk
-ms.custom: "it-pro, seo-update-azuread-jan"
+ms.custom: it-pro, seo-update-azuread-jan, has-adal-ref
 ms.collection: M365-identity-device-management
 ---
 

articles/active-directory/hybrid/reference-connect-version-history.md

@@ -13,6 +13,7 @@ ms.subservice: hybrid
 ms.author: billmath
 
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 ---
 # Azure AD Connect: Version release history
 The Azure Active Directory (Azure AD) team regularly updates Azure AD Connect with new features and functionality. Not all additions are applicable to all audiences.

articles/active-directory/manage-apps/plan-sso-deployment.md

@@ -12,6 +12,7 @@ ms.date: 05/22/2019
 ms.author: baselden
 ms.reviewer: jeedes
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 #customer intent: As an IT admin, I need to learn about single-sign on (SSO) so I can understand the feature and help others in my organization to understand its value.
 ---
 

articles/active-directory/manage-apps/what-is-application-proxy.md

@@ -13,6 +13,7 @@ ms.author: mimart
 ms.reviewer: japere
 
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 ---
 
 # Using Azure AD Application Proxy to publish on-premises apps for remote users

articles/active-directory/managed-identities-azure-resources/known-issues.md

@@ -16,6 +16,7 @@ ms.workload: identity
 ms.date: 12/12/2017
 ms.author: markvi
 ms.collection: M365-identity-device-management
+ms.custom: has-adal-ref
 ---
 
 # FAQs and known issues with managed identities for Azure resources

articles/active-directory/managed-identities-azure-resources/services-support-managed-identities.md

@@ -67,6 +67,19 @@ Refer to the following list to configure managed identity for Azure App Service
 - [Azure PowerShell](/azure/app-service/overview-managed-identity#using-azure-powershell)
 - [Azure Resource Manager template](/azure/app-service/overview-managed-identity#using-an-azure-resource-manager-template)
 
+
+### Azure Kubernetes Service (AKS)
+
+| Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |
+| --- | :-: | :-: | :-: | :-: |
+| System assigned | ![Available][check] | - | - | - | 
+| User assigned | ![Available][check] | - | - | - |
+
+
+For more information, see [Use managed identities in Azure Kubernetes Service](https://docs.microsoft.com/azure/aks/use-managed-identity).
+
+
+
 ### Azure Blueprints
 
 |Managed identity type | All Generally Available<br>Global Azure Regions | Azure Government | Azure Germany | Azure China 21Vianet |