Skip to content

Commit 283f69d

Browse files
authored
Merge pull request #286693 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 3407713 + 60adc89 commit 283f69d

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

articles/expressroute/expressroute-troubleshooting-arp-resource-manager.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ Sample output for one of the paths:
113113
```output
114114
Age InterfaceProperty IpAddress MacAddress
115115
--- ----------------- --------- ----------
116-
10 On-Prem 65.0.0.1 ffff.eeee.dddd
117-
0 Microsoft 65.0.0.2 aaaa.bbbb.cccc
116+
10 On-Prem 20.33.0.1 ffff.eeee.dddd
117+
0 Microsoft 20.33.0.2 aaaa.bbbb.cccc
118118
```
119119

120120

@@ -131,15 +131,15 @@ The ARP table of a peering can be used to determine and validate layer 2 configu
131131
```output
132132
Age InterfaceProperty IpAddress MacAddress
133133
--- ----------------- --------- ----------
134-
10 On-Prem 65.0.0.1 ffff.eeee.dddd
135-
0 Microsoft 65.0.0.2 aaaa.bbbb.cccc
134+
10 On-Prem 20.33.0.1 ffff.eeee.dddd
135+
0 Microsoft 20.33.0.2 aaaa.bbbb.cccc
136136
```
137137
or
138138

139139
```output
140140
Age InterfaceProperty IpAddress MacAddress
141141
--- ----------------- --------- ----------
142-
10 On-Prem 65.0.0.1 ffff.eeee.dddd
142+
10 On-Prem 20.33.0.1 ffff.eeee.dddd
143143
```
144144

145145
### ARP table when on-premises / connectivity provider side has problems
@@ -149,15 +149,15 @@ If a problem with the on-premises or connectivity provider occurs, the ARP table
149149
```output
150150
Age InterfaceProperty IpAddress MacAddress
151151
--- ----------------- --------- ----------
152-
0 On-Prem 65.0.0.1 Incomplete
153-
0 Microsoft 65.0.0.2 aaaa.bbbb.cccc
152+
0 On-Prem 20.33.0.1 Incomplete
153+
0 Microsoft 20.33.0.2 aaaa.bbbb.cccc
154154
```
155155
or
156156

157157
```output
158158
Age InterfaceProperty IpAddress MacAddress
159159
--- ----------------- --------- ----------
160-
0 Microsoft 65.0.0.2 aaaa.bbbb.cccc
160+
0 Microsoft 20.33.0.2 aaaa.bbbb.cccc
161161
```
162162

163163
> [!NOTE]

articles/expressroute/expressroute-workflows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ Ensure that the physical link and admin state are enabled across both links. Ref
5757
This section only pertains to the ExpressRoute partner connectivity model:
5858

5959
* Provide the service key (s-key) to the connectivity provider.
60-
* Provide additional information needed by the connectivity provider (for example, VPN ID).
60+
* Provide additional information needed by the connectivity provider (for example, VLAN ID).
6161
* If the provider manages the routing configuration, provide the necessary details.
6262

6363
You can ensure that the circuit has been provisioned successfully by verifying the ExpressRoute circuit provisioning state using PowerShell, the Azure portal or, CLI.
6464

6565
### 5. Configure routing domains
6666

67-
Configure routing domains. If your connectivity provider manages Layer 3 configuration, they configure routing for your circuit. If your connectivity provider only offers Layer 2 services or if you're using ExpressRoute Direct, you must configure routing per the guidelines described in the [Routing requirements](expressroute-routing.md) and [Routing configuration](expressroute-howto-routing-classic.md) articles.
67+
Configure routing domains. If your connectivity provider manages Layer 3 configuration, they configure routing for your circuit. If your connectivity provider only offers Layer 2 services or if you're using ExpressRoute Direct, you must configure routing per the guidelines described in the [Routing requirements](expressroute-routing.md) and [Routing configuration](expressroute-howto-routing-arm.md) articles.
6868

6969
#### For Azure private peering
7070

articles/frontdoor/how-to-configure-endpoints.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Before you can create a new endpoint with Front Door manager, you must have an A
3131
:::image type="content" source="./media/how-to-configure-endpoints/create-endpoint-page.png" alt-text="Screenshot of add an endpoint page.":::
3232

3333

34-
* **Name** - Enter a unique name for the new Front Door endpoint. Azure Front Door generates a unique endpoint hostname based on the endpoint name in the form of `<endpointname>-hash.z01.azurefd.net`.
35-
* **Endpoint hostname** - A deterministic DNS (domain name system) name that helps prevent subdomain takeover. This name is used to access your resources through your Azure Front Door at the domain `<endpointname>-hash.z01.azurefd.net`.
34+
* **Name** - Enter a unique name for the new Front Door endpoint. Azure Front Door generates a unique endpoint hostname based on the endpoint name in the form of `<endpointname>-*.z01.azurefd.net`.
35+
* **Endpoint hostname** - A deterministic DNS (domain name system) name that helps prevent subdomain takeover. This name is used to access your resources through your Azure Front Door at the domain `<endpointname>-*.z01.azurefd.net`.
3636
* **Status** - Set as checked to enable this endpoint.
3737

3838
### Add a route

0 commit comments

Comments
 (0)