Skip to content

Commit 08062ee

Browse files
authored
Merge branch 'main' into aaronmax-otel-python-comments-1
2 parents f238adf + 28e5caf commit 08062ee

File tree

6,985 files changed

+138406
-114033
lines changed

Some content is hidden

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

6,985 files changed

+138406
-114033
lines changed

.openpublishing.publish.config.json

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,12 +974,90 @@
974974
"branch": "main",
975975
"branch_mapping": {}
976976
},
977+
{
978+
"path_to_root": "cosmos-db-nosql-javascript-samples",
979+
"url": "https://github.com/azure-samples/cosmos-db-nosql-javascript-samples",
980+
"branch": "main",
981+
"branch_mapping": {}
982+
},
977983
{
978984
"path_to_root": "cosmos-db-nosql-python-samples",
979985
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
980986
"branch": "main",
981987
"branch_mapping": {}
982988
},
989+
{
990+
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
991+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
992+
"branch": "main",
993+
"branch_mapping": {}
994+
},
995+
{
996+
"path_to_root": "cosmos-db-mongodb-javascript-samples",
997+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-javascript-samples",
998+
"branch": "main",
999+
"branch_mapping": {}
1000+
},
1001+
{
1002+
"path_to_root": "cosmos-db-mongodb-python-samples",
1003+
"url": "https://github.com/azure-samples/cosmos-db-mongodb-python-samples",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
1007+
{
1008+
"path_to_root": "cosmos-db-apache-cassandra-dotnet-samples",
1009+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-dotnet-samples",
1010+
"branch": "main",
1011+
"branch_mapping": {}
1012+
},
1013+
{
1014+
"path_to_root": "cosmos-db-apache-cassandra-javascript-samples",
1015+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-javascript-samples",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
1019+
{
1020+
"path_to_root": "cosmos-db-apache-cassandra-python-samples",
1021+
"url": "https://github.com/azure-samples/cosmos-db-apache-cassandra-python-samples",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
},
1025+
{
1026+
"path_to_root": "cosmos-db-apache-gremlin-dotnet-samples",
1027+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-dotnet-samples",
1028+
"branch": "main",
1029+
"branch_mapping": {}
1030+
},
1031+
{
1032+
"path_to_root": "cosmos-db-apache-gremlin-javascript-samples",
1033+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-javascript-samples",
1034+
"branch": "main",
1035+
"branch_mapping": {}
1036+
},
1037+
{
1038+
"path_to_root": "cosmos-db-apache-gremlin-python-samples",
1039+
"url": "https://github.com/azure-samples/cosmos-db-apache-gremlin-python-samples",
1040+
"branch": "main",
1041+
"branch_mapping": {}
1042+
},
1043+
{
1044+
"path_to_root": "cosmos-db-table-dotnet-samples",
1045+
"url": "https://github.com/azure-samples/cosmos-db-table-dotnet-samples",
1046+
"branch": "main",
1047+
"branch_mapping": {}
1048+
},
1049+
{
1050+
"path_to_root": "cosmos-db-table-javascript-samples",
1051+
"url": "https://github.com/azure-samples/cosmos-db-table-javascript-samples",
1052+
"branch": "main",
1053+
"branch_mapping": {}
1054+
},
1055+
{
1056+
"path_to_root": "cosmos-db-table-python-samples",
1057+
"url": "https://github.com/azure-samples/cosmos-db-table-python-samples",
1058+
"branch": "main",
1059+
"branch_mapping": {}
1060+
},
9831061
{
9841062
"path_to_root": "azure-cosmos-db-table-dotnet-v12",
9851063
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",

.openpublishing.redirection.active-directory.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3070,6 +3070,11 @@
30703070
"redirect_url": "/azure/active-directory/conditional-access/concept-condition-filters-for-devices",
30713071
"redirect_document_id": false
30723072
},
3073+
{
3074+
"source_path_from_root": "/articles/active-directory/conditional-access/policy-migration.md",
3075+
"redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
3076+
"redirect_document_id": true
3077+
},
30733078
{
30743079
"source_path_from_root": "/articles/active-directory/conditional-access/best-practices.md",
30753080
"redirect_url": "/azure/active-directory/conditional-access/overview",
@@ -3088,7 +3093,7 @@
30883093
{
30893094
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-migration-mfa.md",
30903095
"redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
3091-
"redirect_document_id": true
3096+
"redirect_document_id": false
30923097
},
30933098
{
30943099
"source_path_from_root": "/articles/active-directory/active-directory-conditional-access-policy-connected-applications.md",

.openpublishing.redirection.api-management.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,50 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/api-management/powershell-samples.md",
5+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/api-management/scripts/powershell-add-user-and-get-subscription-key.md",
10+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/api-management/scripts/powershell-create-apim-service.md",
15+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/api-management/scripts/powershell-backup-restore-apim-service.md",
20+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/api-management/scripts/powershell-scale-and-addregion-apim-service.md",
25+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/api-management/scripts/powershell-setup-custom-domain.md",
30+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/api-management/scripts/powershell-import-api-and-add-to-product.md",
35+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/api-management/scripts/powershell-secure-backend-with-mutual-certificate-authentication.md",
40+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/api-management/scripts/powershell-setup-rate-limit-policy.md",
45+
"redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",
46+
"redirect_document_id": false
47+
},
348
{
449
"source_path_from_root": "/articles/api-management/policies/authorize-request-using-external-authorizer.md",
550
"redirect_url": "https://github.com/Azure/api-management-policy-snippets",

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"source_path_from_root": "/articles/aks/aks-planned-maintenance-weekly-releases.md",
2020
"redirect_url": "/azure/aks/planned-maintenance",
2121
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/aks/create-k8s-cluster-with-aks-application-gateway-ingress.md",
25+
"redirect_url": "/azure/application-gateway/for-containers/overview",
26+
"redirect_document_id": false
2227
}
2328
]
2429
}

.openpublishing.redirection.json

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/communication-services/tutorials/file-sharing-tutorial.md",
5+
"redirect_URL": "/azure/communication-services/tutorials/file-sharing-tutorial-acs-chat",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/azure-resource-manager/bicep/bicep-import-providers.md",
510
"redirect_URL": "bicep-import",
@@ -910,6 +915,11 @@
910915
"redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",
911916
"redirect_document_id": false
912917
},
918+
{
919+
"source_path": "articles/databox-online/azure-stack-edge-gpu-2307-release-notes.md",
920+
"redirect_url": "/azure/databox-online/azure-stack-edge-gpu-2309-release-notes",
921+
"redirect_document_id": false
922+
},
913923
{
914924
"source_path": "articles/azure-video-analyzer/video-analyzer-docs/access-policies.md",
915925
"redirect_url": "/previous-versions/azure/azure-video-analyzer/video-analyzer-docs/access-policies",
@@ -22362,6 +22372,11 @@
2236222372
"redirect_url": "/azure/communication-services/how-tos/calling-sdk/lobby",
2236322373
"redirect_document_id": false
2236422374
},
22375+
{
22376+
"source_path_from_root": "/articles/communication-services/tutorials/widgets/click-to-call-widget.md",
22377+
"redirect_url": "/azure/communication-services/tutorials/calling-widget/calling-widget-overview",
22378+
"redirect_document_id": false
22379+
},
2236522380
{
2236622381
"source_path_from_root": "/articles/load-balancer/tutorial-load-balancer-standard-manage-portal.md",
2236722382
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
@@ -23597,6 +23612,11 @@
2359723612
"redirect_url": "/azure/devtest-labs/deliver-proof-of-concept",
2359823613
"redirect_document_id": false
2359923614
},
23615+
{
23616+
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-orchestrate-implementation.md",
23617+
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-scale",
23618+
"redirect_document_id": false
23619+
},
2360023620
{
2360123621
"source_path_from_root": "/articles/devtest-labs/devtest-lab-guidance-governance-cost-ownership.md",
2360223622
"redirect_url": "/azure/devtest-labs/devtest-lab-guidance-governance-resources",
@@ -24462,9 +24482,9 @@
2446224482
"redirect_document_id": false
2446324483
},
2446424484
{
24465-
"source_path": "articles/azure-cache-for-redis/cache-how-to-functions.md",
24466-
"redirect_url": "/azure/azure-functions/functions-bindings-cache",
24467-
"redirect_document_id": false
24485+
"source_path": "articles/azure-cache-for-redis/cache-how-to-functions.md",
24486+
"redirect_url": "/azure/azure-functions/functions-bindings-cache",
24487+
"redirect_document_id": false
2446824488
},
2446924489
{
2447024490
"source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-single-page-app-vanillajs-configure-authentication.md",
@@ -24496,6 +24516,21 @@
2449624516
"redirect_url": "/azure/bastion/bastion-connect-vm-ssh-linux",
2449724517
"redirect_document_id": false
2449824518
},
24519+
{
24520+
"source_path_from_root": "/articles/app-service/overview-disaster-recovery.md",
24521+
"redirect_url": "/azure/reliability/reliability-app-service",
24522+
"redirect_document_id": false
24523+
},
24524+
{
24525+
"source_path_from_root": "/articles/azure-functions/functions-geo-disaster-recovery.md",
24526+
"redirect_url": "/azure/reliability/reliability-functions",
24527+
"redirect_document_id": false
24528+
},
24529+
{
24530+
"source_path_from_root": "/articles/hdinsight/hdinsight-business-continuity.md",
24531+
"redirect_url": "/azure/reliability/reliability-hdinsight",
24532+
"redirect_document_id": false
24533+
},
2449924534
{
2450024535
"source_path_from_root": "/articles/reliability/reliability-postgre-flexible.md",
2450124536
"redirect_url": "/azure/reliability/reliability-postgresql-flexible-server",
@@ -24510,6 +24545,11 @@
2451024545
"source_path_from_root": "/articles/aks/command-invoke.md",
2451124546
"redirect_url": "/azure/aks/access-private-cluster",
2451224547
"redirect_document_id": false
24548+
},
24549+
{
24550+
"source_path_from_root": "/articles/orbital/space-partner-program-overview.md",
24551+
"redirect_url": "/azure/orbital/overview",
24552+
"redirect_document_id": false
2451324553
}
2451424554
]
2451524555
}

articles/active-directory-b2c/TOC.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
items:
6666
- name: Compare solutions for External Identities
6767
href: ../active-directory/external-identities/external-identities-overview.md?bc=/azure/active-directory-b2c/bread/toc.json&toc=/azure/active-directory-b2c/TOC.json
68-
- name: Supported Azure AD features
68+
- name: Supported Microsoft Entra features
6969
href: supported-azure-ad-features.md
7070
- name: Learn authentication basics
7171
items:
@@ -156,7 +156,7 @@
156156
href: microsoft-graph-get-started.md
157157
- name: Register a SAML application
158158
href: saml-service-provider.md?tabs=windows&pivots=b2c-custom-policy
159-
- name: Publish app in Azure AD app gallery
159+
- name: Publish app in Microsoft Entra app gallery
160160
href: publish-app-to-azure-ad-app-gallery.md
161161
- name: Create a user flow or custom policy
162162
items:
@@ -334,9 +334,9 @@
334334
href: identity-provider-amazon.md
335335
- name: Apple
336336
href: identity-provider-apple-id.md
337-
- name: Azure AD (single tenant)
337+
- name: Microsoft Entra ID (single tenant)
338338
href: identity-provider-azure-ad-single-tenant.md
339-
- name: Azure AD (multitenant)
339+
- name: Microsoft Entra ID (multitenant)
340340
href: identity-provider-azure-ad-multi-tenant.md
341341
- name: Azure AD B2C
342342
href: identity-provider-azure-ad-b2c.md
@@ -509,7 +509,7 @@
509509
displayName: azure ad b2c security best practices
510510
- name: Enable MFA
511511
items:
512-
- name: Multi-factor authentication
512+
- name: Multifactor authentication
513513
href: multi-factor-authentication.md
514514
displayName: TOTP, multi-factor, multifactor, time-based-one-time password, time-based one-time password, authenticator app, Microsoft authenticator app, mfa, 2fa
515515
- name: Secure phone-based MFA
@@ -722,12 +722,12 @@
722722
items:
723723
- name: About validation technical profiles
724724
href: validation-technical-profile.md
725-
- name: Azure Active Directory
725+
- name: Microsoft Entra ID
726726
href: active-directory-technical-profile.md
727-
- name: Azure AD Multi-Factor Authentication
727+
- name: Microsoft Entra multifactor authentication
728728
href: multi-factor-auth-technical-profile.md
729729
displayName: mfa
730-
- name: Azure AD SSPR
730+
- name: Microsoft Entra SSPR
731731
href: aad-sspr-technical-profile.md
732732
- name: Claims transformation
733733
href: claims-transformation-technical-profile.md

0 commit comments

Comments
 (0)