Skip to content

Commit 0840b96

Browse files
authored
Merge branch 'main' into azure-ad-b2c-go-local
2 parents 882c7d9 + 2d42f94 commit 0840b96

File tree

4,144 files changed

+76145
-35647
lines changed

Some content is hidden

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

4,144 files changed

+76145
-35647
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
"branch": "master",
153153
"branch_mapping": {}
154154
},
155+
{
156+
"path_to_root": "functions-azure-product",
157+
"url": "https://github.com/Azure/Azure-Functions",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
155161
{
156162
"path_to_root": "functions-pytorch",
157163
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
@@ -950,6 +956,7 @@
950956
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
951957
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
952958
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
959+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
953960
"articles/mariadb/.openpublishing.redirection.mariadb.json",
954961
"articles/marketplace/.openpublishing.redirection.marketplace.json",
955962
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -977,6 +984,7 @@
977984
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
978985
".openpublishing.redirection.baremetal-infrastructure.json",
979986
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
980-
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
987+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
988+
".openpublishing.redirection.azure-vmware.json"
981989
]
982990
}

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
5055
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -10921,6 +10926,11 @@
1092110926
"redirect_url": "/azure/azure-percept/index",
1092210927
"redirect_document_id": false
1092310928
},
10929+
{
10930+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
10931+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
10932+
"redirect_document_id": false
10933+
},
1092410934
{
1092510935
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
1092610936
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",

.openpublishing.redirection.azure-monitor.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5532,6 +5532,11 @@
55325532
"redirect_url": "/azure/azure-monitor/app/export-telemetry",
55335533
"redirect_document_id": false
55345534
},
5535+
{
5536+
"source_path_from_root": "/articles/azure-monitor/app/auto-collect-dependencies.md",
5537+
"redirect_url": "/azure/azure-monitor/app/asp-net-dependencies",
5538+
"redirect_document_id": false
5539+
},
55355540
{
55365541
"source_path_from_root": "/articles/azure-monitor/app/custom-endpoints.md",
55375542
"redirect_url": "/azure/azure-monitor/app/create-new-resource",
@@ -5541,6 +5546,46 @@
55415546
"source_path_from_root": "/articles/azure-monitor/logs/api/authentication-authorization.md",
55425547
"redirect_url": "/azure/azure-monitor/logs/api/access-api",
55435548
"redirect_document_id": false
5549+
},
5550+
{
5551+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-get-started.md",
5552+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5553+
"redirect_document_id": false
5554+
},
5555+
{
5556+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-trace-logs.md",
5557+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5558+
"redirect_document_id": false
5559+
},
5560+
{
5561+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-agent.md",
5562+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5563+
"redirect_document_id": false
5564+
},
5565+
{
5566+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-filter-telemetry.md",
5567+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5568+
"redirect_document_id": false
5569+
},
5570+
{
5571+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-collectd.md",
5572+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5573+
"redirect_document_id": false
5574+
},
5575+
{
5576+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-micrometer.md",
5577+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5578+
"redirect_document_id": false
5579+
},
5580+
{
5581+
"source_path_from_root": "/articles/azure-monitor/vm/tutorial-monitor-vm-alert.md",
5582+
"redirect_url": "/azure/azure-monitor/vm/tutorial-monitor-vm-alert-availability",
5583+
"redirect_document_id": false
5584+
},
5585+
{
5586+
"source_path_from_root": "/articles/azure-monitor/vm/tutorial-monitor-vm-enable.md",
5587+
"redirect_url": "/azure/azure-monitor/vm/tutorial-monitor-vm-enable-insights",
5588+
"redirect_document_id": false
55445589
}
55455590
]
55465591
}
Lines changed: 88 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,89 @@
11
{
2-
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
5-
"redirect_url": "/azure/lab-services/lab-services-overview",
6-
"redirect_document_id": false
7-
},
8-
{
9-
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10-
"redirect_url": "/azure/devtest-labs/samples-powershell",
11-
"redirect_document_id": false
12-
},
13-
{
14-
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15-
"redirect_url": "/azure/devtest-labs/samples-powershell",
16-
"redirect_document_id": false
17-
},
18-
{
19-
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20-
"redirect_url": "/azure/devtest-labs/samples-powershell",
21-
"redirect_document_id": false
22-
},
23-
{
24-
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25-
"redirect_url": "/azure/devtest-labs/samples-powershell",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30-
"redirect_url": "/azure/devtest-labs/samples-powershell",
31-
"redirect_document_id": false
32-
},
33-
{
34-
"source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
35-
"redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
36-
"redirect_document_id": false
37-
}
38-
]
39-
}
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
5+
"redirect_url": "/azure/lab-services/lab-services-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10+
"redirect_url": "/azure/devtest-labs/samples-powershell",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15+
"redirect_url": "/azure/devtest-labs/samples-powershell",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20+
"redirect_url": "/azure/devtest-labs/samples-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25+
"redirect_url": "/azure/devtest-labs/samples-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30+
"redirect_url": "/azure/devtest-labs/samples-powershell",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
35+
"redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/lab-services/how-to-create-schedules-within-teams.md",
40+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/lab-services/how-to-delete-lab-within-teams.md",
45+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/lab-services/how-to-manage-user-lists-within-teams.md",
50+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/lab-services/how-to-manage-vm-pool-within-teams.md",
55+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/lab-services/how-to-get-started-create-lab-within-teams.md",
60+
"redirect_url": "/azure/lab-services/how-to-configure-teams-for-lab-plans",
61+
"redirect_document_id": true
62+
},
63+
{
64+
"source_path": "articles/lab-services/how-to-get-started-create-lab-within-canvas.md",
65+
"redirect_url": "/azure/lab-services/how-to-configure-canvas-for-lab-plans",
66+
"redirect_document_id": true
67+
},
68+
{
69+
"source_path": "articles/lab-services/how-to-create-schedules-within-canvas.md",
70+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/lab-services/how-to-delete-lab-within-canvas.md",
75+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/lab-services/how-to-manage-user-lists-within-canvas.md",
80+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/lab-services/how-to-manage-vm-pool-within-canvas.md",
85+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
86+
"redirect_document_id": false
87+
}
88+
]
89+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-vmware/send-logs-to-log-analytics.md",
5+
"redirect_url": "/azure/azure-vmware/configure-vmware-syslogs",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

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

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,8 @@
642642
},
643643
{
644644
"source_path_from_root": "/articles/security-center/security-center-planning-and-operations-guide.md",
645-
"redirect_url": "/azure/defender-for-cloud/security-center-planning-and-operations-guide",
646-
"redirect_document_id": true
645+
"redirect_url": "/azure/defender-for-cloud/defender-for-cloud-planning-and-operations-guide",
646+
"redirect_document_id": false
647647
},
648648
{
649649
"source_path_from_root": "/articles/security-center/sql-information-protection-policy.md",
@@ -759,6 +759,26 @@
759759
"source_path_from_root": "/articles/defender-for-cloud/deploy-vulnerability-assessment-tvm.md",
760760
"redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management",
761761
"redirect_document_id": true
762-
}
762+
},
763+
{
764+
"source_path_from_root": "/articles/defender-for-cloud/plan-multicloud-security-other-resources.md",
765+
"redirect_url": "/azure/defender-for-cloud/multicloud",
766+
"redirect_document_id": true
767+
},
768+
{
769+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-servers-introduction.md",
770+
"redirect_url": "/azure/defender-for-cloud/plan-defender-for-servers",
771+
"redirect_document_id": true
772+
},
773+
{
774+
"source_path_from_root": "/articles/defender-for-cloud/security-center-readiness-roadmap.md",
775+
"redirect_url": "/azure/defender-for-cloud/defender-for-cloud-planning-and-operations-guide",
776+
"redirect_document_id": false
777+
},
778+
{
779+
"source_path_from_root": "/articles/defender-for-cloud/security-center-planning-and-operations-guide.md",
780+
"redirect_url": "/azure/defender-for-cloud/defender-for-cloud-planning-and-operations-guide",
781+
"redirect_document_id": true
782+
}
763783
]
764784
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@
142142
},
143143
{
144144
"source_path_from_root": "/articles/defender-for-iot/how-to-create-and-manage-users.md",
145-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-create-and-manage-users",
145+
"redirect_url": "/azure/defender-for-iot/organizations/manage-users-overview",
146146
"redirect_document_id": false
147147
},
148148
{
149149
"source_path_from_root": "/articles/defender-for-iot/how-to-define-global-user-access-control.md",
150-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-define-global-user-access-control",
150+
"redirect_url": "/azure/defender-for-iot/organizations/manage-users-on-premises-management-console#define-global-access-permission-for-on-premises-users",
151151
"redirect_document_id": false
152152
},
153153
{

.openpublishing.redirection.healthcare-apis.json

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
},
195195
{
196196
"source_path_from_root": "/articles/healthcare-apis/use-smart-on-fhir-proxy.md",
197-
"redirect_url": "/azure/healthcare-apis/fhir/use-smart-on-fhir-proxy",
198-
"redirect_document_id": true
197+
"redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/smart-on-fhir",
198+
"redirect_document_id": false
199199
},
200200
{
201201
"source_path_from_root": "/articles/healthcare-apis/fhir/use-custom-headers.md",
@@ -357,11 +357,6 @@
357357
"redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/tutorial-web-app-write-web-app",
358358
"redirect_document_id": true
359359
},
360-
{
361-
"source_path_from_root": "/articles/healthcare-apis/fhir/use-smart-on-fhir-proxy.md",
362-
"redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/use-smart-on-fhir-proxy",
363-
"redirect_document_id": true
364-
},
365360
{
366361
"source_path_from_root": "/articles/healthcare-apis/data-transformation/de-identified-export.md",
367362
"redirect_url": "/azure/healthcare-apis/fhir/de-identified-export",
@@ -554,6 +549,34 @@
554549
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings",
555550
"redirect_document_id": false
556551
},
552+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-iot-connector-in-azure.md",
553+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-choose",
554+
"redirect_document_id": false
555+
},
556+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-02-new-button.md",
557+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-button",
558+
"redirect_document_id": false
559+
},
560+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-03-new-manual.md",
561+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-manual",
562+
"redirect_document_id": false
563+
},
564+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-05-new-config.md",
565+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-config",
566+
"redirect_document_id": false
567+
},
568+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-06-new-deploy.md",
569+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-deploy",
570+
"redirect_document_id": false
571+
},
572+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-08-new-ps-cli.md",
573+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-powershell-cli",
574+
"redirect_document_id": false
575+
},
576+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-bicep-ps-cli.md",
577+
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-bicep-powershell-cli",
578+
"redirect_document_id": false
579+
},
557580
{ "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
558581
"redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
559582
"redirect_document_id": false

0 commit comments

Comments
 (0)