Skip to content

Commit 41d1ae2

Browse files
authored
Merge pull request #301051 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 4802332 + 589a2ea commit 41d1ae2

File tree

10 files changed

+15
-11
lines changed

10 files changed

+15
-11
lines changed

articles/active-directory-b2c/identity-provider-adfs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ zone_pivot_groups: b2c-policy-type
3131

3232
To enable sign-in for users with an AD FS account in Azure Active Directory B2C (Azure AD B2C), create an Application Group in your AD FS. For more information, see [Build a web application using OpenID Connect with AD FS 2016 and later](../active-directory/develop/msal-migration.md)
3333

34-
To create an Application Group, follow theses steps:
34+
To create an Application Group, follow these steps:
3535

3636
1. In **Server Manager**, select **Tools**, and then select **AD FS Management**.
3737
1. In AD FS Management, right-click on **Application Groups** and select **Add Application Group**.

articles/backup/backup-azure-sql-mabs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Microsoft Azure Backup Server (MABS) provides backup and recovery for SQL Server
2222

2323
- MABS v3 UR2, MABS v4, or later supports SQL Server Failover Cluster Instance (FCI) using Cluster Shared Volume (CSV).
2424
- Protection of SQL Server FCI with Storage Spaces Direct on Azure, and SQL Server FCI with Azure shared disks is supported with this feature. The DPM server must be deployed in the Azure Virtual Machine to protect the SQL FCI instance, deployed on the Azure VMs.
25-
- A SQL Server Always On availability group with theses preferences:
25+
- A SQL Server Always On availability group with these preferences:
2626
- Prefer Secondary
2727
- Secondary only
2828
- Primary

articles/dev-box/how-to-use-secrets-customization-files.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ To use a secret, like a PAT, in your customization files, store your PAT as a ke
2525

2626
Both team and user customizations support fetching secrets from a key vault. Team customizations, also known as image definition files, define the base image for the dev box with the `image` parameter, and list the tasks that run when a dev box is created. User customizations list the tasks that run when a dev box is created. The following examples show how to use a key vault secret in both types of customizations.
2727

28-
To configure key vault secrets for use in your YAML customizations:
28+
To configure key vault secrets for use in your team or user customizations, ensure that your dev center project's managed identity has the Key Vault Secrets User role on your key vault.
29+
30+
To configure key vault secrets for use in user customizations, you need to additionally:
2931

