Skip to content

Commit 0fd5360

Browse files
authored
Merge branch 'master' into PP-122121-TransformProtectAPI-1890458
2 parents cc1d8f9 + 72f568c commit 0fd5360

File tree

10,228 files changed

+138272
-101772
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,228 files changed

+138272
-101772
lines changed

.acrolinx-config.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
{:allowed-branchname-matches ["master" "release-.*"]
2-
:allowed-filename-matches ["articles/" "includes/"]}
1+
{:allowed-branchname-matches ["main" "master" "release-.*"]
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml))" "includes/"]}

.github/workflows/stale.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Mark stale pull requests
22

33
on:
44
schedule:
5-
- cron: "0 */4 * * *"
5+
- cron: "0 */6 * * *"
66

77
jobs:
88
stale:
@@ -14,13 +14,13 @@ jobs:
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
1616
days-before-pr-stale: 14
17-
days-before-pr-close: 9999
17+
days-before-pr-close: 90
1818
stale-pr-label: inactive
1919
close-pr-label: auto-close
2020
exempt-pr-labels: keep-open
21-
operations-per-run: 1200
21+
operations-per-run: 1300
2222
ascending: false
23-
# start-date: '2021-02-16'
23+
# start-date: '2021-03-19'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
2626
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.publish.config.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
"branch": "master",
7676
"branch_mapping": {}
7777
},
78+
{
79+
"path_to_root": "azure_cli_scripts",
80+
"url": "https://github.com/Azure-Samples/azure-cli-samples",
81+
"branch": "master",
82+
"branch_mapping": {}
83+
},
7884
{
7985
"path_to_root": "powershell_scripts",
8086
"url": "https://github.com/Azure/azure-docs-powershell-samples",
@@ -324,13 +330,13 @@
324330
{
325331
"path_to_root": "azure-iot-sdk-node",
326332
"url": "https://github.com/Azure/azure-iot-sdk-node",
327-
"branch": "master",
333+
"branch": "main",
328334
"branch_mapping": {}
329335
},
330336
{
331337
"path_to_root": "iot-samples-c",
332338
"url": "https://github.com/Azure/azure-iot-sdk-c",
333-
"branch": "master",
339+
"branch": "main",
334340
"branch_mapping": {}
335341
},
336342
{
@@ -806,6 +812,7 @@
806812
"redirection_files": [
807813
".openpublishing.redirection.json",
808814
".openpublishing.redirection.active-directory.json",
815+
".openpublishing.redirection.azure-sql.json",
809816
".openpublishing.redirection.data-factory.json",
810817
".openpublishing.redirection.defender-for-cloud.json",
811818
".openpublishing.redirection.defender-for-iot.json",
@@ -814,9 +821,12 @@
814821
".openpublishing.redirection.key-vault.json",
815822
".openpublishing.redirection.media-services.json",
816823
".openpublishing.redirection.security-benchmark.json",
824+
".openpublishing.redirection.sql-database.json",
817825
".openpublishing.redirection.synapse-analytics.json",
818826
".openpublishing.redirection.azure-web-pubsub.json",
827+
".openpublishing.redirection.azure-monitor.json",
819828
".openpublishing.redirection.azure-percept.json",
829+
".openpublishing.redirection.azure-productivity.json",
820830
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
821831
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
822832
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -833,8 +843,11 @@
833843
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
834844
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
835845
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
846+
"articles/mariadb/.openpublishing.redirection.mariadb.json",
836847
"articles/marketplace/.openpublishing.redirection.marketplace.json",
848+
"articles/mysql/.openpublishing.redirection.mysql.json",
837849
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
850+
"articles/postgresql/.openpublishing.redirection.postgresql.json",
838851
"articles/purview/.openpublishing.redirection.purview.json",
839852
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
840853
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",

.openpublishing.redirection.active-directory.json

Lines changed: 92 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/authentication/how-to-authentication-kerberos.md",
10+
"redirect_url": "/azure/virtual-desktop/create-profile-container-azure-ad",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/active-directory/manage-apps/application-management-fundamentals.md",
1015
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -705,6 +710,36 @@
705710
"redirect_url": "https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect",
706711
"redirect_document_id": false
707712
},
713+
{
714+
"source_path_from_root": "/articles/active-directory/develop/vs-active-directory-add-connected-service.md",
715+
"redirect_url": "/visualstudio/azure/vs-active-directory-add-connected-service",
716+
"redirect_document_id": false
717+
},
718+
{
719+
"source_path_from_root": "/articles/active-directory/develop/vs-active-directory-dotnet-what-happened.md",
720+
"redirect_url": "/visualstudio/azure/vs-active-directory-dotnet-what-happened",
721+
"redirect_document_id": false
722+
},
723+
{
724+
"source_path_from_root": "/articles/active-directory/develop/vs-active-directory-dotnet-getting-started.md",
725+
"redirect_url": "/visualstudio/azure/vs-active-directory-dotnet-getting-started",
726+
"redirect_document_id": false
727+
},
728+
{
729+
"source_path_from_root": "/articles/active-directory/develop/vs-active-directory-error.md",
730+
"redirect_url": "/visualstudio/azure/vs-active-directory-error",
731+
"redirect_document_id": false
732+
},
733+
{
734+
"source_path_from_root": "/articles/active-directory/develop/vs-active-directory-webapi-getting-started.md",
735+
"redirect_url": "/visualstudio/azure/vs-active-directory-webapi-getting-started",
736+
"redirect_document_id": false
737+
},
738+
{
739+
"source_path_from_root": "/articles/active-directory/develop/vs-active-directory-webapi-what-happened.md",
740+
"redirect_url": "/visualstudio/azure/vs-active-directory-webapi-what-happened",
741+
"redirect_document_id": false
742+
},
708743
{
709744
"source_path_from_root": "/articles/active-directory/active-directory-application-proxy-connectors.md",
710745
"redirect_url": "/azure/active-directory/active-directory-application-proxy-connectors-azure-portal",
@@ -4270,17 +4305,17 @@
42704305
"redirect_url": "/azure/active-directory/governance/self-access-review",
42714306
"redirect_document_id": false
42724307
},
4273-
{
4308+
{
42744309
"source_path_from_root": "/azure/active-directory/governance/entitlement-management-access-reviews-self-review.md",
42754310
"redirect_url": "/azure/active-directory/governance/self-access-review",
42764311
"redirect_document_id": false
42774312
},
4278-
{
4313+
{
42794314
"source_path_from_root": "/azure/active-directory/governance/manage-guest-access-with-access-reviews.md",
42804315
"redirect_url": "/azure/active-directory/governance/manage-access-review",
42814316
"redirect_document_id": false
42824317
},
4283-
{
4318+
{
42844319
"source_path_from_root": "/azure/active-directory/governance/manage-user-access-with-access-reviews.md",
42854320
"redirect_url": "/azure/active-directory/governance/manage-access-review",
42864321
"redirect_document_id": false
@@ -4395,6 +4430,21 @@
43954430
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-pilot-aadc-aadccp",
43964431
"redirect_document_id": false
43974432
},
4433+
{
4434+
"source_path_from_root": "/articles/active-directory/governance/what-is-app-provisioning.md",
4435+
"redirect_url": "/azure/active-directory/app-provisioning/user-provisioning",
4436+
"redirect_document_id": false
4437+
},
4438+
{
4439+
"source_path_from_root": "/articles/active-directory/governance/what-is-hr-driven-provisioning.md",
4440+
"redirect_url": "azure/active-directory/app-provisioning/what-is-hr-driven-provisioning",
4441+
"redirect_document_id": false
4442+
},
4443+
{
4444+
"source_path_from_root": "/articles/active-directory/governance/what-is-inter-directory-provisioning.md",
4445+
"redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
4446+
"redirect_document_id": false
4447+
},
43984448
{
43994449
"source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
44004450
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -7147,14 +7197,24 @@
71477197
},
71487198
{
71497199
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-admin-units-add-manage-groups.md",
7150-
"redirect_url": "/azure/active-directory/roles/admin-units-add-manage-groups",
7151-
"redirect_document_id": true
7200+
"redirect_url": "/azure/active-directory/roles/admin-units-members-add",
7201+
"redirect_document_id": false
7202+
},
7203+
{
7204+
"source_path_from_root": "/articles/active-directory/roles/admin-units-add-manage-groups.md",
7205+
"redirect_url": "/azure/active-directory/roles/admin-units-members-add",
7206+
"redirect_document_id": false
71527207
},
71537208
{
71547209
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-admin-units-add-manage-users.md",
7155-
"redirect_url": "/azure/active-directory/roles/admin-units-add-manage-users",
7210+
"redirect_url": "/azure/active-directory/roles/admin-units-members-add",
71567211
"redirect_document_id": true
71577212
},
7213+
{
7214+
"source_path_from_root": "/articles/active-directory/roles/admin-units-add-manage-users.md",
7215+
"redirect_url": "/azure/active-directory/roles/admin-units-members-add",
7216+
"redirect_document_id": false
7217+
},
71587218
{
71597219
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-admin-units-assign-roles.md",
71607220
"redirect_url": "/azure/active-directory/roles/admin-units-assign-roles",
@@ -10594,8 +10654,33 @@
1059410654
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-rest.md",
1059510655
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-rest",
1059610656
"redirect_document_id": false
10657+
},
10658+
{
10659+
"source_path": "articles/active-directory/verifiable-credentials/enable-your-tenant-verifiable-credentials.md",
10660+
"redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant",
10661+
"redirect_document_id": false
10662+
}
10663+
,
10664+
{
10665+
"source_path": "articles/active-directory/verifiable-credentials/issue-verify-verifiable-credentials-your-tenant.md",
10666+
"redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-issuer",
10667+
"redirect_document_id": false
10668+
},
10669+
{
10670+
"source_path": "articles/active-directory/verifiable-credentials/get-started-verifiable-credentials.md",
10671+
"redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant",
10672+
"redirect_document_id": false
10673+
},
10674+
{
10675+
"source_path": "articles/active-directory/manage-apps/application-types.md",
10676+
"redirect_url": "/azure/active-directory/manage-apps/application-list",
10677+
"redirect_document_id": false
10678+
},
10679+
{
10680+
"source_path": "articles/active-directory/reports-monitoring/reference-basic-info-identifiers.md",
10681+
"redirect_url": "/azure/active-directory/reports-monitoring/reference-basic-info-sign-in-logs",
10682+
"redirect_document_id": false
1059710683
}
10598-
1059910684

1060010685
]
1060110686
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
5+
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
10+
"redirect_url": "/azure/azure-monitor/app/performance-counters",
11+
"redirect_document_id": true
12+
}
13+
]
14+
}
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/lab-services/classroom-labs-overview.md",
5+
"redirect_url": "/azure/lab-services/get-started-manage-labs",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

0 commit comments

Comments
 (0)