Skip to content

Commit a0e845d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afd-logs
2 parents a956ece + 64de81d commit a0e845d

File tree

95 files changed

+1061
-854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1061
-854
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/api-management/applications.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Protect Access to Product APIs with Microsoft Entra Application - Azure API Management
2+
title: Securely Access Products and APIs - Microsoft Entra Applications - Azure API Management
33
titleSuffix: Azure API Management
44
description: Configure OAuth 2.0 access to product APIs in Azure API Management with Microsoft Entra ID applications.
55
services: api-management
@@ -11,7 +11,7 @@ ms.date: 05/19/2025
1111
ms.author: danlep
1212
ms.custom:
1313
---
14-
# Secure product API access with Microsoft Entra applications
14+
# Securely access products and APIs with Microsoft Entra applications
1515

1616
[!INCLUDE [api-management-availability-premium-dev-standard-basic](../../includes/api-management-availability-premium-dev-standard-basic.md)]
1717

@@ -64,14 +64,14 @@ The following example uses the **Starter** product, but choose any published pro
6464
1. In the left menu, under **APIs**, select **Products**.
6565
1. Choose the product that you want to configure, such as the **Starter** product.
6666
1. In the left menu, under **Product**, select **Properties**.
67-
1. Enable the **Application based access** setting.
68-
1. Optionally, enable the **Requires subscription** setting. If you enable both application based access and a subscription requirement, the API Management gateway can accept either OAuth 2.0 authorization or a subscription key for access to the product's APIs.
67+
1. In the **Application based access** section, enable the **OAuth 2.0 token (most secure)** setting.
68+
1. Optionally, enable the **Subscription key** setting. If you enable both application based access and a subscription requirement, the API Management gateway can accept either an OAuth 2.0 token or a subscription key for access to the product's APIs.
6969
1. Select **Save**.
7070

7171
:::image type="content" source="media/applications/enable-application-based-access.png" alt-text="Screenshot of enabling application based access in the portal.":::
7272

7373
> [!TIP]
74-
> You can also enable the **Application based access** setting when creating a new product.
74+
> You can also enable the **OAuth 2.0 token** setting when creating a new product.
7575
7676
Enabling application based access creates a backend enterprise application in Microsoft Entra ID to represent the product. The backend application ID is displayed in the product's **Properties** page.
7777

42.4 KB
Loading
9.03 KB
Loading

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/application-gateway/for-containers/prometheus-grafana.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Configure Application Gateway for Containers metrics to be sent to
44
services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-appgw-for-containers
7-
ms.topic: article
7+
ms.topic: how-to
88
ms.date: 10/21/2024
99
ms.author: greglin
1010
---

articles/application-gateway/for-containers/siem-integration-with-sentinel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Configure Application Gateway for Containers for SIEM integration w
44
services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-appgw-for-containers
7-
ms.topic: article
7+
ms.topic: how-to
88
ms.date: 07/11/2024
99
ms.author: greglin
1010
---

0 commit comments

Comments
 (0)