Skip to content

Commit 679e27e

Browse files
authored
Merge pull request #296985 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 5dba4c3 + 64072c0 commit 679e27e

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

articles/azure-resource-manager/management/tag-support.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,11 +2315,11 @@ To get the same data as a file of comma-separated values, download [tag-support.
23152315
> | networkSecurityGroups / securityRules | No | No |
23162316
> | networkSecurityPerimeters | Yes | Yes |
23172317
> | networkVirtualAppliances | Yes | Yes |
2318-
> | networkWatchers | Yes | Yes |
2319-
> | networkWatchers / connectionMonitors | Yes | No |
2320-
> | networkWatchers / flowLogs | Yes | No |
2321-
> | networkWatchers / lenses | Yes | No |
2322-
> | networkWatchers / pingMeshes | Yes | No |
2318+
> | networkWatchers | No | No |
2319+
> | networkWatchers / connectionMonitors | No | No |
2320+
> | networkWatchers / flowLogs | No | No |
2321+
> | networkWatchers / lenses | No | No |
2322+
> | networkWatchers / pingMeshes | No | No |
23232323
> | p2sVpnGateways | Yes | Yes |
23242324
> | privateDnsZones | Yes | Yes |
23252325
> | privateDnsZones / A | No | No |

articles/firewall/firewall-sftp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ $natrulecollectiongroup.Properties.RuleCollection = $natrulecollection
9595
Set-AzFirewallPolicyRuleCollectionGroup -Name "rcg-01 " -FirewallPolicyObject $policy -Priority 200 -RuleCollection $natrulecollectiongroup.Properties.rulecollection
9696
9797
```
98-
## Deploy the firewall and configure the default route
98+
## Deploy the firewall
9999

100100
```azurepowershell
101101

articles/network-watcher/network-watcher-agent-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Network Watcher Agent extension for Linux can be installed on the following Linu
8484
| Azure Linux | 2.0 |
8585
| CentOS <sup>1</sup> | 6.10 and 7 |
8686
| Debian | 7 and 8 |
87-
| OpenSUSE Leap | 42.3+ |
87+
| openSUSE Leap | 42.3+ |
8888
| Oracle Linux | 6.10 <sup>2</sup>, 7 and 8+ |
8989
| Red Hat Enterprise Linux (RHEL) | 6.10 <sup>3</sup>, 7, 8 and 9.2 |
9090
| Rocky Linux | 9.1 |

articles/storage/blobs/access-tiers-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ To learn how to move a blob to the hot, cool, or cold tier, see [Set a blob's ac
4444
Data in the cool and cold tiers have slightly lower availability, but offer the same high durability, retrieval latency, and throughput characteristics as the hot tier. For data in the cool or cold tiers, slightly lower availability and higher access costs may be acceptable trade-offs for lower overall storage costs, as compared to the hot tier. For more information, see [SLA for storage](https://azure.microsoft.com/support/legal/sla/storage/v1_5/).
4545

4646
Blobs are subject to an early deletion penalty if they are deleted, overwritten or moved to a different tier before the minimum number of days required by the tier have transpired. For example, a blob in the cool tier in a general-purpose v2 account is subject to an early deletion penalty if it's deleted or moved to a different tier before 30 days has elapsed. For a blob in the cold tier, the deletion penalty applies if it's deleted or moved to a different tier before 90 days has elapsed. This charge is prorated. For example, if a blob is moved to the cool tier and then deleted after 21 days, you'll be charged an early deletion fee equivalent to 9 (30 minus 21) days of storing that blob in the cool tier.
47-
Early deletion charges also occur if the entire object is rewritten through any operation (i.e. Put Blob, Put Block List, or Copy Blob) within the specified time window.
47+
Early deletion charges also occur if the entire object is rewritten through any operation (i.e. Put Blob, Put Block List, or Copy Blob) within the specified time window. This charge is prorated based on the data storage price of the corresponding tier, i.e. deleting an archived blob after 120 days will lead to this object being charged for 180 days.
4848

4949
> [!NOTE]
5050
> In an account that has soft delete enabled, a blob is considered deleted after it is deleted and retention period expires. Until that period expires, the blob is only _soft-deleted_ and is not subject to the early deletion penalty.

articles/storage/common/storage-use-azcopy-v10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ You can install AzCopy by using a Linux package that is hosted on the [Linux Sof
8484
```
8585
8686
87-
### [zypper (OpenSUSE, SLES)](#tab/zypper)
87+
### [zypper (openSUSE, SLES)](#tab/zypper)
8888
8989
1. Download the repository configuration package.
9090

0 commit comments

Comments
 (0)