fixed merge conflicts

Author: ShannonLeavitt

.openpublishing.redirection.json

@@ -1,5 +1,75 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/power-bi-workspace-collections/app-token-flow.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/app-token-flow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/connect-datasource.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/connect-datasource",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/create-report-from-dataset.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/create-report-from-dataset",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/embed-report.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/embed-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/faq.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/get-started-sample.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/get-started-sample",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/get-started.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/interact-with-reports.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/interact-with-reports",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/row-level-security.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/row-level-security",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/save-reports.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/save-reports",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/scenarios.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/scenarios",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/toggle-mode.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/toggle-mode",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/what-are-power-bi-workspace-collections.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/what-are-power-bi-workspace-collections",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/power-bi-workspace-collections/whats-new.md",
+      "redirect_url": "/previous-versions/azure/power-bi-workspace-collections/whats-new",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/users-groups-roles/groups-update-rule.md",
       "redirect_url": "/articles/active-directory/users-groups-roles/groups-create-rule",
@@ -1686,11 +1756,21 @@
       "redirect_url": "/azure/cosmos-db/conflict-resolution-policies",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cosmos-db/how-to-custom-synchronization.md",
+      "redirect_url": "/azure/cosmos-db/how-to-multi-master",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cosmos-db/create-sql-api-dotnet-preview.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-dotnet",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/change-feed-hl7-fhir-logic-apps.md",
+      "redirect_url": "/azure/cosmos-db/change-feed",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cosmos-db/spark-api-introduction.md",
       "redirect_url": "/azure/cosmos-db/analytics-usecases",
