Skip to content

Commit e5ca4a1

Browse files
Merge pull request #301998 from MicrosoftDocs/main
Merged by Learn.Build PR Management system
2 parents ba2cc5d + 627c373 commit e5ca4a1

File tree

10 files changed

+22
-27
lines changed

10 files changed

+22
-27
lines changed

articles/app-service/quickstart-arm-template.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ To complete this quickstart, you need an Azure account with an active subscripti
2525

2626
If you're familiar with using ARM templates, you can skip to the end by selecting this :::image type="content" source="~/reusable-content/ce-skilling/azure/media/template-deployments/deploy-to-azure-button.svg" alt-text="Button to deploy the Resource Manager template to Azure." border="false" link="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fapp-service-docs-windows%2Fazuredeploy.json"::: button. This button opens the ARM template in the Azure portal.
2727

28-
:::image type="content" source="media/quickstart-arm/create-windows-code.png" alt-text="Screenshot of the ARM Template in the Azure portal.":::
29-
3028
In the Azure portal, select **Create new** to create a new Resource Group and then select the **Review + create** button to deploy the app.
3129

3230
::: zone-end
@@ -39,8 +37,6 @@ To complete this quickstart, you need an Azure account with an active subscripti
3937

4038
If you're familiar with using ARM templates, you can skip to the end by selecting this :::image type="content" source="~/reusable-content/ce-skilling/azure/media/template-deployments/deploy-to-azure-button.svg" alt-text="Button to deploy the Resource Manager template to Azure." border="false" link="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fapp-service-docs-linux%2Fazuredeploy.json"::: button. This button opens the ARM template in the Azure portal.
4139

42-
:::image type="content" source="media/quickstart-arm/create-linux.png" alt-text="Screenshot of the ARM Template in the Azure portal.":::
43-
4440
In the Azure portal, select **Create new** to create a new Resource Group and then select the **Review + create** button to deploy the app.
4541
::: zone-end
4642
::: zone pivot="platform-windows-container"
@@ -50,8 +46,6 @@ Get started with [Azure App Service](overview.md) by deploying an app to the clo
5046

5147
If you're familiar with using ARM templates, you can skip to the end by selecting this :::image type="content" source="~/reusable-content/ce-skilling/azure/media/template-deployments/deploy-to-azure-button.svg" alt-text="Button to deploy the Resource Manager template to Azure." border="false" link="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fapp-service-docs-windows-container%2Fazuredeploy.json"::: button. This button opens the ARM template in the Azure portal.
5248

53-
:::image type="content" source="media/quickstart-arm/create-windows-container.png" alt-text="Screenshot of the ARM Template in the Azure portal.":::
54-
5549
In the Azure portal, select **Create new** to create a new Resource Group and then select the **Review + create** button to deploy the app.
5650
::: zone-end
5751

