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

Author: Heidilohr

.openpublishing.redirection.json

@@ -28465,6 +28465,11 @@
       "redirect_url": "/azure/data-factory/v1/data-factory-web-table-connector",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/data-factory/concepts-data-flow-json.md",
+      "redirect_url": "/azure/data-factory/format-json",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/data-lake-store/data-lake-store-authenticate-using-active-directory.md",
       "redirect_url": "/azure/data-lake-store/data-lake-store-service-to-service-authenticate-using-active-directory",
@@ -35897,9 +35902,39 @@
     },
     {
       "source_path": "articles/active-directory/active-directory-enterprise-apps-manage-provisioning.md",
-      "redirect_url": "/azure/active-directory/manage-apps/configure-automatic-user-provisioning-portal",
+      "redirect_url": "/azure/active-directory/app-provisioning/configure-automatic-user-provisioning-portal",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/plan-auto-user-provisioning.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/plan-auto-user-provisioning",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/plan-cloud-hr-provision.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/plan-cloud-hr-provision",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/provisioning-agent-release-version-history.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/provisioning-agent-release-version-history",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/sap-successfactors-attribute-reference.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/sap-successfactors-attribute-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/skip-out-of-scope-deletions.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/skip-out-of-scope-deletions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/configure-automatic-user-provisioning-portal.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/configure-automatic-user-provisioning-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/active-directory-enterprise-apps-manage-sso.md",
       "redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-portal",
@@ -35940,6 +35975,16 @@
       "redirect_url": "/azure/active-directory/manage-apps/use-scim-to-provision-users-and-groups",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/use-scim-to-provision-users-and-groups.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/use-scim-to-provision-users-and-groups",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/workday-attribute-reference.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/workday-attribute-reference",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/active-directory/migrate-adfs-apps-to-azure.md",
       "redirect_url": "/azure/active-directory/manage-apps/migrate-adfs-apps-to-azure",
@@ -35960,16 +36005,31 @@
       "redirect_url": "/azure/active-directory/manage-apps/user-provisioning",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/user-provisioning.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/user-provisioning",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/user-provisioning-sync-attributes-for-mapping.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/user-provisioning-sync-attributes-for-mapping",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/active-directory-saas-custom-apps.md",
       "redirect_url": "/azure/active-directory/manage-apps/configure-single-sign-on-non-gallery-applications",
       "redirect_document_id": true
     },
     {
       "source_path": "articles/active-directory/active-directory-saas-customizing-attribute-mappings.md",
-      "redirect_url": "/azure/active-directory/manage-apps/customize-application-attributes",
+      "redirect_url": "/azure/active-directory/app-provisioning/customize-application-attributes",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/customize-application-attributes.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/customize-application-attributes",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/active-directory-saas-ie-group-policy.md",
       "redirect_url": "/azure/active-directory/manage-apps/deploy-access-panel-browser-extension",
@@ -35982,19 +36042,34 @@
     },
     {
       "source_path": "articles/active-directory/active-directory-saas-provisioning-reporting.md",
-      "redirect_url": "/azure/active-directory/manage-apps/check-status-user-account-provisioning",
+      "redirect_url": "/azure/active-directory/app-provisioning/check-status-user-account-provisioning",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/check-status-user-account-provisioning.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/check-status-user-account-provisioning",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/active-directory-saas-scoping-filters.md",
-      "redirect_url": "/azure/active-directory/manage-apps/define-conditional-rules-for-provisioning-user-accounts",
+      "redirect_url": "/azure/active-directory/app-provisioning/define-conditional-rules-for-provisioning-user-accounts",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/define-conditional-rules-for-provisioning-user-accounts.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/define-conditional-rules-for-provisioning-user-accounts",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/active-directory-saas-writing-expressions-for-attribute-mappings.md",
-      "redirect_url": "/azure/active-directory/manage-apps/functions-for-customizing-application-data",
+      "redirect_url": "/azure/active-directory/app-provisioning/functions-for-customizing-application-data",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/functions-for-customizing-application-data.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/functions-for-customizing-application-data",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-access-assignment-how-to-add-assignment.md",
       "redirect_url": "/azure/active-directory/manage-apps/methods-for-assigning-users-and-groups",
@@ -36122,34 +36197,74 @@
     },
     {
       "source_path": "articles/active-directory/application-provisioning-config-problem-no-users-provisioned.md",
-      "redirect_url": "/azure/active-directory/manage-apps/application-provisioning-config-problem-no-users-provisioned",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem-no-users-provisioned",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-config-problem-no-users-provisioned.md",
+      "redirect_url": "azure/active-directory/app-provisioning/application-provisioning-config-problem-no-users-provisioned",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-provisioning-config-problem-storage-limit.md",
-      "redirect_url": "/azure/active-directory/manage-apps/application-provisioning-config-problem-storage-limit",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem-storage-limit",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-config-problem-storage-limit.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem-storage-limit",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-provisioning-config-problem-wrong-users-provisioned.md",
-      "redirect_url": "/azure/active-directory/manage-apps/application-provisioning-config-problem-wrong-users-provisioned",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem-wrong-users-provisioned",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-config-problem-wrong-users-provisioned.md",
+      "redirect_url": "azure/active-directory/app-provisioning/application-provisioning-config-problem-wrong-users-provisioned",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-provisioning-config-problem.md",
-      "redirect_url": "/azure/active-directory/manage-apps/application-provisioning-config-problem",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-config-problem.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-config-problem",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-configure-api.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-configure-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-quarantine-status.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-quarantine-status",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-provisioning-when-will-provisioning-finish-specific-user.md",
-      "redirect_url": "/azure/active-directory/manage-apps/application-provisioning-when-will-provisioning-finish-specific-user",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-when-will-provisioning-finish-specific-user.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-when-will-provisioning-finish-specific-user",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-provisioning-when-will-provisioning-finish.md",
-      "redirect_url": "/azure/active-directory/manage-apps/application-provisioning-when-will-provisioning-finish",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-when-will-provisioning-finish",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/active-directory/manage-apps/application-provisioning-when-will-provisioning-finish.md",
+      "redirect_url": "/azure/active-directory/app-provisioning/application-provisioning-when-will-provisioning-finish",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/application-proxy-back-end-kerberos-constrained-delegation-how-to.md",
       "redirect_url": "/azure/active-directory/manage-apps/application-proxy-back-end-kerberos-constrained-delegation-how-to",
@@ -36730,6 +36845,16 @@
       "redirect_url": "/azure/active-directory/authentication/howto-authentication-passwordless-security-key-windows",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/authentication/quickstart-sspr.md",
+      "redirect_url": "/azure/active-directory/authentication/tutorial-enable-sspr",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/authentication/tutorial-sspr-pilot.md",
+      "redirect_url": "/azure/active-directory/authentication/tutorial-enable-sspr",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/application-gateway/application-gateway-ssl-portal.md",
       "redirect_url": "/azure/application-gateway/create-ssl-portal",

articles/active-directory-b2c/azure-monitor.md

@@ -11,12 +11,12 @@ ms.workload: identity
 ms.topic: conceptual
 ms.author: marsma
 ms.subservice: B2C
-ms.date: 02/03/2020
+ms.date: 02/05/2020
 ---
 
 # Monitor Azure AD B2C with Azure Monitor
 
-Use Azure Monitor to route Azure Active Directory B2C (Azure AD B2C) usage activity events to different monitoring solutions. You can retain the logs for long-term use or integrate with third-party security information and event management (SIEM) tools to gain insights into your environment.
+Use Azure Monitor to route Azure Active Directory B2C (Azure AD B2C) sign-in and [auditing](view-audit-logs.md) logs to different monitoring solutions. You can retain the logs for long-term use or integrate with third-party security information and event management (SIEM) tools to gain insights into your environment.
 
 You can route log events to:
 

articles/active-directory-b2c/custom-email.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 12/18/2019
+ms.date: 02/05/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -387,6 +387,36 @@ For more information, see [Self-asserted technical profile](restful-technical-pr
 </ClaimsProvider>
 ```
 
+## [Optional] Localize your email
+
+To localize the email, you must send localized strings to SendGrid, or your email provider. For example to localize the email subject, body, your code message, or signature of the email. To do so, you can use the [GetLocalizedStringsTransformation](string-transformations.md) claims transformation to copy localized strings into claim types. In the `GenerateSendGridRequestBody` claims transformation, which generates the JSON payload, uses input claims that contain the localized strings.
+
+1. In your policy define the following string claims: subject, message, codeIntro and signature.
+1. Define a [GetLocalizedStringsTransformation](string-transformations.md) claims transformation to substitute localized string values into the claims from step 1.
+1. Change the `GenerateSendGridRequestBody` claims transformation to use input claims with the following XML snippet.
+1. Update your SendGrind template to use dynamic parameters in place of all the strings which will be localized by Azure AD B2C.
+
+```XML
+<ClaimsTransformation Id="GenerateSendGridRequestBody" TransformationMethod="GenerateJson">
+  <InputClaims>
+    <InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.to.0.email" />
+    <InputClaim ClaimTypeReferenceId="subject" TransformationClaimType="personalizations.0.dynamic_template_data.subject" />
+    <InputClaim ClaimTypeReferenceId="otp" TransformationClaimType="personalizations.0.dynamic_template_data.otp" />
+    <InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.dynamic_template_data.email" />
+    <InputClaim ClaimTypeReferenceId="message" TransformationClaimType="personalizations.0.dynamic_template_data.message" />
+    <InputClaim ClaimTypeReferenceId="codeIntro" TransformationClaimType="personalizations.0.dynamic_template_data.codeIntro" />
+    <InputClaim ClaimTypeReferenceId="signature" TransformationClaimType="personalizations.0.dynamic_template_data.signature" />
+  </InputClaims>
+  <InputParameters>
+    <InputParameter Id="template_id" DataType="string" Value="d-1234567890" />
+    <InputParameter Id="from.email" DataType="string" Value="[email protected]" />
+  </InputParameters>
+  <OutputClaims>
+    <OutputClaim ClaimTypeReferenceId="sendGridReqBody" TransformationClaimType="outputClaim" />
+  </OutputClaims>
+</ClaimsTransformation>
+```
+
 ## Next steps
 
 You can find an example of a custom email verification policy on GitHub: