Skip to content

Commit e26facb

Browse files
authored
Merge pull request #286370 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 ac9d724 + f2df844 commit e26facb

26 files changed

+73
-42
lines changed

articles/automation/automation-disaster-recovery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ You can use these scripts for migration of Automation account assets from the ac
9393
1. Ensure that both the source and destination Automation accounts should belong to the same Microsoft Entra tenant.
9494

9595
### Create and execute the runbook
96-
You can use the[PowerShell script](https://github.com/azureautomation/Migrate-automation-account-assets-from-one-region-to-another) or [PowerShell workflow](https://github.com/azureautomation/Migrate-automation-account-assets-from-one-region-to-another-PwshWorkflow/tree/main) runbook or import from the Runbook gallery and execute it to enable migration of assets from one Automation account to another.
96+
You can use the [PowerShell script](https://github.com/azureautomation/Migrate-automation-account-assets-from-one-region-to-another) or [PowerShell workflow](https://github.com/azureautomation/Migrate-automation-account-assets-from-one-region-to-another-PwshWorkflow/tree/main) runbook or import from the Runbook gallery and execute it to enable migration of assets from one Automation account to another.
9797

9898
Follow the steps to import and execute the runbook:
9999

articles/automation/automation-scenario-aws-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Ensure that the AWS PowerShell module has been imported into Azure Automation.
9595
9696
## Next steps
9797
98-
* To find out what runbooks are supported, see[Azure Automation runbook types](automation-runbook-types.md).
98+
* To find out what runbooks are supported, see [Azure Automation runbook types](automation-runbook-types.md).
9999
* To work with runbooks, see [Manage runbooks in Azure Automation](manage-runbooks.md).
100100
* For details of PowerShell, see [PowerShell Docs](/powershell/scripting/overview).
101101
* For script support, see [Native PowerShell script support in Azure Automation](https://azure.microsoft.com/blog/announcing-powershell-script-support-azure-automation-2/).

articles/container-registry/container-registry-manage-artifact.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ az login
5858
az acr login -n $REGISTRY
5959
```
6060

61-
If Docker isn't available, you can utilize the AD token provided for authentication. Authenticate with your[individual Microsoft Entra identity](container-registry-authentication.md?tabs=azure-cli#individual-login-with-azure-ad) using an AD token. Always use "000..." for the `USER_NAME` as the token is parsed through the `PASSWORD` variable.
61+
If Docker isn't available, you can utilize the AD token provided for authentication. Authenticate with your [individual Microsoft Entra identity](container-registry-authentication.md?tabs=azure-cli#individual-login-with-azure-ad) using an AD token. Always use "000..." for the `USER_NAME` as the token is parsed through the `PASSWORD` variable.
6262

6363
```azurecli
6464
# Login to Azure
@@ -528,5 +528,3 @@ In this article, you learned how to use Azure Container Registry to store, manag
528528
[iana-mediatypes]: https://www.rfc-editor.org/rfc/rfc6838
529529
[acr-landing]: https://aka.ms/acr
530530
[Notation]: /azure/container-registry/container-registry-tutorial-sign-build-push
531-
532-

articles/dns/dns-faq-private.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ sections:
101101
- question: |
102102
How do I migrate my existing private DNS zones to the new model?
103103
answer: |
104-
We strongly recommend that you migrate to the new resource model as soon as possible. Legacy resource model will be supported, however, further features won't be developed on top of this model. In future, we intend to deprecate it in favor of new resource model. For guidance on how to migrate your existing private DNS zones to new resource model see[migration guide for Azure DNS private zones](private-dns-migration-guide.md).
104+
We strongly recommend that you migrate to the new resource model as soon as possible. Legacy resource model will be supported, however, further features won't be developed on top of this model. In future, we intend to deprecate it in favor of new resource model. For guidance on how to migrate your existing private DNS zones to new resource model see [migration guide for Azure DNS private zones](private-dns-migration-guide.md).
105105
106106
- question: |
107107
Which one takes precedence, Azure private DNS or a custom DNS server setup on a VM?

articles/dns/dns-operations-recordsets-portal.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To create a record set in the Azure portal, see [Create an Azure DNS zone and re
2525

2626
2. Select your DNS zone and then select **Recordsets**. The current record sets are displayed.
2727

28-
![A screenshot of DNS zone record sets.](./media/dns-operations-recordsets-portal/recordsets.png)
28+
[ ![A screenshot of DNS zone record sets.](./media/dns-operations-recordsets-portal/recordsets.png) ](./media/dns-operations-recordsets-portal/recordsets.png)
2929

3030
## Add a new record to a record set
3131

@@ -37,7 +37,7 @@ You can add up to 20 records to any record set. A record set may not contain two
3737

3838
2. Specify the record set properties by filling in the fields.
3939

40-
![A screenshot of adding records to a recordset.](./media/dns-operations-recordsets-portal/record-page.png)
40+
[ ![A screenshot of adding records to a recordset.](./media/dns-operations-recordsets-portal/record-page.png) ](./media/dns-operations-recordsets-portal/record-page.png)
4141

4242
3. Select **Apply** at the bottom of the page to save your settings.
4343

@@ -68,7 +68,7 @@ You can use the Azure portal to remove records from a record set. Removing the l
6868
2. A message appears asking if you want to delete the record set.
6969
3. Verify that the name matches the record set that you want to delete, and then select **Yes**.
7070

71-
![A screenshot of deleting a recordset.](./media/dns-operations-recordsets-portal/delete-record-set.png)
71+
[ ![A screenshot of deleting a recordset.](./media/dns-operations-recordsets-portal/delete-record-set.png) ](./media/dns-operations-recordsets-portal/delete-record-set.png)
7272

7373
4. On the **DNS zone** page, verify that the record set is no longer visible.
7474

@@ -100,4 +100,4 @@ You can't delete the SOA and NS record sets at the zone apex (name = "\@") that
100100
* For more information about Azure DNS, see the [Azure DNS overview](dns-overview.md).
101101
* For more information about automating DNS, see [Creating DNS zones and record sets using the .NET SDK](dns-sdk.md).
102102
* For more information about reverse DNS records, see [Overview of reverse DNS and support in Azure](dns-reverse-dns-overview.md).
103-
* For more information about Azure DNS alias records, see [Azure DNS alias records overview](dns-alias.md).
103+
* For more information about Azure DNS alias records, see [Azure DNS alias records overview](dns-alias.md).

articles/dns/private-resolver-hybrid-dns.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,19 @@ Next, create a rule in your ruleset for your on-premises domain. In this example
9090

9191
The procedure to configure on-premises DNS depends on the type of DNS server you're using. In the following example, a Windows DNS server at **10.100.0.2** is configured with a conditional forwarder for the private DNS zone **azure.contoso.com**. The conditional forwarder is set to forward queries to **10.10.0.4**, which is the inbound endpoint IP address for your Azure DNS Private Resolver. There's another IP address also configured here to enable DNS failover. For more information about enabling failover, see [Tutorial: Set up DNS failover using private resolvers](tutorial-dns-private-resolver-failover.md). For the purposes of this demonstration, only the **10.10.0.4** inbound endpoint is required.
9292

93-
![View on-premises forwarding](./media/private-resolver-hybrid-dns/on-premises-forwarders.png)
93+
![View on-premises forwarding](./media/private-resolver-hybrid-dns/on-premises-forwarders.png#lightbox)
9494

9595
## Demonstrate hybrid DNS
9696

9797
Using a VM located in the virtual network where the Azure DNS Private Resolver is provisioned, issue a DNS query for a resource record in your on-premises domain. In this example, a query is performed for the record **testdns.contoso.com**:
9898

99-
![Verify Azure to on-premise](./media/private-resolver-hybrid-dns/azure-to-on-premises-lookup.png)
99+
![Verify Azure to on-premise](./media/private-resolver-hybrid-dns/azure-to-on-premises-lookup.png#lightbox)
100100

101101
The path for the query is: Azure DNS > inbound endpoint > outbound endpoint > ruleset rule for contoso.com > on-premises DNS (10.100.0.2). The DNS server at 10.100.0.2 is an on-premises DNS resolver, but it could also be an authoritative DNS server.
102102

103103
Using an on-premises VM or device, issue a DNS query for a resource record in your Azure private DNS zone. In this example, a query is performed for the record **test.azure.contoso.com**:
104104

105-
![Verify on-premises to Azure](./media/private-resolver-hybrid-dns/on-premises-to-azure-lookup.png)
105+
![Verify on-premises to Azure](./media/private-resolver-hybrid-dns/on-premises-to-azure-lookup.png#lightbox)
106106

107107
The path for this query is: client's default DNS resolver (10.100.0.2) > on-premises conditional forwarder rule for azure.contoso.com > inbound endpoint (10.10.0.4)
108108

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The identity used to publish events to Event Grid must have the permission ``Mic
6161
With RBAC privileges taken care of, you can now [build your client application to send events](#publish-events-using-event-grids-client-sdks) to Event Grid.
6262

6363
> [!NOTE]
64-
> Event Grid supports more RBAC roles for purposes beyond sending events. For more information, see[Event Grid built-in roles](security-authorization.md#built-in-roles).
64+
> Event Grid supports more RBAC roles for purposes beyond sending events. For more information, see [Event Grid built-in roles](security-authorization.md#built-in-roles).
6565
6666

6767
## Publish events using Event Grid's client SDKs

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The identity used to publish events to Event Grid must have the permission ``Mic
6464
With RBAC privileges taken care of, you can now [build your client application to send events](#publish-events-using-event-grids-client-sdks) to Event Grid.
6565

6666
> [!NOTE]
67-
> Event Grid supports more RBAC roles for purposes beyond sending events. For more information, see[Event Grid built-in roles](security-authorization.md#built-in-roles).
67+
> Event Grid supports more RBAC roles for purposes beyond sending events. For more information, see [Event Grid built-in roles](security-authorization.md#built-in-roles).
6868
6969

7070
## Publish events using Event Grid's client SDKs

articles/expressroute/rate-limit.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ To enable rate limiting for an existing ExpressRoute Direct circuit, complete th
5151

5252
1. Select **Yes** for *Enable Rate Limiting*. The following diagram illustrates the configuration page for enabling rate limiting for an ExpressRoute Direct circuit.
5353

54-
:::image type="content" source="./media/rate-limit/existing-circuit.png" alt-text="Screenshot of the configuration page for an ExpressRoute Direct circuit showing the rate limiting setting.":::
54+
:::image type="content" source="./media/rate-limit/existing-circuit.png" alt-text="Screenshot of the configuration page for an ExpressRoute Direct circuit showing the Enable Rate Limiting setting set to Yes.":::
5555

5656
1. Finally, select the **Save** button at the top of the page to apply the changes.
5757

5858
## Disable rate limiting
5959

60-
To disable rate limiting for an existing ExpressRoute Direct circuit, complete the following these:
60+
To disable rate limiting for an existing ExpressRoute Direct circuit, complete the following steps:
6161

6262
1. Sign-in to the Azure portal using this [Azure portal](https://portal.azure.com/?feature.erdirectportratelimit=true) link, then go to the ExpressRoute Direct circuit that you want to configure rate limiting for.
6363

6464
1. Select **Configuration** under *Settings* on the left side pane.
6565

6666
1. Select **No** for *Enable Rate Limiting*. The following diagram illustrates the configuration page for disabling rate limiting for an ExpressRoute Direct circuit.
6767

68-
:::image type="content" source="./media/rate-limit/disable-rate-limiting.png" alt-text="Screenshot of the configuration page for an ExpressRoute Direct circuit showing how to disable rate limiting.":::
68+
:::image type="content" source="./media/rate-limit/disable-rate-limiting.png" alt-text="Screenshot of the configuration page for an ExpressRoute Direct circuit showing the Enable Rate Limiting setting set to No.":::
6969

7070
1. Finally, select the **Save** button at the top of the page to apply the changes.
7171

@@ -81,11 +81,11 @@ To disable rate limiting for an existing ExpressRoute Direct circuit, complete t
8181

8282
* How does rate limiting affect my circuit performance?
8383

84-
An ExpressRoute circuit has two connection links between Microsoft edge routers and customer edge (CE) routers. For example, if your circuit bandwidth is set to 1 Gbps and you distribute your traffic evenly across both links, you can reach up to 2*1 (that is, 2) Gbps. However, it isn't a recommended practice and we suggest using the extra bandwidth for high availability only. If you exceed the configured bandwidth over private or Microsoft peering on either of the links by more than 20%, then rate limiting lowers the throughput to the configured bandwidth.
84+
An ExpressRoute circuit has two connection links between Microsoft edge routers and customer edge (CE) routers. For example, if your circuit bandwidth is set to 1 Gbps and you distribute your traffic evenly across both links, you can reach up to 2*1 (that is, 2) Gbps. However, this is not a recommended practice and we suggest using the extra bandwidth for high availability only. If you exceed the configured bandwidth over private or Microsoft peering on either of the links by more than 20%, then rate limiting lowers the throughput to the configured bandwidth.
8585

8686
* How can I check the rate limiting status of my ExpressRoute Direct port circuits?
8787

88-
In Azure portal, on the ‘Circuits’ pane of your ExpressRoute Direct port, you would see all the circuits configured over the ExpressRoute Direct port along with the rate limiting status. See the following screenshot:
88+
In the Azure portal, on the ‘Circuits’ pane of your ExpressRoute Direct port, you will see all the circuits configured over the ExpressRoute Direct port along with the rate limiting status. See the following screenshot as an example:
8989

9090
:::image type="content" source="./media/rate-limit/status.png" alt-text="Screenshot of the rate limiting status from an ExpressRoute Direct resource.":::
9191

@@ -116,7 +116,7 @@ To disable rate limiting for an existing ExpressRoute Direct circuit, complete t
116116

117117
* How does increasing the circuit bandwidth affect the traffic flow through the circuit?
118118

119-
Increasing the circuit bandwidth doesn’t affect the traffic flow through the circuit. The bandwidth increase is seamless and the circuit bandwidth upgrade reflects in a few minutes. However, the bandwidth increase is irreversible.
119+
Increasing the circuit bandwidth does not affect the traffic flow through the circuit. The bandwidth increase is seamless and the circuit bandwidth upgrade will be reflected in a few minutes. It is important to note the bandwidth increase is irreversible.
120120

121121
* Can I enable or disable rate limiting for a specific circuit configured over my ExpressRoute Direct port?
122122

articles/frontdoor/classic-retirement-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Azure Front Door (classic) is a legacy service that provides dynamic site accele
3232
Azure Front Door Standard and Premium tiers represent the enhanced versions of Azure Front Door (classic). They maintain the same Service Level Agreement (SLA) and offer more benefits, including:
3333

3434
* A unified static and dynamic delivery platform, with simplified cost model.
35-
* Enhanced security features, such as[Private Link integration](private-link.md), advanced WAF enhancements with DRS 2.1, anomaly scoring based detection and bot management, and many more to come.
35+
* Enhanced security features, such as [Private Link integration](private-link.md), advanced WAF enhancements with DRS 2.1, anomaly scoring based detection and bot management, and many more to come.
3636
* Deep integration with Azure services to deliver secure, accelerated, and user friendly end-to-end cloud solutions. These integrations include:
3737
* DNS deterministic name library integrations to prevent subdomain take over
3838
* [Prevalidated domain integration with PaaS service with one-time domain validation](./standard-premium/how-to-add-custom-domain.md#associate-the-custom-domain-with-your-azure-front-door-endpoint).

0 commit comments

Comments
 (0)