Skip to content

Commit 67b2e55

Browse files
authored
Merge pull request #294347 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 646230f + b964e4d commit 67b2e55

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

articles/defender-for-iot/organizations/appliance-catalog/dell-poweredge-r340-xl-legacy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ Before installing the software on the Dell appliance, you need to adjust the app
8282

8383
To install the Dell PowerEdge R340XL appliance, you need:
8484

85-
- An Enterprise license for Dell Remote Access Controller (iDrac)
85+
- An Enterprise license for Dell Remote Access Controller (iDRAC)
8686

8787
- A BIOS configuration XML
8888

8989
- One of the following server firmware versions:
9090

9191
- BIOS version 2.1.6 or later
92-
- iDrac version 3.23.23.23 or later
92+
- iDRAC version 3.23.23.23 or later
9393

9494
### Configure the Dell BIOS
9595

articles/frontdoor/how-to-enable-private-link-application-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Follow the instructions in [Configure Azure Application Gateway Private Link](..
5252
| Target sub resource | Name of the Azure Application Gateway frontend IP configuration. |
5353
| Request message | Enter a custom message to display while approving the Private Endpoint. |
5454

55-
:::image type="content" source="media/private-link/application-gateway-private-link.png" alt-text="Screenshot of origin dettings for configuring Application Gateway as a private origin.":::
55+
:::image type="content" source="media/private-link/application-gateway-private-link.png" alt-text="Screenshot of origin dettings for configuring Application Gateway as a private origin.":::
5656

5757
1. Select **Add** to save your origin settings
5858
1. Select **Add** to save the origin group settings.

articles/reliability/availability-zones-service-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ In the Product Catalog, always-available services are listed as "non-regional" s
142142

143143
| **Product** | **Reliability** |
144144
| --- | --- |
145-
| [Azure Monitor Logs]((/azure/azure-monitor/logs/availability-zones) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
145+
| [Azure Monitor Logs](/azure/azure-monitor/logs/availability-zones) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
146146

147147
### Hybrid and multicloud
148148

articles/role-based-access-control/permissions/integration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ Azure service: [API Management](/azure/api-management/)
183183
> | Microsoft.ApiManagement/service/apis/releases/read | Lists all releases of an API.<br>An API release is created when making an API Revision current.<br>Releases are also used to rollback to previous revisions.<br>Results will be paged and can be constrained by the $top and $skip parameters.<br>or Returns the details of an API release. |
184184
> | Microsoft.ApiManagement/service/apis/releases/delete | Removes all releases of the API or Deletes the specified release in the API. |
185185
> | Microsoft.ApiManagement/service/apis/releases/write | Creates a new Release for the API. or Updates the details of the release of the API specified by its identifier. |
186-
> | Microsoft.ApiManagement/service/apis/resolvers/read | Get the graphQL resolvers at the API level. or Get the graphQL resolver at the API level. |
187-
> | Microsoft.ApiManagement/service/apis/resolvers/write | Creates or updates graphQL resolver for the API. or Updates the details of the graphQL resolver in the API specified by its identifier. |
186+
> | Microsoft.ApiManagement/service/apis/resolvers/read | Get the GraphQL resolvers at the API level. or Get the GraphQL resolver at the API level. |
187+
> | Microsoft.ApiManagement/service/apis/resolvers/write | Creates or updates GraphQL resolver for the API. or Updates the details of the GraphQL resolver in the API specified by its identifier. |
188188
> | Microsoft.ApiManagement/service/apis/resolvers/delete | Deletes the policy configuration at the Api. |
189189
> | Microsoft.ApiManagement/service/apis/resolvers/policies/read | Get the list of policy configurations at the GraphQL API resolver level. or Get the policy configuration at the GraphQL API resolver level. |
190190
> | Microsoft.ApiManagement/service/apis/resolvers/policies/write | Creates or updates policy configuration for the GraphQL API. |
@@ -431,8 +431,8 @@ Azure service: [API Management](/azure/api-management/)
431431
> | Microsoft.ApiManagement/service/tenants/apis/releases/read | Lists all releases of an API.<br>An API release is created when making an API Revision current.<br>Releases are also used to rollback to previous revisions.<br>Results will be paged and can be constrained by the $top and $skip parameters.<br>or Returns the details of an API release. |
432432
> | Microsoft.ApiManagement/service/tenants/apis/releases/delete | Removes all releases of the API or Deletes the specified release in the API. |
433433
> | Microsoft.ApiManagement/service/tenants/apis/releases/write | Creates a new Release for the API. or Updates the details of the release of the API specified by its identifier. |
434-
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/read | Get the graphQL resolvers at the API level. or Get the graphQL resolver at the API level. |
435-
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/write | Creates or updates graphQL resolver for the API. or Updates the details of the graphQL resolver in the API specified by its identifier. |
434+
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/read | Get the GraphQL resolvers at the API level. or Get the GraphQL resolver at the API level. |
435+
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/write | Creates or updates GraphQL resolver for the API. or Updates the details of the GraphQL resolver in the API specified by its identifier. |
436436
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/delete | Deletes the policy configuration at the Api. |
437437
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/policies/read | Get the list of policy configurations at the GraphQL API resolver level. or Get the policy configuration at the GraphQL API resolver level. |
438438
> | Microsoft.ApiManagement/service/tenants/apis/resolvers/policies/write | Creates or updates policy configuration for the GraphQL API. |

articles/role-based-access-control/transfer-subscription.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Several Azure resources have a dependency on a subscription or a directory. Depe
8787
| Azure Synapse Analytics Workspace | Yes | Yes | | You must update the tenant ID associated with the Synapse Analytics Workspace. If the workspace is associated with a Git repository, you must update the [workspace's Git configuration](../synapse-analytics/cicd/source-control.md#switch-to-a-different-git-repository). For more information, see [Recovering Synapse Analytics workspace after transferring a subscription to a different Microsoft Entra directory (tenant)](../synapse-analytics/how-to-recover-workspace-after-tenant-move.md). |
8888
| Azure Databricks | Yes | No | | Currently, Azure Databricks does not support moving workspaces to a new tenant. For more information, see [Manage your Azure Databricks account](/azure/databricks/administration-guide/account-settings/#move-workspace-between-tenants-unsupported). |
8989
| Azure Compute Gallery | Yes | Yes | | Replicate the image versions in the gallery to other regions or [copy an image from another gallery](/azure/virtual-machines/image-version). |
90+
| Azure resource locks | Yes | Yes | [List resource locks](/cli/azure/resource/lock#az-resource-lock-list) | Export Azure resource locks manually using the Azure portal or [Azure CLI](/cli/azure/resource/lock). |
9091

9192
> [!WARNING]
9293
> If you are using encryption at rest for a resource, such as a storage account or SQL database, that has a dependency on a key vault that is being transferred, it can lead to an unrecoverable scenario. If you have this situation, you should take steps to use a different key vault or temporarily disable customer-managed keys to avoid this unrecoverable scenario.

articles/sentinel/sap/reference-systemconfig-json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following code shows the overall structure of the `systemconfig.json` file:
4545

4646
"connector_configuration": {...},
4747

48-
"abap_table_selector":: {...}
48+
"abap_table_selector": {...}
4949

5050
...
5151

articles/virtual-network/virtual-network-manage-peering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Before creating a peering, familiarize yourself with the [requirements and const
7878
:::image type="content" source="./media/virtual-network-manage-peering/add-peering.png" alt-text="Screenshot of peering configuration page.":::
7979

8080
> [!NOTE]
81-
> If you use a Virtual Network Gateway to send on-premises traffic transitively to a peered virtual network, the peered virtual network IP range for the on-premises VPN device must be set to 'interesting' traffic. You may need to add all Azure virtual network's CIDR addresses to the Site-2-Site IPSec VPN Tunnel configuration on the on-premises VPN device. CIDR addresses include resources like such as **Hub**, Spokes, and Point-2-Site IP address pools. Otherwise, your on-premises resources won't be able to communicate with resources in the peered VNet.
81+
> If you use a Virtual Network Gateway to send on-premises traffic transitively to a peered virtual network, the peered virtual network IP range for the on-premises VPN device must be set to 'interesting' traffic. You may need to add all Azure virtual network's CIDR addresses to the Site-2-Site IPsec VPN Tunnel configuration on the on-premises VPN device. CIDR addresses include resources like such as **Hub**, Spokes, and Point-2-Site IP address pools. Otherwise, your on-premises resources won't be able to communicate with resources in the peered VNet.
8282
> Interesting traffic is communicated through Phase 2 security associations. The security association creates a dedicated VPN tunnel for each specified subnet. The on-premises and Azure VPN Gateway tier have to support the same number of Site-2-Site VPN tunnels and Azure VNet subnets. Otherwise, your on-premises resources won't be able to communicate with resources in the peered VNet. Consult your on-premises VPN documentation for instructions to create Phase 2 security associations for each specified Azure VNet subnet.
8383
8484
1. Select the **Refresh** button after a few seconds, and the peering status will change from **Updating** to **Connected**.

articles/virtual-network/virtual-network-tcpip-performance-tuning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The PMTUD process is inefficient and affects network performance. When packets a
7979

8080
If you use VMs that perform encapsulation (like IPsec VPNs), there are some additional considerations regarding packet size and MTU. VPNs add more headers to packets, which increases the packet size and requires a smaller MSS.
8181

82-
For Azure, we recommend that you set TCP MSS clamping to 1,350 bytes and tunnel interface MTU to 1,400. For more information, see the [VPN devices and IPSec/IKE parameters page](../vpn-gateway/vpn-gateway-about-vpn-devices.md).
82+
For Azure, we recommend that you set TCP MSS clamping to 1,350 bytes and tunnel interface MTU to 1,400. For more information, see the [VPN devices and IPsec/IKE parameters page](../vpn-gateway/vpn-gateway-about-vpn-devices.md).
8383

8484
### Latency, round-trip time, and TCP window scaling
8585

0 commit comments

Comments
 (0)