Skip to content

Commit 64277c8

Browse files
Merge pull request #270012 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 f4ef606 + 3a8429e commit 64277c8

File tree

14 files changed

+42
-37
lines changed

14 files changed

+42
-37
lines changed

articles/ai-services/language-service/custom-named-entity-recognition/includes/roles-for-resource-and-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ Use the following steps to set the required roles for your Language resource and
3737
5. Select **Select members**
3838
6. Select your subscription, and **Language** as the managed identity. You can search for user names in the **Select** field.
3939

40-
> ![IMPORTANT]
40+
> [!IMPORTANT]
4141
> If you have a virtual network or private endpoint, be sure to select **Allow Azure services on the trusted services list to access this storage account** in the Azure portal.

articles/ai-services/language-service/includes/custom/roles-for-resource-and-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ Use the following steps to set the required roles for your Language resource and
3737
5. Select **Select members**
3838
6. Select your subscription, and **Language** as the managed identity. You can search for user names in the **Select** field.
3939

40-
> ![IMPORTANT]
40+
> [!IMPORTANT]
4141
> If you have a virtual network or private endpoint, be sure to select **Allow Azure services on the trusted services list to access this storage account** in the Azure portal.

articles/ai-services/language-service/question-answering/how-to/encrypt-data-at-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ By default, your subscription uses Microsoft-managed encryption keys. There is a
2121

2222
Custom question answering uses CMK support from Azure search, and associates the provided CMK to encrypt the data stored in Azure search index. Please follow the steps listed in [this article](../../../../search/search-security-manage-encryption-keys.md) to configure Key Vault access for the Azure search service.
2323

24-
> [NOTE]
24+
> [!NOTE]
2525
> Whenever the CMK is being rotated, make sure there is a period of overlap between the old and new versions of the key where both are enabled and not expired.
2626
2727
> [!IMPORTANT]

articles/app-service/configure-authentication-provider-google.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ To complete the procedure in this topic, you must have a Google account that has
4141

4242
1. Click **Add**.
4343

44-
> [Note]
45-
> For adding scope: You can define what permissions your application has in the provider's registration portal. The app can request scopes at login time which leverage these permissions.
44+
> [!NOTE]
45+
> For adding scope: You can define what permissions your application has in the provider's registration portal. The app can request scopes at login time which leverage these permissions.
4646
4747
You are now ready to use Google for authentication in your app. The provider will be listed on the **Authentication** screen. From there, you can edit or delete this provider configuration.
4848

articles/backup/backup-azure-dataprotection-use-rest-api-backup-blobs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ It returns two responses: 201 (Created) when backup instance is created and the
345345

346346
Once you submit the *PUT* request to create a backup instance, the initial response is 201 (Created) with an Azure-asyncOperation header.
347347

