Skip to content

Commit eb40867

Browse files
authored
Merge pull request #1 from MicrosoftDocs/master
sync
2 parents fd4c10d + 768542b commit eb40867

File tree

10,950 files changed

+215126
-145421
lines changed

Some content is hidden

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

10,950 files changed

+215126
-145421
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
"branch": "master",
4646
"branch_mapping": {}
4747
},
48+
{
49+
"path_to_root": "azure_arc_sample",
50+
"url": "https://github.com/microsoft/azure_arc",
51+
"branch": "main",
52+
"branch_mapping": {}
53+
},
4854
{
4955
"path_to_root": "resourcemanager-templates",
5056
"url": "https://github.com/Azure/azure-docs-json-samples",
@@ -423,12 +429,6 @@
423429
"branch": "main",
424430
"branch_mapping": {}
425431
},
426-
{
427-
"path_to_root": "azureml-examples-cli-preview",
428-
"url": "https://github.com/azure/azureml-examples",
429-
"branch": "cli-preview",
430-
"branch_mapping": {}
431-
},
432432
{
433433
"path_to_root": "terraform",
434434
"url": "https://github.com/Azure/terraform",
@@ -591,12 +591,6 @@
591591
"branch": "master",
592592
"branch_mapping": {}
593593
},
594-
{
595-
"path_to_root": "samples-cosmosdb-dotnet-v2",
596-
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
597-
"branch": "master",
598-
"branch_mapping": {}
599-
},
600594
{
601595
"path_to_root": "samples-cosmosdb-java-v4-web-app",
602596
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -717,12 +711,6 @@
717711
"branch": "master",
718712
"branch_mapping": {}
719713
},
720-
{
721-
"path_to_root": "azure-cosmosdb-java-v2",
722-
"url": "https://github.com/Azure/azure-cosmosdb-java",
723-
"branch": "master",
724-
"branch_mapping": {}
725-
},
726714
{
727715
"path_to_root": "azure-cosmosdb-graph-dotnet",
728716
"url": "https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started",
@@ -825,13 +813,15 @@
825813
".openpublishing.redirection.json",
826814
".openpublishing.redirection.active-directory.json",
827815
".openpublishing.redirection.data-factory.json",
816+
".openpublishing.redirection.defender-for-cloud.json",
828817
".openpublishing.redirection.defender-for-iot.json",
829818
".openpublishing.redirection.healthcare-apis.json",
830819
".openpublishing.redirection.iot-hub.json",
831820
".openpublishing.redirection.key-vault.json",
832821
".openpublishing.redirection.media-services.json",
833822
".openpublishing.redirection.security-benchmark.json",
834823
".openpublishing.redirection.synapse-analytics.json",
824+
".openpublishing.redirection.azure-web-pubsub.json",
835825
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
836826
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
837827
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -853,6 +843,7 @@
853843
"articles/purview/.openpublishing.redirection.purview.json",
854844
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
855845
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
846+
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
856847
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
857848
"articles/mysql/.openpublishing.redirection.mysql.json"
858849
]

