Skip to content

Commit 9c228ee

Browse files
authored
Merge pull request #266663 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 4d71725 + 5dbc8e8 commit 9c228ee

File tree

9 files changed

+12
-11
lines changed

9 files changed

+12
-11
lines changed

articles/active-directory-b2c/custom-policies-series-validate-user-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Azure Active Directory B2C (Azure AD B2C) custom policy not only allows you to m
4949

5050
## Step 1 - Validate user input by limiting user input options
5151

52-
If you know all the possible values that a user can enter for a given input, you can provide a finite set of values that a user must select from. You can use *DropdownSinglSelect*, *CheckboxMultiSelect*, and *RadioSingleSelect* [UserInputType](claimsschema.md#userinputtype) for this purpose. In this article, you'll use a *RadioSingleSelect* input type:
52+
If you know all the possible values that a user can enter for a given input, you can provide a finite set of values that a user must select from. You can use *DropdownSingleSelect*, *CheckboxMultiSelect*, and *RadioSingleSelect* [UserInputType](claimsschema.md#userinputtype) for this purpose. In this article, you'll use a *RadioSingleSelect* input type:
5353

5454
1. In VS Code, open the file `ContosoCustomPolicy.XML`.
5555

articles/active-directory-b2c/session-behavior.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ With single sign-on, users sign in once with a single account and get access to
2525

2626
When the user initially signs in to an application, Azure AD B2C persists a cookie-based session. Upon subsequent authentication requests, Azure AD B2C reads and validates the cookie-based session, and issues an access token without prompting the user to sign in again. If the cookie-based session expires or becomes invalid, the user is prompted to sign-in again.
2727

28+
>[!NOTE]
29+
>If the user uses a browser that blocks third-party cookies, there are limitations with SSO due to limited access to the cookie-based session. The most user-visible impact is that there are more interactions required for sign-in. Additionally, the front channel sign-out doesn't immediately clear authentication state from federated applications. Check our recommended ways about [how to handle third-party cookie blocking in browsers](/entra/identity-platform/reference-third-party-cookies-spas).
30+
2831
## Prerequisites
2932

3033
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]

articles/ai-studio/how-to/quota.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Use quotas to manage compute target allocation between multiple Azure AI hub r
9494

9595
By default, all Azure AI hub resources share the same quota as the subscription-level quota for VM families. However, you can set a maximum quota for individual VM families for more granular cost control and governance on Azure AI hub resources in a subscription. Quotas for individual VM families let you share capacity and avoid resource contention issues.
9696

97-
In Azure AI Studio, select **Manage** from the top menu. Select **Quota** to view your quota at the subscription level in a region for both Azure Machine Learning virtual machine families and for your Azure Open AI resources.
97+
In Azure AI Studio, select **Manage** from the top menu. Select **Quota** to view your quota at the subscription level in a region for both Azure Machine Learning virtual machine families and for your Azure OpenAI resources.
9898

9999
:::image type="content" source="../media/cost-management/quota-manage.png" alt-text="Screenshot of the page to view and request quota for virtual machines and Azure OpenAI models." lightbox="../media/cost-management/quota-manage.png":::
100100

articles/azure-monitor/agents/azure-monitor-agent-send-data-to-event-hubs-and-storage.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ Use custom template deployment to create the DCR association and AMA deployment.
602602
"settings": {
603603
"authentication": {
604604
"managedIdentity": {
605-
"identifier-type": "mi_res_id",
606605
"identifier-name": "mi_res_id",
607606
"identifier-value": "[resourceID('Microsoft.ManagedIdentity/userAssignedIdentities/',parameters('identityName'))]"
608607
}
@@ -680,7 +679,6 @@ Use custom template deployment to create the DCR association and AMA deployment.
680679
"settings": {
681680
"authentication": {
682681
"managedIdentity": {
683-
"identifier-type": "mi_res_id",
684682
"identifier-name": "mi_res_id",
685683
"identifier-value": "[resourceID('Microsoft.ManagedIdentity/userAssignedIdentities/',parameters('identityName'))]"
686684
}

articles/devtest-labs/image-factory-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The solution enables the speed of creating virtual machines from custom images w
2121
<br/>
2222

2323
## High-level view of the solution
24-
The solution enables the speed of creating virtual machines from custom images while eliminating extra ongoing maintenance costs. With this solution, you can automatically create custom images and distribute them to other DevTest Labs. You use Azure DevOps (formerly Visual Studio Team Services) as the orchestration engine for automating the all the operations in the DevTest Labs.
24+
The solution enables the speed of creating virtual machines from custom images while eliminating extra ongoing maintenance costs. With this solution, you can automatically create custom images and distribute them to other DevTest Labs. You use Azure DevOps (formerly Visual Studio Team Services) as the orchestration engine for automating all the operations in the DevTest Labs.
2525

2626
![High-level view of the solution.](./media/create-image-factory/high-level-view-of-solution.png)
2727

articles/machine-learning/prompt-flow/concept-connections.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Connections in prompt flow play a crucial role in establishing connections to re
2424

2525
In the Azure Machine Learning workspace, connections can be configured to be shared across the entire workspace or limited to the creator. Secrets associated with connections are securely persisted in the corresponding Azure Key Vault, adhering to robust security and compliance standards.
2626

27-
Prompt flow provides various prebuilt connections, including Azure Open AI, Open AI, and Azure Content Safety. These prebuilt connections enable seamless integration with these resources within the built-in tools. Additionally, users have the flexibility to create custom connection types using key-value pairs, empowering them to tailor the connections to their specific requirements, particularly in Python tools.
27+
Prompt flow provides various prebuilt connections, including Azure OpenAI, OpenAI, and Azure Content Safety. These prebuilt connections enable seamless integration with these resources within the built-in tools. Additionally, users have the flexibility to create custom connection types using key-value pairs, empowering them to tailor the connections to their specific requirements, particularly in Python tools.
2828

2929
| Connection type | Built-in tools |
3030
| ------------------------------------------------------------ | ------------------------------- |
31-
| [Azure Open AI](https://azure.microsoft.com/products/cognitive-services/openai-service) | LLM or Python |
32-
| [Open AI](https://openai.com/) | LLM or Python |
31+
| [Azure OpenAI](https://azure.microsoft.com/products/cognitive-services/openai-service) | LLM or Python |
32+
| [OpenAI](https://openai.com/) | LLM or Python |
3333
| [Azure Content Safety](https://aka.ms/acs-doc) | Content Safety (Text) or Python |
3434
| [Azure AI Search](https://azure.microsoft.com/products/search) (formerly Cognitive Search) | Vector DB Lookup or Python |
3535
| [Serp](https://serpapi.com/) | Serp API or Python |

articles/machine-learning/v1/azure-machine-learning-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,7 @@ Azure Machine Learning is now a resource provider for Event Grid, you can config
24002400
+ **Preview features**
24012401
+ We are releasing preview support for disk encryption of your local SSD in Azure Machine Learning Compute. Raise a technical support ticket to get your subscription allow listed to use this feature.
24022402
+ Public Preview of Azure Machine Learning Batch Inference. Azure Machine Learning Batch Inference targets large inference jobs that are not time-sensitive. Batch Inference provides cost-effective inference compute scaling, with unparalleled throughput for asynchronous applications. It is optimized for high-throughput, fire-and-forget inference over large collections of data.
2403-
+ [**azureml-contrib-dataset**](/python/api/azureml-contrib-dataset)
2403+
+ **azureml-contrib-dataset**
24042404
+ Enabled functionalities for labeled dataset
24052405
```Python
24062406
import azureml.core

articles/orbital/register-spacecraft.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Submit a spacecraft authorization request in order to schedule [contacts](concep
8181
> A [Basic Support Plan](https://azure.microsoft.com/support/plans/) or higher is required to submit a spacecraft authorization request.
8282
8383
> [!NOTE]
84-
> **Private spacecraft**: prior to submitting an authorization request, you must have an active spacecraft license for your satellite and work with Mircosot to add your satellite to our ground station licenses. Microsoft can provide technical information required to complete the federal regulator and ITU processes as needed. Learn more about [initiating ground station licensing](initiate-licensing.md).
84+
> **Private spacecraft**: prior to submitting an authorization request, you must have an active spacecraft license for your satellite and work with Microsoft to add your satellite to our ground station licenses. Microsoft can provide technical information required to complete the federal regulator and ITU processes as needed. Learn more about [initiating ground station licensing](initiate-licensing.md).
8585
>
8686
> **Public spacecraft**: licensing is not required for authorization. The Azure Orbital Ground Station service supports several public satellites including Aqua, Suomi NPP, JPSS-1/NOAA-20, and Terra.
8787

articles/postgresql/migrate/how-to-migrate-single-to-flexible-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ The structure of the JSON is:
122122
{
123123
"sourceServerPassword": "<password>",
124124
"targetServerPassword": "<password>"
125-
}
125+
},
126126
"sourceServerUserName": "<username>@<servername>",
127127
"targetServerUserName": "<username>"
128128
},

0 commit comments

Comments
 (0)