Fix metadata etc.

Author: dominicbetts

articles/iot/iot-overview-connectivity.md

@@ -1,9 +1,8 @@
 ---
 title: Device infrastructure and connectivity
-titleSuffix: Azure IoT
 description: An overview of device infrastructure and connectivity in an Azure IoT solution, including gateways and protocols such as MQTT and OPC-UA.
-ms.service: iot-fundamentals
-services: iot-fundamentals
+ms.service: iot
+services: iot
 author: dominicbetts
 ms.author: dobett
 ms.topic: overview
@@ -51,7 +50,7 @@ A device can establish a secure connection to an IoT hub:
 - Directly, in which case you must provide the device with a connection string that includes the hostname.
 - Indirectly by using DPS, in which case the device connects to a well-known DPS endpoint to retrieve the connection string for the IoT hub it's assigned to.
 
-The advantage of using DPS is that you don't need to configure all of your devices with connection-strings that are specific to your IoT hub. Instead, you configure your devices to connect to a well-known, common DPS endpoint where they discover their connection details. To learn more, see [Device Provisioning Service](/iot-dps/about-iot-dps.md).
+The advantage of using DPS is that you don't need to configure all of your devices with connection-strings that are specific to your IoT hub. Instead, you configure your devices to connect to a well-known, common DPS endpoint where they discover their connection details. To learn more, see [Device Provisioning Service](../iot-dps/about-iot-dps.md).
 
 ## Device connection strings
 
@@ -118,7 +117,7 @@ Field gateways (sometimes referred to as edge gateways) are typically deployed o
 - Filter, compress, or aggregate telemetry before it's sent to the cloud.
 - Run logic at the edge to remove the latency associated with running logic on behalf of devices in the cloud. For example, detecting a spike in temperature and opening a valve in response.
 
