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

Author: roygara

articles/frontdoor/front-door-ddos.md

@@ -34,11 +34,12 @@ Front Door is a large scaled, globally distributed service. We have many custome
 
 [Front Door's Web Application Firewall (WAF)](../web-application-firewall/afds/afds-overview.md) can be used to mitigate many different types of attacks:
 
-* Using the managed rule set provides protection against many common attacks.
+* Using the managed rule set provides protection against many common attacks. For more information, see [Managed rules](../web-application-firewall/afds/waf-front-door-drs.md).
 * Traffic from outside a defined geographic region, or within a defined region, can be blocked or redirected to a static webpage. For more information, see [Geo-filtering](../web-application-firewall/afds/waf-front-door-geo-filtering.md).
-* IP addresses and ranges that you identify as malicious can be blocked.
-* Rate limiting can be applied to prevent IP addresses from calling your service too frequently.
+* IP addresses and ranges that you identify as malicious can be blocked. For more information, see [IP restrictions](../web-application-firewall/afds/waf-front-door-configure-ip-restriction.md).
+* Rate limiting can be applied to prevent IP addresses from calling your service too frequently. For more information, see [Rate limiting](../web-application-firewall/afds/waf-front-door-rate-limit.md).
 * You can create [custom WAF rules](../web-application-firewall/afds/waf-front-door-custom-rules.md) to automatically block and rate limit HTTP or HTTPS attacks that have known signatures.
+* Using the bot protection managed rule set provides protection against known bad bots. For more information, see [Configuring bot protection](../web-application-firewall/afds/waf-front-door-policy-configure-bot-protection.md).
 
 ## Protect VNet origins
 

articles/iot-edge/tutorial-configure-est-server.md

@@ -3,7 +3,7 @@ title: Tutorial - Configure Enrollment over Secure Transport Server (EST) for Az
 description: This tutorial shows you how to set up an Enrollment over Secure Transport (EST) server for Azure IoT Edge.
 author: PatAltimore
 ms.author: patricka
-ms.date: 01/05/2023
+ms.date: 03/16/2023
 ms.topic: tutorial
 ms.service: iot-edge
 services: iot-edge
@@ -81,10 +81,12 @@ The Dockerfile uses Ubuntu 18.04, a [Cisco library called `libest`](https://gith
     # Setting the root CA expiration to 20 years
     RUN sed -i "s|-days 365|-days 7300 |g" ./createCA.sh
 
-    ## If you want to host your EST server in the cloud (for example, an Azure Container Instance),
-    ## change myestserver.westus.azurecontainer.io to the fully qualified DNS name of your EST server 
-    ## and uncomment the next line.
-    # RUN sed -i "s|ip6-localhost|myestserver.westus.azurecontainer.io |g" ./ext.cnf
+    ## If you want to host your EST server remotely (for example, an Azure Container Instance),
+    ## change myestserver.westus.azurecontainer.io to the fully qualified DNS name of your EST server
+    ## OR, change the IP address
+    ## and uncomment the corresponding line.
+    # RUN sed -i "s|DNS.2 = ip6-localhost|DNS.2 = myestserver.westus.azurecontainer.io|g" ./ext.cnf
+    # RUN sed -i "s|IP.2 = ::1|IP.2 = <YOUR EST SERVER IP ADDRESS>|g" ./ext.cnf
 
     # Set EST server certificate to be valid for 10 years
     RUN sed -i "s|-keyout \$EST_SERVER_PRIVKEY -subj|-keyout \$EST_SERVER_PRIVKEY -days 7300 -subj |g" ./createCA.sh
@@ -331,4 +333,4 @@ You can keep the resources and configurations that you created in this tutorial
 * Using username and password to bootstrap authentication to EST server isn't recommended for production. Instead, consider using long-lived *bootstrap certificates* that can be stored onto the device during manufacturing [similar to the recommended approach for DPS](../iot-hub/iot-hub-x509ca-concept.md). To see how to configure bootstrap certificate for EST server, see [Authenticate a Device Using Certificates Issued Dynamically via EST](https://github.com/Azure/iotedge/blob/main/edgelet/doc/est.md).
 * EST server can be used to issue certificates for all devices in a hierarchy as well. Depending on if you have ISA-95 requirements, it may be necessary to run a chain of EST servers with one at every layer or use the API proxy module to forward the requests. To learn more, see [Kevin's blog](https://kevinsaye.wordpress.com/2021/07/21/deep-dive-creating-hierarchies-of-azure-iot-edge-devices-isa-95-part-3/).
 * For enterprise grade solutions, consider: [GlobalSign IoT Edge Enroll](https://www.globalsign.com/en/iot-edge-enroll) or [DigiCert IoT Device Manager](https://www.digicert.com/iot/iot-device-manager)
-* To learn more about certificates, see [Understand how Azure IoT Edge uses certificates](iot-edge-certs.md).
+* To learn more about certificates, see [Understand how Azure IoT Edge uses certificates](iot-edge-certs.md).

articles/iot-hub/.openpublishing.redirection.iot-hub.json

@@ -631,6 +631,61 @@
       "redirect_url": "/azure/iot-hub/iot-hub-intel-edison-kit-node-get-started",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot-hub/twin-get-started-cli.md",
+      "redirect_url": "/azure/iot-hub/device-twins-cli",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-csharp-csharp-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/device-twins-dotnet",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-java-java-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/device-twins-java",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-node-node-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/device-twins-node",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-python-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/device-twins-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-node-node-module-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/module-twins-node",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-c-c-module-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/module-twins-c",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-csharp-csharp-module-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/module-twins-dotnet",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-python-python-module-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/module-twins-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-portal-csharp-module-twin-getstarted.md",
+      "redirect_url": "/azure/iot-hub/module-twins-portal-dotnet",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/module-twin-getstarted-cli.md",
+      "redirect_url": "/azure/iot-hub/module-twins-cli",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-gateway-sdk-physical-device.md",
       "redirect_url": "/azure/iot-hub/iot-hub-iot-edge-physical-device",
@@ -658,7 +713,7 @@
     },
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-csharp-node-twin-getstarted.md",
-      "redirect_url": "/azure/iot-hub/iot-hub-node-node-twin-getstarted",
+      "redirect_url": "/azure/iot-hub/device-twins-node",
       "redirect_document_id": false
     },
     {

articles/iot-hub/TOC.yml

@@ -342,39 +342,39 @@
           items:
             - name: CLI
               displayName: device twins
-              href: twin-get-started-cli.md
+              href: device-twins-cli.md
             - name: .NET
               displayName: device twins
-              href: iot-hub-csharp-csharp-twin-getstarted.md
+              href: device-twins-dotnet.md
             - name: Python
               displayName: device twins
-              href: iot-hub-python-twin-getstarted.md
+              href: device-twins-python.md
             - name: Node.js
               displayName: device twins
-              href: iot-hub-node-node-twin-getstarted.md
+              href: device-twins-node.md
             - name: Java
               displayName: device twins
-              href: iot-hub-java-java-twin-getstarted.md
+              href: device-twins-java.md
         - name: Get started with module twins
           items:
             - name: Portal
               displayName: module twins, module identity
-              href: iot-hub-portal-csharp-module-twin-getstarted.md
+              href: module-twins-portal-dotnet.md
             - name: CLI
               displayName: module twins, module identity
-              href: module-twin-getstarted-cli.md
+              href: module-twins-cli.md
             - name: .NET
               displayName: module twins, module identity
-              href: iot-hub-csharp-csharp-module-twin-getstarted.md
+              href: module-twins-dotnet.md
             - name: Python
               displayName: module twins, module identity
-              href: iot-hub-python-python-module-twin-getstarted.md
+              href: module-twins-python.md
             - name: Node.js
               displayName: module twins, module identity
-              href: iot-hub-node-node-module-twin-getstarted.md
+              href: module-twins-node.md
             - name: C
               displayName: module twins, module identity
-              href: iot-hub-c-c-module-twin-getstarted.md
+              href: module-twins-c.md
         - name: Get started with device management
           items:
             - name: CLI

articles/iot-hub/twin-get-started-cli.md renamed to articles/iot-hub/device-twins-cli.md

@@ -1,14 +1,14 @@
 ---
 title: Get started with Azure IoT Hub device twins (Azure CLI)
+titleSuffix: Azure IoT Hub
 description: How to use Azure IoT Hub device twins and the Azure CLI to create and simulate devices, add tags to device twins, and execute IoT Hub queries. 
 author: kgremban
 
+ms.author: kgremban
 ms.service: iot-hub
-services: iot-hub
 ms.devlang: azurecli
-ms.topic: conceptual
+ms.topic: how-to
 ms.date: 02/17/2023
-ms.author: kgremban
 ms.custom: "mqtt, devx-track-azurecli"
 ---
 

articles/iot-hub/iot-hub-csharp-csharp-twin-getstarted.md renamed to articles/iot-hub/device-twins-dotnet.md

@@ -1,14 +1,14 @@
 ---
-title: Get started with Azure IoT Hub device twins (.NET/.NET) | Microsoft Docs
-description: How to use Azure IoT Hub device twins to add tags and then use an IoT Hub query. You use the Azure IoT device SDK for .NET to implement the simulated device app and the Azure IoT service SDK for .NET to implement a service app that adds the tags and runs the IoT Hub query.
+title: Get started with Azure IoT Hub device twins (.NET)
+titleSuffix: Azure IoT Hub
+description: How to use Azure IoT Hub device twins and the Azure IoT SDKs for .NET to create and simulate devices, add tags to device twins, and execute IoT Hub queries. 
 author: kgremban
 
+ms.author: kgremban
 ms.service: iot-hub
-services: iot-hub
 ms.devlang: csharp
-ms.topic: conceptual
+ms.topic: how-to
 ms.date: 02/17/2023
-ms.author: kgremban
 ms.custom: "mqtt, devx-track-csharp"
 ---
 
@@ -152,13 +152,13 @@ In this section, you create a .NET console app that connects to your hub as **my
 
 1. Run this app by right-clicking the **ReportConnectivity** project and selecting **Debug**, then **Start new instance**. You should see the app getting the twin information, and then sending connectivity as a ***reported property***.
 
-   ![Run device app to report connectivity](./media/iot-hub-csharp-csharp-twin-getstarted/rundeviceapp.png)
+   ![Run device app to report connectivity](./media/device-twins-dotnet/rundeviceapp.png)
 
    After the device reported its connectivity information, it should appear in both queries.
 
 1. Right-click the **AddTagsAndQuery** project and select **Debug** > **Start new instance** to run the queries again. This time, **myDeviceId** should appear in both query results.
 
-   ![Device connectivity reported successfully](./media/iot-hub-csharp-csharp-twin-getstarted/tagappsuccess.png)
+   ![Device connectivity reported successfully](./media/device-twins-dotnet/tagappsuccess.png)
 
 ## Create a service app that updates desired properties and queries twins
 
@@ -168,15 +168,15 @@ In this section, you create a .NET console app, using C#, that adds location met
 
 1. In **Configure your new project**, name the project **AddTagsAndQuery**, the select **Next**.
 
-   :::image type="content" source="./media/iot-hub-csharp-csharp-twin-getstarted/config-addtagsandquery-app.png" alt-text="Screenshot of how to create a new Visual Studio project." lightbox="./media/iot-hub-csharp-csharp-twin-getstarted/config-addtagsandquery-app.png":::
+   :::image type="content" source="./media/device-twins-dotnet/config-addtagsandquery-app.png" alt-text="Screenshot of how to create a new Visual Studio project." lightbox="./media/device-twins-dotnet/config-addtagsandquery-app.png":::
 
 1. Accept the default version of the .NET Framework, then select **Create** to create the project.
 
 1. In Solution Explorer, right-click the **AddTagsAndQuery** project, and then select **Manage NuGet Packages**.
 
 1. Select **Browse** and search for and select **Microsoft.Azure.Devices**. Select **Install**.
 
-   ![NuGet Package Manager window](./media/iot-hub-csharp-csharp-twin-getstarted/nuget-package-addtagsandquery-app.png)
+   ![NuGet Package Manager window](./media/device-twins-dotnet/nuget-package-addtagsandquery-app.png)
 
    This step downloads, installs, and adds a reference to the [Azure IoT service SDK](https://www.nuget.org/packages/Microsoft.Azure.Devices/) NuGet package and its dependencies.
 
@@ -240,7 +240,7 @@ In this section, you create a .NET console app, using C#, that adds location met
 
 1. Run this application by right-clicking on the **AddTagsAndQuery** project and selecting **Debug**, followed by **Start new instance**. You should see one device in the results for the query asking for all devices located in **Redmond43** and none for the query that restricts the results to devices that use a cellular network.
 
-   ![Query results in window](./media/iot-hub-csharp-csharp-twin-getstarted/addtagapp.png)
+   ![Query results in window](./media/device-twins-dotnet/addtagapp.png)
 
 In this article, you:
 

articles/iot-hub/iot-hub-java-java-twin-getstarted.md renamed to articles/iot-hub/device-twins-java.md

@@ -1,13 +1,13 @@
 ---
-title: Get started with Azure IoT Hub device twins (Java) | Microsoft Docs
-description: How to use Azure IoT Hub device twins to add tags and then use an IoT Hub query. You use the Azure IoT device SDK for Java to implement the device app and the Azure IoT service SDK for Java to implement a service app that adds the tags and runs the IoT Hub query.
+title: Get started with Azure IoT Hub device twins (Java)
+titleSuffix: Azure IoT Hub
+description: How to use Azure IoT Hub device twins and the Azure IoT SDKs for Java to create and simulate devices, add tags to device twins, and execute IoT Hub queries. 
 author: kgremban
 
 ms.author: kgremban
 ms.service: iot-hub
-services: iot-hub
 ms.devlang: java
-ms.topic: conceptual
+ms.topic: how-to
 ms.date: 02/17/2023
 ms.custom: mqtt, devx-track-java
 ---
@@ -375,7 +375,7 @@ You are now ready to run the console apps.
     mvn exec:java -Dexec.mainClass="com.mycompany.app.App"
     ```
 
-    ![Screenshot that shows the output from the command to run the add tags query service app.](./media/iot-hub-java-java-twin-getstarted/service-app-1.png)
+    ![Screenshot that shows the output from the command to run the add tags query service app.](./media/device-twins-java/service-app-1.png)
 
     You can see the **plant** and **region** tags added to the device twin. The first query returns your device, but the second does not.
 
@@ -385,15 +385,15 @@ You are now ready to run the console apps.
     mvn exec:java -Dexec.mainClass="com.mycompany.app.App"
     ```
 
-    ![The device client adds the connectivity Type reported property](./media/iot-hub-java-java-twin-getstarted/device-app-1.png)
+    ![The device client adds the connectivity Type reported property](./media/device-twins-java/device-app-1.png)
 
 3. At a command prompt in the **add-tags-query** folder, run the following command to run the **add-tags-query** service app a second time:
 
     ```cmd/sh
     mvn exec:java -Dexec.mainClass="com.mycompany.app.App"
     ```
 
-    ![Java IoT Hub service app to update tag values and run device queries](./media/iot-hub-java-java-twin-getstarted/service-app-2.png)
+    ![Java IoT Hub service app to update tag values and run device queries](./media/device-twins-java/service-app-2.png)
 
     Now that your device has sent the **connectivityType** property to IoT Hub, the second query returns your device.
 

articles/iot-hub/iot-hub-node-node-twin-getstarted.md renamed to articles/iot-hub/device-twins-node.md

@@ -1,13 +1,14 @@
 ---
-title: Get started with Azure IoT Hub device twins (Node) | Microsoft Docs
-description: How to use Azure IoT Hub device twins to add tags and then use an IoT Hub query. You use the Azure IoT SDKs for Node.js to implement the simulated device app and a service app that adds the tags and runs the IoT Hub query.
+title: Get started with Azure IoT Hub device twins (Node.js)
+titleSuffix: Azure IoT Hub
+description: How to use Azure IoT Hub device twins and the Azure IoT SDKs for Node.js to create and simulate devices, add tags to device twins, and execute IoT Hub queries. 
 author: kgremban
+
+ms.author: kgremban
 ms.service: iot-hub
-services: iot-hub
-ms.devlang: javascript
-ms.topic: conceptual
+ms.devlang: nodejs
+ms.topic: how-to
 ms.date: 02/17/2023
-ms.author: kgremban
 ms.custom: mqtt, devx-track-js
 ---
 
@@ -124,7 +125,7 @@ In this section, you create a Node.js console app that connects to your hub as *
 
     This time **myDeviceId** should appear in both query results.
 
-    ![Show myDeviceId in both query results](media/iot-hub-node-node-twin-getstarted/service2.png)
+    ![Show myDeviceId in both query results](media/device-twins-node/service2.png)
 
 ## Create a service app that updates desired properties and queries twins
 
@@ -217,7 +218,7 @@ In this section, you create a Node.js console app that adds location metadata to
 
    You should see one device in the results for the query asking for all devices located in **Redmond43** and none for the query that restricts the results to devices that use a cellular network.
 
-   ![See the one device in the query results](media/iot-hub-node-node-twin-getstarted/service1.png)
+   ![See the one device in the query results](media/device-twins-node/service1.png)
 
 In this article, you: