Merge branch 'master' into vcraic0923

Author: Craig Casey

.openpublishing.redirection.json

@@ -26039,11 +26039,21 @@
       "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-powershell",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/sentinel/tutorial-detect-threats.md",
+      "redirect_url": "/azure/sentinel/tutorial-detect-threats-built-in",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/sentinel/user-analytics.md",
       "redirect_url": "/azure/sentinel/overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/sentinel/connect-fusion.md",
+      "redirect_url": "/azure/sentinel/fusion",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/security-center/security-center-ata-integration.md",
       "redirect_url": "/azure/security-center/security-center-partner-integration",
@@ -36870,7 +36880,12 @@
     },
     {
       "source_path": "articles/monitoring-and-diagnostics/monitoring-archive-diagnostic-logs.md",
-      "redirect_url": "/azure/azure-monitor/platform/archive-diagnostic-logs",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-collect-storage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/archive-diagnostic-logs.md",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-collect-storage",
       "redirect_document_id": true
     },
     {
@@ -36888,6 +36903,11 @@
       "redirect_url": "/azure/azure-monitor/platform/diagnostic-logs-stream-template",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/azure-monitor/platform/diagnostic-logs-stream-template.md",
+      "redirect_url": "/azure/azure-monitor/platform/diagnostic-settings-template",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/monitoring-and-diagnostics/monitoring-autoscale-scale-by-custom-metric.md",
       "redirect_url": "/azure/azure-monitor/platform/autoscale-custom-metric",
@@ -36955,7 +36975,17 @@
     },
     {
       "source_path": "articles/monitoring-and-diagnostics/monitoring-overview-of-diagnostic-logs.md",
-      "redirect_url": "/azure/azure-monitor/platform/diagnostic-logs-overview",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/monitoring-and-diagnostics/diagnostic-logs-overview.md",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/diagnostic-logs-overview.md",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-overview",
       "redirect_document_id": true
     },
     {
@@ -36970,14 +37000,24 @@
     },
     {
       "source_path": "articles/monitoring-and-diagnostics/monitoring-stream-diagnostic-logs-to-event-hubs.md",
-      "redirect_url": "/azure/azure-monitor/platform/diagnostic-logs-stream-event-hubs",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-stream-event-hubs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/diagnostic-logs-stream-event-hubs.md",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-stream-event-hubs",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/monitoring-and-diagnostics/monitor-stream-diagnostic-logs-log-analytics.md",
       "redirect_url": "/azure/azure-monitor/platform/diagnostic-logs-stream-log-store",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/azure-monitor/platform/diagnostic-logs-stream-log-store.md",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-collect-workspace",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/monitoring-and-diagnostics/monitor-tutorial-archive-monitoring-data.md",
       "redirect_url": "/azure/azure-monitor/learn/tutorial-archive-data",
@@ -41368,6 +41408,11 @@
       "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-monitor/platform/diagnostic-logs.md",
+      "redirect_url": "/azure/azure-monitor/platform/resource-logs-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory-domain-services/active-directory-ds-admin-guide-administer-domain.md",
       "redirect_url": "/azure/active-directory-domain-services/manage-domain",

articles/active-directory-b2c/active-directory-b2c-reference-disable-ev.md

@@ -1,34 +1,36 @@
 ---
-title: Disable email verification during consumer sign-up in Azure Active Directory B2C | Microsoft Docs
-description: A topic demonstrating how to disable email verification during consumer sign-up in Azure Active Directory B2C.
+title: Disable email verification during customer sign-up in Azure Active Directory B2C
+description: Learn how to disable email verification during customer sign-up in Azure Active Directory B2C.
 services: active-directory-b2c
 author: mmacy
 manager: celestedg
 
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 11/30/2018
+ms.date: 09/25/2018
 ms.author: marsma
 ms.subservice: B2C
 ---
 
-# Disable email verification during consumer sign-up in Azure Active Directory B2C
-When enabled, Azure Active Directory B2C (Azure AD B2C) gives a consumer the ability to sign up for applications by providing an email address and creating a local account. Azure AD B2C ensures valid email addresses by requiring consumers to verify them during the sign-up process. It also prevents a malicious automated process from generating fake accounts for the applications.
+# Disable email verification during customer sign-up in Azure Active Directory B2C
 
-Some application developers prefer to skip email verification during the sign-up process and instead have consumers verify the email address later. To support this, Azure AD B2C can be configured to disable email verification. Doing so creates a smoother sign-up process and gives developers the flexibility to differentiate the consumers that have verified their email address from those consumers that have not.
+By default, Azure Active Directory B2C (Azure AD B2C) verifies your customer's email address for local accounts (accounts for users who sign up with email address or username). Azure AD B2C ensures valid email addresses by requiring customers to verify them during the sign-up process. It also prevents a malicious actors from using automated processes to generate fraudulent accounts in your applications.
 
-By default, sign-up user flows have email verification turned on. Use the following steps to turn it off:
+Some application developers prefer to skip email verification during the sign-up process and instead have customers verify their email address later. To support this, Azure AD B2C can be configured to disable email verification. Doing so creates a smoother sign-up process and gives developers the flexibility to differentiate customers that have verified their email address from customers that have not.
 
-1. Click **User flows**.
-2. Click your user flow (for example, "B2C_1_SiUp") to open it.
-3. Click **Page layouts**.
-4. Click **Local account sign-up page**.
-5. Click **Email Address** in the **Name** column under the **User attributes** section.
-6. Under **Requires verification**, select **No**.
-7. Click **Save** at the top of the blade. You're done!
+Follow these steps to disable email verification:
 
-> [!NOTE]
-> Disabling email verification in the sign-up process may lead to spam. If you disable the default one, we recommend adding your own verification system.
->
->
+1. Sign in to the [Azure portal](https://portal.azure.com)
+1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
+1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
+1. Select **User flows**.
+1. Select the user flow for which you want to disable email verification. For example, *B2C_1_signinsignup*.
+1. Select **Page layouts**.
+1. Select **Local account sign-up page**.
+1. Under **User attributes**, select **Email Address**.
+1. In the **REQUIRES VERIFICATION** drop down, select **No**.
+1. Select **Save**. Email verification is now disabled for this user flow.
+
+> [!WARNING]
+> Disabling email verification in the sign-up process may lead to spam. If you disable the default Azure AD B2C-provided email verification, we recommend that you implement a replacement verification system.

articles/active-directory-b2c/active-directory-b2c-reference-threat-management.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 07/10/2019
+ms.date: 09/26/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -32,10 +32,10 @@ The first 10 lockout periods are one minute long. The next 10 lockout periods ar
 
 To manage password protection settings, including the lockout threshold:
 
-1. Navigate to the [Azure portal](https://portal.azure.com).
-1. Select the **Directory + Subscription** filter in the top-right menu of the portal, then select your Azure AD B2C tenant.
-1. Select **Azure Active Directory** in the left-hand menu (or select **All services** in the upper-left section of the portal, then search for and select *Azure Active Directory*).
-1. Under **Security**, select **Authentication methods**, then select **Password protection**.
+1. Sign in to the [Azure portal](https://portal.azure.com)
+1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
+1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
+1. Under **Security**, select **Authentication methods (Preview)**, then select **Password protection**.
 1. Enter your desired password protection settings, then select **Save**.
 
     ![Azure portal Password protection page in Azure AD settings](media/active-directory-b2c-reference-threat-management/portal-02-password-protection.png)

articles/active-directory-b2c/active-directory-b2c-setup-sf-app-custom.md

@@ -123,7 +123,7 @@ You can define a Salesforce account as a claims provider by adding it to the **C
             <Key Id="SamlMessageSigning" StorageReferenceId="B2C_1A_SAMLSigningCert"/>
           </CryptographicKeys>
           <OutputClaims>
-            <OutputClaim ClaimTypeReferenceId="socialIdpUserId" PartnerClaimType="userId"/>
+            <OutputClaim ClaimTypeReferenceId="issuerUserId" PartnerClaimType="userId"/>
             <OutputClaim ClaimTypeReferenceId="givenName" PartnerClaimType="given_name"/>
             <OutputClaim ClaimTypeReferenceId="surname" PartnerClaimType="family_name"/>
             <OutputClaim ClaimTypeReferenceId="email" PartnerClaimType="email"/>