Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram21-1018

Author: tamram

articles/iot-develop/quickstart-send-telemetry-central.md

@@ -1,6 +1,6 @@
 ---
 title: Quickstart - connect a device and send telemetry to Azure IoT Central
-description: This quickstart shows device developers how to connect a device securely to Azure IoT Central. You use an Azure IoT device SDK for C, C#, Python, Node.js, or Java, to run a client app on a simulated device, then you connect to IoT Central and send telemetry.
+description: This quickstart shows device developers how to connect a device securely to Azure IoT Central. You use an Azure IoT device SDK for C, C#, Python, Node.js, or Java, to run a client app on a device, then you connect to IoT Central and send telemetry.
 author: timlt
 ms.author: timlt
 ms.service: iot-develop
@@ -47,7 +47,7 @@ zone_pivot_groups: iot-develop-set1
 :::zone-end
 
 ## View telemetry
-After the simulated device connects to IoT Central, it begins sending telemetry. You can view the telemetry and other details about connected devices in IoT Central. 
+After the device connects to IoT Central, it begins sending telemetry. You can view the telemetry and other details about connected devices in IoT Central. 
 
 In IoT Central, select **Devices**, click your device name, then select the **Overview** tab. This view displays a graph of the temperatures from the two thermostat devices.
 
@@ -68,7 +68,7 @@ To remove the Azure IoT Central sample application and all its devices and resou
 
 ## Next steps
 
-In this quickstart, you learned a basic Azure IoT application workflow for securely connecting a device to the cloud and sending device-to-cloud telemetry. You used Azure IoT Central to create an application and a device instance. Then you used an Azure IoT device SDK to create a simulated device, connect to IoT Central, and send telemetry. You also used IoT Central to monitor the telemetry.
+In this quickstart, you learned a basic Azure IoT application workflow for securely connecting a device to the cloud and sending device-to-cloud telemetry. You used Azure IoT Central to create an application and a device instance. Then you used an Azure IoT device SDK to create a temperature controller, connect to IoT Central, and send telemetry. You also used IoT Central to monitor the telemetry.
 
 As a next step, explore the following articles to learn more about building device solutions with Azure IoT. 
 

articles/iot-develop/quickstart-send-telemetry-iot-hub.md

@@ -1,6 +1,6 @@
 ---
 title: Send device telemetry to Azure IoT Hub quickstart
-description: This quickstart shows device developers how to connect a device securely to Azure IoT Hub. You use an Azure IoT device SDK for C, C#, Python, Node.js, or Java, to build a simulated device client for Windows, Linux, or Raspberry Pi OS (Raspian). Finally you connect the device to Azure IoT Hub and send telemetry.
+description: This quickstart shows device developers how to connect a device securely to Azure IoT Hub. You use an Azure IoT device SDK for C, C#, Python, Node.js, or Java, to build a device client for Windows, Linux, or Raspberry Pi OS (Raspian). Finally you connect the device to Azure IoT Hub and send telemetry.
 author: timlt
 ms.author: timlt
 ms.service: iot-develop
@@ -66,7 +66,7 @@ To delete a resource group by name:
 
 ## Next steps
 
-In this quickstart, you learned a basic Azure IoT application workflow for securely connecting a device to the cloud and sending device-to-cloud telemetry. You used Azure CLI to create an Azure IoT hub and a device instance. Then you used an Azure IoT device SDK to create a simulated device, connect it to the hub, and send telemetry. You also used Azure portal to monitor telemetry.
+In this quickstart, you learned a basic Azure IoT application workflow for securely connecting a device to the cloud and sending device-to-cloud telemetry. You used Azure CLI to create an Azure IoT hub and a device instance. Then you used an Azure IoT device SDK to create a temperature controller, connect it to the hub, and send telemetry. You also used Azure CLI to monitor telemetry.
 
 As a next step, explore the following articles to learn more about building device solutions with Azure IoT. 
 

includes/iot-develop-create-central-app-with-device.md

@@ -33,16 +33,15 @@ To create a new application:
     :::image type="content" source="media/iot-develop-create-central-app-with-device/iot-central-created.png" alt-text="IoT Central new application dashboard":::
 
 ## Add a device
-In this section, you add a new device to your IoT Central application. The device is an instance of a device template that represents a real or simulated device that you'll connect to the application. 
+In this section, you add a new device to your IoT Central application. The device is an instance of a device template that represents a device that you'll connect to the application. 
 
 To create a new device:
 1. In the left pane select **Devices**, then select **+New**.
-1. Leave **Device template** set to *Unassigned*.
+1. Leave **Device template** set to *Unassigned* and **Simulate this device?** set to *No*.
 