3032
1. Ensure that your dev center project's managed identity has the Key Vault Reader role and the Key Vault Secrets User role on your key vault.
3133
2. Grant the Key Vault Secrets User role for the key vault secret to each user or user group that should be able to consume the secret during the customization of a dev box. The user or group granted the role must include the managed identity for the dev center, the admin's user account, and any user or group that needs the secret during dev box customization.
@@ -85,4 +87,4 @@ To learn how to let trusted Microsoft services bypass the firewall, see [Configu
8587

8688
- [Microsoft Dev Box team customizations](concept-what-are-team-customizations.md)
8789
- [Configure imaging for Dev Box team customizations](how-to-configure-customization-imaging.md)
88-
- Learn how to [add and configure a catalog from GitHub or Azure Repos](../deployment-environments/how-to-configure-catalog.md).
90+
- Learn how to [add and configure a catalog from GitHub or Azure Repos](../deployment-environments/how-to-configure-catalog.md).

articles/devtest-labs/samples-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ if($existingPolicy.Properties.threshold -eq '[]')
269269
$allAvailableImages = Get-AzResource -ResourceType Microsoft.DevTestLab/labs/galleryImages -Name $lab.Name -ResourceGroupName $lab.ResourceGroupName -ApiVersion 2017-04-26-preview
270270
$finalImages = $existingImages
271271
272-
# loop through the requested images and add them to the finalImages list if they arent already there
272+
# loop through the requested images and add them to the finalImages list if they aren't already there
273273
foreach($image in $ImagesToAdd)
274274
{
275275
$imageObject = $allAvailableImages | Where-Object {$_.Name -eq $image}

articles/healthcare-apis/iot/overview-of-samples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: chrupa
1616
> As of 2/26/2025 the MedTech service will no longer be available in the following regions: UK West, UAE North, South Africa North, Qatar Central.
1717
1818

19-
The [MedTech service](overview.md) scenario-based [samples](https://github.com/Azure-Samples/azure-health-data-and-ai-samples/tree/main/samples/medtech-service-mappings) provide conforming and valid [device](overview-of-device-mapping.md) and [FHIR® destination](overview-of-fhir-destination-mapping.md) mappings and test device messages. Theses samples can be used to help with the authoring and troubleshooting of your own MedTech service mappings.
19+
The [MedTech service](overview.md) scenario-based [samples](https://github.com/Azure-Samples/azure-health-data-and-ai-samples/tree/main/samples/medtech-service-mappings) provide conforming and valid [device](overview-of-device-mapping.md) and [FHIR® destination](overview-of-fhir-destination-mapping.md) mappings and test device messages. These samples can be used to help with the authoring and troubleshooting of your own MedTech service mappings.
2020

2121
## Sample resources
2222

articles/managed-grafana/how-to-upgrade-grafana-11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: maud-lv
77
ms.author: malev
88
ms.date: 02/28/2025
99
ms.topic: how-to
10-
# customerIntent: As a user of Azure Managed Grafana, I want to upgrade my workspce from Grafana 10 to Grafana 11.
10+
# customerIntent: As a user of Azure Managed Grafana, I want to upgrade my workspace from Grafana 10 to Grafana 11.
1111
---
1212

1313
# Upgrade to Grafana 11

articles/sentinel/normalization-parsers-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ASIM includes two levels of parsers: **unifying** parser and **source-specific**
4444
The unifying parser name is `_Im_<schema>` for built-in parsers and `im<schema>` for workspace deployed parsers, where `<schema>` stands for the specific schema it serves. Source-specific parsers can also be used independently. Use `_Im_<schema>_<source>` for built-in parsers and `vim<schema><source>` for workspace deployed parsers. For example, in an Infoblox-specific workbook, use the `_Im_Dns_InfobloxNIOS` source-specific parser. You can find a list of source-specific parsers in the [ASIM parsers list](normalization-parsers-list.md).
4545

4646
>[!TIP]
47-
> A corresponding set of parsers that use `_ASim_<schema>` and `ASim<Schema>` are also available. Theses parsers do not support filtering parameters and are provided to help mitigate the [Time picker set to a custom range](normalization-known-issues.md#time-picker-set-to-a-custom-range) issue. Use those parsers only interactively in the logs screen, but not elsewhere, for example in analytic rules or workbooks. This parsers may not be removed when the issue is resolves.
47+
> A corresponding set of parsers that use `_ASim_<schema>` and `ASim<Schema>` are also available. These parsers do not support filtering parameters and are provided to help mitigate the [Time picker set to a custom range](normalization-known-issues.md#time-picker-set-to-a-custom-range) issue. Use those parsers only interactively in the logs screen, but not elsewhere, for example in analytic rules or workbooks. This parsers may not be removed when the issue is resolves.
4848

4949

5050
>[!TIP]

articles/synapse-analytics/data-explorer/includes/data-explorer-deprecation-notice.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ ms.service: azure-synapse-analytics
77
ms.subservice: data-explorer
88
---
99
> [!IMPORTANT]
10-
> Azure Synapse Analytics Data Explorer (Preview) will be retired on October 7, 2025. After this date, workloads running on Synapse Data Explorer will be deleted, and the associated application data will be lost. We highly recommend [migrating to Eventhouse](/fabric/real-time-intelligence/migrate-synapse-data-explorer) in Microsoft Fabric.
10+
> Azure Synapse Analytics Data Explorer (Preview) will be retired on October 7, 2025. After this date, workloads running on Synapse Data Explorer will be deleted, and the associated application data will be lost. We highly recommend [migrating to Eventhouse](/fabric/real-time-intelligence/migrate-synapse-data-explorer) in Microsoft Fabric.
11+
12+
The Microsoft Cloud Migration Factory (CMF) program is designed to assist customers in migrating to Fabric. The program offers hands-on keyboard resources at no cost to the customer. These resources are assigned for a period of 6-8 weeks, with a predefined and agreed-upon scope. Customer nominations are accepted from the Microsoft account team or directly by submitting a [request for help](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR0PMD-G9mq1Kry22u32eGOtUQ1pWQVIyUU9USDBXSjUwQ1E0NEJCMExORC4u) to the CMF team.

articles/synapse-analytics/monitoring/apache-spark-advisor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ This query is on a Delta table and contains a highly selective filter. To improv
6767

6868
## User Experience
6969

70-
The Apache Spark advisor displays the advices, including info, warning and errors, at Notebook cell output real-time.
70+
The Apache Spark advisor displays the advice, including info, warning and errors, at Notebook cell output real-time.
7171

7272
* Info
7373

articles/traffic-manager/traffic-manager-endpoint-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Azure Traffic Manager allows you to control how network traffic is distributed t
1616
There are three types of endpoint supported by Traffic Manager:
1717

1818
* [**Azure endpoints**](#azure-endpoints) are used for services hosted in Azure.
19-
* [**External endpoints**](#external-endpoints) are used for IPv4/IPv6 addresses, FQDNs, or for services hosted outside Azure. Theses services can either be on-premises or with a different hosting provider.
19+
* [**External endpoints**](#external-endpoints) are used for IPv4/IPv6 addresses, FQDNs, or for services hosted outside Azure. These services can either be on-premises or with a different hosting provider.
2020
* [**Nested endpoints**](#nested-endpoints) are used to combine Traffic Manager profiles to create more flexible traffic-routing schemes to support the needs of larger, more complex deployments.
2121

2222
There are some restrictions on how endpoints of different types can be combined in a single Traffic Manager profile or nested profile hierarchy. You can't mix external endpoints that have targets of different types (domain name, IP address] or external endpoints that have IP addresses as targets with Azure endpoints.

0 commit comments

Comments
 (0)