Skip to content

Commit af01516

Browse files
authored
Merge pull request #281815 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 a7315fc + 2125f9f commit af01516

File tree

10 files changed

+19
-16
lines changed

10 files changed

+19
-16
lines changed

articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ The Localization element allows you to support multiple locales or languages in
542542
<LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_send_new_code">Send new code</LocalizedString>
543543
<LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_change_claims">Change e-mail</LocalizedString>
544544
<!-- Claims-->
545-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
546-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
547-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
545+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
546+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
547+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
548548
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
549549
<!-- Email validation error messages-->
550550
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>

articles/app-service/environment/migration-alternatives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: jordanselig
1313
> There are two automated migration features available to help you upgrade to App Service Environment v3. To learn more about those features and for help deciding which migration option is right for you, see [Migration path decision tree](upgrade-to-asev3.md#migration-path-decision-tree). Consider one of the automated options for a quicker path to [App Service Environment v3](overview.md).
1414
>
1515
16-
If you're currently using App Service Environment v1 or v2, you have the opportunity to migrate your workloads to [App Service Environment v3](overview.md). App Service Environment v3 has [advantages and feature differences](overview.md#feature-differences) that provide enhanced support for your workloads and can reduce overall costs. Consider using the [the automated migration features](upgrade-to-asev3.md) if your environment meets the criteria described in the [migration path decision tree](upgrade-to-asev3.md#migration-path-decision-tree).
16+
If you're currently using App Service Environment v1 or v2, you have the opportunity to migrate your workloads to [App Service Environment v3](overview.md). App Service Environment v3 has [advantages and feature differences](overview.md#feature-differences) that provide enhanced support for your workloads and can reduce overall costs. Consider using [the automated migration features](upgrade-to-asev3.md) if your environment meets the criteria described in the [migration path decision tree](upgrade-to-asev3.md#migration-path-decision-tree).
1717

1818
If your App Service Environment isn't supported for the migration features, you must use one of the manual methods to migrate to App Service Environment v3.
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ For REST API operations, see [Azure Billing REST API Reference](/rest/api/billin
6363

6464
## Unique tags pagination
6565

66-
When calling the [Unique Tags API](/rest/api/resources/tags/list) there is a limit to the size of each API response page that is returned. A tag that has a large set of unique values will require the API to fetch the next page to retrieve the remaining set of values. When this happens the tag key is shown again to indicate that the vales are still under this key.
66+
When calling the [Unique Tags API](/rest/api/resources/tags/list) there is a limit to the size of each API response page that is returned. A tag that has a large set of unique values will require the API to fetch the next page to retrieve the remaining set of values. When this happens the tag key is shown again to indicate that the values are still under this key.
6767

6868
This can result in some tools, like the Azure portal, to show the tag key twice.
6969

articles/chaos-studio/chaos-studio-tutorial-aad-outage-portal.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Use a chaos experiment template to induce an outage on an Azure Active Directory instance
3-
description: Use the Azure portal to create an experiment from the AAD outage experiment template.
2+
title: Use a chaos experiment template to induce an outage on a Microsoft Entra ID instance
3+
description: Use the Azure portal to create an experiment from the Microsoft Entra ID outage experiment template.
44
author: prasha-microsoft
55
ms.author: abbyweisberg
66
ms.reviewer: prashabora
@@ -10,9 +10,9 @@ ms.date: 09/27/2023
1010
ms.custom: template-how-to
1111
---
1212

13-
# Use a chaos experiment template to induce an outage on an Azure Active Directory instance
13+
# Use a chaos experiment template to induce an outage on a Microsoft Entra ID instance
1414

15-
You can use a chaos experiment to verify that your application is resilient to failures by causing those failures in a controlled environment. In this article, you induce an outage on an Azure Active Directory resource using a pre-populated experiment template and Azure Chaos Studio.
15+
You can use a chaos experiment to verify that your application is resilient to failures by causing those failures in a controlled environment. In this article, you induce an outage on a Microsoft Entra ID resource using a pre-populated experiment template and Azure Chaos Studio.
1616

1717
## Prerequisites
1818

@@ -40,7 +40,7 @@ Now you can create your experiment from a pre-filled experiment template. A chao
4040
1. In Chaos Studio, go to **Experiments** > **Create** > **New from template**.
4141

4242
[![Screenshot that shows the Experiments screen, with the New from template button highlighted.](images/tutorial-aad-outage-create.png)](images/tutorial-aad-outage-create.png#lightbox)
43-
1. Select **AAD Outage**.
43+
1. Select **Microsoft Entra ID Outage**.
4444

4545
[![Screenshot that shows the experiment templates screen, with the AAD outage template button highlighted.](images/tutorial-aad-outage-select.png)](images/tutorial-aad-outage-select.png#lightbox)
4646
1. Add a name for your experiment that complies with resource naming guidelines. Select **Next: Permissions**.
@@ -67,6 +67,6 @@ You're now ready to run your experiment.
6767
1. When **Status** changes to *Running*, select **Details** for the latest run under **History** to see details for the running experiment.
6868

6969
## Next steps
70-
Now that you've run an AAD outage template experiment, you're ready to:
70+
Now that you've run a Microsoft Entra ID outage template experiment, you're ready to:
7171
- [Manage your experiment](chaos-studio-run-experiment.md)
7272
- [Create an experiment that shut down all targets in a zone](chaos-studio-tutorial-dynamic-target-portal.md)

articles/container-apps/java-eureka-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Now that you have an existing environment, you can create your container app and
133133

134134
This command returns the URL of your container app that consumes registers with the Eureka server component. Copy the URL to a text editor so you can use it in a coming step.
135135

136-
Navigate top the `/allRegistrationStatus` route view all applications registered with the Eureka Server for Spring.
136+
Navigate to the `/allRegistrationStatus` route to view all applications registered with the Eureka Server for Spring.
137137

138138
The binding injects several configurations into the application as environment variables, primarily the `eureka.client.service-url.defaultZone` property. This property indicates the internal endpoint of the Eureka Server Java component.
139139

articles/cost-management-billing/costs/tutorial-acm-opt-recommendations.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ After you choose a suitable size, select **Resize** to start the resize action.
8787

8888
Resizing requires an actively running virtual machine to restart. If the virtual machine is in a production environment, we recommend that you run the resize operation after business hours. Scheduling the restart can reduce disruptions caused by momentarily unavailability.
8989

90+
> [!TIP]
91+
> If you’re unsure whether shutting down a VM will cause a problem for others, you can first restrict access to the VM. Consider [Configuring role assignments for the VM](/entra/identity/devices/howto-vm-sign-in-azure-ad-windows#configure-role-assignments-for-the-vm) to limit access to it. Afterward, you can [Monitor Azure Virtual Machines](../../virtual-machines/monitor-vm.md) to assess the VM’s usage and determine if limiting access caused problems for others.
92+
9093
## Verify the action
9194

9295
When the VM resizing completes successfully, an Azure notification is shown.

articles/machine-learning/prompt-flow/how-to-end-to-end-llmops-with-prompt-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.date: 01/02/2024
1717

1818
# LLMOps with prompt flow and GitHub
1919

20-
Large Language Operations, or **LLMOps**, has become the cornerstone of efficient prompt engineering and LLM-infused application development and deployment. As the demand for LLM-infused applications continues to soar, organizations find themselves in need of a cohesive and streamlined process to manage their end-to-end lifecycle.
20+
Large Language Models Operations, or **LLMOps**, has become the cornerstone of efficient prompt engineering and LLM-infused application development and deployment. As the demand for LLM-infused applications continues to soar, organizations find themselves in need of a cohesive and streamlined process to manage their end-to-end lifecycle.
2121

2222
Azure Machine Learning allows you to integrate with GitHub to automate the LLM-infused application development lifecycle with prompt flow.
2323

articles/search/cognitive-search-defining-skillset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Context also determines where outputs are produced in the [enrichment tree](cogn
166166

167167
Skills read from and write to an enriched document. Skill inputs specify the origin of the incoming data. It's often the root node of the enriched document. For blobs, a typical skill input is the document's content property.
168168

169-
[Skill reference documentation](cognitive-search-predefined-skills.md) for each skill describes the inputs it can consume. Each input has a "name" that identifies a specific input, and a "source" that specifies the location fo the data in the enriched document. The following example is from the Entity Recognition skill:
169+
[Skill reference documentation](cognitive-search-predefined-skills.md) for each skill describes the inputs it can consume. Each input has a "name" that identifies a specific input, and a "source" that specifies the location of the data in the enriched document. The following example is from the Entity Recognition skill:
170170

171171
```json
172172
"inputs": [

articles/virtual-desktop/troubleshoot-app-attach.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To validate that your session hosts have the necessary access to a file share co
4848
```powershell
4949
# Install the CimDiskImage PowerShell module, if it's not already installed.
5050
If (!(Get-Module -ListAvailable | ? Name -eq CimDiskImage)) {
51-
Install-Module CimDiskImage -WhatIf
51+
Install-Module CimDiskImage
5252
}
5353
5454
# Import the CimDiskImage PowerShell module.

articles/virtual-machines/trusted-launch-existing-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: template-how-to, devx-track-azurepowershell
1717

1818
Azure Virtual Machines supports enabling Azure Trusted launch on existing [Azure Generation 2](generation-2.md) virtual machines (VMs) by upgrading to the [Trusted launch](trusted-launch.md) security type.
1919

20-
[Trusted launch](trusted-launch.md) is a way to enable foundational compute security on [Azure Generation 2 VMs](generation-2.md) VMs and protects against advanced and persistent attack techniques like boot kits and rootkits. It does so by combining infrastructure technologies like Secure Boot, virtual Trusted Platform Module (vTPM), and boot integrity monitoring on your VM.
20+
[Trusted launch](trusted-launch.md) is a way to enable foundational compute security on [Azure Generation 2 VMs](generation-2.md) and protects against advanced and persistent attack techniques like boot kits and rootkits. It does so by combining infrastructure technologies like Secure Boot, virtual Trusted Platform Module (vTPM), and boot integrity monitoring on your VM.
2121

2222
> [!IMPORTANT]
2323
> Support for *enabling Trusted launch on existing Azure Generation 1 VMs* is currently in private preview. You can gain access to preview by using the [registration form](https://aka.ms/Gen1ToTLUpgrade).

0 commit comments

Comments
 (0)