-    > [!NOTE]
-    > In this quickstart for simplicity, you connect a simulated device that uses an unassigned template. If you continue using IoT Central to manage devices, you'll learn about using device templates. For an overview of working with device templates, see [Quickstart: Add a simulated device to your IoT Central application](../articles/iot-central/core/quick-create-simulated-device.md).
 1. Set a friendly **Device name** and **Device ID**. Optionally, use the generated values.
     :::image type="content" source="media/iot-develop-create-central-app-with-device/iot-central-create-device.png" alt-text="IoT Central new device dialog":::
+
 1. Select **Create**.
 
     The created device appears in the **All devices** list.

includes/iot-develop-send-telemetry-central-c.md

@@ -11,7 +11,7 @@
 
 [![Browse code](../articles/iot-develop/media/common/browse-code.svg)](https://github.com/Azure/azure-iot-sdk-c/tree/master/iothub_client/samples/pnp)
 
-In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to run a simulated temperature controller, connect it securely to IoT Central, and send telemetry.
+In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to create a temperature controller, connect it securely to IoT Central, and send telemetry. The temperature controller sample application runs on your local machine and generates simulated sensor data to send to IoT Central.
 
 ## Prerequisites
 This quickstart runs on Windows, Linux, and Raspberry Pi. It's been tested on the following OS and device versions:
@@ -51,14 +51,14 @@ To complete this quickstart on Windows, install Visual Studio 2019 and add the r
 
 [!INCLUDE [iot-develop-create-central-app-with-device](iot-develop-create-central-app-with-device.md)]
 
-## Run a simulated device
-In this section, you configure your local environment, install the Azure IoT C device SDK, and run a sample that creates a simulated temperature controller.
+## Run a device
+In this section, you configure your local environment, install the Azure IoT C device SDK, and run a sample that creates a temperature controller.
 
 ### Configure your environment
 
 1. Open a console to install the Azure IoT C device SDK and run the code sample. For Windows, select **Start**, type *Developer Command Prompt for VS 2019*, and open the console. For Linux and Raspberry Pi OS, open a terminal for Bash commands. 
 
-1. Set the following environment variables, using the appropriate commands for your console. The simulated device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
+1. Set the following environment variables, using the appropriate commands for your console. The device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
 
     **CMD**
 
@@ -121,7 +121,7 @@ In this section, you configure your local environment, install the Azure IoT C d
     cmake/iothub_client/samples/pnp/pnp_temperature_controller/pnp_temperature_controller
     ```
 
-    After your simulated device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. The connection details and telemetry output are shown in your console: 
+    After your device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. The connection details and telemetry output are shown in your console: 
     
     ```output
     Info: Initiating DPS client to retrieve IoT Hub connection information

includes/iot-develop-send-telemetry-central-csharp.md

@@ -11,7 +11,7 @@
 
 [![Browse code](../articles/iot-develop/media/common/browse-code.svg)](https://github.com/Azure-Samples/azure-iot-samples-csharp/tree/main/iot-hub/Samples/device/PnpDeviceSamples)
 
-In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to run a simulated temperature controller, connect it securely to IoT Central, and send telemetry.
+In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to create a temperature controller, connect it securely to IoT Central, and send telemetry. The temperature controller sample application runs on your local machine and generates simulated sensor data to send to IoT Central.
 
 ## Prerequisites
 
@@ -32,14 +32,14 @@ Install the following prerequisites on your development machine:
 
 [!INCLUDE [iot-develop-create-central-app-with-device](iot-develop-create-central-app-with-device.md)]
 
-## Run a simulated device
-In this section, you configure your local environment, install the Azure IoT C# samples, and run a sample that creates a simulated temperature controller.
+## Run a device
+In this section, you configure your local environment, install the Azure IoT C# samples, and run a sample that creates a temperature controller.
 
 ### Configure your environment
 
 1. Open a console such as Windows CMD, PowerShell, or Bash.
 
-1. Set the following environment variables, using the appropriate commands for your console. The simulated device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
+1. Set the following environment variables, using the appropriate commands for your console. The device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
 
     **CMD (Windows)**
 
@@ -106,13 +106,13 @@ In this section, you configure your local environment, install the Azure IoT C#
 
 ### Run the code
 
-1. In your console, run the code sample. The sample creates a simulated temperature controller with thermostat sensors.
+1. In your console, run the code sample. The sample creates a temperature controller with thermostat sensors.
 
     ```console
     dotnet run
     ```
 
-    After your simulated device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. The connection details and telemetry output are shown in your console:
+    After your device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. The connection details and telemetry output are shown in your console:
 
     ```output
     [10/09/2021 00:29:18]info: Microsoft.Azure.Devices.Client.Samples.TemperatureControllerSample[0]

includes/iot-develop-send-telemetry-central-java.md

@@ -11,7 +11,7 @@
 
 [![Browse code](../articles/iot-develop/media/common/browse-code.svg)](https://github.com/Azure/azure-iot-sdk-java/tree/main/device/iot-device-samples/pnp-device-sample)
 
-In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to run a simulated temperature controller, connect it securely to IoT Central, and send telemetry.
+In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to create a temperature controller, connect it securely to IoT Central, and send telemetry. The temperature controller sample application runs on your local machine and generates simulated sensor data to send to IoT Central.
 
 ## Prerequisites
 - A development machine with Java SE Development Kit 8 or later. You can download the Java 8 (LTS) JDK for multiple platforms from [Download Zulu Builds of OpenJDK](https://www.azul.com/downloads/zulu-community/). In the installer, select the **Add to Path** option.
@@ -20,14 +20,14 @@ In this quickstart, you learn a basic Azure IoT application development workflow
 
 [!INCLUDE [iot-develop-create-central-app-with-device](iot-develop-create-central-app-with-device.md)]
 
-## Run a simulated device
-In this section, you configure your local environment, install the Azure IoT Java device SDK, and run a sample that creates a simulated temperature controller.
+## Run a device
+In this section, you configure your local environment, install the Azure IoT Java device SDK, and run a sample that creates a temperature controller.
 
 ### Configure your environment
 
 1. Open a console such as Windows CMD, PowerShell, or Bash.
 
-1. Set the following environment variables, using the appropriate commands for your console. The simulated device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
+1. Set the following environment variables, using the appropriate commands for your console. The device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
 
     **Windows CMD**
 
@@ -76,12 +76,12 @@ In this section, you configure your local environment, install the Azure IoT Jav
     cd device/iot-device-samples/pnp-device-sample/temperature-controller-device-sample
     ```
 
-1. In your console, run the following code sample. The sample creates a simulated temperature controller with thermostat sensors.
+1. In your console, run the following code sample. The sample creates a temperature controller with thermostat sensors.
     ```console
     mvn exec:java -Dexec.mainClass="samples.com.microsoft.azure.sdk.iot.device.TemperatureController"
     ```
 
-    After your simulated device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. After some initial provisioning details, the console start to output the telemetry for the temperature controller.
+    After your device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. After some initial provisioning details, the console start to output the telemetry for the temperature controller.
     
     ```output
     2021-05-13 15:39:26.411 DEBUG Mqtt:253 - Sending MQTT SUBSCRIBE packet for topic $iothub/twin/res/#

includes/iot-develop-send-telemetry-central-nodejs.md

@@ -11,7 +11,7 @@
 
 [![Browse code](../articles/iot-develop/media/common/browse-code.svg)](https://github.com/Azure/azure-iot-sdk-node/tree/master/device/samples/javascript/pnp)
 
-In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to run a simulated temperature controller, connect it securely to IoT Central, and send telemetry.
+In this quickstart, you learn a basic Azure IoT application development workflow. First you create an Azure IoT Central application for hosting devices. Then you use an Azure IoT device SDK sample to create a temperature controller, connect it securely to IoT Central, and send telemetry. The temperature controller sample application runs on your local machine and generates simulated sensor data to send to IoT Central.
 
 ## Prerequisites
 This quickstart runs on Windows, Linux, and Raspberry Pi. It's been tested on the following OS and device versions:
@@ -27,14 +27,14 @@ Install the following prerequisites on your development machine:
 
 [!INCLUDE [iot-develop-create-central-app-with-device](iot-develop-create-central-app-with-device.md)]
 
-## Run a simulated device
-In this section, you configure your local environment, install the Azure IoT Node.js device SDK, and run a sample that creates a simulated temperature controller.
+## Run a device
+In this section, you configure your local environment, install the Azure IoT Node.js device SDK, and run a sample that creates a temperature controller.
 
 ### Configure your environment
 
 1. Open a console such as Windows CMD, PowerShell, or Bash.
 
-1. Set the following environment variables, using the appropriate commands for your console. The simulated device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
+1. Set the following environment variables, using the appropriate commands for your console. The device uses these values to connect to IoT Central. For `IOTHUB_DEVICE_DPS_ID_SCOPE`, `IOTHUB_DEVICE_DPS_DEVICE_KEY`, and `IOTHUB_DEVICE_DPS_DEVICE_ID`, use the device connection values that you saved previously.
 
     **CMD (Windows)**
 
@@ -96,12 +96,12 @@ In this section, you configure your local environment, install the Azure IoT Nod
 
 ### Run the code
 
-1. In your console, run the following code sample from the SDK. The sample creates a simulated temperature controller with thermostat sensors.
+1. In your console, run the following code sample from the SDK. The sample creates a temperature controller with thermostat sensors.
     ```console
     node pnpTemperatureController.js
     ```
 
-    After your simulated device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. The connection details and telemetry output are shown in your console: 
+    After your device connects to your IoT Central application, it connects to the device instance you created in the application and begins to send telemetry. The connection details and telemetry output are shown in your console: 
     
     ```output
     registration succeeded