Skip to content

Commit 0c94463

Browse files
authored
Merge pull request #277587 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents e8d5198 + df34ca7 commit 0c94463

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

articles/api-management/authentication-managed-identity-policy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ Both system-assigned identity and any of the multiple user-assigned identities c
4949
<authentication-managed-identity resource="https://graph.microsoft.com"/>
5050
```
5151
```xml
52+
<authentication-managed-identity resource="https://cognitiveservices.azure.com"/> <!--Azure OpenAI-->
53+
```
54+
```xml
5255
<authentication-managed-identity resource="https://management.azure.com/"/> <!--Azure Resource Manager-->
5356
```
5457
```xml

articles/iot/iot-mqtt-5-preview-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ ms.topic: reference
1111
ms.date: 04/24/2023
1212
---
1313

14-
# IoT Hub data plane MQTT 5 API reference (preview)
14+
# IoT Hub data plane MQTT 5 API reference (deprecated)
1515

1616
This document defines operations available in version 2.0 (api-version: `2020-10-01-preview`) of IoT Hub data plane API.
1717

1818
> [!NOTE]
19-
> IoT Hub has limited feature support for MQTT. If your solution needs MQTT v3.1.1 or v5 support, we recommend [MQTT support in Azure Event Grid](../event-grid/mqtt-overview.md). For more information, see [Compare MQTT support in IoT Hub and Event Grid](../iot/iot-mqtt-connect-to-iot-hub.md#compare-mqtt-support-in-iot-hub-and-event-grid).
19+
> MQTT 5 support in IoT Hub is deprecated and IoT Hub has limited feature support for MQTT. If your solution needs MQTT v3.1.1 or v5 support, we recommend [MQTT support in Azure Event Grid](../event-grid/mqtt-overview.md). For more information, see [Compare MQTT support in IoT Hub and Event Grid](../iot/iot-mqtt-connect-to-iot-hub.md#compare-mqtt-support-in-iot-hub-and-event-grid).
2020
2121
## Operations
2222

articles/iot/iot-mqtt-5-preview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ ms.topic: conceptual
1111
ms.date: 04/08/2024
1212
---
1313

14-
# IoT Hub MQTT 5 support (preview)
14+
# IoT Hub MQTT 5 support (deprecated)
1515

1616
**Version:** 2.0
1717
**api-version:** 2020-10-01-preview
1818

1919
This document defines IoT Hub data plane API over MQTT version 5.0 protocol. See [API Reference](iot-mqtt-5-preview-reference.md) for complete definitions in this API.
2020

2121
> [!NOTE]
22-
> IoT Hub has limited feature support for MQTT. If your solution needs MQTT v3.1.1 or v5 support, we recommend [MQTT support in Azure Event Grid](../event-grid/mqtt-overview.md). For more information, see [Compare MQTT support in IoT Hub and Event Grid](../iot/iot-mqtt-connect-to-iot-hub.md#compare-mqtt-support-in-iot-hub-and-event-grid).
22+
> MQTT 5 support in IoT Hub is deprecated and IoT Hub has limited feature support for MQTT. If your solution needs MQTT v3.1.1 or v5 support, we recommend [MQTT support in Azure Event Grid](../event-grid/mqtt-overview.md). For more information, see [Compare MQTT support in IoT Hub and Event Grid](../iot/iot-mqtt-connect-to-iot-hub.md#compare-mqtt-support-in-iot-hub-and-event-grid).
2323
2424
## Prerequisites
2525

articles/role-based-access-control/permissions/web-and-mobile.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,6 @@ Azure service: [App Service](/azure/app-service/), [Azure Functions](/azure/azur
602602
> | Microsoft.Web/serverfarms/eventGridFilters/delete | Delete Event Grid Filter on server farm. |
603603
> | Microsoft.Web/serverfarms/eventGridFilters/read | Get Event Grid Filter on server farm. |
604604
> | Microsoft.Web/serverfarms/eventGridFilters/write | Put Event Grid Filter on server farm. |
605-
> | microsoft.web/serverfarms/firstpartyapps/keyvaultsettings/read | Get first party Azure Key vault referenced settings for App Service Plan. |
606-
> | microsoft.web/serverfarms/firstpartyapps/keyvaultsettings/write | Create or Update first party Azure Key vault referenced settings for App Service Plan. |
607-
> | microsoft.web/serverfarms/firstpartyapps/settings/delete | Delete App Service Plans First Party Apps Settings. |
608-
> | microsoft.web/serverfarms/firstpartyapps/settings/read | Get App Service Plans First Party Apps Settings. |
609-
> | microsoft.web/serverfarms/firstpartyapps/settings/write | Update App Service Plans First Party Apps Settings. |
610605
> | microsoft.web/serverfarms/hybridconnectionnamespaces/relays/read | Get App Service Plans Hybrid Connection Namespaces Relays. |
611606
> | microsoft.web/serverfarms/hybridconnectionnamespaces/relays/delete | Delete App Service Plans Hybrid Connection Namespaces Relays. |
612607
> | microsoft.web/serverfarms/hybridconnectionnamespaces/relays/sites/read | Get App Service Plans Hybrid Connection Namespaces Relays Web Apps. |
@@ -1077,4 +1072,4 @@ Azure service: [App Service](/azure/app-service/), [Azure Functions](/azure/azur
10771072
10781073
## Next steps
10791074

1080-
- [Azure resource providers and types](/azure/azure-resource-manager/management/resource-providers-and-types)
1075+
- [Azure resource providers and types](/azure/azure-resource-manager/management/resource-providers-and-types)

0 commit comments

Comments
 (0)