Skip to content

Commit 86315b7

Browse files
kromermkromerm
authored
Merge pull request #83 from MicrosoftDocs/main
refresh
2 parents 3a1cf56 + 494b11c commit 86315b7

File tree

772 files changed

+17915
-18266
lines changed

Some content is hidden

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

772 files changed

+17915
-18266
lines changed

‎.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{:allowed-branchname-matches ["main" "master" "release-.*"]
1+
{:allowed-branchname-matches ["main" "release-.*"]
22
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}

‎.openpublishing.publish.config.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@
6060
{
6161
"path_to_root": "_themes",
6262
"url": "https://github.com/Microsoft/templates.docs.msft",
63-
"branch": "master",
63+
"branch": "main",
6464
"branch_mapping": {}
6565
},
6666
{
6767
"path_to_root": "_themes.pdf",
6868
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
69-
"branch": "master",
69+
"branch": "main",
7070
"branch_mapping": {}
7171
},
7272
{
@@ -772,10 +772,10 @@
772772
"branch_mapping": {}
773773
},
774774
{
775-
"path_to_root": "digital-twins-docs-samples-getting-started",
776-
"url": "https://github.com/Azure-Samples/azure-digital-twins-getting-started",
777-
"branch": "main",
778-
"branch_mapping": {}
775+
"path_to_root": "digital-twins-docs-samples-getting-started",
776+
"url": "https://github.com/Azure-Samples/azure-digital-twins-getting-started",
777+
"branch": "main",
778+
"branch_mapping": {}
779779
},
780780
{
781781
"path_to_root": "dotnet-samples",
@@ -806,14 +806,14 @@
806806
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
807807
"branch": "main",
808808
"branch_mapping": {}
809-
}
809+
}
810810
],
811811
"branch_target_mapping": {
812812
"live": [
813813
"Publish",
814814
"PDF"
815815
],
816-
"master": [
816+
"main": [
817817
"Publish",
818818
"PDF"
819819
]
@@ -831,7 +831,7 @@
831831
".openpublishing.redirection.json",
832832
".openpublishing.redirection.active-directory.json",
833833
".openpublishing.redirection.azure-sql.json",
834-
".openpublishing.redirection.data-factory.json",
834+
"articles/data-factory/.openpublishing.redirection.data-factory.json",
835835
".openpublishing.redirection.defender-for-cloud.json",
836836
".openpublishing.redirection.defender-for-iot.json",
837837
".openpublishing.redirection.healthcare-apis.json",
@@ -846,7 +846,7 @@
846846
".openpublishing.redirection.azure-percept.json",
847847
".openpublishing.redirection.azure-productivity.json",
848848
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
849-
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
849+
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
850850
"articles/azure-relay/.openpublishing.redirection.relay.json",
851851
"articles/communication-services/.openpublishing.redirection.communication-services.json",
852852
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
@@ -873,4 +873,4 @@
873873
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
874874
"articles/mysql/.openpublishing.redirection.mysql.json"
875875
]
876-
}
876+
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@
357357
},
358358
{
359359
"source_path_from_root": "/articles/active-directory/conditional-access-azure-management.md",
360-
"redirect_url": "/azure/role-based-access-control/conditional-access-azure-management",
361-
"redirect_document_id": true
360+
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
361+
"redirect_document_id": false
362362
},
363363
{
364364
"source_path_from_root": "/articles/active-directory/role-based-access-control-custom-roles.md",
@@ -755,14 +755,29 @@
755755
"redirect_url": "/azure/active-directory/active-directory-b2b-admin-add-users",
756756
"redirect_document_id": false
757757
},
758+
{
759+
"source_path_from_root": "/articles/active-directory/external-identities/delegate-invitations.md",
760+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
761+
"redirect_document_id": true
762+
},
763+
{
764+
"source_path_from_root": "/articles/active-directory/external-identities/conditional-access.md",
765+
"redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
766+
"redirect_document_id": true
767+
},
768+
{
769+
"source_path_from_root": "/articles/active-directory/external-identities/compare-with-b2c.md",
770+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
771+
"redirect_document_id": true
772+
},
758773
{
759774
"source_path_from_root": "/articles/active-directory/external-identities/add-guest-to-role.md",
760775
"redirect_url": "/azure/active-directory/external-identities/add-users-administrator",
761776
"redirect_document_id": false
762777
},
763778
{
764779
"source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-external-identities.md",
765-
"redirect_url": "/azure/active-directory/active-directory-b2b-compare-b2c",
780+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
766781
"redirect_document_id": false
767782
},
768783
{
@@ -1827,13 +1842,13 @@
18271842
},
18281843
{
18291844
"source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-b2c.md",
1830-
"redirect_url": "/azure/active-directory/b2b/compare-with-b2c",
1831-
"redirect_document_id": true
1845+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
1846+
"redirect_document_id": false
18321847
},
18331848
{
18341849
"source_path_from_root": "/articles/active-directory/active-directory-b2b-mfa-instructions.md",
18351850
"redirect_url": "/azure/active-directory/b2b/conditional-access",
1836-
"redirect_document_id": true
1851+
"redirect_document_id": false
18371852
},
18381853
{
18391854
"source_path_from_root": "/articles/active-directory/active-directory-b2b-configure-saas-apps.md",
@@ -1852,8 +1867,8 @@
18521867
},
18531868
{
18541869
"source_path_from_root": "/articles/active-directory/active-directory-b2b-delegate-invitations.md",
1855-
"redirect_url": "/azure/active-directory/b2b/delegate-invitations",
1856-
"redirect_document_id": true
1870+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
1871+
"redirect_document_id": false
18571872
},
18581873
{
18591874
"source_path_from_root": "/articles/active-directory/active-directory-b2b-faq.md",
@@ -3822,13 +3837,13 @@
38223837
},
38233838
{
38243839
"source_path_from_root": "/articles/active-directory/b2b/compare-with-b2c.md",
3825-
"redirect_url": "/azure/active-directory/external-identities/compare-with-b2c",
3826-
"redirect_document_id": true
3840+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
3841+
"redirect_document_id": false
38273842
},
38283843
{
38293844
"source_path_from_root": "/articles/active-directory/b2b/conditional-access.md",
3830-
"redirect_url": "/azure/active-directory/external-identities/conditional-access",
3831-
"redirect_document_id": true
3845+
"redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
3846+
"redirect_document_id": false
38323847
},
38333848
{
38343849
"source_path_from_root": "/articles/active-directory/b2b/configure-saas-apps.md",
@@ -3847,8 +3862,8 @@
38473862
},
38483863
{
38493864
"source_path_from_root": "/articles/active-directory/b2b/delegate-invitations.md",
3850-
"redirect_url": "/azure/active-directory/external-identities/delegate-invitations",
3851-
"redirect_document_id": true
3865+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
3866+
"redirect_document_id": false
38523867
},
38533868
{
38543869
"source_path_from_root": "/articles/active-directory/b2b/direct-federation.md",

‎.openpublishing.redirection.azure-sql.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@
179179
"source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
180180
"redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
181181
"redirect_document_id": true
182-
}
182+
},
183+
{
184+
"source_path": "articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
185+
"redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
186+
"redirect_document_id": false
187+
}
183188
]
184189
}

‎.openpublishing.redirection.data-factory.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,16 @@
554554
"source_path_from_root": "/articles/defender-for-iot/device-builders/architecture-agent-based.md",
555555
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
556556
"redirect_document_id": false
557+
},
558+
{
559+
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-api.md",
560+
"redirect_url": "/azure/defender-for-iot/organizations",
561+
"redirect_document_id": false
562+
},
563+
{
564+
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
565+
"redirect_url": "/azure/defender-for-iot/organizations",
566+
"redirect_document_id": false
557567
}
558568
]
559569
}

0 commit comments

Comments
 (0)