Merge pull request #85441 from robinsh/robinsh-0814

replace 'rule' with 'query', small edits per Ashita.

Author: PRMerger15

articles/iot-hub/iot-hub-devguide-messages-construct.md

@@ -44,14 +44,15 @@ For more information about how to encode and decode messages sent using differen
 
 ## System Properties of **D2C** IoT Hub messages
 
-| Property | Description  |User Settable?|Keyword for routing query|
+| Property | Description  |User Settable?|Keyword for </br>routing query|
 | --- | --- | --- | --- |
-| message-id |A user-settable identifier for the message used for request-reply patterns. Format: A case-sensitive string (up to 128 characters long) of ASCII 7-bit alphanumeric characters + `{'-', ':', '.', '+', '%', '_', '#', '*', '?', '!', '(', ')', ',', '=', '@', ';', '$', '''}`.  | Yes | MessageId |
-| iothub-enqueuedtime |Date and time the [Device-to-Cloud](iot-hub-devguide-d2c-guidance.md) message was received by IoT Hub. | No | EnqueuedTime |
-| user-id |An ID used to specify the origin of messages. When messages are generated by IoT Hub, it is set to `{iot hub name}`. | Yes | UserId |
-| iothub-connection-device-id |An ID set by IoT Hub on device-to-cloud messages. It contains the **deviceId** of the device that sent the message. | No | DeviceId |
-| iothub-connection-auth-generation-id |An ID set by IoT Hub on device-to-cloud messages. It contains the **generationId** (as per [Device identity properties](iot-hub-devguide-identity-registry.md#device-identity-properties)) of the device that sent the message. | No |DeviceGenerationId |
-| iothub-connection-auth-method |An authentication method set by IoT Hub on device-to-cloud messages. This property contains information about the authentication method used to authenticate the device sending the message.| No | AuthMethod |
+| message-id |A user-settable identifier for the message used for request-reply patterns. Format: A case-sensitive string (up to 128 characters long) of ASCII 7-bit alphanumeric characters + `{'-', ':', '.', '+', '%', '_', '#', '*', '?', '!', '(', ')', ',', '=', '@', ';', '$', '''}`.  | Yes | messageId |
+| iothub-enqueuedtime |Date and time the [Device-to-Cloud](iot-hub-devguide-d2c-guidance.md) message was received by IoT Hub. | No | enqueuedTime |
+| user-id |An ID used to specify the origin of messages. When messages are generated by IoT Hub, it is set to `{iot hub name}`. | Yes | userId |
+| iothub-connection-device-id |An ID set by IoT Hub on device-to-cloud messages. It contains the **deviceId** of the device that sent the message. | No | connectionDeviceId |
+| iothub-connection-module-id |An ID set by IoT Hub on device-to-cloud messages. It contains the **moduleId** of the device that sent the message. | No | connectionModuleId |
+| iothub-connection-auth-generation-id |An ID set by IoT Hub on device-to-cloud messages. It contains the **connectionDeviceGenerationId** (as per [Device identity properties](iot-hub-devguide-identity-registry.md#device-identity-properties)) of the device that sent the message. | No |connectionDeviceGenerationId |
+| iothub-connection-auth-method |An authentication method set by IoT Hub on device-to-cloud messages. This property contains information about the authentication method used to authenticate the device sending the message.| No | connectionAuthMethod |
 
 ## System Properties of **C2D** IoT Hub messages
 

articles/iot-hub/iot-hub-event-grid.md

@@ -198,3 +198,5 @@ Applications that handle IoT Hub events should follow these suggested practices:
 * [Learn more about Event Grid](../event-grid/overview.md)
 
 * [Compare the differences between routing IoT Hub events and messages](iot-hub-event-grid-routing-comparison.md)
+
+* [Learn how to use IoT telemetry events to implement IoT spatial analytics using Azure Maps (and IoT Hub message routing)](../azure-maps/tutorial-iot-hub-maps.md#filter-events-using-iot-hub-message-routing)

articles/iot-hub/tutorial-message-enrichments.md

@@ -79,7 +79,7 @@ Here are the resources created by the script. **Enriched** means that resource i
 
 ```azurecli-interactive
 # This command retrieves the subscription id of the current Azure account.
-# This field is used when setting up the routing rules.
+# This field is used when setting up the routing queries.
 subscriptionID=$(az account show --query id -o tsv)
 
 # Concatenate this number onto the resources that have to be globally unique.
@@ -264,7 +264,7 @@ At this point, the resources are all set up and the routing is configured. You c
 
 ## Send messages to the IoT Hub
 
-Now that the message enrichments are configured for the endpoint, run the Simulated Device application to send messages to the IoT Hub. The hub has been set up with rules that accomplish the following :
+Now that the message enrichments are configured for the endpoint, run the Simulated Device application to send messages to the IoT Hub. The hub has been set up with settings that accomplish the following :
 
 * Messages routed to the storage endpoint ContosoStorageEndpointOriginal will not be enriched and will be stored in the storage container `original`.
 

articles/iot-hub/tutorial-routing-config-message-routing-CLI.md

@@ -40,7 +40,7 @@ Copy and paste the script below into Cloud Shell and press Enter. It runs the sc
 
 ```azurecli-interactive
 # This command retrieves the subscription id of the current Azure account. 
-# This field is used when setting up the routing rules.
+# This field is used when setting up the routing queries.
 subscriptionID=$(az account show --query id)
 
 # Concatenate this number onto the resources that have to be globally unique.

articles/iot-hub/tutorial-routing-config-message-routing-PowerShell.md

@@ -40,7 +40,7 @@ Copy and paste the script below into Cloud Shell and press Enter. It runs the sc
 
 ```azurepowershell-interactive
 # This command retrieves the subscription id of the current Azure account.
-# This field is used when setting up the routing rules.
+# This field is used when setting up the routing queries.
 $subscriptionID = (Get-AzContext).Subscription.Id
 
 # Concatenate this number onto the resources that have to be globally unique.

articles/iot-hub/tutorial-routing.md

@@ -31,7 +31,7 @@ A note about debugging: this script uses the continuation symbol (the backslash
 ```azurecli-interactive
 # This retrieves the subscription id of the account 
 #   in which you're logged in.
-# This field is used to set up the routing rules.
+# This field is used to set up the routing queries.
 subscriptionID=$(az account show --query id)
 
 # Concatenate this number onto the resources that have to be globally unique.