Skip to content

Commit f271544

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sv2ga
2 parents 5a52ad4 + 5f2bf77 commit f271544

File tree

780 files changed

+17227
-4332
lines changed

Some content is hidden

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

780 files changed

+17227
-4332
lines changed

.gitignore

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,23 @@ AzureMigration.ps1
2626
*.pdn
2727

2828
# Pycharm
29-
.idea/*
29+
.idea/*
30+
articles/planetary-computer/doc-tree-generator.py
31+
.gitignore
32+
articles/planetary-computer/article_links_diagram.md
33+
articles/planetary-computer/index_helper.py
34+
articles/planetary-computer/metadata_index.csv
35+
articles/planetary-computer/broken_link_checker.py
36+
articles/planetary-computer/broken_links_external.csv
37+
articles/planetary-computer/broken_links.csv
38+
articles/planetary-computer/check_orphaned_docs.py
39+
40+
# Python cache files
41+
*.pyc
42+
__pycache__/
43+
articles/planetary-computer/interesting_stats.py
44+
articles/planetary-computer/locate_text.py
45+
articles/planetary-computer/image_syntax_checker.py
46+
articles/planetary-computer/image-file-fixer.py
47+
articles/planetary-computer/orphaned-media.py
48+
articles/planetary-computer/orphaned_media_files.txt

.openpublishing.publish.config.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,30 @@
140140
"branch": "main",
141141
"branch_mapping": {}
142142
},
143+
{
144+
"path_to_root": "remote-mcp-functions-dotnet",
145+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-dotnet",
146+
"branch": "main",
147+
"branch_mapping": {}
148+
},
149+
{
150+
"path_to_root": "remote-mcp-functions-typescript",
151+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-typescript",
152+
"branch": "main",
153+
"branch_mapping": {}
154+
},
155+
{
156+
"path_to_root": "remote-mcp-functions-python",
157+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-python",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
161+
{
162+
"path_to_root": "remote-mcp-functions-java",
163+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-java",
164+
"branch": "main",
165+
"branch_mapping": {}
166+
},
143167
{
144168
"path_to_root": "azure-functions-durable-js",
145169
"url": "https://github.com/Azure/azure-functions-durable-js",
@@ -158,6 +182,12 @@
158182
"branch": "dev",
159183
"branch_mapping": {}
160184
},
185+
{
186+
"path_to_root": "azure-functions-mongodb-extension",
187+
"url": "https://github.com/Azure/Azure-functions-mongodb-extension",
188+
"branch": "main",
189+
"branch_mapping": {}
190+
},
161191
{
162192
"path_to_root": "azure-functions-nodejs-v4",
163193
"url": "https://github.com/Azure/azure-functions-nodejs-samples",

.openpublishing.redirection.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
},
228228
{
229229
"source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
230-
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
230+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes"
231231
},
232232
{
233233
"source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
@@ -2393,7 +2393,7 @@
23932393
"source_path_from_root": "/articles/app-service/manage-disaster-recovery.md",
23942394
"redirect_url": "/azure/architecture/web-apps/guides/multi-region-app-service/multi-region-app-service",
23952395
"redirect_document_id": false
2396-
},
2396+
},
23972397
{
23982398
"source_path_from_root": "/articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
23992399
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
@@ -6875,49 +6875,49 @@
68756875
"redirect_document_id": false
68766876
},
68776877
{
6878-
"source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
6878+
"source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
68796879
"redirect_url": "/azure/storage/files/storage-files-prevent-file-share-deletion",
68806880
"redirect_document_id": false
6881-
},
6882-
{
6881+
},
6882+
{
68836883
"source_path": "articles/defender-for-iot/organizations/release-notes-archive.md",
68846884
"redirect_url": "/azure/defender-for-iot/organizations/release-notes-ot-monitoring-sensor-archive",
6885-
"redirect_document_id": false
6886-
},
6887-
{
6885+
"redirect_document_id": false
6886+
},
6887+
{
68886888
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-portal.md",
68896889
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6890-
"redirect_document_id": false
6891-
},
6892-
{
6890+
"redirect_document_id": false
6891+
},
6892+
{
68936893
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-powershell.md",
68946894
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6895-
"redirect_document_id": false
6896-
},
6897-
{
6895+
"redirect_document_id": false
6896+
},
6897+
{
68986898
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-cli.md",
68996899
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6900-
"redirect_document_id": false
6901-
},
6902-
{
6900+
"redirect_document_id": false
6901+
},
6902+
{
69036903
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-template.md",
69046904
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6905-
"redirect_document_id": false
6906-
},
6907-
{
6905+
"redirect_document_id": false
6906+
},
6907+
{
69086908
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-terraform.md",
69096909
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6910-
"redirect_document_id": false
6911-
},
6912-
{
6910+
"redirect_document_id": false
6911+
},
6912+
{
69136913
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-bicep.md",
69146914
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6915-
"redirect_document_id": false
6916-
},
6917-
{
6915+
"redirect_document_id": false
6916+
},
6917+
{
69186918
"source_path": "articles/defender-for-iot/organizations/eiot-sensor.md",
69196919
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
69206920
"redirect_document_id": false
69216921
}
69226922
]
6923-
}
6923+
}

articles/app-service/configure-basic-auth-disable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following table shows how various deployment methods behave when basic authe
6868

6969
| Deployment method | When basic authentication is disabled |
7070
|-|-|
71-
| Visual Studio deployment | Doesn't work. |
71+
| Visual Studio deployment | Deployment with Microsoft Entra authentication requires Visual Studio 2022 version 17.12 or later. |
7272
| [FTP](deploy-ftp.md) | Doesn't work. |
7373
| [Local Git](deploy-local-git.md) | Doesn't work. |
7474
| Azure CLI | In the Azure CLI 2.48.1 or higher, the following commands fall back to Microsoft Entra authentication:<br/>[`az webapp up`](/cli/azure/webapp#az-webapp-up).<br/>[`az webapp deploy`](/cli/azure/webapp#az-webapp-deploy).<br/>[`az webapp log deployment show`](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-show).<br/>[`az webapp log deployment list`](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-list).<br/>[`az webapp log download`](/cli/azure/webapp/log#az-webapp-log-download).<br/>[`az webapp log tail`](/cli/azure/webapp/log#az-webapp-log-tail).<br/>[`az webapp browse`](/cli/azure/webapp#az-webapp-browse).<br/>[`az webapp create-remote-connection`](/cli/azure/webapp#az-webapp-create-remote-connection).<br/>[`az webapp ssh`](/cli/azure/webapp#az-webapp-ssh).<br/>[`az functionapp deploy`](/cli/azure/functionapp#az-functionapp-deploy).<br/>[`az functionapp log deployment list`](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-list).<br/>[`az functionapp log deployment show`](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-show).<br/>[`az functionapp deployment source config-zip`](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip). |

articles/app-service/deploy-authentication-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ With Azure App Service, you have multiple options for deploying your web applica
2222
| SCM/Kudu/OneDeploy REST endpoint | Basic authentication<br/><br/>Microsoft Entra | [Deploy files to App Service](deploy-zip.md) |
2323
| Kudu UI | Basic authentication<br/><br/>Microsoft Entra | [Deploy files to App Service](deploy-zip.md) |
2424
| FTP/FTPS | Basic authentication | [Deploy your app to Azure App Service by using FTP/S](deploy-ftp.md) |
25-
| Visual Studio | Basic authentication  | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Develop and deploy WebJobs by using Visual Studio](webjobs-dotnet-deploy-vs.md)<br/><br/>[Troubleshoot an app in Azure App Service by using Visual Studio](troubleshoot-dotnet-visual-studio.md)<br/><br/>[GitHub Actions integration in Visual Studio](/visualstudio/azure/overview-github-actions)<br/><br/>[Deploy your application to Azure by using GitHub Actions workflows created by Visual Studio](/visualstudio/deployment/azure-deployment-using-github-actions) |
25+
| Visual Studio | Basic authentication<br/><br/>Microsoft Entra  | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Develop and deploy WebJobs by using Visual Studio](webjobs-dotnet-deploy-vs.md)<br/><br/>[Troubleshoot an app in Azure App Service by using Visual Studio](troubleshoot-dotnet-visual-studio.md)<br/><br/>[GitHub Actions integration in Visual Studio](/visualstudio/azure/overview-github-actions)<br/><br/>[Deploy your application to Azure by using GitHub Actions workflows created by Visual Studio](/visualstudio/deployment/azure-deployment-using-github-actions) |
2626
| Visual Studio Code | Microsoft Entra | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Working with GitHub in VS Code](https://code.visualstudio.com/docs/sourcecontrol/github) |
2727
| GitHub with GitHub Actions | Publish profile (basic authentication)<br/><br/>Service principal (Microsoft Entra)<br/><br/>OpenID Connect (Microsoft Entra) | [Deploy to App Service by using GitHub Actions](deploy-github-actions.md) |
2828
| GitHub with the App Service build service as a build engine | Basic authentication | [Continuous deployment to Azure App Service](deploy-continuous-deployment.md) |
117 KB
Loading

articles/app-service/overview-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This article explains how to troubleshoot issues with your app in Azure App Serv
1515

1616
Azure App Service diagnostics is an interactive experience to help you troubleshoot your app with no configuration required. App Service diagnostics points out what's wrong and guides you to the right information to more easily and quickly troubleshoot and resolve the problem.
1717

18-
Although this experience is most helpful for problems that occured within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
18+
Although this experience is most helpful for problems that occurred within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
1919

2020
App Service diagnostics works for not only apps on Windows, but also for apps on built-in or custom containers, [App Service Environments](./environment/intro.md), and [Azure Functions](../azure-functions/functions-overview.md).
2121

articles/app-service/overview-vnet-integration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ You must have at least the following Role-based access control permissions on th
108108
|-|-|
109109
| Microsoft.Network/virtualNetworks/read | Read the virtual network definition |
110110
| Microsoft.Network/virtualNetworks/subnets/read | Read a virtual network subnet definition |
111+
| Microsoft.Network/virtualNetworks/subnets/write | Delegate the subnet. Only required when the subnet has not been delegated or has not already been used for virtual network integration |
111112
| Microsoft.Network/virtualNetworks/subnets/join/action | Joins a virtual network |
112113

113114
If the virtual network is in a different subscription than the app, you must ensure that the subscription with the virtual network is registered for the `Microsoft.Web` resource provider. You can explicitly register the provider [by following this documentation](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider), but it also automatically registers when creating the first web app in a subscription.

0 commit comments

Comments
 (0)