@@ -97,7 +91,7 @@ This template contains several parameters that are predefined for your convenien
9791
| appServicePlanName | string | `webAppPlan-<uniqueString>` | App Service Plan name based on a [unique string value](../azure-resource-manager/templates/template-functions-string.md#uniquestring) |
9892
| location | string | `[resourceGroup().location]` | [App region](../azure-resource-manager/templates/template-functions-resource.md#resourcegroup)
9993
| sku | string | `F1` | Instance size (F1 = Free Tier) |
100-
| linuxFxVersion | string | `DOTNETCORE|3.0` | "Programming language stack &#124; Version" |
94+
| linuxFxVersion | string | `DOTNETCORE|9.0` | "Programming language stack &#124; Version" |
10195
| repoUrl | string | ` ` | External Git repo (optional) |
10296

10397
---
@@ -162,11 +156,11 @@ az webapp config show --resource-group myResourceGroup --name <app-name> --query
162156

163157
| Language | Example |
164158
|-------------|------------------------------------------------------------------------------------|
165-
| **.NET** | linuxFxVersion="DOTNETCORE&#124;3.0" |
166-
| **Java** | linuxFxVersion="JAVA&#124;21-java21 TOMCAT&#124;10.1-java21 JBOSSEAP&#124;8-java17"|
167-
| **Node.js** | linuxFxVersion="NODE&#124;10.15" |
168-
| **Python** | linuxFxVersion="PYTHON&#124;3.7" |
169-
| **PHP** | linuxFxVersion="PHP&#124;7.4" |
159+
| **.NET** | linuxFxVersion="DOTNETCORE&#124;9.0" |
160+
| **Java** | linuxFxVersion="JAVA&#124;21-java21 TOMCAT&#124;11.0-java21 JBOSSEAP&#124;8-java17"|
161+
| **Node.js** | linuxFxVersion="NODE&#124;22-lts |
162+
| **Python** | linuxFxVersion="PYTHON&#124;3.13" |
163+
| **PHP** | linuxFxVersion="PHP&#124;8.4" |
170164

171165
---
172166
::: zone-end
@@ -220,3 +214,4 @@ When no longer needed, [delete the resource group](../azure-resource-manager/man
220214
221215
> [!div class="nextstepaction"]
222216
> [Secure with custom domain and certificate](tutorial-secure-domain-certificate.md)
217+

articles/app-service/tutorial-php-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ The creation wizard generated the connectivity variables for you already as [app
239239
A **Create connection** dialog is opened on top of the edit dialog.
240240
:::column-end:::
241241
:::column:::
242-
:::image type="content" source="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png" alt-text="A screenshot showing how to edit a service connector with a key vault connection." lightbox="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png":::
242+
:::image type="content" source="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png" alt-text="A screenshot that shows how to edit a service connector with a key vault connection." lightbox="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png":::
243243
:::column-end:::
244244
:::row-end:::
245245
:::row:::

articles/azure-resource-manager/managed-applications/publish-bicep-definition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To complete the tasks in this article, you need the following items:
3333
## Create a Bicep file
3434

3535
> [!Note]
36-
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
36+
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
3737
3838
Every managed application definition includes a file named _mainTemplate.json_. The template defines the Azure resources to deploy and is no different than a regular ARM template. You can develop the template using Bicep and then convert the Bicep file to JSON.
3939

articles/azure-resource-manager/managed-applications/publish-service-catalog-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To complete this quickstart, you need the following items:
3434
## Create the ARM template
3535

3636
> [!Note]
37-
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
37+
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
3838
3939
Every managed application definition includes a file named _mainTemplate.json_. The template defines the Azure resources to deploy and is no different than a regular ARM template.
4040

articles/azure-resource-manager/managed-applications/publish-service-catalog-bring-your-own-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To complete this quickstart, you need the following items:
3535
## Create the ARM template
3636

3737
> [!Note]
38-
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
38+
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
3939
4040
Every managed application definition includes a file named _mainTemplate.json_. The template defines the Azure resources to deploy and is no different than a regular ARM template.
4141

articles/azure-resource-manager/managed-applications/reference-main-template-artifact.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This article is a reference for a _mainTemplate.json_ artifact in Azure Managed
1212
## Deployment template
1313

1414
> [!Note]
15-
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
15+
> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
1616
1717
The following JSON shows an example of _mainTemplate.json_ file for Azure Managed Applications:
1818

articles/confidential-computing/confidential-vm-overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ Pricing depends on your confidential VM size. For more information, see the [Pri
122122

123123
Confidential VMs *don't support*:
124124

125-
- [Azure Backup](https://learn.microsoft.com/azure/backup/backup-overview)
125+
- [Azure Backup](/azure/backup/backup-overview)
126126
- [Azure Site Recovery](https://azure.microsoft.com/products/site-recovery/)
127-
- Limited [Azure Compute Gallery](https://learn.microsoft.com/azure/virtual-machines/azure-compute-gallery) support
128-
- [Shared disks](https://learn.microsoft.com/azure/virtual-machines/disks-shared)
129-
- [Accelerated Networking](https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview)
130-
- [Live migration](https://learn.microsoft.com/windows-server/virtualization/hyper-v/manage/live-migration-overview)
131-
- [Screenshots under boot diagnostics](https://learn.microsoft.com/azure/virtual-machines/boot-diagnostics#boot-diagnostics-view)
132-
- [Dynamic memory](https://learn.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831766(v=ws.11))
127+
- Limited [Azure Compute Gallery](/azure/virtual-machines/azure-compute-gallery) support
128+
- [Shared disks](/azure/virtual-machines/disks-shared)
129+
- [Accelerated Networking](/azure/virtual-network/accelerated-networking-overview)
130+
- [Live migration](/windows-server/virtualization/hyper-v/manage/live-migration-overview)
131+
- [Screenshots under boot diagnostics](/azure/virtual-machines/boot-diagnostics#boot-diagnostics-view)
132+
- [Dynamic memory](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831766(v=ws.11))
133133

134134
## Next steps
135135

articles/healthcare-apis/deidentification/quickstart-asynchronous-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ az storage account update --name $StorageAccountName --public-network-access Dis
8989
```
9090

9191
## Use the python SDK
92-
The code below contains a sample from the [Azure Health Deidentification SDK for Python](https://learn.microsoft.com/python/api/overview/azure/health-deidentification?view=azure-python).
92+
The code below contains a sample from the [Azure Health Deidentification SDK for Python](/python/api/overview/azure/health-deidentification).
9393

9494
```Bash
9595

articles/healthcare-apis/register-application-cli-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ echo $clientsecret
9595

9696
## Change the flag for public client applications
9797

98-
For public client applications that use the OAuth authorization protocol or features as described in [Public client and confidential client applications](https://learn.microsoft.com/entra/identity-platform/msal-client-applications#when-should-you-enable-a-public-client-flow-in-your-app-registration), change the **Allow public client flows** flag to **Yes**. For confidential client applications, skip this step.
98+
For public client applications that use the OAuth authorization protocol or features as described in [Public client and confidential client applications](/entra/identity-platform/msal-client-applications#when-should-you-enable-a-public-client-flow-in-your-app-registration), change the **Allow public client flows** flag to **Yes**. For confidential client applications, skip this step.
9999

100100
[![Allow public client flows](media/app-registration-public-client.png)](media/app-registration-public-client.png#lightbox)
101101

articles/healthcare-apis/register-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you keep this default value, the application registration is a **confidential
3939

4040
[ ![Screenshot of confidential client application.](media/register-application-five.png) ](media/register-application-five.png#lightbox)
4141

42-
If you change the default value to "Yes" for the "Allow public client flows" option in the advanced setting, the application registration is a **public client application** and a certificate or secret isn't required. The "Yes" value is useful when you want to build a public client application using the OAuth authorization protocol or features as described in [Public client and confidential client applications](https://learn.microsoft.com/entra/identity-platform/msal-client-applications#when-should-you-enable-a-public-client-flow-in-your-app-registration).
42+
If you change the default value to "Yes" for the "Allow public client flows" option in the advanced setting, the application registration is a **public client application** and a certificate or secret isn't required. The "Yes" value is useful when you want to build a public client application using the OAuth authorization protocol or features as described in [Public client and confidential client applications](/entra/identity-platform/msal-client-applications#when-should-you-enable-a-public-client-flow-in-your-app-registration).
4343

4444
For tools that require a redirect URL, select **Add a platform** to configure the platform.
4545

0 commit comments

Comments
 (0)