@@ -3358,7 +3438,12 @@
     },
     {
       "source_path": "articles/azure-resource-manager/extension-resource-types.md",
-      "redirect_url": "/azure/azure-resource-manager/templates/extension-resource-types",
+      "redirect_url": "/azure/azure-resource-manager/management/extension-resource-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/templates/extension-resource-types.md",
+      "redirect_url": "/azure/azure-resource-manager/management/extension-resource-types",
       "redirect_document_id": false
     },
     {
@@ -4163,7 +4248,7 @@
     },
     {
       "source_path": "articles/billing-how-to-create-billing-support-ticket.md",
-      "redirect_url": "/azure/azure-supportability/how-to-create-azure-support-request",
+      "redirect_url": "/azure/azure-portal/supportability/how-to-create-azure-support-request",
       "redirect_document_id": false
     },
     {
@@ -4173,7 +4258,7 @@
     },
     {
       "source_path": "articles/billing-how-to-use-file-uploader.md",
-      "redirect_url": "/azure/azure-supportability/how-to-use-file-uploader",
+      "redirect_url": "/azure/azure-portal/supportability/how-to-use-file-uploader",
       "redirect_document_id": false
     },
     {
@@ -11611,6 +11696,11 @@
       "redirect_url": "/azure/lab-services/devtest-lab-attach-detach-data-disk",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/lab-services/devtest-lab-auto-shutdown-vm.md",
+      "redirect_url": "/azure/lab-services/devtest-lab-auto-shutdown",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/devtest-lab/devtest-lab-comparing-vm-base-image-types.md",
       "redirect_url": "/azure/lab-services/devtest-lab-comparing-vm-base-image-types",
@@ -14168,9 +14258,9 @@
       "redirect_document_id": true
     },
     {
-      "source_path": "articles/machine-learning/service/how-to-vscode-tools.md",
-      "redirect_url": "/azure/machine-learning/how-to-vscode-tools",
-      "redirect_document_id": true
+        "source_path": "articles/machine-learning/service/how-to-vscode-tools.md",
+        "redirect_url": "/azure/machine-learning/tutorial-setup-vscode-extension",
+        "redirect_document_id": true
     },
     {
       "source_path": "articles/machine-learning/service/monitor-azure-machine-learning.md",
@@ -14614,9 +14704,14 @@
     },
     {
       "source_path": "articles/machine-learning/machine-learning-algorithm-choice.md",
-      "redirect_url": "/azure/machine-learning/studio/algorithm-choice",
+      "redirect_url": "/azure/machine-learning/how-to-select-algorithms",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/machine-learning/studio/algorithm-choice.md",
+      "redirect_url": "/azure/machine-learning/how-to-select-algorithms",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/machine-learning/machine-learning-algorithm-parameters-optimize.md",
       "redirect_url": "/azure/machine-learning/studio/algorithm-parameters-optimize",
@@ -17254,7 +17349,7 @@
     },
     {
       "source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-use-spot",
+      "redirect_url": "/azure/virtual-machine-scale-sets/use-spot",
       "redirect_document_id": true
     },
     {
@@ -26622,15 +26717,55 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/active-directory/active-directory-azureadjoin-personal-device.md",
+      "source_path": "articles/active-directory/user-help-auth-app-add-account-overview.md",
       "redirect_url": "/azure/active-directory/user-help/device-management-azuread-joined-devices-setup",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/active-directory-azureadjoin-personal-device.md",
+      "redirect_url": "/azure/active-directory/user-help/user-help-auth-app-add-work-school-account",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/user-help/multi-factor-authentication-end-user.md",
       "redirect_url": "/azure/active-directory/user-help/user-help-two-step-verification-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/active-directory/user-help/user-help-security-info-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/security-info-setup-signin",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/user-help/user-help-two-step-verification-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/multi-factor-authentication-end-user-first-time",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/user-help/security-info-add-update-methods-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/security-info-setup-auth-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/user-help/user-help-device-mgmt-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/user-help-join-device-on-network",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/user-help/my-apps-portal-end-user-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/my-apps-portal-end-user-access",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/user-help/my-applications-portal-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/my-applications-portal-access",
+      "redirect_document_id": false
+    },  
+    {
+      "source_path": "articles/active-directory/user-help/user-help-password-reset-overview.md",
+      "redirect_url": "/azure/active-directory/user-help/active-directory-passwords-reset-register",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/active-directory/user-help/security-info-manage-settings.md",
       "redirect_url": "/azure/active-directory/user-help/security-info-add-update-methods-overview",
@@ -27861,6 +27996,11 @@
       "redirect_url": "/azure/security-center/security-center-partner-integration",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/security-center/security-center-playbooks.md",
+      "redirect_url": "/azure/security-center/workflow-automation",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/security-center/security-center-compliance-rest-api.md",
       "redirect_url": "https://docs.microsoft.com/rest/api/securitycenter/compliances",
@@ -39672,9 +39812,29 @@
     },
     {
       "source_path": "articles/application-insights/app-insights-troubleshoot-faq.md",
-      "redirect_url": "/azure/azure-monitor/app/troubleshoot-faq",
+      "redirect_url": "/azure/azure-monitor/faq",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/azure-monitor/app/troubleshoot-faq.md",
+      "redirect_url": "/azure/azure-monitor/faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/platform/log-faq.md",
+      "redirect_url": "/azure/azure-monitor/faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/insights/container-insights-faq.md",
+      "redirect_url": "/azure/azure-monitor/faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/insights/vminsights-faq.md",
+      "redirect_url": "/azure/azure-monitor/faq",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-insights/app-insights-usage-cohorts.md",
       "redirect_url": "/azure/azure-monitor/app/usage-cohorts",
@@ -40960,6 +41120,11 @@
       "redirect_url": "/azure/hdinsight/hdinsight-debug-ambari-tez-view",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/hdinsight/hadoop/apache-hadoop-debug-jobs.md",
+      "redirect_url": "/azure/hdinsight/hdinsight-hadoop-oms-log-analytics-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/hdinsight/hadoop/apache-hadoop-use-mapreduce-remote-desktop.md",
       "redirect_url": "/azure/hdinsight/hadoop/apache-hadoop-use-mapreduce-ssh",
@@ -40970,6 +41135,11 @@
       "redirect_url": "/azure/hdinsight/hadoop/apache-hadoop-use-pig-ssh",
       "redirect_document_id": false
     },
