Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-encrypt-patch

Author: asudbring

articles/azure-functions/dotnet-isolated-process-guide.md

@@ -865,11 +865,14 @@ Azure Functions currently can be used with the following "Preview" or "Go-live"
 
 | Operating system | .NET preview version |
 | - | - |
-| Linux | .NET 9 RC2<sup>1, 2</sup> |
+| Windows | .NET 9 Preview 6<sup>1, 2</sup> |
+| Linux | .NET 9 RC2<sup>1, 3</sup> |
 
 <sup>1</sup> To successfully target .NET 9, your project needs to reference the [2.x versions of the core packages](#version-2x-preview). If using Visual Studio, .NET 9 requires version 17.12 or later.
 
-<sup>2</sup> .NET 9 is not yet supported on the Flex Consumption SKU.
+<sup>2</sup> Support for Windows might not appear in some clients during the preview period.
+
+<sup>3</sup> .NET 9 is not yet supported on the Flex Consumption SKU.
 
 See [Supported versions][supported-versions] for a list of generally available releases that you can use.
 

articles/fxt-edge-filer/media/fxt-cluster-create/fxt-support-info.png

@@ -5,7 +5,7 @@ author: timlt
 ms.author: timlt
 ms.date: 1/23/2024
 ms.topic: conceptual
-ms.service: iot
+ms.service: azure-iot
 ---
 
 # IoT Plug and Play conventions

articles/iot/concepts-convention.md

@@ -5,7 +5,7 @@ author: timlt
 ms.author: timlt
 ms.date: 1/23/2024
 ms.topic: conceptual
-ms.service: iot
+ms.service: azure-iot
 ms.custom: devx-track-extended-java, devx-track-js, devx-track-python
 zone_pivot_groups: programming-languages-set-twenty-seven
 

articles/iot/concepts-developer-guide-device.md

@@ -3,7 +3,7 @@ title: Introduction to Azure IoT device development
 description: Learn how to use Azure IoT services, SDKs, and tools to do device development with general devices and embedded devices.  
 author: timlt
 ms.author: timlt
-ms.service: iot
+ms.service: azure-iot
 ms.topic: concept-article
 ms.date: 04/09/2024
 

articles/iot/concepts-iot-device-development.md

@@ -3,7 +3,7 @@ title: Azure IOT prototyping device selection list
 description: This document provides guidance on choosing a hardware device for prototyping IoT Azure solutions.
 author: timlt
 ms.author: timlt
-ms.service: iot
+ms.service: azure-iot
 ms.topic: conceptual
 ms.date: 04/04/2024
 ---

articles/iot/concepts-iot-device-selection.md

@@ -7,7 +7,7 @@ author: timlt
 ms.author: timlt
 ms.date: 04/04/2024
 ms.topic: conceptual
-ms.service: iot
+ms.service: azure-iot
 ms.custom: [amqp, mqtt, devx-track-csharp]
 ---
 

articles/iot/concepts-manage-device-reconnections.md

@@ -3,7 +3,7 @@ title: C SDK and Embedded C SDK usage scenarios
 description: Helps developers decide which C-based Azure IoT device SDK to use for device development, based on their usage scenario.
 author: timlt
 ms.author: timlt
-ms.service: iot
+ms.service: azure-iot
 ms.topic: conceptual
 ms.date: 04/08/2024
 ms.custom: template-concept, linux-related-content

articles/iot/concepts-using-c-sdk-and-embedded-c-sdk.md

@@ -5,7 +5,7 @@ author: timlt
 ms.author: timlt
 ms.date: 1/23/2024
 ms.topic: conceptual
-ms.service: iot
+ms.service: azure-iot
 ms.custom: references_regions
 
 #Customer intent: As a device builder, I need to know what is IoT Plug and Play, so I can understand how it can help me build and market my IoT devices.

articles/iot/overview-iot-plug-and-play.md

@@ -3,7 +3,7 @@ title: Troubleshooting the embedded device tutorials
 description: Steps to help you troubleshoot common issues when using the Eclipse ThreadX embedded device tutorials
 author: timlt
 ms.author: timlt
-ms.service: iot
+ms.service: azure-iot
 ms.topic: troubleshooting
 ms.date: 04/08/2024
 ---