Skip to content

Commit 7887988

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into avesanRefresh
2 parents f8c47fd + 0df3661 commit 7887988

22 files changed

+36
-35
lines changed

articles/active-directory-b2c/string-transformations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ The following example generates an error message when an account is already in t
446446
</Localization>
447447
```
448448

449-
The claims transformation creates a response message based on the localized string. The message contains the user's email address embedded into the localized sting *ResponseMessage_EmailExists*.
449+
The claims transformation creates a response message based on the localized string. The message contains the user's email address embedded into the localized string *ResponseMessage_EmailExists*.
450450

451451
```xml
452452
<ClaimsTransformation Id="SetResponseMessageForEmailAlreadyExists" TransformationMethod="FormatLocalizedString">

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-azure-portal-pivot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For more information about containerized applications in a serverless environmen
1515
## Prerequisites
1616

1717
- An [Azure account](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-docker-extension&mktingSource=vscode-tutorial-docker-extension)
18-
- An [Azure container registry](/azure/container-registry/container-registry-get-started-portal)
18+
- An [Azure Container Registry](/azure/container-registry/container-registry-get-started-portal)
1919
- [Azure CLI](/cli/azure/install-azure-cli)
2020
- [Docker](https://www.docker.com/community-edition)
2121

@@ -91,7 +91,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
9191

9292
1. At the top of the page, select the **Container** tab.
9393

94-
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry**. Under **Azure container registry options**, set the following values:
94+
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry**. Under **Azure Container Registry options**, set the following values:
9595

9696
- **Registry**: Select your Azure Container Registry.
9797
- **Image**: Select **dotnetcore-docs-hello-world-linux**.

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-visual-studio-code-pivot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This quickstart uses Azure Container Registry as the registry. You can use other
2727
Create a container registry by following the instructions in [Quickstart: Create a private container registry using the Azure portal](/azure/container-registry/container-registry-get-started-portal).
2828

2929
> [!IMPORTANT]
30-
> Be sure to set the **Admin User** option to **Enable** when you create the Azure container registry. You can also set it from the **Access keys** section of your registry page in the Azure portal. This setting is required for App Service access. For managed identity, see [Deploy from ACR tutorial](../../tutorial-custom-container.md?pivots=container-linux#vi-configure-the-web-app).
30+
> Be sure to set the **Admin User** option to **Enable** when you create the Azure Container Registry. You can also set it from the **Access keys** section of your registry page in the Azure portal. This setting is required for App Service access. For managed identity, see [Deploy from ACR tutorial](../../tutorial-custom-container.md?pivots=container-linux#vi-configure-the-web-app).
3131
3232
## Sign in
3333

@@ -132,7 +132,7 @@ docker --version
132132
1. Make sure the image tag begins with `<acr-name>.azurecr.io` and press **Enter**.
133133
1. When Visual Studio Code finishes pushing the image to your container registry, select **Refresh** at the top of the **REGISTRIES** explorer and verify that the image is pushed successfully.
134134

135-
:::image type="content" source="../../media/quickstart-docker/image-in-registry.png" alt-text="Screenshot shows the image deployed to Azure container registry.":::
135+
:::image type="content" source="../../media/quickstart-docker/image-in-registry.png" alt-text="Screenshot shows the image deployed to Azure Container Registry.":::
136136

137137
## Deploy to App Service
138138

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-azure-portal-pivot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This quickstart shows you how to deploy an ASP.NET app in a Windows image from A
1414
## Prerequisites
1515

1616
- An [Azure account](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-docker-extension&mktingSource=vscode-tutorial-docker-extension)
17-
- An [Azure container registry](/azure/container-registry/container-registry-get-started-portal)
17+
- An [Azure Container Registry](/azure/container-registry/container-registry-get-started-portal)
1818
- [Azure CLI](/cli/azure/install-azure-cli)
1919
- [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
2020
- [Switch Docker to run Windows containers](/virtualization/windowscontainers/quick-start/quick-start-windows-10)
@@ -94,7 +94,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
9494
9595
1. At the top of the page, select the **Container** tab.
9696
97-
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry** . Under **Azure container registry options**, set the following values:
97+
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry** . Under **Azure Container Registry options**, set the following values:
9898
9999
- **Registry**: Select your Azure Container Registry.
100100
- **Image**: Select **dotnetcore-docs-hello-world-linux**.
@@ -137,7 +137,7 @@ The App Service app pulls from the container registry each time it starts. If yo
137137
- [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
138138
- [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
139139
- [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
140-
- [Use Azure container registry with Private Link](/azure/container-registry/container-registry-private-link)
140+
- [Use Azure Container Registry with Private Link](/azure/container-registry/container-registry-private-link)
141141
- [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
142142
- [Deploy a container with Azure Pipelines](../../deploy-container-azure-pipelines.md)
143143
- [Deploy a container with GitHub Actions](../../deploy-container-github-action.md)

articles/app-service/tutorial-dotnetcore-sqldb-app.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ In this tutorial, you learn how to:
3636
::: zone pivot="azure-portal"
3737

3838
* An Azure account with an active subscription. If you don't have an Azure account, you [can create one for free](https://azure.microsoft.com/free).
39-
* A GitHub account. you can also [get one for free](https://github.com/join).
39+
* A GitHub account. You can also [get one for free](https://github.com/join).
4040
* Knowledge of ASP.NET Core development.
4141
* **(Optional)** To try GitHub Copilot, a [GitHub Copilot account](https://docs.github.com/copilot/using-github-copilot/using-github-copilot-code-suggestions-in-your-editor). A 30-day free trial is available.
4242

@@ -83,7 +83,7 @@ First, you set up a sample data-driven app as a starting point. For your conveni
8383
:::column span="2":::
8484
**Step 2:** In the GitHub fork:
8585
1. Select **main** > **starter-no-infra** for the starter branch. This branch contains just the sample project and no Azure-related files or configuration.
86-
1. Select **Code** > **Create codespace on starter-no-infra**.
86+
1. Select **Code** > **Codespaces** > **Create codespace on starter-no-infra**.
8787
The codespace takes a few minutes to set up.
8888
:::column-end:::
8989
:::column:::
@@ -212,9 +212,10 @@ The creation wizard generated the connectivity variable for you already as [.NET
212212
1. Select the **Networking** tab.
213213
1. Unselect **Enable public access**.
214214
1. Select **Create a private endpoint**.
215-
1. In **Resource Group**, select **msdocs-core-sql-tutorial**.
215+
1. In **Resource group**, select **msdocs-core-sql-tutorial**.
216216
1. In the dialog, in **Location**, select the same location as your App Service app.
217217
1. In **Name**, type **msdocs-core-sql-XYZVvaultEndpoint**.
218+
1. In **Location**, select the same location as your App Service app.
218219
1. In **Virtual network**, select **msdocs-core-sql-XYZVnet**.
219220
1. In **Subnet**, **msdocs-core-sql-XYZSubnet**.
220221
1. Select **OK**.
@@ -265,7 +266,7 @@ The creation wizard generated the connectivity variable for you already as [.NET
265266
:::row:::
266267
:::column span="2":::
267268
**Step 7: Configure the Redis connector to use Key Vault secrets**
268-
1. In the Service Connectors page, select the checkbox next to the Cache for Redis connector, then select **Edit**.
269+
1. In the Service Connector page, select the checkbox next to the Cache for Redis connector, then select **Edit**.
269270
1. Select the **Authentication** tab.
270271
1. Select **Store Secret in Key Vault**.
271272
1. Under **Key Vault Connection**, select the key vault you created.
@@ -425,7 +426,7 @@ With the SQL Database protected by the virtual network, the easiest way to run [
425426
:::column span="2":::
426427
**Step 1:** Back in the App Service page, in the left menu,
427428
1. Select **Development Tools** > **SSH**.
428-
1. Select **Go**.
429+
1. Select **Go**. (The start up takes a few minutes.)
429430
:::column-end:::
430431
:::column:::
431432
:::image type="content" source="./media/tutorial-dotnetcore-sqldb-app/azure-portal-generate-db-schema-1.png" alt-text="A screenshot showing how to open the SSH shell for your app from the Azure portal." lightbox="./media/tutorial-dotnetcore-sqldb-app/azure-portal-generate-db-schema-1.png":::

articles/azure-functions/functions-bindings-web-pubsub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The Web PubSub extension is part of an [extension bundle], which is specified in
7272
By default, an application setting named `WebPubSubConnectionString` is used to store your Web PubSub connection string. When you choose to use a different setting name for your connection, you must explicitly set that as the key name in your binding definitions. During local development, you must also add this setting to the `Values` collection in the the [_local.settings.json_ file](./functions-develop-local.md#local-settings-file).
7373

7474
> [!IMPORTANT]
75-
> A connection string includes the authorization information required for your application to access Azure Web PubSub service. The access key inside the connection string is similar to a root password for your service. For optimal security, your function app should use managed idenities when connecting to the Web PubSub service instead of using a connection string. For more information, see [Authorize a managed identity request by using Microsoft Entra ID](../azure-web-pubsub/howto-authorize-from-managed-identity.md).
75+
> A connection string includes the authorization information required for your application to access Azure Web PubSub service. The access key inside the connection string is similar to a root password for your service. For optimal security, your function app should use managed identities when connecting to the Web PubSub service instead of using a connection string. For more information, see [Authorize a managed identity request by using Microsoft Entra ID](../azure-web-pubsub/howto-authorize-from-managed-identity.md).
7676
7777
For details on how to configure and use Web PubSub and Azure Functions together, refer to [Tutorial: Create a serverless notification app with Azure Functions and Azure Web PubSub service](../azure-web-pubsub/tutorial-serverless-notification.md).
7878

articles/azure-signalr/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ landingContent:
124124
url: howto-network-access-control.md
125125
- text: Custom domain
126126
url: howto-custom-domain.md
127-
- text: Managed identites
127+
- text: Managed identities
128128
url: howto-use-managed-identity.md
129129
- text: Availability Zones
130130
url: availability-zones.md

articles/communication-services/concepts/voice-video-calling/includes/user-facing-diagnostics-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following user-facing diagnostics are available:
3333
| -------------------------------- | ------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
3434
| noSpeakerDevicesAvailable | there's no audio output device (speaker) on the user's system. | - Set to `True` when there are no speaker devices on the system, and speaker selection is supported. <br/> - Set to `False` when there's a least one speaker device on the system, and speaker selection is supported. | All speakers are unplugged | When value set to `True`, consider giving visual notification to end user that their current call session doesn't have any speakers available. |
3535
| speakingWhileMicrophoneIsMuted | Speaking while being on mute. | - Set to `True` when local microphone is muted and the local user is speaking. <br/> - Set to `False` when local user either stops speaking, or unmutes the microphone. <br/> - This diagnostic event can be automatically disabled if it is triggered for a certain amount of times without any user action to avoid noise and provide a better user experience. It will be re-enabled again when a new mute action occurs. | During a call, mute your microphone and speak into it. | When value set to `True` consider giving visual notification to end user that they might be talking and not realizing that their audio is muted. |
36-
| noMicrophoneDevicesAvailable | No audio capture devices (microphone) on the user's system | - Set to `True` when there are no microphone devices on the system. <br/> - Set to `False` when there's at least one microphone device on the system. | All microphones are unplugged during the call. | When value set to `True` consider giving visual notification to end user that their current call session doesn't have a microphone. For more information, see [enable microphone from device manger](../../best-practices.md#plug-in-a-microphone-or-enable-a-microphone-from-the-device-manager-when-a-call-is-in-progress) section. |
36+
| noMicrophoneDevicesAvailable | No audio capture devices (microphone) on the user's system | - Set to `True` when there are no microphone devices on the system. <br/> - Set to `False` when there's at least one microphone device on the system. | All microphones are unplugged during the call. | When value set to `True` consider giving visual notification to end user that their current call session doesn't have a microphone. For more information, see [enable microphone from device manager](../../best-practices.md#plug-in-a-microphone-or-enable-a-microphone-from-the-device-manager-when-a-call-is-in-progress) section. |
3737
| microphoneNotFunctioning | Microphone isn't functioning. | - Set to `True` when we fail to start sending local audio stream because the microphone device may have been disabled in the system or it's being used by another process. This UFD takes about 10 seconds to get raised. <br/> - Set to `False` when microphone starts to successfully send audio stream again. | No microphones available, microphone access disabled in a system | When value set to `True` give visual notification to end user that there's a problem with their microphone. |
3838
| microphoneMuteUnexpectedly | Microphone is muted | - Set to `True` when microphone enters muted state unexpectedly. <br/> - Set to `False` when microphone starts to successfully send audio stream | Microphone is muted from the system. Most cases happen when user is on an Azure Communication Services call on a mobile device and a phone call comes in. In most cases, the operating system mutes the Azure Communication Services call so a user can answer the phone call. | When value is set to `True`, give visual notification to end user that their call was muted because a phone call came in. For more information, see how to best handle [OS muting an Azure Communication Services call](../../best-practices.md#handle-the-os-muting-a-call-when-a-phone-call-comes-in) section for more details. |
3939
| microphonePermissionDenied | there's low volume from device or it's almost silent on macOS. | - Set to `True` when audio permission is denied from the system settings (audio). <br/> - Set to `False` on successful stream acquisition. <br/> Note: This diagnostic only works on macOS. | Microphone permissions are disabled in the Settings. | When value is set to `True`, give visual notification to end user that they didn't enable permission to use microphone for an Azure Communication Services call. |

0 commit comments

Comments
 (0)