resolving merge conflict

Author: schaffererin

.openpublishing.redirection.json

@@ -23200,7 +23200,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/develop/web-app-quickstart-portal-node-js-passport.md",
-            "redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
+            "redirect_url": "/azure/active-directory/develop/quickstart-web-app-nodejs-msal-sign-in",
             "redirect_document_id": false
         },
         {
@@ -23215,7 +23215,37 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp.md",
-            "redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
+            "redirect_url": "/azure/active-directory/develop/quickstart-web-app-nodejs-msal-sign-in",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/console-app-quickstart.md",
+            "redirect_url": "/azure/active-directory/develop/index-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/desktop-app-quickstart.md",
+            "redirect_url": "/azure/active-directory/develop/index-desktop",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/mobile-app-quickstart.md",
+            "redirect_url": "/azure/active-directory/develop/index-mobile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/web-api-quickstart.md",
+            "redirect_url": "/azure/active-directory/develop/index-web-api",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/web-app-quickstart.md",
+            "redirect_url": "/azure/active-directory/develop/index-web-app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/develop/single-page-app-quickstart.md",
+            "redirect_url": "/azure/active-directory/develop/index-spa",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.sentinel.json

@@ -174,6 +174,11 @@
             "source_path": "articles/sentinel/data-connectors/zoom-reports-using-azure-function.md",
             "redirect_url": "/azure/sentinel/data-connectors/zoom-reports-using-azure-functions",
             "redirect_document_id": true
+          },
+          {
+            "source_path": "articles/sentinel/store-logs-in-azure-data-explorer.md",
+            "redirect_url": "/azure/azure-monitor/logs/data-retention-archive",
+            "redirect_document_id": true
           }
     ]
 }

articles/active-directory-b2c/enable-authentication-python-web-app.md

@@ -190,7 +190,7 @@ In the root folder of your web app, create the `templates` folder. In the templa
 
 Add the following templates under the templates folder. These templates extend the `base.html` template:
 
