Skip to content

Commit 971eee4

Browse files
authored
Merge branch 'master' into patch-10
2 parents 293b004 + b31031f commit 971eee4

File tree

2,540 files changed

+25862
-14737
lines changed

Some content is hidden

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

2,540 files changed

+25862
-14737
lines changed

.openpublishing.publish.config.json

Lines changed: 739 additions & 629 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 43 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path": "articles/iot-accelerators/howto-opc-publisher-configure.md",
5-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-publisher-configure",
6-
"redirect_document_id": false
7-
},
8-
{
9-
"source_path": "articles/iot-accelerators/howto-opc-publisher-run.md",
10-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-publisher-run",
11-
"redirect_document_id": false
12-
},
13-
{
14-
"source_path": "articles/iot-accelerators/howto-opc-vault-deploy.md",
15-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-vault-deploy",
16-
"redirect_document_id": false
17-
},
18-
{
19-
"source_path": "articles/iot-accelerators/howto-opc-twin-deploy-modules.md",
20-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-twin-deploy-modules",
21-
"redirect_document_id": false
22-
},
23-
{
24-
"source_path": "articles/iot-accelerators/howto-opc-twin-deploy-existing.md",
25-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-twin-deploy-existing",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path": "articles/iot-accelerators/howto-opc-twin-deploy-dependencies.md",
30-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-twin-deploy-dependencies",
31-
"redirect_document_id": false
32-
},
33-
{
34-
"source_path": "articles/iot-accelerators/howto-opc-vault-manage.md",
35-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-vault-manage",
36-
"redirect_document_id": false
37-
},
38-
{
39-
"source_path": "articles/iot-accelerators/howto-opc-vault-secure-ca.md",
40-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-vault-secure-ca",
41-
"redirect_document_id": false
42-
},
43-
{
44-
"source_path": "articles/iot-accelerators/howto-opc-vault-secure.md",
45-
"redirect_url": "/previous-versions/azure/iot-accelerators/howto-opc-vault-secure",
46-
"redirect_document_id": false
47-
},
48-
{
49-
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-configure.md",
50-
"redirect_url": "/previous-versions/azure/iot-accelerators/iot-accelerators-connected-factory-configure",
51-
"redirect_document_id": false
52-
},
53-
{
54-
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-customize.md",
55-
"redirect_url": "/previous-versions/azure/iot-accelerators/iot-accelerators-connected-factory-customize",
56-
"redirect_document_id": false
57-
},
58-
{
59-
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-dashboard.md",
60-
"redirect_url": "/previous-versions/azure/iot-accelerators/iot-accelerators-connected-factory-dashboard",
61-
"redirect_document_id": false
62-
},
63-
{
64-
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-features.md",
65-
"redirect_url": "/previous-versions/azure/iot-accelerators/iot-accelerators-connected-factory-features",
66-
"redirect_document_id": false
67-
},
68-
{
69-
"source_path": "articles/iot-accelerators/iot-accelerators-faq-cf.md",
70-
"redirect_url": "/previous-versions/azure/iot-accelerators/iot-accelerators-faq-cf",
71-
"redirect_document_id": false
72-
},
73-
{
74-
"source_path": "articles/iot-accelerators/quickstart-connected-factory-deploy.md",
75-
"redirect_url": "/previous-versions/azure/iot-accelerators/quickstart-connected-factory-deploy",
76-
"redirect_document_id": false
77-
},
78-
{
79-
"source_path": "articles/iot-accelerators/overview-opc-vault.md",
80-
"redirect_url": "/previous-versions/azure/iot-accelerators/overview-opc-vault",
81-
"redirect_document_id": false
82-
},
83-
{
84-
"source_path": "articles/iot-accelerators/overview-opc-vault-architecture.md",
85-
"redirect_url": "/previous-versions/azure/iot-accelerators/overview-opc-vault-architecture",
86-
"redirect_document_id": false
87-
},
88-
{
89-
"source_path": "articles/iot-accelerators/overview-opc-twin.md",
90-
"redirect_url": "/previous-versions/azure/iot-accelerators/overview-opc-twin",
91-
"redirect_document_id": false
92-
},
93-
{
94-
"source_path": "articles/iot-accelerators/overview-opc-twin-architecture.md",
95-
"redirect_url": "/previous-versions/azure/iot-accelerators/overview-opc-twin-architecture",
96-
"redirect_document_id": false
97-
},
98-
{
99-
"source_path": "articles/iot-accelerators/overview-opc-publisher.md",
100-
"redirect_url": "/previous-versions/azure/iot-accelerators/overview-opc-publisher",
101-
"redirect_document_id": false
102-
},
103-
{
104-
"source_path": "articles/iot-accelerators/overview-iot-industrial.md",
105-
"redirect_url": "/previous-versions/azure/iot-accelerators/overview-iot-industrial",
106-
"redirect_document_id": false
107-
},
1083
{
1094
"source_path": "articles/virtual-machines/linux/tutorial-govern-resources.md",
1105
"redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-govern-resources",
@@ -130,6 +25,11 @@
13025
"redirect_url": "/previous-versions/azure/virtual-machines/windows/tutorial-govern-resources",
13126
"redirect_document_id": false
13227
},
28+
{
29+
"source_path": "articles/confidential-computing/how-to-fortanix-enclave-manager.md",
30+
"redirect_url": "/azure/confidential-computing/how-to-fortanix-confidential-computing-manager-node-agent",
31+
"redirect_document_id": false
32+
},
13333
{
13434
"source_path": "articles/azure-percept/advanced-development-cloud.md",
13535
"redirect_url": "/azure/azure-percept/overview-advanced-code",
@@ -24704,6 +24604,16 @@
2470424604
"redirect_url": "/azure/iot-pnp/concepts-modeling-guide",
2470524605
"redirect_document_id": true
2470624606
},
24607+
{
24608+
"source_path_from_root": "/articles/iot-pnp/concepts-certification-program.md",
24609+
"redirect_url": "/azure/certification/program-requirements-pnp",
24610+
"redirect_document_id": true
24611+
},
24612+
{
24613+
"source_path_from_root": "/articles/iot-pnp/howto-certify-device.md",
24614+
"redirect_url": "/azure/certification/program-requirements-pnp",
24615+
"redirect_document_id": false
24616+
},
2470724617
{
2470824618
"source_path_from_root": "/articles/container-instances/container-instances-jenkins.md",
2470924619
"redirect_url": "/azure/jenkins/container-instances-jenkins",
@@ -33806,7 +33716,7 @@
3380633716
"redirect_document_id": false
3380733717
},
3380833718
{
33809-
"source_path_from_root": "/articles/spring-cloud/spring-cloud/spring-cloud-overview.md",
33719+
"source_path_from_root": "/articles/spring-cloud/spring-cloud-overview.md",
3381033720
"redirect_url": "/azure/spring-cloud/overview",
3381133721
"redirect_document_id": false
3381233722
},
@@ -46194,12 +46104,12 @@
4619446104
},
4619546105
{
4619646106
"source_path_from_root": "/articles/virtual-machines/windows/sqlclassic/virtual-machines-windows-classic-sql-server-reportviewer.md",
46197-
"redirect_url": "/sql/reporting-services/application-integration/integrating-reporting-services-using-reportviewer-controls-get-started?view=sql-server-2017",
46107+
"redirect_url": "/sql/reporting-services/application-integration/integrating-reporting-services-using-reportviewer-controls-get-started",
4619846108
"redirect_document_id": false
4619946109
},
4620046110
{
4620146111
"source_path_from_root": "/articles/virtual-machines/windows/sqlclassic/virtual-machines-windows-classic-ps-sql-report.md",
46202-
"redirect_url": "/sql/reporting-services/report-server/reporting-services-report-server-native-mode?view=sql-server-2017",
46112+
"redirect_url": "/sql/reporting-services/report-server/reporting-services-report-server-native-mode",
4620346113
"redirect_document_id": false
4620446114
},
4620546115
{
@@ -46269,7 +46179,7 @@
4626946179
},
4627046180
{
4627146181
"source_path_from_root": "/articles/virtual-machines/windows/sqlclassic/virtual-machines-windows-classic-ps-sql-bi.md",
46272-
"redirect_url": "/sql/ssdt/download-sql-server-data-tools-ssdt?view=sql-server-2017",
46182+
"redirect_url": "/sql/ssdt/download-sql-server-data-tools-ssdt",
4627346183
"redirect_document_id": false
4627446184
},
4627546185
{
@@ -51522,6 +51432,21 @@
5152251432
"redirect_url": "/azure/active-directory/develop/msal-logging-dotnet",
5152351433
"redirect_document_id": false
5152451434
},
51435+
{
51436+
"source_path_from_root": "/articles/active-directory/develop/quickstart-modify-supported-accounts.md",
51437+
"redirect_url": "/azure/active-directory/develop/howto-modify-supported-accounts",
51438+
"redirect_document_id": false
51439+
},
51440+
{
51441+
"source_path_from_root": "/articles/active-directory/develop/quickstart-remove-app.md",
51442+
"redirect_url": "/azure/active-directory/develop/howto-remove-app",
51443+
"redirect_document_id": false
51444+
},
51445+
{
51446+
"source_path_from_root": "/articles/active-directory/develop/quickstart-restore-app.md",
51447+
"redirect_url": "/azure/active-directory/develop/howto-restore-app",
51448+
"redirect_document_id": false
51449+
},
5152551450
{
5152651451
"source_path_from_root": "/articles/active-directory/develop/msal-testing.md",
5152751452
"redirect_url": "/azure/active-directory/develop/msal-overview",
@@ -64970,6 +64895,15 @@
6497064895
"source_path_from_root": "/articles/cognitive-services/translator/custom-translator/glossary.md",
6497164896
"redirect_url": "/azure/cognitive-services/translator/custom-translator/terminology",
6497264897
"redirect_document_id": false
64898+
},
64899+
{
64900+
"source_path": "articles/virtual-desktop/partners.md",
64901+
"redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?search=Windows%20virtual%20desktop&page=1",
64902+
"redirect_document_id": false
64903+
},
64904+
{
64905+
"source_path": "articles/app-service/quickstart-dotnet-framework.md",
64906+
"redirect_url": "/azure/app-service/quickstart-dotnetcore?tabs=netframework48"
6497364907
}
6497464908
]
6497564909
}

0 commit comments

Comments
 (0)