Skip to content

Commit 682e09e

Browse files
authored
Merge pull request #262052 from MicrosoftDocs/main
12/29 11:00 AM IST Publish
2 parents 0063771 + f647c29 commit 682e09e

Some content is hidden

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

42 files changed

+360
-498
lines changed

articles/ai-services/document-intelligence/toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ items:
172172
href: concept-layout.md
173173
- name: 🆕 Add-on capabilities
174174
displayName: extract, formula, font, styles, fontStyle, ocr.highResolution, ocr.formula, high resolution, background color, inline, display
175+
href: concept-add-on-capabilities.md
175176
- name: 🆕 Query field extraction
176177
displayName: queries, fields, OpenAI, chat
177178
href: concept-query-fields.md

articles/azure-vmware/index.yml

Lines changed: 196 additions & 206 deletions
Large diffs are not rendered by default.

articles/cloud-services/mitigate-se.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ titleSuffix: Azure Cloud Services
44
description: In this article, learn now to mitigate speculative execution side-channel vulnerabilities in Azure.
55
services: cloud-services
66
documentationcenter: ''
7-
author: cynthn
7+
author: ju-shim
88
tags: azure-resource-manager
99
keywords: spectre,meltdown,specter
1010
ms.service: cloud-services
1111
ms.workload: infrastructure-services
1212
ms.tgt_pltfrm: vm-windows
1313
ms.topic: article
1414
ms.date: 02/21/2023
15-
ms.author: cynthn
15+
ms.author: jushiman
1616
ms.custom: compute-evergreen
1717
---
1818

@@ -21,4 +21,3 @@ ms.custom: compute-evergreen
2121
# Guidance to mitigate speculative execution side-channel vulnerabilities in Azure
2222

2323
[!INCLUDE [virtual-machines-common-mitigate-se](../../includes/virtual-machines-common-mitigate-se.md)]
24-

articles/expressroute/expressroute-config-samples-nat.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@ title: 'Azure ExpressRoute: Router configuration samples - NAT'
33
description: This page provides router configuration samples for Cisco and Juniper routers.
44
services: expressroute
55
author: duongau
6-
76
ms.service: expressroute
87
ms.topic: article
9-
ms.date: 01/07/2021
8+
ms.date: 12/28/2023
109
ms.author: duau
11-
1210
---
11+
1312
# Router configuration samples to set up and manage NAT
1413

15-
This article provides NAT configuration samples for Cisco ASA and Juniper SRX series routers when working with ExpressRoute. These router configurations are intended to be samples for guidance only and must not be used as is. You'll need to work with your vendor to come up with appropriate configurations for your network.
14+
This article provides NAT configuration samples for Cisco ASA and Juniper SRX series routers when working with ExpressRoute. These router configurations are intended to be samples for guidance only and must not be used as is. You need to work with your vendor to come up with appropriate configurations for your network.
1615

1716
> [!IMPORTANT]
1817
> Samples in this page are intended to be purely for guidance. You must work with your vendor's sales / technical team and your networking team to come up with appropriate configurations to meet your needs. Microsoft will not support issues related to configurations listed in this page. You must contact your device vendor for support issues.
1918
>
2019
>
2120
22-
* Router configuration samples below apply to Azure Public and Microsoft peerings. You don't configure NAT for Azure private peering. Review [ExpressRoute peerings](expressroute-circuit-peerings.md) and [ExpressRoute NAT requirements](expressroute-nat.md) for more details.
21+
* The following router configuration samples apply to Azure Public and Microsoft peerings. You don't configure NAT for Azure private peering. Review [ExpressRoute peerings](expressroute-circuit-peerings.md) and [ExpressRoute NAT requirements](expressroute-nat.md) for more details.
2322

24-
* You MUST use separate NAT IP pools for connectivity to the internet and ExpressRoute. Using the same NAT IP pool across the internet and ExpressRoute will result in asymmetric routing and loss of connectivity.
23+
* You MUST use separate NAT IP pools for connectivity to the internet and ExpressRoute. Using the same NAT IP pool across the internet and ExpressRoute results in asymmetric routing and loss of connectivity.
2524

