Skip to content

Commit d830f36

Browse files
authored
Merge pull request #286311 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 de4e4d5 + bb47fe9 commit d830f36

File tree

7 files changed

+17
-7
lines changed

7 files changed

+17
-7
lines changed

articles/azure-arc/servers/prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Azure Arc supports the following Windows and Linux operating systems. Only x86-6
4040

4141
* AlmaLinux 9
4242
* Amazon Linux 2 and 2023
43-
* Azure Linux (CBL-Mariner) 2.0
43+
* Azure Linux (CBL-Mariner) 2.0 and 3.0
4444
* Azure Stack HCI
4545
* Debian 11, and 12
4646
* Oracle Linux 7, 8, and 9

articles/load-balancer/egress-only.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ In this section, you'll add the virtual machine you created previously to the ba
246246

247247
1. Select **Connect**.
248248

249-
1. Open Internet Explorer.
249+
1. Open Microsoft Edge browser.
250250

251251
1. Enter **https://whatsmyip.org** in the address bar.
252252

@@ -292,7 +292,7 @@ In this section, you'll add the virtual machine you created previously to the ba
292292

293293
1. Select **Connect**.
294294

295-
1. Open Internet Explorer.
295+
1. Open Microsoft Edge browser.
296296

297297
1. Enter **https://whatsmyip.org** in the address bar.
298298

articles/load-balancer/load-balancer-outbound-connections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ For more information about connection pooling with Azure App Service, see [Troub
150150

151151
New outbound connections to a destination IP fail when port exhaustion occurs. Connections succeed when a port becomes available. This exhaustion occurs when the 64,000 ports from an IP address are spread thin across many backend instances. For guidance on mitigation of SNAT port exhaustion, see the [troubleshooting guide](./troubleshoot-outbound-connection.md).
152152

153-
### Port reuse
153+
## Port reuse
154154
For TCP connections, the load balancer uses a single SNAT port for every destination IP and port. For connections to the same destination IP, a single SNAT port can be reused as long as the destination port differs. Reuse isn't possible when there already exists a connection to the same destination IP and port.
155155

156156
For UDP connections, the load balancer uses a **port-restricted cone NAT** algorithm, which consumes one SNAT port per destination IP, regardless of the destination port.

articles/security/fundamentals/network-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Best practices for logically segmenting subnets include:
4747
**Detail**: Use [CIDR](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)-based subnetting principles to create your subnets.
4848

4949
**Best practice**: Create network access controls between subnets. Routing between subnets happens automatically, and you don't need to manually configure routing tables. By default, there are no network access controls between the subnets that you create on an Azure virtual network.
50-
**Detail**: Use a [network security group](../../virtual-network/manage-network-security-group.md) to protect against unsolicited traffic into Azure subnets. Network security groups (NSGs) are simple, stateful packet inspection devices. NSGs use the 5-tuple approach (source IP, source port, destination IP, destination port, and layer 4 protocol) to create allow/deny rules for network traffic. You allow or deny traffic to and from a single IP address, to and from multiple IP addresses, or to and from entire subnets.
50+
**Detail**: Use a [network security group](../../virtual-network/manage-network-security-group.md) to protect against unsolicited traffic into Azure subnets. Network security groups (NSGs) are simple, stateful packet inspection devices. NSGs use the 5-tuple approach (source IP, source port, destination IP, destination port and protocol) to create allow/deny rules for network traffic. You allow or deny traffic to and from a single IP address, to and from multiple IP addresses, or to and from entire subnets.
5151

5252
When you use network security groups for network access control between subnets, you can put resources that belong to the same security zone or role in their own subnets.
5353

articles/storage/container-storage/use-container-storage-with-managed-disks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Follow these steps to create a dynamic storage pool for Azure Disks.
7575
azureDisk:
7676
skuName: PremiumV2_LRS
7777
iopsReadWrite: 5000
78-
MbpsReadWrite: 200
78+
mbpsReadWrite: 200
7979
resources:
8080
requests:
8181
storage: 1Ti

articles/web-application-firewall/ag/application-gateway-crs-rulegroups-rules.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ The following rule groups and rules are available when using Web Application Fir
392392
|942100|SQL Injection Attack Detected via libinjection|
393393
|942110|SQL Injection Attack: Common Injection Testing Detected|
394394
|942120|SQL Injection Attack: SQL Operator Detected|
395+
|942130|SQL Injection Attack: SQL Tautology Detected.|
395396
|942140|SQL Injection Attack: Common DB Names Detected|
396397
|942150|SQL Injection Attack|
397398
|942160|Detects blind sqli tests using sleep() or benchmark().|

includes/elastic-san-regions.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@ The following list contains the regions Elastic SAN is currently available in, a
3535
- Norway East - LRS
3636
- UAE North - LRS
3737
- India Central - LRS
38-
38+
39+
Elastic SAN is also available in the following regions, but without Availability Zone support:
40+
- Canada East - LRS
41+
- North Central US - LRS
42+
- Japan West - LRS
43+
44+
To enable these regions, run the following command to register the necessary feature flag:
45+
```azurepowershell
46+
Register-AzProviderFeature -FeatureName "EnableElasticSANRegionalDeployment" -ProviderNamespace "Microsoft.ElasticSan"
47+
```

0 commit comments

Comments
 (0)