-You can use Azure IoT Edge to deploy a field gateway to your on-premises environment. IoT Edge provides a set of features that enable you to deploy and manage field gateways at scale. IoT Edge also provides a set of modules that you can use to implement common gateway scenarios. To learn more, see [What is Azure IoT Edge?](../iot-edge/iot-edge-what-is-azure-iot-edge.md)
+You can use Azure IoT Edge to deploy a field gateway to your on-premises environment. IoT Edge provides a set of features that enable you to deploy and manage field gateways at scale. IoT Edge also provides a set of modules that you can use to implement common gateway scenarios. To learn more, see [What is Azure IoT Edge?](../iot-edge/about-iot-edge.md)
 
 An IoT Edge device can maintain a [persistent connection](#persistent-connections) to an IoT hub. The gateway forwards device telemetry to IoT Central. This option enables command and control of the downstream devices connected to the IoT Edge device.
 

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

@@ -1,9 +1,8 @@
 ---
 title: Device development introduction
-titleSuffix: Azure IoT
 description: An overview of Azure IoT device development including an introduction to the device SDKs, modeling, IoT Edge modules, and a survey of the available tools.
-ms.service: iot-fundamentals
-services: iot-fundamentals
+ms.service: iot
+services: iot
 author: dominicbetts
 ms.author: dobett
 ms.topic: overview
@@ -44,7 +43,7 @@ Examples of specialized hardware and operating systems include:
 
 [Windows for IoT](/windows/iot/product-family/windows-iot) is an embedded version of Windows for MPUs with cloud connectivity that lets you create secure devices with easy provisioning and management.
 
-[Azure RTOS](/rtos/overview-rtos) is a real time operating system for IoT and edge devices powered by MCUs. Azure RTOS is designed to support highly constrained devices that are battery powered and have less than 64 KB of flash memory.
+[Azure RTOS](/azure/rtos/overview-rtos) is a real time operating system for IoT and edge devices powered by MCUs. Azure RTOS is designed to support highly constrained devices that are battery powered and have less than 64 KB of flash memory.
 
 [Azure Sphere](/azure-sphere/product-overview/what-is-azure-sphere) is a secure, high-level application platform with built-in communication and security features for internet-connected devices. It comprises a secured, connected, crossover MCU, a custom high-level Linux-based operating system, and a cloud-based security service that provides continuous, renewable security.
 
@@ -134,7 +133,7 @@ The following table lists some of the available IoT development tools:
 | --- | --- |
 | [Azure IoT Hub (VS Code extension)](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) | This VS Code extension lets you manage your IoT Hub resources and devices from within VS Code. |
 | [Azure IoT explorer](howto-use-iot-explorer.md) | This cross-platform tool lets you manage your IoT Hub resources and devices from a desktop application. |
-| [Azure IoT extension for Azure CLI](https://learn.microsoft.com/cli/azure/service-page/azure%20iot) | This CLI extension includes commands such as `az iot device simulate`, `az iot device c2d-message`, and `az iot hub monitor-events` that help you test interactions with devices. |
+| [Azure IoT extension for Azure CLI](/cli/azure/service-page/azure%20iot) | This CLI extension includes commands such as `az iot device simulate`, `az iot device c2d-message`, and `az iot hub monitor-events` that help you test interactions with devices. |
 
 ## Next steps
 

articles/iot/iot-overview-device-management.md

@@ -1,9 +1,8 @@
 ---
 title: Device management and control
-titleSuffix: Azure IoT
 description: An overview of device management and control options in an Azure IoT solution including device updates.
-ms.service: iot-fundamentals
-services: iot-fundamentals
+ms.service: iot
+services: iot
 author: dominicbetts
 ms.author: dobett
 ms.topic: overview
@@ -92,7 +91,7 @@ The [Device Update for IoT Hub](../iot-hub-device-update/understand-device-updat
 
 During the lifecycle of your IoT solution, you may need to roll over the keys used to authenticate devices. For example, you may need to roll over your keys if you suspect that a key has been compromised or if a certificate expires:
 
-- [Roll over the keys used to authenticate devices in IoT Hub and DPS](../iot-dps/how-to-roll-certificates.md#roll-x509-device-certificates)
+- [Roll over the keys used to authenticate devices in IoT Hub and DPS](../iot-dps/how-to-roll-certificates.md)
 - [Roll over the keys used to authenticate devices in IoT Central](../iot-central/core/how-to-connect-devices-x509.md#roll-x509-device-certificates)
 
 ## Device monitoring

articles/iot/iot-sdks.md

@@ -1,6 +1,5 @@
 ---
 title: Azure IoT device and service SDKs
-titleSuffix: Azure IoT
 description: A list of the IoT SDKs and libraries. Includes SDKs for device development and SDKs for building service applications.
 author: dominicbetts
 ms.author: dobett

articles/iot/iot-security-architecture.md

@@ -1,6 +1,5 @@
 ---
 title: Security architecture
-titleSuffix: Azure IoT
 description: Security architecture guidelines and considerations for Azure IoT solutions illustrated using the IoT reference architecture
 author: dominicbetts
 ms.service: iot

articles/iot/iot-security-best-practices.md

@@ -1,6 +1,5 @@
 ---
 title: Security best practices
-titleSuffix: Azure IoT
 description: Security best practices for building, deploying, and operating your IoT solution. Includes recommendations for devices, data, and infrastructure
 author: dominicbetts
 ms.service: iot

docfx.json

@@ -1156,6 +1156,8 @@
         "articles/governance/policy/**/*.md": "Azure Policy",
         "articles/governance/resource-graph/**/*.md": "Azure Resource Graph",
         "articles/industry/agriculture/**/*.md": "Azure for Industry: Agriculture",
+        "articles/iot/**/*.md": "Azure IoT",
+        "articles/iot/**/*yml": "Azure IoT",
         "articles/jenkins/**/*.yml": "Jenkins",
         "articles/lab-services/**/*.md": "Azure Lab Services",
         "articles/lighthouse/**/*.md": "Azure Lighthouse",