Skip to content

Commit ee16533

Browse files
Court72Court72
authored
Merge branch 'main' into patch-4
2 parents 0c5136d + 3176e17 commit ee16533

File tree

11,862 files changed

+249389
-154620
lines changed

Some content is hidden

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

11,862 files changed

+249389
-154620
lines changed

‎.openpublishing.publish.config.json

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,6 @@
410410
"branch": "main",
411411
"branch_mapping": {}
412412
},
413-
{
414-
"path_to_root": "azureml-examples-vj",
415-
"url": "https://github.com/azure/azureml-examples",
416-
"branch": "vijetajo-patch-2",
417-
"branch_mapping": {}
418-
},
419413
{
420414
"path_to_root": "azureml-examples-batch-pup",
421415
"url": "https://github.com/azure/azureml-examples",
@@ -746,6 +740,12 @@
746740
"branch": "main",
747741
"branch_mapping": {}
748742
},
743+
{
744+
"path_to_root": "web-apps-node-iot-hub-data-visualization",
745+
"url": "https://github.com/azure-samples/web-apps-node-iot-hub-data-visualization",
746+
"branch": "master",
747+
"branch_mapping": {}
748+
},
749749
{
750750
"path_to_root": "ImmersiveReaderSdk",
751751
"url": "https://github.com/microsoft/immersive-reader-sdk",
@@ -915,9 +915,9 @@
915915
"branch_mapping": {}
916916
},
917917
{
918-
"path_to_root": "ms-identity-python-webapp",
918+
"path_to_root": "ms-identity-python-webapp-quickstart",
919919
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
920-
"branch": "main",
920+
"branch": "0.7.0",
921921
"branch_mapping": {}
922922
},
923923
{
@@ -997,7 +997,13 @@
997997
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
998998
"branch": "main",
999999
"branch_mapping": {}
1000-
}
1000+
},
1001+
{
1002+
"path_to_root": "azure-actions-workflow-samples",
1003+
"url": "https://github.com/Azure/actions-workflow-samples",
1004+
"branch": "master",
1005+
"branch_mapping": {}
1006+
}
10011007
],
10021008
"branch_target_mapping": {
10031009
"live": ["Publish", "PDF"],
@@ -1074,6 +1080,7 @@
10741080
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10751081
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
10761082
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1083+
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
10771084
"articles/mariadb/.openpublishing.redirection.mariadb.json",
10781085
"articles/marketplace/.openpublishing.redirection.marketplace.json",
10791086
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1091,6 +1098,7 @@
10911098
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
10921099
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
10931100
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1094-
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
1101+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
1102+
"articles/network-watcher/.openpublishing.redirection.network-watcher.json"
10951103
]
10961104
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 423 additions & 5 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path_from_root": "/articles/aks/stop-api-upgrade.md",
55
"redirect_url": "/azure/aks/upgrade-cluster",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/aks/cilium-enterprise-marketplace.md",
10+
"redirect_url": "/azure/aks/azure-cni-powered-by-cilium",
11+
"redirect_document_id": false
712
}
813
]
914
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6150,7 +6150,26 @@
61506150
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61516151
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
61526152
"redirect_document_id": false
6153+
},
6154+
{
6155+
"source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
6156+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
6157+
"redirect_document_id": false
6158+
},
6159+
{
6160+
"source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-query-storage.md",
6161+
"redirect_url": "/azure/data-explorer/query-exported-azure-monitor-data",
6162+
"redirect_document_id": false
6163+
},
6164+
{
6165+
"source_path_from_root": "/articles/azure-monitor/logs/api/app-insights-azure-ad-api.md",
6166+
"redirect_url": "/azure/azure-monitor/app/app-insights-azure-ad-api",
6167+
"redirect_document_id": false
6168+
},
6169+
{
6170+
"source_path_from_root": "/articles/azure-monitor/app/javascript-sdk-advanced.md",
6171+
"redirect_url": "/azure/azure-monitor/app/javascript-sdk-configuration",
6172+
"redirect_document_id": false
61536173
}
6154-
61556174
]
61566175
}

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,11 @@
740740
"redirect_url": "/azure/defender-for-cloud/enable-pull-request-annotations",
741741
"redirect_document_id": true
742742
},
743+
{
744+
"source_path_from_root": "/articles/defender-for-cloud/devops-faq.md",
745+
"redirect_url": "/azure/defender-for-cloud/faq-defender-for-devops",
746+
"redirect_document_id": true
747+
},
743748
{
744749
"source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
745750
"redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",

‎.openpublishing.redirection.defender-for-iot.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
22
"redirections": [
33
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md",
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",
6+
"redirect_document_id": false
7+
}, {
8+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md",
59
"redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-management",
610
"redirect_document_id": false
711
}, {
@@ -712,6 +716,11 @@
712716
"source_path_from_root": "/articles/defender-for-iot/organizations/references-defender-for-iot-glossary.md",
713717
"redirect_url": "/azure/defender-for-iot/organizations/overview",
714718
"redirect_document_id": false
719+
},
720+
{
721+
"source_path_from_root": "/articles/defender-for-iot/organizations/faqs-ot.md",
722+
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",
723+
"redirect_document_id": false
715724
}
716725
]
717726
}

‎.openpublishing.redirection.healthcare-apis.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,19 +694,27 @@
694694
"redirect_document_id": false
695695
},
696696
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculated-functions-mappings.md",
697-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-mappings",
697+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
698698
"redirect_document_id": false
699699
},
700700
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculatedcontenttemplate-mappings.md",
701-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-mappings",
701+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
702+
"redirect_document_id": false
703+
},
704+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-calculatedcontent-mappings.md",
705+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-calculatedcontent-templates",
702706
"redirect_document_id": false
703707
},
704708
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings.md",
705-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
709+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
706710
"redirect_document_id": false
707711
},
708712
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings.md",
709-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
713+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
714+
"redirect_document_id": false
715+
},
716+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings.md",
717+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates",
710718
"redirect_document_id": false
711719
},
712720
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-button.md",

0 commit comments

Comments
 (0)