-- **index.html**: the home page of the web app. The templates use the following logic: if a user doesn't sign-in, it renders the sing-in button. If users sings-in, it renders the access token's claims, link to edit profile, and call a Graph API.
+- **index.html**: the home page of the web app. The templates use the following logic: if a user doesn't sign in, it renders the sign-in button. If a user signs in, it renders the access token's claims, link to edit profile, and call a Graph API.
 
     ```html
     {% extends "base.html" %}

articles/active-directory-domain-services/policy-reference.md

@@ -1,7 +1,7 @@
 ---
 title: Built-in policy definitions for Azure Active Directory Domain Services
 description: Lists Azure Policy built-in policy definitions for Azure Active Directory Domain Services. These built-in policy definitions provide common approaches to managing your Azure resources.
-ms.date: 07/25/2023
+ms.date: 08/03/2023
 ms.service: active-directory
 ms.subservice: domain-services
 author: justinha

articles/active-directory/develop/TOC.yml

@@ -122,7 +122,13 @@
     - name: SPA authentication
       href: index-spa.yml
     - name: Quickstart
-      href: single-page-app-quickstart.md
+      items: 
+        - name: React
+          href: quickstart-single-page-app-react-sign-in.md
+        - name: Angular
+          href: quickstart-single-page-app-angular-sign-in.md
+        - name: JavaScript
+          href: quickstart-single-page-app-javascript-sign-in.md
     - name: Tutorials
       items:
         - name: React
@@ -167,7 +173,17 @@
     - name: Web app authentication
       href: index-web-app.yml
     - name: Quickstart
-      href: web-app-quickstart.md
+      items: 
+        - name: ASP.NET 
+          href: quickstart-web-app-aspnet-sign-in.md
+        - name: ASP.NET Core
+          href: quickstart-web-app-aspnet-core-sign-in.md
+        - name: Node.js - MSAL
+          href: quickstart-web-app-nodejs-msal-sign-in.md
+        - name: Java
+          href: quickstart-web-app-java-sign-in.md
+        - name: Python
+          href: quickstart-web-app-python-sign-in.md
     - name: Tutorials
       items:
         - name: ASP.NET
@@ -238,7 +254,11 @@
     - name: Web API authentication
       href: index-web-api.yml
     - name: Quickstart
-      href: web-api-quickstart.md
+      items:
+        - name: ASP.NET
+          href: quickstart-web-api-aspnet-protect-api.md
+        - name: ASP.NET Core
+          href: quickstart-web-api-aspnet-core-protect-api.md
     - name: Tutorials
       items:
         - name: ASP.NET
@@ -289,7 +309,13 @@
     - name: Desktop app authentication
       href: index-desktop.yml
     - name: Quickstart
-      href: desktop-app-quickstart.md
+      items:
+        - name: Node.js Electron
+          href: quickstart-desktop-app-nodejs-electron-sign-in.md
+        - name: Universal Windows Platform
+          href: quickstart-desktop-app-uwp-sign-in.md
+        - name: Windows Presentation Foundation
+          href: quickstart-desktop-app-wpf-sign-in.md
     - name: Tutorials
       items:
         - name: Universal Windows Platform (UWP)
@@ -335,7 +361,11 @@
     - name: Mobile app authentication
       href: index-mobile.yml
     - name: Quickstart
-      href: mobile-app-quickstart.md
+      items: 
+        - name: Android
+          href: quickstart-mobile-app-android-sign-in.md
+        - name: iOS and macOS
+          href: quickstart-mobile-app-ios-sign-in.md
     - name: Tutorials
       items:
         - name: Android
@@ -393,7 +423,15 @@
     - name: Service/daemon authentication
       href: index-service.yml
     - name: Quickstart
-      href: console-app-quickstart.md
+      items:
+        - name: .NET Core
+          href: quickstart-console-app-netcore-acquire-token.md
+        - name: Java
+          href: quickstart-daemon-app-java-acquire-token.md
+        - name: Node.js
+          href: quickstart-console-app-nodejs-acquire-token.md
+        - name: Python
+          href: quickstart-daemon-app-python-acquire-token.md
     - name: Tutorials
       items:
         - name: ASP.NET

articles/active-directory/develop/console-app-quickstart.md

@@ -19,7 +19,7 @@ ms.custom: mode-api, devx-track-js
 > [!div renderon="docs"]
 > Welcome! This probably isn't the page you were expecting. While we work on a fix, this link should take you to the right article:
 > 
-> > [Quickstart: Node.js console app that calls an API](console-app-quickstart.md?pivots=devlang-nodejs)
+> > [Quickstart: Acquire a token and call Microsoft Graph from a Node.js console app](quickstart-console-app-nodejs-acquire-token.md)
 > 
 > We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
 

articles/active-directory/develop/console-quickstart-portal-nodejs.md

@@ -20,7 +20,7 @@ ms.custom: aaddev, "scenarios:getting-started", "languages:Java", devx-track-jav
 > [!div renderon="docs"]
 > Welcome! This probably isn't the page you were expecting. While we work on a fix, this link should take you to the right article:
 >
-> > [Quickstart: Java daemon that calls a protected API](console-app-quickstart.md?pivots=devlang-java)
+> > [Quickstart: Acquire a token and call Microsoft Graph from a Java daemon app](quickstart-daemon-app-java-acquire-token.md)
 > 
 > We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
 

articles/active-directory/develop/daemon-quickstart-portal-java.md

@@ -21,7 +21,7 @@ ms.custom: devx-track-csharp, aaddev, identityplatformtop40, "scenarios:getting-
 > [!div renderon="docs"]
 > Welcome! This probably isn't the page you were expecting. While we work on a fix, this link should take you to the right article:
 > 
-> > [Quickstart: .NET Core console that calls an API](console-app-quickstart.md?pivots=devlang-dotnet-core)
+> > [Quickstart: Acquire a token and call Microsoft Graph in a .NET Core console app](quickstart-console-app-netcore-acquire-token.md)
 > 
 > We apologize for the inconvenience and appreciate your patience while we work to get this resolved.
 

articles/active-directory/develop/daemon-quickstart-portal-netcore.md

@@ -20,7 +20,7 @@ ms.custom: aaddev, identityplatformtop40, devx-track-python, "scenarios:getting-
 > [!div renderon="docs"]
 > Welcome! This probably isn't the page you were expecting. While we work on a fix, this link should take you to the right article:
 > 
-> > [Quickstart: Python console app that calls an API](console-app-quickstart.md?pivots=devlang-python)
+> > [Quickstart: Acquire a token and call Microsoft Graph from a Python daemon app](quickstart-daemon-app-python-acquire-token.md)
 > 
 > We apologize for the inconvenience and appreciate your patience while we work to get this resolved.