+    {
+        "source_path": "articles/cognitive-services/LUIS/sdk-csharp-3x.md",
+        "redirect_url": "/azure/cognitive-services/LUIS/sdk-authoring.md",
+        "redirect_document_id": true
+      },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-reference-faq.md",
       "redirect_url": "/azure/cognitive-services/LUIS/troubleshooting",
@@ -46435,10 +46605,30 @@
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/load-balancer/load-balancer-standard-overview.md",
+      "redirect_url": "/azure/load-balancer/load-balancer-overview",
+      "redirect_document_id": false
+    },
+    {
+        "source_path": "articles/backup/backup-azure-files.md",
+        "redirect_url": "/azure/backup/backup-afs",
+        "redirect_document_id": false
+    },
     {
       "source_path": "articles/load-balancer/load-balancer-arm.md",
       "redirect_url": "/azure/load-balancer/load-balancer-overview",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/healthcare-apis/tutorial-2-setup-environment.md",
+      "redirect_url": "/azure/healthcare-apis/tutorial-web-app-fhir-server",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/healthcare-apis/tutorial-3-connect-to-endpoint.md",
+      "redirect_url": "/azure/healthcare-apis/tutorial-web-app-fhir-server",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -76,7 +76,7 @@
   items:
   - name: App integration
     items:
-    - name: Register an OIDC application
+    - name: Register an application
       href: tutorial-register-applications.md
     - name: Register a SAML service provider
       href: connect-with-saml-service-providers.md
@@ -282,6 +282,11 @@
           items:
           - name: Localization string IDs
             href: localization-string-ids.md
+        - name: DisplayControls
+          href: display-controls.md
+          items:
+          - name: Verification
+            href: display-control-verification.md
       - name: ClaimsProviders
         href: claimsproviders.md
         items:
@@ -320,11 +325,6 @@
             href: active-directory-b2c-reference-sso-custom.md
           - name: Validation
             href: validation-technical-profile.md
-      - name: DisplayControls
-        href: display-controls.md
-        items:
-        - name: Verification
-          href: display-control-verification.md
       - name: UserJourneys
         href: userjourneys.md
       - name: RelyingParty

articles/active-directory-b2c/active-directory-b2c-faqs.md

@@ -23,7 +23,7 @@ There are two common reasons for why the Azure AD extension is not working for y
 
 ### Can I use Azure AD B2C features in my existing, employee-based Azure AD tenant?
 
-Azure AD and Azure AD B2C are separate product offerings and cannot coexist in the same tenant. An Azure AD tenant represents an organization. An Azure AD B2C tenant represents a collection of identities to be used with relying party applications. With custom policies, Azure AD B2C can federate to Azure AD allowing authentication of employees in an organization.
+Azure AD and Azure AD B2C are separate product offerings and cannot coexist in the same tenant. An Azure AD tenant represents an organization. An Azure AD B2C tenant represents a collection of identities to be used with relying party applications. By adding **New OpenID Connect provider** under **Azure AD B2C > Identity providers** or with custom policies, Azure AD B2C can federate to Azure AD allowing authentication of employees in an organization.
 
 ### Can I use Azure AD B2C to provide social login (Facebook and Google+) into Office 365?
 

articles/active-directory-b2c/active-directory-b2c-reference-oauth-code.md

@@ -98,8 +98,8 @@ Now that you've acquired an authorization code, you can redeem the `code` for a
 You can also request an access token for your app's own back-end Web API by convention of using the app's client ID as the requested scope (which will result in an access token with that client ID as the "audience"):
 
 ```HTTP
-POST {tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
-Host: {tenant}.b2clogin.com
+POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
+
 Content-Type: application/x-www-form-urlencoded
 
 grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&code=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob
@@ -165,8 +165,8 @@ Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZn
 Access tokens and ID tokens are short-lived. After they expire, you must refresh them to continue to access resources. To do this, submit another POST request to the `/token` endpoint. This time, provide the `refresh_token` instead of the `code`:
 
 ```HTTP
-POST {tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
-Host: {tenant}.b2clogin.com
+POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
+
 Content-Type: application/x-www-form-urlencoded
 
 grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob