Skip to content

Commit 6f87167

Browse files
authored
Merge branch 'main' into ga-chili-central
2 parents 60a06bf + d5792f4 commit 6f87167

File tree

7,430 files changed

+145908
-94226
lines changed

Some content is hidden

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

7,430 files changed

+145908
-94226
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: 190 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,110 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/traffic-analytics-schema-update.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/traffic-analytics-schema-update",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools.md",
10+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/network-watcher/network-watcher-nsg-grafana.md",
15+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-nsg-grafana",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/network-watcher/network-watcher-analyze-nsg-flow-logs-graylog.md",
20+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-analyze-nsg-flow-logs-graylog",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/api-management/migrate-stv1-to-stv2-no-vnet.md",
25+
"redirect_url": "/previous-versions/azure/api-management/migrate-stv1-to-stv2-no-vnet",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/api-management/migrate-stv1-to-stv2-vnet.md",
30+
"redirect_url": "/previous-versions/azure/api-management/migrate-stv1-to-stv2-vnet",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/api-management/migrate-stv1-to-stv2.md",
35+
"redirect_url": "/previous-versions/azure/api-management/migrate-stv1-to-stv2",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/api-management/breaking-changes/stv1-platform-retirement-august-2024.md",
40+
"redirect_url": "/previous-versions/azure/api-management/breaking-changes/stv1-platform-retirement-august-2024",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/api-management/breaking-changes/stv1-platform-retirement-sovereign-clouds-february-2025.md",
45+
"redirect_url": "/previous-versions/azure/api-management/breaking-changes/stv1-platform-retirement-sovereign-clouds-february-2025",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/api-management/breaking-changes/self-hosted-gateway-v0-v1-retirement-oct-2023.md",
50+
"redirect_url": "/previous-versions/azure/api-management/breaking-changes/self-hosted-gateway-v0-v1-retirement-oct-2023",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/api-management/compute-infrastructure.md",
55+
"redirect_url": "/previous-versions/azure/api-management/compute-infrastructure",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/cdn/cdn-caching-rules.md",
60+
"redirect_url": "/previous-versions/azure/cdn/cdn-caching-rules",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/cdn/cdn-dynamic-site-acceleration.md",
65+
"redirect_url": "/previous-versions/azure/cdn/cdn-dynamic-site-acceleration",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/cdn/cdn-caching-policy.md",
70+
"redirect_url": "/previous-versions/azure/cdn/cdn-caching-policy",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/cdn/cdn-manage-expiration-of-blob-content.md",
75+
"redirect_url": "/previous-versions/azure/cdn/cdn-manage-expiration-of-blob-content",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/cdn/cdn-manage-expiration-of-cloud-service-content.md",
80+
"redirect_url": "/previous-versions/azure/cdn/cdn-manage-expiration-of-cloud-service-content",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/cdn/cdn-http-variables.md",
85+
"redirect_url": "/previous-versions/azure/cdn/cdn-http-variables",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/cdn/cdn-advanced-http-reports.md",
90+
"redirect_url": "/previous-versions/azure/cdn/cdn-advanced-http-reports",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/cdn/cdn-preload-endpoint.md",
95+
"redirect_url": "/previous-versions/azure/cdn/cdn-preload-endpoint",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/cdn/cdn-real-time-stats.md",
100+
"redirect_url": "/previous-versions/azure/cdn/cdn-real-time-stats",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "articles/cdn/cdn-token-auth.md",
105+
"redirect_url": "/previous-versions/azure/cdn/cdn-token-auth",
106+
"redirect_document_id": false
107+
},
3108
{
4109
"source_path": "articles/cdn/edgio-retirement-faq.md",
5110
"redirect_url": "/previous-versions/azure/cdn/edgio-retirement-faq",
@@ -142,7 +247,7 @@
142247
},
143248
{
144249
"source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
145-
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
250+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes"
146251
},
147252
{
148253
"source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
@@ -2308,7 +2413,12 @@
23082413
"source_path_from_root": "/articles/app-service/manage-disaster-recovery.md",
23092414
"redirect_url": "/azure/architecture/web-apps/guides/multi-region-app-service/multi-region-app-service",
23102415
"redirect_document_id": false
2311-
},
2416+
},
2417+
{
2418+
"source_path_from_root": "/articles/app-service/app-service-configure-premium-tier.md",
2419+
"redirect_url": "/azure/app-service/app-service-configure-premium-v4-tier",
2420+
"redirect_document_id": false
2421+
},
23122422
{
23132423
"source_path_from_root": "/articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
23142424
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
@@ -6471,27 +6581,27 @@
64716581
},
64726582
{
64736583
"source_path": "articles/cloud-services/cloud-services-guestos-family-2-3-4-retirement.md",
6474-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-family-2-3-4-retirement",
6584+
"redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-family-2-3-4-retirement",
64756585
"redirect_document_id": false
64766586
},
64776587
{
64786588
"source_path": "articles/cloud-services/cloud-services-guestos-family1-retirement.md",
6479-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-family1-retirement",
6589+
"redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-family-1-retirement",
64806590
"redirect_document_id": false
64816591
},
64826592
{
64836593
"source_path": "articles/cloud-services/cloud-services-guestos-msrc-releases.md",
6484-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-msrc-releases",
6594+
"redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-microsoft-security-response-center-releases",
64856595
"redirect_document_id": false
64866596
},
64876597
{
64886598
"source_path": "articles/cloud-services/cloud-services-guestos-retirement-policy.md",
6489-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-retirement-policy",
6599+
"redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-retirement-policy",
64906600
"redirect_document_id": false
64916601
},
64926602
{
64936603
"source_path": "articles/cloud-services/cloud-services-guestos-update-matrix.md",
6494-
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-update-matrix",
6604+
"redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-update-matrix",
64956605
"redirect_document_id": false
64966606
},
64976607
{
@@ -6740,7 +6850,7 @@
67406850
"redirect_document_id": false
67416851
},
67426852
{
6743-
"source_path": "articles/work-with-styx-objects-and-indicators.md",
6853+
"source_path": "articles/sentinel/work-with-styx-objects-and-indicators.md",
67446854
"redirect_url": "/azure/sentinel/work-with-styx-objects-indicators",
67456855
"redirect_document_id": false
67466856
},
@@ -6752,7 +6862,12 @@
67526862
{
67536863
"source_path": "articles/defender-for-iot/organizations/extra-deploy-enterprise-iot.md",
67546864
"redirect_url": "/azure/defender-for-iot/organizations/eiot-defender-for-endpoint",
6755-
"redirect_document_id": false
6865+
"redirect_document_id": false
6866+
},
6867+
{
6868+
"source_path": "articles/cyclecloud/how-to/slurm-cloud-bursting-setup.md",
6869+
"redirect_url": "/azure/cyclecloud/how-to/bursting/slurm-cloud-bursting-setup",
6870+
"redirect_document_id": false
67566871
},
67576872
{
67586873
"source_path": "articles/sentinel/work-with-styx-objects-indicators.md",
@@ -6761,7 +6876,27 @@
67616876
},
67626877
{
67636878
"source_path_from_root": "/articles/azure-functions/migration.md",
6764-
"redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
6879+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6880+
"redirect_document_id": false
6881+
},
6882+
{
6883+
"source_path": "articles/azure-functions/migration/migrate-lambda-workloads-overview.md",
6884+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6885+
"redirect_document_id": false
6886+
},
6887+
{
6888+
"source_path": "articles/azure-functions/migration/discover-lambda-workloads.md",
6889+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6890+
"redirect_document_id": false
6891+
},
6892+
{
6893+
"source_path": "articles/azure-functions/migration/assess-lambda-workloads.md",
6894+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6895+
"redirect_document_id": false
6896+
},
6897+
{
6898+
"source_path": "articles/azure-functions/migration/migrate-lambda-workloads.md",
6899+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
67656900
"redirect_document_id": false
67666901
},
67676902
{
@@ -6784,5 +6919,50 @@
67846919
"redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
67856920
"redirect_document_id": false
67866921
},
6922+
{
6923+
"source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
6924+
"redirect_url": "/azure/storage/files/storage-files-prevent-file-share-deletion",
6925+
"redirect_document_id": false
6926+
},
6927+
{
6928+
"source_path": "articles/defender-for-iot/organizations/release-notes-archive.md",
6929+
"redirect_url": "/azure/defender-for-iot/organizations/release-notes-ot-monitoring-sensor-archive",
6930+
"redirect_document_id": false
6931+
},
6932+
{
6933+
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-portal.md",
6934+
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6935+
"redirect_document_id": false
6936+
},
6937+
{
6938+
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-powershell.md",
6939+
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6940+
"redirect_document_id": false
6941+
},
6942+
{
6943+
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-cli.md",
6944+
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6945+
"redirect_document_id": false
6946+
},
6947+
{
6948+
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-template.md",
6949+
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6950+
"redirect_document_id": false
6951+
},
6952+
{
6953+
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-terraform.md",
6954+
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6955+
"redirect_document_id": false
6956+
},
6957+
{
6958+
"source_path": "articles/nat-gateway/quickstart-create-nat-gateway-bicep.md",
6959+
"redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
6960+
"redirect_document_id": false
6961+
},
6962+
{
6963+
"source_path": "articles/defender-for-iot/organizations/eiot-sensor.md",
6964+
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
6965+
"redirect_document_id": false
6966+
}
67876967
]
67886968
}

ThirdPartyNotices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ see the [LICENSE](LICENSE) file, and grant you a license to any code in the repo
77
Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
88
may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
99
The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
10-
Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
10+
You can find Microsoft general trademark guidelines at [Microsoft Trademark and Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks).
1111

12-
Privacy information can be found at https://privacy.microsoft.com/en-us/
12+
For privacy information, see [privacy at Microsoft](https://privacy.microsoft.com/en-us/).
1313

1414
Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
1515
or trademarks, whether by implication, estoppel, or otherwise.

articles/active-directory-b2c/aad-sspr-technical-profile.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ ms.subservice: b2c
2121

2222
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
2323

24+
[!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
25+
2426
Azure Active Directory B2C (Azure AD B2C) provides support for verifying an email address for self-service password reset (SSPR). Use the Microsoft Entra ID SSPR technical profile to generate and send a code to an email address, and then verify the code. The Microsoft Entra ID SSPR technical profile may also return an error message. The validation technical profile validates the user-provided data before the user journey continues. With the validation technical profile, an error message displays on a self-asserted page.
2527

2628
This technical profile:

articles/active-directory-b2c/access-tokens.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ms.subservice: b2c
1818
---
1919
# Request an access token in Azure Active Directory B2C
2020

21+
[!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
22+
2123
An *access token* contains claims that you can use in Azure Active Directory B2C (Azure AD B2C) to identify the granted permissions to your APIs. To call a resource server, the HTTP request must include an access token. An access token is denoted as **access_token** in the responses from Azure AD B2C.
2224

2325
This article shows you how to request an access token for a web application and web API. For more information about tokens in Azure AD B2C, see the [overview of tokens in Azure Active Directory B2C](tokens-overview.md).

articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ ms.subservice: b2c
2121

2222
# Define a Microsoft Entra technical profile in an Azure Active Directory B2C custom policy
2323

24+
[!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
25+
2426
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
2527

2628
<!-- docutune:ignored "AAD-" -->

articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ zone_pivot_groups: b2c-policy-type
1515
---
1616

1717
# Enrich tokens with claims from external sources using API connectors
18+
19+
[!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
20+
1821
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
1922
Azure Active Directory B2C (Azure AD B2C) enables identity developers to integrate an interaction with a RESTful API into their user flow using [API connectors](api-connectors-overview.md). It enables developers to dynamically retrieve data from external identity sources. At the end of this walkthrough, you'll be able to create an Azure AD B2C user flow that interacts with APIs to enrich tokens with information from external sources.
2023
::: zone pivot="b2c-user-flow"

0 commit comments

Comments
 (0)