Skip to content

Commit b9b41c0

Browse files
authored
Merge pull request #292839 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 a9e147f + 56df32c commit b9b41c0

24 files changed

+30
-30
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,6 @@ After the policy finishes execution, you're redirected to `https://jwt.ms`, and
508508

509509
Next, learn:
510510

511-
- About [types of Technical Profiles](technicalprofiles.md#types-of-technical-profiles) in Azure AD B2C's custom policies.
511+
- About the [types of Technical Profiles](technicalprofiles.md#types-of-technical-profiles) in Azure AD B2C's custom policies.
512512

513-
- How to [Validate user inputs by using custom policy](custom-policies-series-validate-user-input.md).
513+
- How to [Validate user inputs by using custom policy](custom-policies-series-validate-user-input.md).

articles/azure-signalr/signalr-howto-authorize-managed-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Besides, you can use either [DefaultAzureCredential](/dotnet/api/overview/azure/
8787
Notice that system-assigned managed identity is used by default, but *make sure that you don't configure any environment variables* that [EnvironmentCredential](/dotnet/api/azure.identity.environmentcredential) preserved if you use `DefaultAzureCredential`. Otherwise, Azure SignalR Service falls back to use `EnvironmentCredential` to make the request, which usually results in an `Unauthorized` response.
8888

8989
> [!IMPORTANT]
90-
> Remove `Azure__SignalR__ConnectionString` if there was from environment variables in this way. `Azure__SignalR__ConnectionString` will be used to build default `ServiceEndpoint` with first priority and may leads your App Server use Access Key unexpectedly.
90+
> If `Azure__SignalR__ConnectionString` is in your environment variables, remove it. If found the environment variable will take priority and will be used to build the default `ServiceEndpoint`, which may lead your App Server to use Access Key unexpectedly.
9191
9292
```C#
9393
services.AddSignalR().AddAzureSignalR(option =>

articles/synapse-analytics/overview-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ sections:
130130
- question: |
131131
What is the difference between Apache Spark for Synapse and Apache Spark?
132132
answer: |
133-
Apache Spark for Synapse is Apache Spark with added support for integrations with other services (Microsoft Entra ID, AzureML, etc.) and additional libraries (mssparktuils, Hummingbird) and pre-tuned performance configurations.
133+
Apache Spark for Synapse is Apache Spark with added support for integrations with other services (Microsoft Entra ID, AzureML, etc.) and additional libraries (mssparkutils, Hummingbird) and pre-tuned performance configurations.
134134
135135
Any workload that is currently running on Apache Spark will run on Apache Spark for Azure Synapse without change.
136136

articles/synapse-analytics/spark/synapse-file-mount-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The article shows you how to use mount/unmount APIs in your workspace. You'll le
1919

2020
+ How to mount Data Lake Storage Gen2 or Blob Storage.
2121
+ How to access files under the mount point via the local file system API.
22-
+ How to access files under the mount point by using the `mssparktuils fs` API.
22+
+ How to access files under the mount point by using the `mssparkutils fs` API.
2323
+ How to access files under the mount point by using the Spark read API.
2424
+ How to unmount the mount point.
2525

includes/business-continuity-center-view-fired-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To monitor the alerts, follow these steps:
1212

1313
The count of all alert rules appears that have at least one or more fired alerts in the selected time range.
1414

15-
:::image type="content" source="./media/business-continuity-center-view-fired-alerts/view-triggered-alerts-in-selected-time-range.png" alt-text="Screemshot shows the triggered alerts in a selected time range." lightbox="./media/business-continuity-center-view-fired-alerts/view-triggered-alerts-in-selected-time-range.png":::
15+
:::image type="content" source="./media/business-continuity-center-view-fired-alerts/view-triggered-alerts-in-selected-time-range.png" alt-text="Screenshot shows the triggered alerts in a selected time range." lightbox="./media/business-continuity-center-view-fired-alerts/view-triggered-alerts-in-selected-time-range.png":::
1616

1717
2. On **Alerts**, filter the list by *severity of alert*, *category of alert*, *time range* (up to last 15 days), and other parameters.
1818

includes/cdn-classic-retirement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
> [!IMPORTANT]
1414
> Azure CDN Standard from Microsoft (classic) will be retired on **September 30, 2027**. To avoid any service disruption, it is important that you [**migrate your Azure CDN Standard from Microsoft (classic) profiles**](../articles/cdn/migrate-tier.md) to Azure Front Door Standard or Premium tier by September 30, 2027. For more information, see [**Azure CDN Standard from Microsoft (classic) retirement**](https://azure.microsoft.com/updates/v2/Azure-CDN-Standard-from-Microsoft-classic-will-be-retired-on-30-September-2027).
1515
>
16-
> Azure CDN from Edgio will be retired on **Januray 15, 2025**. You must [migrate your workload](../articles/frontdoor/migrate-cdn-to-front-door.md) to Azure Front Door before this date to avoid service disruption. For more information, see [**Azure CDN from Edgio retirement FAQ**](../articles/cdn/edgio-retirement-faq.md).
16+
> Azure CDN from Edgio will be retired on **January 15, 2025**. You must [migrate your workload](../articles/frontdoor/migrate-cdn-to-front-door.md) to Azure Front Door before this date to avoid service disruption. For more information, see [**Azure CDN from Edgio retirement FAQ**](../articles/cdn/edgio-retirement-faq.md).

includes/container-apps/sessions-tutorial-deploy-autogen.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ You then need to configure managed identity for the app and assign it the proper
2727
--resource-group $RESOURCE_GROUP_NAME \
2828
--location $SESSION_POOL_LOCATION \
2929
--environment $ENVIRONMENT_NAME \
30-
--env-vars 'OAI_CONFIG_LIST=[{"model": "gpt-4", "api_key": "<AZURE_OPENAI_KEY>", "api_type": "azure", "base_url": "<AZURE_OPENAI_ENDPOINT>", "api_version": "2023-12-01-preview"}]' 'POOL_MANAGEMENT_ENDPOINT=<SESSION_POOL_MANAGMENT_ENDPOINT>' \
30+
--env-vars 'OAI_CONFIG_LIST=[{"model": "gpt-4", "api_key": "<AZURE_OPENAI_KEY>", "api_type": "azure", "base_url": "<AZURE_OPENAI_ENDPOINT>", "api_version": "2023-12-01-preview"}]' 'POOL_MANAGEMENT_ENDPOINT=<SESSION_POOL_MANAGEMENT_ENDPOINT>' \
3131
--source .
3232
```
3333

34-
Replace `<AZURE_OPENAI_ENDPOINT>` with the Azure OpenAI account endpoint, `<AZURE_OPENAI_KEY>` with the Azure OpenAI key, and `<SESSION_POOL_MANAGMENT_ENDPOINT>` with the session pool management endpoint.
34+
Replace `<AZURE_OPENAI_ENDPOINT>` with the Azure OpenAI account endpoint, `<AZURE_OPENAI_KEY>` with the Azure OpenAI key, and `<SESSION_POOL_MANAGEMENT_ENDPOINT>` with the session pool management endpoint.
3535

3636
1. Enable the system-assigned managed identity for the app:
3737

includes/container-apps/sessions-tutorial-deploy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ You then need to configure managed identity for the app and assign it the proper
2828
--resource-group $RESOURCE_GROUP_NAME \
2929
--location $SESSION_POOL_LOCATION \
3030
--environment $ENVIRONMENT_NAME \
31-
--env-vars "AZURE_OPENAI_ENDPOINT=<OPEN_AI_ENDPOINT>" "POOL_MANAGEMENT_ENDPOINT=<SESSION_POOL_MANAGMENT_ENDPOINT>" \
31+
--env-vars "AZURE_OPENAI_ENDPOINT=<OPEN_AI_ENDPOINT>" "POOL_MANAGEMENT_ENDPOINT=<SESSION_POOL_MANAGEMENT_ENDPOINT>" \
3232
--source .
3333
```
3434

35-
Replace `<OPEN_AI_ENDPOINT>` with the Azure OpenAI account endpoint and `<SESSION_POOL_MANAGMENT_ENDPOINT>` with the session pool management endpoint.
35+
Replace `<OPEN_AI_ENDPOINT>` with the Azure OpenAI account endpoint and `<SESSION_POOL_MANAGEMENT_ENDPOINT>` with the session pool management endpoint.
3636

3737
1. Enable the system-assigned managed identity for the app:
3838

includes/cost-management-billing-transform-data-before-using-large-usage-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.subservice: billing
77
ms.topic: include
88
ms.date: 10/09/2020
99
ms.author: banders
10-
ms.reviwer:
10+
ms.reviewer:
1111
ms.custom: include file
1212
---
1313

includes/data-box-shares.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The following table shows the UNC path to the shares on your Data Box and Azure
1919
| Blobs and Files | Paths and URLs |
2020
| --------------- | -------------- |
2121
| 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> |
22-
| Azure Page blobs | <li>UNC path to shares: `\\<DeviceIPAddres>\<StorageAccountName_PageBlob>\<ContainerName>\files\a.txt`</li><li>Azure Storage URL: `https://<StorageAccountName>.blob.core.windows.net/<ContainerName>/files/a.txt`</li> |
23-
| Azure Files |<li>UNC path to shares: `\\<DeviceIPAddres>\<StorageAccountName_AzFile>\<ShareName>\files\a.txt`</li><li>Azure Storage URL: `https://<StorageAccountName>.file.core.windows.net/<ShareName>/files/a.txt`</li> |
22+
| 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> |
23+
| 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> |
2424

2525

0 commit comments

Comments
 (0)