348-
>[Note]
349-
>The request body contains all the backup instance properties.
348+
> [!NOTE]
349+
> The request body contains all the backup instance properties.
350350
351351
```http
352352
HTTP/1.1 201 Created

articles/backup/backup-blobs-storage-account-ps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ See the [prerequisites](./blob-backup-configure-manage.md#before-you-start) and
3333

3434
## Create a Backup vault
3535

36-
A Backup vault is a storage entity in Azure that holds backup data for various newer workloads that Azure Backup supports, such as Azure Database for PostgreSQL servers, Azure blobs and Azure blobs. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides enhanced capabilities to help secure backup data.
36+
A Backup vault is a storage entity in Azure that holds backup data for various newer workloads that Azure Backup supports, such as Azure Database for PostgreSQL servers and Azure blobs. Backup vaults make it easy to organize your backup data, while minimizing management overhead. Backup vaults are based on the Azure Resource Manager model of Azure, which provides enhanced capabilities to help secure backup data.
3737

3838
Before creating a backup vault, choose the storage redundancy of the data within the vault. Then proceed to create the backup vault with that storage redundancy and the location. In this article, we will create a backup vault _TestBkpVault_ in region _westus_, under the resource group _testBkpVaultRG_. Use the [New-AzDataProtectionBackupVault](/powershell/module/az.dataprotection/new-azdataprotectionbackupvault) command to create a backup vault.Learn more about [creating a Backup vault](./create-manage-backup-vault.md#create-a-backup-vault).
3939

articles/backup/backup-mabs-whats-new-mabs.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Microsoft Azure Backup Server gives you enhanced backup capabilities to protect
1616

1717
Microsoft Azure Backup Server version 4 (MABS V4) Update *Rollup 1 Refresh* includes critical bug fixes and feature enhancements. For information about the bugs fixed and the installation instructions of MABS V4 UR1 Refresh, see [KB article 5033756](https://support.microsoft.com/home/contact?SourceApp=smcivr2).
1818

19-
>[!Important]
20-
>MABS V4 UR1 Refresh supersedes MABS V4 UR1 that has the same feature enhancements, but fixes the known issues in MABS V4 UR1. [Learn more](backup-mabs-release-notes-v3.md).
19+
> [!IMPORTANT]
20+
> MABS V4 UR1 Refresh supersedes MABS V4 UR1 that has the same feature enhancements, but fixes the known issues in MABS V4 UR1. [Learn more](backup-mabs-release-notes-v3.md).
2121
2222
The following table lists the new features added in MABS V4 UR1:
2323

@@ -34,17 +34,17 @@ The following table lists the new features added in MABS V4 UR1:
3434

3535
**Microsoft Azure Backup Server version 4 (MABS V4) Update Rollup 1** includes critical bug fixes and feature enhancements. To view the list of bugs fixed and the installation instructions for MABS V4 UR1, see [KB article 5032421](https://support.microsoft.com/help/5032421/).
3636

37-
>[!Important]
38-
>We're temporarily pausing the release of Update Rollup 1 for Microsoft Azure Backup Server V4 due to the known issue - **Hyper-V scheduled backups take a long time to complete because each backup job triggers a consistency check.**
37+
> [!IMPORTANT]
38+
> We're temporarily pausing the release of Update Rollup 1 for Microsoft Azure Backup Server V4 due to the known issue - **Hyper-V scheduled backups take a long time to complete because each backup job triggers a consistency check.**
3939
>
40-
>Error message: The replica of Microsoft Hyper-V RCT on `<Machine Name>` is not consistent with the protected data source. DPM has detected changes in file locations or volume configurations of protected objects since the data source was configured for protection. (ID 30135).
40+
> Error message: The replica of Microsoft Hyper-V RCT on `<Machine Name>` is not consistent with the protected data source. DPM has detected changes in file locations or volume configurations of protected objects since the data source was configured for protection. (ID 30135).
4141
>
42-
>Resolution: This will be resolved in the new version planned to be released soon.
42+
> Resolution: This will be resolved in the new version planned to be released soon.
4343
>
44-
>- If you haven't installed UR1 for MABS V4 already, wait for the new release.
45-
>- If you have already installed UR1 for MABS V4, this new build will install on top of UR1 for MABS V4 to fix the known issues.
44+
> - If you haven't installed UR1 for MABS V4 already, wait for the new release.
45+
> - If you have already installed UR1 for MABS V4, this new build will install on top of UR1 for MABS V4 to fix the known issues.
4646
>
47-
>For additional information, reach out to Microsoft Support.
47+
> For additional information, reach out to Microsoft Support.
4848
4949
The following table lists the new features added in MABS V4 UR1:
5050

@@ -87,8 +87,8 @@ This update contains the following enhancement to improve the backup time. For m
8787
- - Item-level recovery errors due to inconsistent file catalog metadata are avoided because *iSCSI mounts* are used.
8888
- - After the recovery point is mounted, file browsing during item-level recovery is faster for recovery points with many files and folders.
8989

90-
>[!Note]
91-
>We recommend that you update your MABS V3 installation to Hotfix for Update Rollup 2 to benefit from the enhancement. Ensure that you also update your MARS Agent to the latest version (2.0.9262.0 or higher).
90+
> [!NOTE]
91+
> We recommend that you update your MABS V3 installation to Hotfix for Update Rollup 2 to benefit from the enhancement. Ensure that you also update your MARS Agent to the latest version (2.0.9262.0 or higher).
9292
9393
## What’s new in MABS v3 UR2?
9494

@@ -120,8 +120,8 @@ MABS v3 UR2 supports Offline backup using Azure Data Box. With Microsoft Azure D
120120

121121
Microsoft Azure Backup Server (MABS) version 3 UR1 is the latest update, and includes critical bug fixes and other features and enhancements. To view the list of bugs fixed and the installation instructions for MABS V3 UR1, see KB article [4534062](https://support.microsoft.com/help/4534062).
122122

123-
>[!NOTE]
124-
>Support for the 32 bit protection agent is deprecated with MABS v3 UR1. See [32 Bit protection agent deprecation](#32-bit-protection-agent-deprecation).
123+
> [!NOTE]
124+
> Support for the 32 bit protection agent is deprecated with MABS v3 UR1. See [32 Bit protection agent deprecation](#32-bit-protection-agent-deprecation).
125125
126126
### Faster backups with tiered storage using SSDs
127127

@@ -138,11 +138,11 @@ With MABS V3 UR1, you can back up the ReFS volumes and workloads deployed on the
138138
* Exchange: Exchange 2019, 2016.
139139
* SharePoint: SharePoint 2019, 2016 with latest SP.
140140

141-
>[!NOTE]
141+
> [!NOTE]
142142
> Backup of Hyper-V VMs stored on an ReFS volume is supported with MABS V3
143143
144-
>[IMPORTANT]
145-
>We've identified a few issues with backup of deduplicated ReFS volumes. We're working on fixing these, and will update this section as soon as we have a fix available. Until then, we're removing the support for backup of deduplicated ReFS volumes from MABSv3 UR1.
144+
> [!IMPORTANT]
145+
> We've identified a few issues with backup of deduplicated ReFS volumes. We're working on fixing these, and will update this section as soon as we have a fix available. Until then, we're removing the support for backup of deduplicated ReFS volumes from MABSv3 UR1.
146146
147147
### Azure VMware Solution protection support
148148

@@ -165,8 +165,8 @@ With MABS V3 UR1, an additional a layer of authentication is added for critical
165165

166166
MABS v3 UR1 improves the experience of offline backup with Azure Import/Export Service. For more information, see the updated steps [here](./backup-azure-backup-server-import-export.md).
167167

168-
>[!NOTE]
169-
>From MABS v3 UR2, MABS can perform offline backup using Azure Data Box. [Learn more](./offline-backup-azure-data-box-dpm-mabs.md).
168+
> [!NOTE]
169+
> From MABS v3 UR2, MABS can perform offline backup using Azure Data Box. [Learn more](./offline-backup-azure-data-box-dpm-mabs.md).
170170
171171
### New cmdlet parameter
172172

@@ -176,8 +176,8 @@ MABS V3 UR1 includes a new parameter **[-CheckReplicaFragmentation]**. The new p
176176

177177
With MABS v3 UR1, support for 32-bit protection agent is no longer supported. You won't be able to protect 32-bit workloads after upgrading the MABS v3 server to UR1. Any existing 32-bit protection agents will be in a disabled state and scheduled backups will fail with the **agent is disabled** error. If you want to retain the backup data for these agents, you can stop the protection with the retained data option. Otherwise, the protection agent can be removed.
178178

179-
>[!NOTE]
180-
>Review the [updated protection matrix](./backup-mabs-protection-matrix.md) to learn the supported workloads for protection with MABS UR 1.
179+
> [!NOTE]
180+
> Review the [updated protection matrix](./backup-mabs-protection-matrix.md) to learn the supported workloads for protection with MABS UR 1.
181181
182182
## What's new in MABS V3 RTM?
183183

articles/cloud-services-extended-support/enable-rdp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The Azure portal uses the remote desktop extension to enable remote desktop even
2222
3. Choose the roles to enable remote desktop for.
2323
4. Fill in the required fields for user name, password and expiration.
2424

25-
> [Note]
25+
> [!NOTE]
2626
> The password for remote desktop must be between 8-123 characters long and must satisfy at least 3 of password complexity requirements from the following: 1) Contains an uppercase character 2) Contains a lowercase character 3) Contains a numeric digit 4) Contains a special character 5) Control characters are not allowed
2727
2828
:::image type="content" source="media/remote-desktop-2.png" alt-text="Image shows inputting the information required to connect to remote desktop.":::

articles/cosmos-db/nosql/query/computed-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ There are a few considerations for indexing computed properties, including:
310310
> [!TIP]
311311
> Every time you update container properties, the old values are overwritten. If you have existing computed properties and want to add new ones, be sure that you add both new and existing computed properties to the collection.
312312
313-
>![NOTE]
313+
> [!NOTE]
314314
> When the definition of an indexed computed property is modified, it's not automatically reindexed. To index the modified computed property, you'll first need to drop the computed property from the index. Then after the reindexing is completed, add the computed property back to the index policy.
315315
>
316316
> If you want to delete a computed property, you'll first need to remove it from the index policy.

articles/cost-management-billing/savings-plan/scope-savings-plan.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ You have the following options to scope a savings plan, depending on your needs:
1919

2020
## Scope options
2121

22-
- **Single resource group scope** - Applies the savings plan benefit to the eligible resources in the selected resource group only.
23-
- **Single subscription scope** - Applies the savings plan benefit to the eligible resources in the selected subscription.
22+
- **Single resource group scope** - Applies the savings plan benefit to eligible resources in the selected resource group only.
23+
- **Single subscription scope** - Applies the savings plan benefit to eligible resources in the selected subscription.
24+
- **Management group** - Applies the savings plan benefit to eligible resources within all subscriptions contained in both the management group and billing scope.
2425
- **Shared scope** - Applies the savings plan benefit to eligible resources within subscriptions that are in the billing context. If a subscription was moved to different billing context, the benefit will no longer be applied to this subscription and will continue to apply to other subscriptions in the billing context.
2526
- For Enterprise Agreement customers, the billing context is the enrollment. The savings plan shared scope would include multiple Microsoft Entra tenants in an enrollment.
2627
- For Microsoft Customer Agreement customers, the billing scope is the billing profile. Usage from all billing subscriptions under the billing profile, is eligible to receive benefits for a Shared scoped savings plan.
27-
- **Management group** - Applies the savings plan benefit to eligible resources in the list of subscriptions that are a part of both the management group and billing scope. To buy a savings plan for a management group, you must have at least read permission on the management group and be a savings plan owner on the billing subscription.
28+
2829

2930
## Scope processing order
3031

@@ -33,7 +34,7 @@ While applying savings plan benefits to your usage, Azure processes savings plan
3334
1. Savings plans with a single resource group scope.
3435
2. Savings plans with a single subscription scope.
3536
3. Savings plans scoped to a management group.
36-
4. Savings plans with a shared scope (multiple subscriptions), described previously.
37+
4. Savings plans with a shared scope.
3738

3839
You can always update the scope after you buy a savings plan. To do so, go to the savings plan, select **Configuration**, and rescope the savings plan. Rescoping a savings plan isn't a commercial transaction, so your savings plan term isn't changed. For more information about updating the scope, see [Update the scope](manage-savings-plan.md#change-the-savings-plan-scope) after you purchase a savings plan.
3940

0 commit comments

Comments
 (0)