Skip to content

Commit 35a6df9

Browse files
authored
Merge pull request #250374 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 d41b68a + 79bfd30 commit 35a6df9

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

articles/active-directory/privileged-identity-management/concept-pim-for-groups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To learn more about Azure AD built-in roles and their permissions, see [Azure AD
4646

4747
One Azure AD tenant can have up to 500 role-assignable groups. To learn more about Azure AD service limits and restrictions, see [Azure AD service limits and restrictions](../enterprise-users/directory-service-limits-restrictions.md).
4848

49-
Azure AD role-assignable group feature is not part of Azure AD Privileged Identity Management (Azure AD PIM). It requires a Microsft Entra Premium P1, P2, or Micrsoft Entra ID Governance license.
49+
Azure AD role-assignable group feature is not part of Azure AD Privileged Identity Management (Azure AD PIM). It requires a Microsoft Entra Premium P1, P2, or Microsoft Entra ID Governance license.
5050

5151
## Relationship between role-assignable groups and PIM for Groups
5252

@@ -92,4 +92,4 @@ Provisioning configuration depends on the application. Generally, we recommend h
9292
- [Bring groups into Privileged Identity Management](groups-discover-groups.md)
9393
- [Assign eligibility for a group in Privileged Identity Management](groups-assign-member-owner.md)
9494
- [Activate your group membership or ownership in Privileged Identity Management](groups-activate-roles.md)
95-
- [Approve activation requests for group members and owners](groups-approval-workflow.md)
95+
- [Approve activation requests for group members and owners](groups-approval-workflow.md)

articles/azure-monitor/alerts/alerts-create-new-alert-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ To edit an existing alert rule:
146146

147147
1. (Optional) If you're querying an ADX or ARG cluster, Log Analytics can't automatically identify the column with the event timestamp, so we recommend that you add a time range filter to the query. For example:
148148
```KQL
149-
adx(cluster).table
149+
adx('https://help.kusto.windows.net/Samples').table
150150
| where MyTS >= ago(5m) and MyTS <= now()
151151
```
152152
```KQL

articles/databox/data-box-deploy-copy-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The following table shows the UNC path to the shares on your Data Box and Azure
6464
| Azure Block blobs | <li>UNC path to shares: `\\<DeviceIPAddress>\<storageaccountname_BlockBlob>\<ContainerName>\files\a.txt`</li><li>Azure Storage URL: `https://<storageaccountname>.blob.core.windows.net/<ContainerName>/files/a.txt`</li> |
6565
| Azure Page blobs | <li>UNC path to shares: `\\<DeviceIPAddress>\<storageaccountname_PageBlob>\<ContainerName>\files\a.txt`</li><li>Azure Storage URL: `https://<storageaccountname>.blob.core.windows.net/<ContainerName>/files/a.txt`</li> |
6666
| Azure Files |<li>UNC path to shares: `\\<DeviceIPAddress>\<storageaccountname_AzFile>\<ShareName>\files\a.txt`</li><li>Azure Storage URL: `https://<storageaccountname>.file.core.windows.net/<ShareName>/files/a.txt`</li> |
67-
| Azure Block blobs (Archive) | <li>UNC path to shares: `\\<DeviceIPAddress>\<storageaccountname_BlockBlobArchive>\<ContainerName>\files\a.txt`</li><li>Azure Storage URL: `https://<storageaccountname>.blob.core.windows.net/<ContainerName>/files/a.txt`</li> |
67+
| Azure Block blobs (Archive) | <li>UNC path to shares: `\\<DeviceIPAddress>\<storageaccountname_BlockBlob_Archive>\<ContainerName>\files\a.txt`</li><li>Azure Storage URL: `https://<storageaccountname>.blob.core.windows.net/<ContainerName>/files/a.txt`</li> |
6868

6969
If using a Windows Server host computer, follow these steps to connect to the Data Box.
7070

articles/databox/data-box-deploy-export-ordered.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Perform the following steps in the Azure portal to order a device.
6363

6464
|Setting |Value |
6565
|---------|---------|
66-
|Transfer type | Select **Export to Azure**. |
66+
|Transfer type | Select **Export from Azure**. |
6767
|Subscription | Select an EA, CSP, or Azure sponsorship subscription for Data Box service. <br> The subscription is linked to your billing account. |
6868
|Resource group | Select an existing resource group. <br> A resource group is a logical container for the resources that can be managed or deployed together. |
6969
|Source Azure region | Select the Azure region where your data currently is. |

articles/frontdoor/apex-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To add a root or apex domain to your Azure Front Door profile, see [Onboard a ro
2020

2121
## DNS CNAME flattening
2222

23-
The DNS protocol prevents the assignment of CNAME records at the zone apex. For example, if your domain is `contoso.com`, you can create a CNAME record for `myappliation.contoso.com`, but you can't create a CNAME record for `contoso.com` itself.
23+
The DNS protocol prevents the assignment of CNAME records at the zone apex. For example, if your domain is `contoso.com`, you can create a CNAME record for `myapplication.contoso.com`, but you can't create a CNAME record for `contoso.com` itself.
2424

2525
Azure Front Door doesn't expose the frontend public IP address associated with your Azure Front Door endpoint. So, you can't map an apex domain to an Azure Front Door IP address.
2626

articles/storage/blobs/archive-rehydrate-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ Rehydration of an archived blob may take up to 15 hours, and it is inefficient t
101101

102102
Azure Event Grid raises one of the following two events on blob rehydration, depending on which operation was used to rehydrate the blob:
103103

104-
- The **Microsoft.Storage.BlobCreated** event fires when a blob is created. In the context of blob rehydration, this event fires when a [Copy Blob](/rest/api/storageservices/copy-blob) operation creates a new destination blob in either the Hot or Cool tier and the blob's data is fully rehydrated from the Archive tier.
104+
- The **Microsoft.Storage.BlobCreated** event fires when a blob is created. In the context of blob rehydration, this event fires when a [Copy Blob](/rest/api/storageservices/copy-blob) operation creates a new destination blob in either the Hot or Cool tier and the blob's data is fully rehydrated from the Archive tier. If the account has the **hierarchical namespace** feature enabled on it, the `CopyBlob` operation works a little differently. In that case, the **Microsoft.Storage.BlobCreated** event is triggered when the `CopyBlob` operation is **initiated** and not when the Block Blob is completely committed.
105+
105106
- The **Microsoft.Storage.BlobTierChanged** event fires when a blob's tier is changed. In the context of blob rehydration, this event fires when a [Set Blob Tier](/rest/api/storageservices/set-blob-tier) operation successfully changes an archived blob's tier to the Hot or Cool tier.
106107

107108
To learn how to capture an event on rehydration and send it to an Azure Function event handler, see [Run an Azure Function in response to a blob rehydration event](archive-rehydrate-handle-event.md).

0 commit comments

Comments
 (0)