resolve conflict

Author: mumian

.openpublishing.publish.config.json

@@ -157,7 +157,7 @@
       "url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
       "branch": "master",
       "branch_mapping": {}
-    },   
+    },
     {
       "path_to_root": "functions-quickstart-templates",
       "url": "https://github.com/Azure/azure-functions-templates",
@@ -187,7 +187,8 @@
       "path_to_root": "functions-docs-powershell",
       "url": "https://github.com/Azure-Samples/functions-docs-powershell",
       "branch": "master"
-    },     {
+    },
+    {
       "path_to_root": "samples-personalizer",
       "url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
       "branch": "master"
@@ -366,7 +367,7 @@
       "path_to_root": "azure-sdk-for-java-script-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-js/",
       "branch": "master"
-    },        
+    },
     {
       "path_to_root": "azure-sdk-for-net-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -376,7 +377,7 @@
       "path_to_root": "azure-sdk-for-python-event-hubs",
       "url": "https://github.com/Azure/azure-sdk-for-python/",
       "branch": "master"
-    },      
+    },
     {
       "path_to_root": "cosmos-dotnet-getting-started",
       "url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -510,5 +511,8 @@
     "Pdf": {
       "template_folder": "_themes.pdf"
     }
+  },
+  "docs_build_engine": {
+    "name": "docfx_v3"
   }
 }

.openpublishing.redirection.json

@@ -1745,6 +1745,26 @@
       "redirect_url": "/azure/cognitive-services/bing-entity-search/quickstarts/client-libraries?pivots=programming-language-python",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Bing-News-Search/news-search-sdk-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-csharp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-News-Search/news-sdk-java-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-java",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-News-Search/news-search-sdk-node-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-javascript",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-News-Search/news-sdk-python-quickstart.md",
+      "redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-python",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
       "redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -4483,7 +4503,7 @@
     {
       "source_path": "articles/azure-supportability/create-manage-support-requests-using-access-control.md",
       "redirect_url": "/azure/azure-portal/supportability/how-to-create-azure-support-request#role-based-access-control",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/azure-supportability/how-to-create-azure-support-request.md",
@@ -15299,16 +15319,6 @@
       "redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/machine-learning/algorithm-module-reference/pca-based-anomaly-detection.md",
-      "redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/algorithm-module-reference/train-anomaly-detection-model.md",
-      "redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/machine-learning/how-to-ui-sample-regression-predict-automobile-price-basic.md",
       "redirect_url": "/azure/machine-learning/how-to-designer-sample-regression-automobile-price-basic",
@@ -17034,6 +17044,31 @@
       "redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#change-a-maintenance-schedule",
       "redirect_document_id": false
     },
+    {
+        "source_path": "articles/sql-data-warehouse/backup-and-restore.md",
+        "redirect_url": "/azure/synapse-analytics/sql-data-warehouse/backup-and-restore",
+        "redirect_document_id": true
+    },
+    {
+        "source_path": "articles/sql-data-warehouse/cheat-sheet.md",
+        "redirect_url": "/azure/synapse-analytics/sql-data-warehouse/cheat-sheet",
+        "redirect_document_id": true
+    },
+    {
+        "source_path": "articles/sql-data-warehouse/column-level-security.md",
+        "redirect_url": "/azure/synapse-analytics/sql-data-warehouse/column-level-security",
+        "redirect_document_id": true
+    },
+    {
+        "source_path": "articles/sql-data-warehouse/create-data-warehouse-portal.md",
+        "redirect_url": "/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-portal",
+        "redirect_document_id": true
+    },
+    {
+        "source_path": "articles/sql-data-warehouse/create-data-warehouse-powershell.md",
+        "redirect_url": "/azure/synapse-analytics/sql-data-warehouse/create-data-warehouse-powershell",
+        "redirect_document_id": true
+    }, 
     {
       "source_path": "articles/sql-data-warehouse/viewing-maintenance-schedule.md",
       "redirect_url": "/azure/sql-data-warehouse/maintenance-scheduling#view-a-maintenance-schedule",
@@ -48184,11 +48219,6 @@
       "redirect_url": "/azure/app-service/containers/configure-language-java#use-service-bus-as-a-message-broker",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/mysql/howto-redirection.md",
-      "redirect_url": "/azure/mysql/concepts-connectivity-architecture",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-storage.md",
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/overview",
@@ -49404,19 +49434,19 @@
       "redirect_url": "/azure/media-services/latest/create-account-howto",
       "redirect_document_id": false
     },
