Skip to content

Commit be51635

Browse files
authored
Merge pull request #292059 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 97c9a8e + 63af8bb commit be51635

File tree

43 files changed

+69
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+69
-66
lines changed

articles/app-service/provision-resource-terraform.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ resource "azurerm_linux_web_app" "webapp" {
7474
location = azurerm_resource_group.rg.location
7575
resource_group_name = azurerm_resource_group.rg.name
7676
service_plan_id = azurerm_service_plan.appserviceplan.id
77+
depends_on = [azurerm_service_plan.appserviceplan]
7778
https_only = true
7879
site_config {
7980
minimum_tls_version = "1.2"

articles/baremetal-infrastructure/workloads/nc2-on-azure/architecture.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ When planning your NC2 on Azure design, use the following table to understand wh
120120
| North Central US | AN36P |
121121
| Qatar Central | AN36P |
122122
| Southeast Asia | AN36P |
123+
| South India | AN36P |
123124
| UAE North | AN36P |
124125
| UK South | AN36P |
125126
| West Europe | AN36P |

articles/governance/machine-configuration/how-to/develop-custom-package/5-access-package.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signature (SAS) token.
1919

2020
## Steps to provide access to the package
2121

22-
The following steps prepare your resources for more secure operations. TThe code snippets for the
22+
The following steps prepare your resources for more secure operations. The code snippets for the
2323
steps include values in angle brackets, like `<storage-account-container-name>`, which you must
2424
replace with a valid value when following the steps. If you just copy and paste the code, the
2525
commands may raise errors due to invalid values.
@@ -80,4 +80,4 @@ included in the policy scope.
8080
8181
<!-- Reference link definitions -->
8282
[01]: /entra/identity/managed-identities-azure-resources/managed-identity-best-practice-recommendations#using-user-assigned-identities-to-reduce-administration
83-
[02]: /entra/identity/managed-identities-azure-resources/how-to-assign-managed-identity-via-azure-policy
83+
[02]: /entra/identity/managed-identities-azure-resources/how-to-assign-managed-identity-via-azure-policy

articles/service-bus-messaging/deprecate-service-bus-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ For more information on Service Manager and Resource Manager APIs for Azure Serv
2222
| Service Manager APIs (Deprecated) | Resource Manager - Service Bus API | Resource Manager - Event Hubs API | Resource Manager - Relay API |
2323
| --------------- | ----------------- | ----------------- | ----------------- |
2424
| **Namespaces-GetNamespaceAsync** <br/>[Service Bus Get Namespace](/rest/api/servicebus/get-namespace)<br/>[Event Hubs Get Namespace](/rest/api/eventhub/get-event-hub)<br/>[Relay Get Namespace](/rest/api/servicebus/get-relays)<br/> ```GET https://management.core.windows.net/{subscription ID}/services/ServiceBus/Namespaces/{namespace name}``` | [get](/rest/api/servicebus/controlplane-stable/namespaces/get) | [get](/rest/api/eventhub/controlplane-stable/namespaces/get) | [get](/rest/api/relay/controlplane-preview/namespaces/get) |
25-
| **ConnectionDetails-GetConnectionDetails**<br/>Service Bus/Event Hub/Relay GetConnectionDetals<br/>```GET https://management.core.windows.net/{subscription ID}/services/ServiceBus/Namespaces/{namespace name}/ConnectionDetails``` | [listkeys](/rest/api/servicebus/controlplane-stable/namespaces-authorization-rules/list-keys) | [listkeys](/rest/api/eventhub/controlplane-stable/authorization-rules-event-hubs/list-keys) | [listkeys](/rest/api/relay/controlplane-stable/wcf-relays/list-keys) |
25+
| **ConnectionDetails-GetConnectionDetails**<br/>Service Bus/Event Hub/Relay GetConnectionDetails<br/>```GET https://management.core.windows.net/{subscription ID}/services/ServiceBus/Namespaces/{namespace name}/ConnectionDetails``` | [listkeys](/rest/api/servicebus/controlplane-stable/namespaces-authorization-rules/list-keys) | [listkeys](/rest/api/eventhub/controlplane-stable/authorization-rules-event-hubs/list-keys) | [listkeys](/rest/api/relay/controlplane-stable/wcf-relays/list-keys) |
2626
| **Topics-GetTopicsAsync**<br/>Service Bus<br/>```GET https://management.core.windows.net/{subscription ID}/services/ServiceBus/Namespaces/{namespace name}/topics? $skip={skip}&$top={top}``` | [list](/rest/api/servicebus/controlplane-preview/topics/list-by-namespace) | &nbsp; | &nbsp; |
2727
| **Queues-GetQueueAsync** <br/>Service Bus<br/>```GET https://management.core.windows.net/{subscription ID}/services/ServiceBus/Namespaces/{namespace name}/queues/{queueName}``` | [get](/rest/api/servicebus/controlplane-stable/queues/get) | &nbsp; | &nbsp; |
2828
| **Relays-GetRelaysAsync**<br/>[Get Relays](/rest/api/servicebus/get-relays)<br/>```GET https://management.core.windows.net/{subscription ID}/services/ServiceBus/Namespaces/{namespace name}/relays? $skip={skip}&$top={top}```| &nbsp; | &nbsp; | [list](/rest/api/relay/controlplane-stable/wcf-relays/list-by-namespace) |

articles/service-bus-messaging/disable-local-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Disable local authentication with Azure Service Bus
33
description: This article explains how to disable local or Shared Access Signature key authentication for a Service Bus namespace.
44
ms.topic: how-to
55
ms.date: 07/25/2024
6-
#customer intent: As a developer or IT adminstrator, I want to know how to disable shared access key authentication and use only the Microsoft Entra ID authentication for higher security.
6+
#customer intent: As a developer or IT administrator, I want to know how to disable shared access key authentication and use only the Microsoft Entra ID authentication for higher security.
77
---
88

99
# Disable local or shared access key authentication with Azure Service Bus

articles/service-bus-messaging/message-expiration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Here's what considered idleness of entities (queues, topics, and subscriptions):
6565
| Subscription | <ul><li>No receives</li><li>No updates to the subscription</li><li>No new rules added to the subscription</li><li>No browse/peek</li></ul> |
6666

6767
> [!IMPORTANT]
68-
> If you have auto forwarding setup on the queue or subscription, that is equivalent to having a receiver peform receives on the queue or subscription and they will not be idle.
68+
> If you have auto forwarding setup on the queue or subscription, that is equivalent to having a receiver perform receives on the queue or subscription and they will not be idle.
6969
7070
## SDKs
7171
You can set the time-to-live property using Software Development Kits (SDKs).

articles/service-bus-messaging/service-bus-dotnet-multi-tier-app-using-service-bus-queues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ queue and displays status information about the queue.
135135

136136
Note that the required client assemblies are now referenced and some new code files have been added.
137137
10. Follow the same steps to add the `Azure.Identity` NuGet package to the project.
138-
10. In **Solution Explorer**, expand **FronendWebRole**, right-click **Models** and select **Add**,
138+
10. In **Solution Explorer**, expand **FrontendWebRole**, right-click **Models** and select **Add**,
139139
then select **Class**. In the **Name** box, type the name
140140
**OnlineOrder.cs**. Then select **Add**.
141141

articles/service-bus-messaging/service-bus-geo-replication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ You can automate promotion either with monitoring systems, or with custom-built
217217

218218
In the portal, click on the **Promote** icon, and follow the instructions in the pop-up blade to delete the region.
219219

220-
:::image type="content" source="./media/service-bus-geo-replication/promote-secondary-region.png" alt-text="Screeshot showing the flow to promote secondary region." lightbox="./media/service-bus-geo-replication/promote-secondary-region.png":::
220+
:::image type="content" source="./media/service-bus-geo-replication/promote-secondary-region.png" alt-text="Screenshot showing the flow to promote secondary region." lightbox="./media/service-bus-geo-replication/promote-secondary-region.png":::
221221

222222
### Using Azure CLI
223223

224224
Execute the Azure CLI command to initiate the promotion. The **Force** property is optional, and defaults to **false**.
225225

226226
```azurecli
227-
az rest --method post --url https://management.azure.com/subscriptions/<subscriptionId>/resourceGroups/<resourceGroup>/providers/Microsoft.ServiceBus/namespaces/<namespaceName>/failover?api-version=2023-01-01-preview --body "{'properties': {'PrimaryLocation': '<newPrimaryocation>', 'api-version':'2023-01-01-preview', 'Force':'false'}}"
227+
az rest --method post --url https://management.azure.com/subscriptions/<subscriptionId>/resourceGroups/<resourceGroup>/providers/Microsoft.ServiceBus/namespaces/<namespaceName>/failover?api-version=2023-01-01-preview --body "{'properties': {'PrimaryLocation': '<newPrimaryLocation>', 'api-version':'2023-01-01-preview', 'Force':'false'}}"
228228
```
229229

230230
### Monitoring data replication

articles/service-bus-messaging/service-bus-messaging-exceptions-latest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ We recommend that you follow these verification steps, depending on the type of
211211
- The replication queue for an entity exceeds its maximum size in bytes. The maximum size in bytes for a replication queue is an internal limit set by Service Bus.
212212
- **Example**: Replication queue size 73128000 exceeded threshold 67108864.
213213
- In synchronous replication, a request times out while waiting for another request to replicate.
214-
- **Example**: High volume of requests from client application for skarri-stroage-exp1(westus3)/q1:MessagingJournal. Replication to other region(s) is in progress.
214+
- **Example**: High volume of requests from client application for skarri-storage-exp1(westus3)/q1:MessagingJournal. Replication to other region(s) is in progress.
215215

216216
#### Resolution
217217

articles/service-bus-messaging/service-bus-messaging-sql-rule-action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Here are a few important points:
214214
215215
- Only properties on a message can be modified.
216216
- All user properties can be modified.
217-
- All publicly updatable system properties can also be modified, like `ReplyTo` and `CorreationId`, but we recommend that you don't alter system properties as part of a rule action. It's still allowed for backward compatibility reasons.
217+
- All publicly updatable system properties can also be modified, like `ReplyTo` and `CorrelationId`, but we recommend that you don't alter system properties as part of a rule action. It's still allowed for backward compatibility reasons.
218218
- When setting properties, only numeric, Boolean, and string literals are allowed. A string literal in turn is converted to a type based on the property being modified. If the property being set doesn't already exist, there's no type conversion from string. If the property being modified already exists and its value is one of these types `Guid`, `DateTimeOffset`, `TimeSpan`, `Uri`, `DateTime`, then the string literal is converted to that type and set as the property value. To be more specific, the action tries to convert the string literal to the type of property. If it's successful, the property is set. Otherwise, the rule action evaluation throws an exception and the message is dead-lettered.
219219
220220
## Next steps

0 commit comments

Comments
 (0)