Skip to content

Commit 9afe476

Browse files
authored
Merge pull request #291644 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 c583236 + 2d843b5 commit 9afe476

File tree

84 files changed

+118
-102
lines changed

Some content is hidden

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

84 files changed

+118
-102
lines changed

articles/azure-resource-manager/management/lock-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Applying locks can lead to unexpected results. Some operations, which don't seem
101101

102102
- A cannot-delete lock on a **Virtual Machine** that is protected by **Site Recovery** prevents certain resource links related to Site Recovery from being removed properly when you remove the protection or disable replication. If you plan to protect the VM again later, you need to remove the lock before disabling protection. If you don't remove the lock, you need to follow certain steps to clean up the stale links before you can protect the VM. For more information, see [Troubleshoot Azure VM replication](../../site-recovery/azure-to-azure-troubleshoot-errors.md#replication-not-enabled-on-vm-with-stale-resources-error-code-150226).
103103

104-
- For **Postgresql**, the virtual network shouldn't have any resource locks set at the virtual network or subnet level, as locks may interfere with network and DNS operations. Before creating the server in a virtual network, ensure you remove any delete or read-only locks from your virtual network and all subnets. You can reapply the locks after the server is created.
104+
- For **PostgreSQL**, the virtual network shouldn't have any resource locks set at the virtual network or subnet level, as locks may interfere with network and DNS operations. Before creating the server in a virtual network, ensure you remove any delete or read-only locks from your virtual network and all subnets. You can reapply the locks after the server is created.
105105

106106
## Who can create or delete locks
107107