.openpublishing.redirection.active-directory.json

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/active-directory/authentication/how-to-nudge-authenticator-app.md",
15+
"redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
1520
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -82,7 +87,7 @@
8287
},
8388
{
8489
"source_path": "articles/active-directory/user-help/multi-factor-authentication-end-user-first-time.md",
85-
"redirect_url": "https://support.microsoft.com/account-billing/how-to-use-the-microsoft-authenticator-app-9783c865-0308-42fb-a519-8cf666fe0acc",
90+
"redirect_url": "https://support.microsoft.com/account-billing/download-and-install-the-microsoft-authenticator-app-351498fc-850a-45da-b7b6-27e523b8702a",
8691
"redirect_document_id": false
8792
},
8893
{
@@ -957,7 +962,7 @@
957962
},
958963
{
959964
"source_path_from_root": "/articles/active-directory/active-directory-saas-facebook-at-work-provisioning-tutorial.md",
960-
"redirect_url": "/azure/active-directory/active-directory-saas-workplacebyfacebook-provisioning-tutorial",
965+
"redirect_url": "/azure/active-directory/saas-apps/workplace-by-facebook-provisioning-tutorial",
961966
"redirect_document_id": false
962967
},
963968
{
@@ -1670,6 +1675,26 @@
16701675
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
16711676
"redirect_document_id": false
16721677
},
1678+
{
1679+
"source_path_from_root": "/articles/active-directory/conditional-access/require-managed-devices.md",
1680+
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-grant",
1681+
"redirect_document_id": false
1682+
},
1683+
{
1684+
"source_path_from_root": "/articles/active-directory/conditional-access/untrusted-networks.md",
1685+
"redirect_url": "/azure/active-directory/conditional-access/howto-conditional-access-policy-all-users-mfa",
1686+
"redirect_document_id": true
1687+
},
1688+
{
1689+
"source_path_from_root": "/articles/active-directory/conditional-access/app-based-conditional-access.md",
1690+
"redirect_url": "/azure/active-directory/conditional-access/howto-policy-approved-app-or-app-protection",
1691+
"redirect_document_id": false
1692+
},
1693+
{
1694+
"source_path_from_root": "/articles/active-directory/conditional-access/app-protection-based-conditional-access.md",
1695+
"redirect_url": "/azure/active-directory/conditional-access/howto-policy-approved-app-or-app-protection",
1696+
"redirect_document_id": true
1697+
},
16731698
{
16741699
"source_path_from_root": "/articles/active-directory/authentication/quickstart-sspr.md",
16751700
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-sspr",
@@ -9887,8 +9912,8 @@
98879912
},
98889913
{
98899914
"source_path_from_root": "/articles/active-directory/active-directory-saas-workplacebyfacebook-provisioning-tutorial.md",
9890-
"redirect_url": "/azure/active-directory/saas-apps/workplacebyfacebook-provisioning-tutorial",
9891-
"redirect_document_id": true
9915+
"redirect_url": "/azure/active-directory/saas-apps/workplace-by-facebook-provisioning-tutorial",
9916+
"redirect_document_id": false
98929917
},
98939918
{
98949919
"source_path_from_root": "/articles/active-directory/active-directory-saas-workplacebyfacebook-tutorial.md",
@@ -10544,6 +10569,33 @@
1054410569
"source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
1054510570
"redirect_url": "/azure/active-directory-b2c/troubleshoot",
1054610571
"redirect_document_id": false
10547-
}
10572+
},
10573+
{
10574+
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
10575+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",
10576+
"redirect_document_id": false
10577+
},
10578+
{
10579+
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-cli.md",
10580+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-azcli",
10581+
"redirect_document_id": false
10582+
},
10583+
{
10584+
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal.md",
10585+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-azp",
10586+
"redirect_document_id": false
10587+
},
10588+
{
10589+
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-powershell.md",
10590+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-powershell",
10591+
"redirect_document_id": false
10592+
},
10593+
{
10594+
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-rest.md",
10595+
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-rest",
10596+
"redirect_document_id": false
10597+
}
10598+
10599+
1054810600
]
10549-
}
10601+
}
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-web-pubsub/howto-troubleshoot-diagnostic-logs.md",
5+
"redirect_url": "/azure/azure-web-pubsub/howto-troubleshoot-resource-logs",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.data-factory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path_from_root": "/articles/data-factory/continuous-integration-deployment.md",
1515
"redirect_url": "/azure/data-factory/continuous-integration-delivery",
1616
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/data-factory/continuous-integration-deployment-improvements.md",
20+
"redirect_url": "/azure/data-factory/continuous-integration-delivery-improvements",
21+
"redirect_document_id": false
1722
}
1823
]
1924
}

0 commit comments

Comments
 (0)