Skip to content

Commit b980005

Browse files
authored
Merge pull request #268499 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 9ba3e44 + 5a1a2ce commit b980005

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

articles/expressroute/expressroute-locations-providers.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ If you're remote and don't have fiber connectivity or want to explore other conn
200200
* [SES](https://www.ses.com/networks/signature-solutions/signature-cloud/ses-and-azure-expressroute)
201201
* [Viasat](https://news.viasat.com/newsroom/press-releases/viasat-introduces-direct-cloud-connect-a-new-service-providing-fast-secure-private-connections-to-business-critical-cloud-services)
202202

203+
## Connectivity through additional service providers
204+
203205
| Location | Exchange | Connectivity providers |
204206
|--|--|--|
205207
| **Amsterdam** | Equinix<br/>Interxion<br/>Level 3 Communications | BICS<br/>CloudXpress<br/>Eurofiber<br/>Fastweb S.p.A<br/>Gulf Bridge International<br/>Kalaam Telecom Bahrain B.S.C<br/>MainOne<br/>Nianet<br/>POST Telecom Luxembourg<br/>Proximus<br/>RETN<br/>TDC Erhverv<br/>Telecom Italia Sparkle<br/>Telekom Deutschland GmbH<br/>Telia |

articles/open-datasets/dataset-encode.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This dataset is a mirror of the data store at https://www.encodeproject.org/
2020

2121
## Data volumes and update frequency
2222

23-
This dataset includes approximately 756 TB of data, and is updated monthly during the first week of every month.
23+
This dataset includes approximately 756 TB of data, and is updated daily.
2424

2525
## Storage location
2626

@@ -46,4 +46,4 @@ If you have any questions, concerns, or comments, email our help desk at encode-
4646

4747
## Next steps
4848

49-
View the rest of the datasets in the [Open Datasets catalog](dataset-catalog.md).
49+
View the rest of the datasets in the [Open Datasets catalog](dataset-catalog.md).

articles/virtual-machines/linux/os-disk-swap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you have an existing VM, but you want to swap the disk for a backup disk or a
1616

1717
The VM does not need to be stopped\deallocated. The resource ID of the managed disk can be replaced with the resource ID of a different managed disk.
1818

19-
Make sure that the VM size and storage type are compatible with the disk you want to attach. For example, if the disk you want to use is in Premium Storage, then the VM needs to be capable of Premium Storage (like a DS-series size).
19+
Make sure that the VM size and storage type are compatible with the disk you want to attach. For example, if the disk you want to use is in Premium Storage, then the VM needs to be capable of Premium Storage (like a DS-series size). Both disks must also be the same size. And ensure that you're not mixing an un-encrypted VM with an encrypted OS disk, this is not supported. If the VM doesn't use Azure Disk Encryption, then the OS disk being swapped in shouldn't be using Azure Disk Encryption. If disks are using Disk Encryption Sets, both disks should belong to same Disk Encryption set.
2020

2121
This article requires Azure CLI version 2.0.25 or greater. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI]( /cli/azure/install-azure-cli).
2222

articles/virtual-wan/virtual-wan-global-transit-network-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ The VNet-to-VNet secured transit enables VNets to connect to each other via secu
152152

153153
### VNet-to-Internet or third-party Security Service (i)
154154

155-
The VNet-to-Internet enables VNets to connect to the internet via the via security appliances (Azure Firewall, select NVA and SaaS) in the virtual WAN hub. Traffic to internet via supported third-party security services doesn't flow through a security appliance and is routed straight to the third-party security service. You can configure Vnet-to-Internet path via supported third-party security service using Azure Firewall Manager.
155+
The VNet-to-Internet enables VNets to connect to the internet via the security appliances (Azure Firewall, select NVA and SaaS) in the virtual WAN hub. Traffic to internet via supported third-party security services doesn't flow through a security appliance and is routed straight to the third-party security service. You can configure Vnet-to-Internet path via supported third-party security service using Azure Firewall Manager.
156156

157157
### Branch-to-Internet or third-party Security Service (j)
158158

0 commit comments

Comments
 (0)