2625

2726
## Cisco ASA firewalls
@@ -196,7 +195,7 @@ nat (inside,outside) source dynamic MSFT-PAT-Networks pat-pool outbound-PAT dest
196195
```
197196

198197
### 4. Configure NAT policies
199-
* Create two NAT pools. One will be used to NAT traffic outbound to Microsoft and other from Microsoft to the customer.
198+
* Create two NAT pools. One is used to NAT traffic outbound to Microsoft and other from Microsoft to the customer.
200199
* Create rules to NAT the respective traffic
201200

202201
```console

articles/expressroute/expressroute-howto-reset-peering.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22
title: 'Azure ExpressRoute: Reset circuit peering using Azure PowerShell'
33
description: Learn how to enable and disable peerings for an Azure ExpressRoute circuit using Azure PowerShell.
44
services: expressroute
5-
author: charwen
6-
5+
author: duongau
76
ms.service: expressroute
8-
ms.custom: devx-track-azurepowershell
97
ms.topic: how-to
10-
ms.date: 12/15/2020
8+
ms.date: 12/28/2023
119
ms.author: duau
1210
---
1311

1412
# Reset ExpressRoute circuit peerings using Azure PowerShell
1513

16-
This article describes how to enable and disable peerings of an ExpressRoute circuit using PowerShell. Peerings are enabled by default when you create them. When you disable a peering, the BGP session on both the primary and the secondary connection of your ExpressRoute circuit will be shut down. You'll lose connectivity for this peering to Microsoft. When you enable a peering, the BGP session on both the primary and the secondary connection of your ExpressRoute circuit will be established. The connectivity to Microsoft will be restored for this peering. You can enable and disable peering for Microsoft Peering and Azure Private Peering independently on the ExpressRoute circuit.
14+
This article describes how to enable and disable peerings of an ExpressRoute circuit using PowerShell. Peerings are enabled by default when you create them. When you disable a peering, the BGP session on both the primary and the secondary connection of your ExpressRoute circuit disconnects. You lose connectivity for this peering to Microsoft. When you enable a peering, the BGP session on both the primary and the secondary connection of your ExpressRoute circuit establishes. The connectivity to Microsoft reconnects for this peering. You can enable and disable peering for Microsoft Peering and Azure Private Peering independently on the ExpressRoute circuit.
1715

18-
There are a two scenarios where you may find it helpful to reset your ExpressRoute peerings.
16+
There are a two scenarios where you can find it helpful to reset your ExpressRoute peerings.
1917
* If you want to test your disaster recovery design and implementation. For example, you have two ExpressRoute circuits. You can disable the peerings on one circuit and force your network traffic to fail over to the other circuit.
20-
* Enable Bidirectional Forwarding Detection (BFD) on either Azure Private Peering or Microsoft Peering of your ExpressRoute circuit. BFD gets enabled by default on Azure Private Peering if you created your ExpressRoute circuit after August 1, 2018 and for Microsoft Peering after January 10, 2020. If your circuit was created before the date listed, you'll need reset the peering to enable BFD.
18+
* Enable Bidirectional Forwarding Detection (BFD) on either Azure Private Peering or Microsoft Peering of your ExpressRoute circuit. BFD gets enabled by default on Azure Private Peering if you created your ExpressRoute circuit after August 1, 2018 and for Microsoft Peering after January 10, 2020. If your circuit was created before the date listed, you need reset the peering to enable BFD.
2119

2220
### Working with Azure PowerShell
2321

@@ -144,7 +142,7 @@ There are a two scenarios where you may find it helpful to reset your ExpressRou
144142
$ckt.Peerings[0].State = "Enabled"
145143
Set-AzExpressRouteCircuit -ExpressRouteCircuit $ckt
146144
```
147-
The peering should be in a enabled state you set.
145+
The peering should be in an enabled state you set.
148146

149147
## Next steps
150148
If you need help with troubleshooting an ExpressRoute problem, see the following articles:

0 commit comments

Comments
 (0)