Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: v-sonan

.openpublishing.redirection.json

@@ -4547,7 +4547,7 @@
     },
     {
       "source_path": "articles/active-directory-ds/active-directory-ds-admin-guide-administer-dns.md",
-      "redirect_url": "/azure/active-directory-domain-services/active-directory-ds-admin-guide-administer-dns",
+      "redirect_url": "/azure/active-directory-domain-services/tutorial-create-instance#update-dns-settings-for-the-azure-virtual-network",
       "redirect_document_id": false
     },
     {
@@ -42073,6 +42073,11 @@
       "redirect_url": "/azure/active-directory-domain-services/tutorial-configure-password-hash-sync",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory-domain-services/active-directory-ds-admin-guide-administer-dns.md",
+      "redirect_url": "/azure/active-directory-domain-services/tutorial-create-instance#update-dns-settings-for-the-azure-virtual-network",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/media-services/previous/media-services-fmp4-live-ingest-overview.md",
       "redirect_url": "/azure/media-services/media-services-fmp4-live-ingest-overview",
@@ -42702,6 +42707,131 @@
       "source_path": "articles/azure-cache-for-redis/cache-howto-manage-redis-cache-powershell.md",
       "redirect_url": "/azure/azure-cache-for-redis/cache-how-to-manage-redis-cache-powershell",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/actuarial-risk-analysis-and-financial-modeling-overview.md",
+      "redirect_url": "/azure/industry-marketing/financial/actuarial-risk-analysis-and-financial-modeling-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/actuarial-risk-analysis-and-financial-modeling-solution-guide.md",
+      "redirect_url": "/azure/industry-marketing/financial/actuarial-risk-analysis-and-financial-modeling-solution-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/data-mgmt-in-banking-overview.md",
+      "redirect_url": "/azure/industry-marketing/financial/data-mgmt-in-banking-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/FSI-risk-modeling.md",
+      "redirect_url": "/azure/industry-marketing/financial/FSI-risk-modeling",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/index.md",
+      "redirect_url": "/azure/industry-marketing/financial/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/mobile-bank-fraud-overview.md",
+      "redirect_url": "/azure/industry-marketing/financial/mobile-bank-fraud-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/risk-grid-banking-overview.md",
+      "redirect_url": "/azure/industry-marketing/financial/risk-grid-banking-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/financial/risk-grid-banking-solution-guide.md",
+      "redirect_url": "/azure/industry-marketing/financial/risk-grid-banking-solution-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/health/index.md",
+      "redirect_url": "/azure/industry-marketing/health/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/health/overview-healthcare-ai-blueprint.md",
+      "redirect_url": "/azure/industry-marketing/health/overview-healthcare-ai-blueprint",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/health/sg-healthcare-ai-blueprint.md",
+      "redirect_url": "/azure/industry-marketing/health/sg-healthcare-ai-blueprint",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/manufacturing/Compute-in-manufacturing-overview.md",
+      "redirect_url": "/azure/industry-marketing/manufacturing/Compute-in-manufacturing-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/manufacturing/extracting-insights-from-iot-data.md",
+      "redirect_url": "/azure/industry-marketing/manufacturing/extracting-insights-from-iot-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/manufacturing/extracting-insights-from-iot-data-overview.md",
+      "redirect_url": "/azure/industry-marketing/manufacturing/extracting-insights-from-iot-data-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/manufacturing/index.md",
+      "redirect_url": "/azure/industry-marketing/manufacturing/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/manufacturing/predictive-maintenance-overview.md",
+      "redirect_url": "/azure/industry-marketing/manufacturing/predictive-maintenance-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/manufacturing/predictive-maintenance-solution.md",
+      "redirect_url": "/azure/industry-marketing/manufacturing/predictive-maintenance-solution",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/index.md",
+      "redirect_url": "/azure/industry-marketing/retail/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/migrating-ecommerce-solution-to-azure.md",
+      "redirect_url": "/azure/industry-marketing/retail/migrating-ecommerce-solution-to-azure",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/recommendation-engine-optimization.md",
+      "redirect_url": "/azure/industry-marketing/retail/recommendation-engine-optimization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/retail-data-management-overview.md",
+      "redirect_url": "/azure/industry-marketing/retail/retail-data-management-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/sku-optimization-overview.md",
+      "redirect_url": "/azure/industry-marketing/retail/sku-optimization-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/sku-optimization-solution-guide.md",
+      "redirect_url": "/azure/industry-marketing/retail/sku-optimization-solution-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/retail/visual-search-use-case-overview.md",
+      "redirect_url": "/azure/industry-marketing/retail/visual-search-use-case-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/industry/index.md",
+      "redirect_url": "/azure/industry-marketing/index",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/active-directory-b2c-reference-oidc.md

@@ -145,7 +145,7 @@ grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&sco
 | {tenant} | Yes | Name of your Azure AD B2C tenant |
 | {policy} | Yes | The user flow that was used to acquire the authorization code. You can't use a different user flow in this request. Add this parameter to the query string, not to the POST body. |
 | client_id | Yes | The application ID that the [Azure portal](https://portal.azure.com/) assigned to your application. |
-| client_secret | Yes | The application secret that was generated in the [Azure portal](https://portal.azure.com/). This application secret is an important security artifact. You should store it securely on your server. Change this client secret on a periodic basis. |
+| client_secret | Yes, in Web Apps | The application secret that was generated in the [Azure portal](https://portal.azure.com/). Client secrets are used in this flow for Web App scenarios, where the client can securely store a client secret. For Native App (public client) scenarios, client secrets cannot be securely stored, threfore not used on this flow. If using a client secret, please change it on a periodic basis. |
 | code | Yes | The authorization code that you acquired in the beginning of the user flow. |
 | grant_type | Yes | The type of grant, which must be `authorization_code` for the authorization code flow. |
 | redirect_uri | Yes | The `redirect_uri` parameter of the application where you received the authorization code. |
@@ -214,7 +214,7 @@ grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=op
 | {tenant} | Yes | Name of your Azure AD B2C tenant |
 | {policy} | Yes | The user flow that was used to acquire the original refresh token. You can't use a different user flow in this request. Add this parameter to the query string, not to the POST body. |
 | client_id | Yes | The application ID that the [Azure portal](https://portal.azure.com/) assigned to your application. |
-| client_secret | Yes | The application secret that was generated in the [Azure portal](https://portal.azure.com/). This application secret is an important security artifact. You should store it securely on your server. Change this client secret on a periodic basis. |
+| client_secret | Yes, in Web Apps | The application secret that was generated in the [Azure portal](https://portal.azure.com/). Client secrets are used in this flow for Web App scenarios, where the client can securely store a client secret. For Native App (public client) scenarios, client secrets cannot be securely stored, threfore not used on this call. If using a client secret, please change it on a periodic basis. |
 | grant_type | Yes | The type of grant, which must be a refresh token for this part of the authorization code flow. |
 | refresh_token | Yes | The original refresh token that was acquired in the second part of the flow. The `offline_access` scope must be used in both the authorization and token requests in order to receive a refresh token. |
 | redirect_uri | No | The `redirect_uri` parameter of the application where you received the authorization code. |

articles/active-directory/authentication/active-directory-passwords-troubleshoot.md

@@ -5,7 +5,7 @@ description: Troubleshooting Azure AD self-service password reset
 services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
-ms.topic: conceptual
+ms.topic: troubleshooting
 ms.date: 02/01/2019
 
 ms.author: joflore

articles/active-directory/authentication/howto-password-ban-bad-on-premises-troubleshoot.md

@@ -5,7 +5,7 @@ description: Understand Azure AD password protection common troubleshooting
 services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
-ms.topic: conceptual
+ms.topic: troubleshooting
 ms.date: 02/01/2019
 
 ms.author: joflore

articles/active-directory/conditional-access/technical-reference.md

@@ -5,7 +5,7 @@ description: Get an overview of the supported settings in an Azure Active Direct
 services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
-ms.topic: article
+ms.topic: reference
 ms.date: 07/10/2019
 
 ms.author: joflore

articles/active-directory/develop/msal-js-initializing-client-applications.md

@@ -88,6 +88,7 @@ export type SystemOptions = {
     logger?: Logger;
     loadFrameTimeout?: number;
     tokenRenewalOffsetSeconds?: number;
+    navigateFrameWait?: number;
 };
 
 // Developer App Environment Support
@@ -137,6 +138,8 @@ Below is the total set of configurable options that are supported currently in t
 
 - **tokenRenewalOffsetSeconds**: Optional. The number of milliseconds which sets the window of offset needed to renew the token before expiry. Default is 300 milliseconds.
 
+- **navigateFrameWait**: Optional. The number of milliseconds which sets the wait time before hidden iframes navigate to their destination. Default is 500 milliseconds.
+
 These are only applicable to be passed down from the MSAL Angular wrapper library:
 - **unprotectedResources**: Optional.  Array of URIs that are unprotected resources. MSAL will not attach a token to outgoing requests that have these URI. Defaults to `null`.