Skip to content

Commit fac6f5f

Browse files
authored
Merge pull request #277560 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 1fa68b4 + f1e55ea commit fac6f5f

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

articles/cdn/cdn-create-a-storage-account-with-cdn.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ ms.custom: mvc, mode-other
1414

1515
In this quickstart, you enable [Azure Content Delivery Network](cdn-overview.md) to cache content from Azure Storage. Azure Content Delivery Network offers developers a global solution for delivering high-bandwidth content. It can cache blobs and static content of compute instances at physical nodes in the United States, Europe, Asia, Australia, and South America.
1616

17+
> [!NOTE]
18+
> Azure Content Delivery Network provides permanent access to Azure Storage resources and removing access requires manual steps.
19+
1720
## Prerequisites
1821

1922
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio).

articles/cdn/cdn-storage-custom-domain-https.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ ms.custom: mvc
1414

1515
After you've integrated your Azure Storage account with Azure Content Delivery Network, you can add a custom domain and enable HTTPS on that domain for your custom blob storage endpoint.
1616

17+
> [!NOTE]
18+
> Azure Content Delivery Network provides permanent access to Azure Storage resources and removing access requires manual steps.
19+
1720
## Prerequisites
1821

1922
Before you can complete the steps in this tutorial, you must first integrate your Azure Storage account with Azure Content Delivery Network. For more information, see [Quickstart: Integrate an Azure Storage account with Azure Content Delivery Network](cdn-create-a-storage-account-with-cdn.md).

articles/expressroute/gateway-migration.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ In the gateway migration experience, you need to validate if your resource is ca
7777
* Gateway Subnet needs two or more prefixes for migration.
7878
* MaxGatewayCountInVnetReached – Reached maximum number of gateways that can be created in a Virtual Network.
7979

80-
If your first address prefix is large enough for the second gateway creation and deployment, such as /24, you won't need to add a second prefix.
81-
82-
### Connection
83-
84-
The virtual network gateway connection resource isn't in a succeed state.
80+
You must create a second prefix in your Gateway Subnet for migration.
8581

8682
## Next steps
8783

articles/openshift/concepts-networking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The following networking features are specific to Azure Red Hat OpenShift:
7676
* Pod CIDRs should be minimum /18 in size. (The pod network is non-routable IPs, and is only used inside the OpenShift SDN.)
7777
* Each node is allocated /23 subnet (512 IPs) for its pods. This value can't be changed.
7878
* You can't attach a pod to multiple networks.
79-
* You can't configure an egress static IP. (This restriction is an OpenShift feature. For information, see [configuring egress IPs](https://docs.openshift.com/container-platform/4.6/networking/openshift_sdn/assigning-egress-ips.html)).
79+
* For private ARO clusters using OVN-Kubernetes network plugin, it is possible to configure egress IPs. For information, see [configuring an egress IP address](https://docs.openshift.com/container-platform/4.13/networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.html).
8080

8181
## Network settings
8282

articles/web-application-firewall/ag/create-custom-waf-rules.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ And here's the corresponding JSON:
7171
}
7272
],
7373
"operator": "Contains",
74-
"negationConditon": false,
74+
"negationCondition": false,
7575
"matchValues": [
7676
"evilbot"
7777
],
@@ -132,7 +132,7 @@ And the corresponding JSON:
132132
}
133133
],
134134
"operator": "Regex",
135-
"negationConditon": false,
135+
"negationCondition": false,
136136
"matchValues": [
137137
"evilbot"
138138
],
@@ -189,7 +189,7 @@ And the corresponding JSON:
189189
}
190190
],
191191
"operator": "GeoMatch",
192-
"negationConditon": true,
192+
"negationCondition": true,
193193
"matchValues": [
194194
"US"
195195
],
@@ -249,7 +249,7 @@ Here's the corresponding JSON:
249249
}
250250
],
251251
"operator": "IPMatch",
252-
"negationConditon": false,
252+
"negationCondition": false,
253253
"matchValues": [
254254
"192.168.5.0/24"
255255
],
@@ -319,7 +319,7 @@ Here's the corresponding JSON:
319319
}
320320
],
321321
"operator": "IPMatch",
322-
"negationConditon": false,
322+
"negationCondition": false,
323323
"matchValues": [
324324
"192.168.5.0/24"
325325
],
@@ -333,7 +333,7 @@ Here's the corresponding JSON:
333333
}
334334
],
335335
"operator": "Contains",
336-
"negationConditon": false,
336+
"negationCondition": false,
337337
"matchValues": [
338338
"evilbot"
339339
],
@@ -410,7 +410,7 @@ And the corresponding JSON:
410410
}
411411
],
412412
"operator": "IPMatch",
413-
"negationConditon": true,
413+
"negationCondition": true,
414414
"matchValues": [
415415
"192.168.5.0/24"
416416
],
@@ -433,7 +433,7 @@ And the corresponding JSON:
433433
}
434434
],
435435
"operator": "Contains",
436-
"negationConditon": true,
436+
"negationCondition": true,
437437
"matchValues": [
438438
"chrome"
439439
],
@@ -494,7 +494,7 @@ Corresponding JSON:
494494
}
495495
],
496496
"operator": "Equal",
497-
"negationConditon": true,
497+
"negationCondition": true,
498498
"matchValues": [
499499
"user1",
500500
"user2"
@@ -555,7 +555,7 @@ And here's the corresponding JSON:
555555
}
556556
],
557557
"operator": "Equal",
558-
"negationConditon": true,
558+
"negationCondition": true,
559559
"matchValues": [
560560
"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
561561
],

0 commit comments

Comments
 (0)