-    { 
-      "source_path": "articles/mariadb/howto-tls-configurations.md", 
-      "redirect_url": "/azure/mariadb/howto-configure-ssl", 
-      "redirect_document_id": false 
+    {
+      "source_path": "articles/mariadb/howto-tls-configurations.md",
+      "redirect_url": "/azure/mariadb/howto-configure-ssl",
+      "redirect_document_id": false
     },
     {
-      "source_path": "articles/mysql/howto-tls-configurations.md", 
-      "redirect_url": "/azure/mysql/howto-configure-ssl", 
+      "source_path": "articles/mysql/howto-tls-configurations.md",
+      "redirect_url": "/azure/mysql/howto-configure-ssl",
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/postgresql/howto-tls-configurations.md", 
-      "redirect_url": "/azure/postgresql/concepts-ssl-connection-security", 
+      "source_path": "articles/postgresql/howto-tls-configurations.md",
+      "redirect_url": "/azure/postgresql/concepts-ssl-connection-security",
       "redirect_document_id": false
     }
   ]

articles/active-directory/develop/quickstart-v2-aspnet-core-webapp.md

@@ -65,7 +65,7 @@ In this quickstart, you use a code sample to learn how an ASP.NET Core web app c
 > [!div class="sxs-lookup" renderon="portal"]
 > Run the project using Visual Studio 2019.
 > [!div renderon="portal" id="autoupdate" class="nextstepaction"]
-> [Download the code sample]()
+> [Download the code sample](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/archive/aspnetcore2-2.zip)
 
 > [!div class="sxs-lookup" renderon="portal"]
 > #### Step 3: Your app is configured and ready to run

articles/active-directory/develop/quickstart-v2-aspnet-webapp.md

@@ -63,7 +63,7 @@ In this quickstart, you use a code sample to learn how an ASP.NET web app to sig
 > [!div renderon="portal"]
 > Run the project using Visual Studio 2019.
 > [!div renderon="portal" id="autoupdate" class="nextstepaction"]
-> [Download the code sample]()
+> [Download the code sample](https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-DotNet/archive/master.zip)
 
 > [!div class="sxs-lookup" renderon="portal"]
 > #### Step 3: Your app is configured and ready to run

articles/active-directory/develop/quickstart-v2-java-webapp.md

@@ -95,7 +95,7 @@ To run this sample you will need:
 >   Put the generated keystore file in the "resources" folder.
    
 > [!div renderon="portal" id="autoupdate" class="nextstepaction"]
