Merge remote-tracking branch 'upstream/main' into AB#7781

Author: v-tappelgate

.openpublishing.redirection.outlook.json

@@ -27,6 +27,10 @@
     {
       "source_path": "Outlook/client/outlook-client-welcome.yml",
       "redirect_url": "/troubleshoot/outlook/classic-outlook-windows-welcome"
-    }
+    },
+    {
+      "source_path": "Outlook/classic-outlook-windows/performance/collect-performance-trace.md",
+      "redirect_url": "/troubleshoot/outlook/new-outlook-windows/performance/collect-performance-trace"
+    }    
   ]
 }

Outlook/classic-outlook-for-windows/clienttoc/toc.yml

@@ -273,8 +273,6 @@
           href: ../performance/cannot-open-word-documents-or-excel-spreadsheets.md
         - name: Can't start Outlook in cached mode or create a profile
           href: ../performance/cannot-start-outlook-in-cached-mode-or-create-profile.md
-        - name: Collect performance and network traces
-          href: ../performance/collect-performance-trace.md
         - name: Crashes after installing language packs
           href: ../performance/outlook-2016-crash-event-1000.md
         - name: Error when you copy MSG email message files in Outlook containing multiple attachments or recipients

Outlook/new-outlook-for-windows/new-windows-toc/toc.yml

@@ -16,6 +16,10 @@ items:
     items:
     - name: New emails automatically move to Junk folder
       href: ../junk-email/new-emails-automatically-move-to-junk-folder.md
+  - name: Performance
+    items:
+    - name: Collect a performance trace in new Outlook for Windows
+      href: ../performance/collect-performance-trace.md    
   - name: Profiles and Accounts
     items:
     - name: Archive mailbox doesn't appear in Outlook or Outlook on the web

…performance/collect-performance-trace.md …performance/collect-performance-trace.mdOutlook/classic-outlook-for-windows/performance/collect-performance-trace.md renamed to Outlook/new-outlook-for-windows/performance/collect-performance-trace.md Outlook/classic-outlook-for-windows/performance/collect-performance-trace.md renamed to Outlook/new-outlook-for-windows/performance/collect-performance-trace.md

@@ -140,14 +140,11 @@
       "ms.service": {
         "SharePointHybrid/**/*.md": "sharepoint-online",
         "SharePointOnline/**/*.md": "sharepoint-online",
-        "OneDrive/**/*.md": "microsoft-graph",
+        "OneDrive/**/*.md": "microsoft-graph", // OneDrive only appears under Microsoft Graph service according to Learn Taxonomy. Meera requesting onedrive slug.
         "SharePointServer/**/*.md": "sharepoint-server-itpro",
         "SharePointExperts/**/*.md": "sharepoint-server-itpro",
         "SharePointOnline/migration/**/*.md": "microsoft-365-migration"
       },
-      "ms.subservice": {
-        "OneDrive/**/*.md": "onedrive"
-      },
       "author": {
         "**/*.md": "Cloud-Writer"
       },

SharePoint/docfx.json

@@ -9,7 +9,7 @@ author: msangapu-msft
 ms.author: msangapu
 ms.reviewer: v-ryanberg
 ms.service: azure-app-service
-ms.custom: devx-track-js
+ms.custom: sap:Availability, Performance, and Application Issues, devx-track-js
 # customer intent: As a developer, I want to learn best practices for Node.js applications that run in App Service so that I can use these apps more effectively.
 ---
 # Best practices and troubleshooting guide for node applications on Azure App Service Windows

support/azure/app-service/app-service-web-nodejs-best-practices-troubleshoot-guide.md

@@ -6,6 +6,7 @@ ms.service: azure-app-service
 ms.author: shwagarwal
 author: ShwetaAgarwal-MS
 ms.reviewer: 
+ms.custom: sap:Configuration and Management
 ---
 # Backing up, restoring, and cloning Microsoft Azure App Service
 

support/azure/app-service/backing-up-restoring-and-cloning-microsoft-azure-app-services.md

@@ -8,6 +8,7 @@ editor: v-jsitser
 ms.topic: how-to
 ms.reviewer: kamils, v-leedennis
 ms.service: azure-app-service
+ms.custom: sap:Availability, Performance, and Application Issues
 ---
 # Capture memory dumps on the Azure App Service platform
 

support/azure/app-service/capture-memory-dumps-app-service.md

@@ -9,6 +9,7 @@ ms.date: 09/22/2025
 ms.author: jarrettr
 ms.reviewer: v-ryanberg
 ms.service: azure-app-service
+ms.custom: sap:SSL Certificates and Domains
 ---
 # Troubleshoot domain and TLS/SSL certificate problems in Azure App Service
 

support/azure/app-service/connection-issues-with-ssl-or-tls/troubleshoot-domain-and-tls-ssl-certificates.md

@@ -6,7 +6,7 @@ ms.author: jarrettr
 ms.service: azure-app-service
 ms.date: 07/21/2025
 ms.reviewer: v-liuamson; v-gsitser
-ms.custom: Connection issues with SSL or TLS
+ms.custom: sap:Connection issues with SSL or TLS, SSL Certificates and Domains
 ---
 
 # Use Azure App Service Certificate with Application Gateway