articles/event-grid/authenticate-with-entra-id-namespaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Besides managed identities, another identity option is to create a security prin
5252
Once you have an application security principal and followed above steps, [assign the permission to publish events to that identity](#assign-permission-to-a-security-principal-to-publish-events).
5353

5454
> [!NOTE]
55-
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsot Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
55+
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsoft Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
5656
5757
## Assign permission to a security principal to publish events
5858

articles/event-grid/authenticate-with-microsoft-entra-id.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Besides managed identities, another identity option is to create a security prin
5454
Once you have an application security principal and followed above steps, [assign the permission to publish events to that identity](#assign-permission-to-a-security-principal-to-publish-events).
5555

5656
> [!NOTE]
57-
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsot Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
57+
> When you register an application in the portal, an [application object](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#application-object) and a [service principal](/entra/identity-platform/app-objects-and-service-principals?tabs=browser#service-principal-object) are created automatically in your home tenant. Alternatively, you can use Microsoft Graph to register your application. However, if you register or create an application using the Microsoft Graph APIs, creating the service principal object is a separate step.
5858
5959

6060
## Assign permission to a security principal to publish events
@@ -136,7 +136,7 @@ Microsoft Entra authentication provides a superior authentication support than t
136136
Once you decide to use Microsoft Entra authentication, you can disable authentication based on access keys or SAS tokens.
137137

138138
> [!NOTE]
139-
> Acess keys or SAS token authentication is a form of **local authentication**. you'll hear sometimes referring to "local auth" when discussing this category of authentication mechanisms that don't rely on Microsoft Entra ID. The API parameter used to disable local authentication is called, appropriately so, ``disableLocalAuth``.
139+
> Access keys or SAS token authentication is a form of **local authentication**. you'll hear sometimes referring to "local auth" when discussing this category of authentication mechanisms that don't rely on Microsoft Entra ID. The API parameter used to disable local authentication is called, appropriately so, ``disableLocalAuth``.
140140
141141
### Azure portal
142142

articles/event-grid/communication-services-advanced-messaging-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Details for the attributes specific to `Microsoft.Communication.AdvancedMessageA
266266

267267
| Attribute | Type | Nullable | Description |
268268
|:---------------|:--------:|:--------:|---------------------------------------------|
269-
| language | `string` | ✔️ | The languege detected. |
269+
| language | `string` | ✔️ | The language detected. |
270270
| confidenceScore | `float` | ✔️ | The confidence score of the language detected. |
271271
| translation | `string` | ✔️ | The message translation. |
272272

articles/event-grid/configure-private-endpoints.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ To create a private endpoint, use the [az network private-endpoint create](/cli/
129129

130130
```azurecli-interactive
131131
az network private-endpoint create \
132-
--resource-group <RESOURECE GROUP NAME> \
132+
--resource-group <RESOURCE GROUP NAME> \
133133
--name <PRIVATE ENDPOINT NAME> \
134134
--vnet-name <VIRTUAL NETWORK NAME> \
135135
--subnet <SUBNET NAME> \
@@ -147,7 +147,7 @@ For descriptions of the parameters used in the example, see documentation for [a
147147
To delete a private endpoint, use the [az network private-endpoint delete](/cli/azure/network/private-endpoint?#az-network-private-endpoint-delete) method as shown in the following example:
148148

149149
```azurecli-interactive
150-
az network private-endpoint delete --resource-group <RESOURECE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
150+
az network private-endpoint delete --resource-group <RESOURCE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
151151
```
152152

153153
> [!NOTE]
@@ -173,7 +173,7 @@ To create a private endpoint, use the [az network private-endpoint create](/cli/
173173

174174
```azurecli-interactive
175175
az network private-endpoint create \
176-
--resource-group <RESOURECE GROUP NAME> \
176+
--resource-group <RESOURCE GROUP NAME> \
177177
--name <PRIVATE ENDPOINT NAME> \
178178
--vnet-name <VIRTUAL NETWORK NAME> \
179179
--subnet <SUBNET NAME> \
@@ -191,7 +191,7 @@ For descriptions of the parameters used in the example, see documentation for [a
191191
To delete a private endpoint, use the [az network private-endpoint delete](/cli/azure/network/private-endpoint?#az-network-private-endpoint-delete) method as shown in the following example:
192192

193193
```azurecli-interactive
194-
az network private-endpoint delete --resource-group <RESOURECE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
194+
az network private-endpoint delete --resource-group <RESOURCE GROUP NAME> --name <PRIVATE ENDPOINT NAME>
195195
```
196196

197197
> [!NOTE]

articles/event-grid/cross-tenant-delivery-using-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ For more information, see the following articles:
5757

5858
- In the URL, use the multitenant app object ID.
5959
- For **Name**, provide a unique name for the federated client credential.
60-
- For **Issuer**, use `https://login.microsoftonline.com/TENANTAID/v2.0` where `TENANTAID` is the ID of the tenant where the user-assigned identity is located.
60+
- For **Issuer**, use `https://login.microsoftonline.com/TENANTID/v2.0` where `TENANTID` is the ID of the tenant where the user-assigned identity is located.
6161
- For **Subject**, specify the client ID of the user-assigned identity.
6262

6363
Verify and wait for the API call to succeed.

articles/event-grid/dead-letter-event-subscriptions-namespace-topics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The format used when storing dead-letter events is the [CloudEvents JSON format]
3535
- `deliveryresult` - The last result during the last time the service attempted to deliver the event.
3636
- `publishutc` - The UTC time at which the event was persisted and accepted (HTTP 200 OK, for example) by Event Grid.
3737
- `deliveryattemptutc` - The UTC time of the last delivery attempt.
38-
- `customDeliveryProperties` - Headers (custom push delivery properties) configured on the event subscription to go with every outgoing HTTP push delivery request. One or more of these custom properties might be present in the persisted dead-letter JSON. Custom properties identified as secrets aren't stored. This metadata are described using a separate object whose key name is `customDeliveryProperties`. The property key names inside that object and their values are exactly the same as the ones set in the event subscription. Here's an exmaple:
38+
- `customDeliveryProperties` - Headers (custom push delivery properties) configured on the event subscription to go with every outgoing HTTP push delivery request. One or more of these custom properties might be present in the persisted dead-letter JSON. Custom properties identified as secrets aren't stored. This metadata are described using a separate object whose key name is `customDeliveryProperties`. The property key names inside that object and their values are exactly the same as the ones set in the event subscription. Here's an example:
3939

4040
```
4141
Custom-Header-1: value1

articles/event-grid/enable-diagnostic-logs-topic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ You can also enable collection of all **metrics** for the system topic.
104104
```json
105105
{
106106
"time": "2019-11-01T00:17:13.4389048Z",
107-
"resourceId": "/SUBSCRIPTIONS/SAMPLE-SUBSCTIPTION-ID /RESOURCEGROUPS/SAMPLE-RESOURCEGROUP-NAME/PROVIDERS/MICROSOFT.EVENTGRID/TOPICS/SAMPLE-TOPIC-NAME ",
107+
"resourceId": "/SUBSCRIPTIONS/SAMPLE-SUBSCRIPTION-ID /RESOURCEGROUPS/SAMPLE-RESOURCEGROUP-NAME/PROVIDERS/MICROSOFT.EVENTGRID/TOPICS/SAMPLE-TOPIC-NAME ",
108108
"eventSubscriptionName": "SAMPLEDESTINATION",
109109
"category": "DeliveryFailures",
110110
"operationName": "Deliver",

articles/event-grid/event-schema-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.custom: FY25Q1-Linter
1111
# Event schema compatibility
1212
When a topic is created, an incoming event schema is defined. And, when a subscription is created, an outgoing event schema is defined. This article shows you the compatibility between input and output schema that's allowed when creating an event subscription.
1313

14-
## Input schema to outupt schema
14+
## Input schema to output schema
1515
The following table shows you the compatibility allowed when creating a subscription.
1616

1717
| Incoming event schema | Outgoing event schema | Supported |

articles/event-grid/event-schema-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ This section shows the `CreatedOrUpdated` event generated when an Azure Storage
243243
"data": {
244244
"resourceInfo": {
245245
"tags": {},
246-
"id": "/subscriptions/{subcription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
246+
"id": "/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
247247
"name": "StorageAccount-name",
248248
"type": "Microsoft.Storage/storageAccounts",
249249
"location": "eastus",
@@ -320,7 +320,7 @@ This section shows the `CreatedOrUpdated` event generated when an Azure Storage
320320
"data": {
321321
"resourceInfo": {
322322
"tags": {},
323-
"id": "/subscriptions/{subcription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
323+
"id": "/subscriptions/{subscription-id}/resourceGroups/{rg-name}/providers/Microsoft.Storage/storageAccounts/{storageAccount-name}",
324324
"name": "StorageAccount-name",
325325
"type": "Microsoft.Storage/storageAccounts",
326326
"location": "eastus",

0 commit comments

Comments
 (0)