-> [Download the code sample]()
+> [Download the code sample](https://github.com/Azure-Samples/ms-identity-java-webapp/archive/master.zip)
 
 > [!div renderon="docs"]
 > #### Step 3: Configure the code sample

articles/active-directory/develop/quickstart-v2-javascript.md

@@ -78,7 +78,7 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
 > Run the project with a web server by using Node.js
 
 > [!div renderon="portal" id="autoupdate" class="nextstepaction"]
-> [Download the code sample]()
+> [Download the code sample](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2/archive/quickstart.zip)
 
 > [!div renderon="docs"]
 

articles/active-directory/develop/sample-v2-code.md

@@ -44,9 +44,9 @@ These samples show how to write a single-page application secured with Microsoft
 | -------- | --------------------- | -------- |
 | ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
 | ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
-| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
 | ![This image shows the Angular JS logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL AngularJS)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angularjs)| Calls Microsoft Graph  | [MsalAngularjsDemoApp](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/MsalAngularjsDemoApp)
 | ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph  | [javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
+| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[active-directory-b2c-javascript-angular-spa](https://github.com/Azure-Samples/active-directory-b2c-javascript-angular-spa) |
 
 ## Web applications
 
@@ -58,7 +58,6 @@ The following samples illustrate web applications that sign in users. Some sampl
 | ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NETframework.png)</p> ASP.NET | [ASP.NET Quickstart](https://github.com/AzureAdQuickstarts/AppModelv2-WebApp-OpenIDConnect-DotNet) </p> [dotnet-webapp-openidconnect-v2](https://github.com/azure-samples/active-directory-dotnet-webapp-openidconnect-v2)  |  [dotnet-admin-restricted-scopes-v2](https://github.com/azure-samples/active-directory-dotnet-admin-restricted-scopes-v2) </p> |[msgraph-training-aspnetmvcapp](https://github.com/microsoftgraph/msgraph-training-aspnetmvcapp)
 | ![This image shows the Java logo](media/sample-v2-code/logo_java.png)  |                   | [ms-identity-java-webapp](https://github.com/Azure-Samples/ms-identity-java-webapp) |
 | ![This image shows the Python logo](media/sample-v2-code/logo_python.png)  |                   | [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp) |
-| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png)  |                   | [Node.js Quickstart](https://github.com/azureadquickstarts/appmodelv2-webapp-openidconnect-nodejs) |
 | ![This image shows the Ruby logo](media/sample-v2-code/logo_ruby.png) |                   | [msgraph-training-rubyrailsapp](https://github.com/microsoftgraph/msgraph-training-rubyrailsapp) |
 
 ## Desktop and mobile public client apps
@@ -111,6 +110,7 @@ The following samples show how to protect a web API with the Microsoft identity
 | ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
 | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | Web API (service) of [ms-identity-java-webapi](https://github.com/Azure-Samples/ms-identity-java-webapi) |
 | ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | Web API (service) of [active-directory-javascript-nodejs-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-nodejs-webapi-v2) |
+| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | B2C Web API (service) of [active-directory-b2c-javascript-nodejs-webapi](https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi) |
 
 ## Azure Functions as web APIs
 

articles/active-directory/devices/faq.md

@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
 
 ## General FAQ
 
-### Q: I registered the device recently. Why can’t I see the device under my user info in the Azure portal? Or why is the device owner marked as N/A for hybrid Azure Active Directory (Azure AD) joined devices?
+### Q: I registered the device recently. Why can't I see the device under my user info in the Azure portal? Or why is the device owner marked as N/A for hybrid Azure Active Directory (Azure AD) joined devices?
 
 **A:** Windows 10 devices that are hybrid Azure AD joined don't show up under **USER devices**.
 Use the **All devices** view in the Azure portal. You can also use a PowerShell [Get-MsolDevice](/powershell/module/msonline/get-msoldevice?view=azureadps-1.0) cmdlet.
@@ -126,7 +126,7 @@ See below on how these actions can be rectified.
 **A:** It takes up to an hour for a revoke to be applied from the time the Azure AD device is marked as disabled.
 
 >[!NOTE] 
->For enrolled devices, we recommend that you wipe the device to make sure users can't access the resources. For more information, see [What is device enrollment?](/intune/deploy-use/enroll-devices-in-microsoft-intune). 
+>For enrolled devices, we recommend that you wipe the device to make sure users can't access the resources. For more information, see [What is device enrollment?](/mem/intune/user-help/use-managed-devices-to-get-work-done). 
 
 ---
 
@@ -188,7 +188,7 @@ Deleted or disabled users who didn't sign in previously can't access a device. T
 
 ---
 
-### Q: Why do my users see *You can’t get there from here*?
+### Q: Why do my users see *You can't get there from here*?
 
 **A:** Did you configure certain Conditional Access rules to require a specific device state? If the device doesn't meet the criteria, users are blocked, and they see that message. 
 Evaluate the Conditional Access policy rules. Make sure the device meets the criteria to avoid the message.
@@ -309,8 +309,8 @@ Enable the following registry to block your users from adding additional work ac
 
 **A:** Take the following steps:
 
-1.	[Create a compliance policy](/intune/compliance-policy-create-mac-os)
-1.	[Define a Conditional Access policy for macOS devices](../active-directory-conditional-access-azure-portal.md) 
+1.    [Create a compliance policy](/intune/compliance-policy-create-mac-os)
+1.    [Define a Conditional Access policy for macOS devices](../active-directory-conditional-access-azure-portal.md) 
 
 **Remarks:**