Skip to content

Commit 163be41

Browse files
authored
Merge pull request #105119 from MicrosoftDocs/master
Merge Master to Live, 4 AM
2 parents 3c8fbce + 1983907 commit 163be41

File tree

69 files changed

+946
-645
lines changed

Some content is hidden

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

69 files changed

+946
-645
lines changed

.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18120,6 +18120,11 @@
1812018120
"redirect_url": "/azure/virtual-machine-scale-sets/disk-encryption-powershell",
1812118121
"redirect_document_id": true
1812218122
},
18123+
{
18124+
"source_path": "articles/virtual-machines/linux/update-infrastructure-redhat.md",
18125+
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-rhui",
18126+
"redirect_document_id": false
18127+
},
1812318128
{
1812418129
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
1812518130
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
@@ -23527,7 +23532,7 @@
2352723532
},
2352823533
{
2352923534
"source_path": "articles/virtual-machines/virtual-machines-linux-update-infrastructure-redhat.md",
23530-
"redirect_url": "/azure/virtual-machines/linux/update-infrastructure-redhat",
23535+
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-rhui",
2353123536
"redirect_document_id": false
2353223537
},
2353323538
{
@@ -35545,6 +35550,11 @@
3554535550
"redirect_url": "/azure/iot-accelerators/iot-accelerators-device-simulation-advanced-device",
3554635551
"redirect_document_id": false
3554735552
},
35553+
{
35554+
"source_path": "articles/active-directory/conditional-access/app-based-mfa.md",
35555+
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
35556+
"redirect_document_id": false
35557+
},
3554835558
{
3554935559
"source_path": "articles/active-directory/conditional-access/technical-reference.md",
3555035560
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-conditions",

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,12 +1450,13 @@ If you're building an application that will be used by more than one tenant, you
14501450
### Gallery onboarding checklist
14511451
Follow the checklist below to ensure that your application is onboarded quicky and customers have a smooth deployment experience. The information will be gathered from you when onboarding to the gallery.
14521452
> [!div class="checklist"]
1453-
> * [Support SCIM 2.0 ](https://tools.ietf.org/html/draft-wahl-scim-profile-00) (Required)
1453+
> * Support a [SCIM 2.0 ](https://docs.microsoft.com/azure/active-directory/app-provisioning/use-scim-to-provision-users-and-groups#step-2-understand-the-azure-ad-scim-implementation) user and group endpoint (Only one is required but both are recommended)
14541454
> * Support at least 25 requests per second per tenant (Required)
1455-
> * Support schema discovery (Recommended)
14561455
> * Support the OAuth authorization code grant or a long lived token as described below (Required)
1457-
> * Establish an engineering and support point of contact to support customer post gallery onboarding (Required)
1456+
> * Establish an engineering and support point of contact to support customers post gallery onboarding (Required)
1457+
> * Support updating multiple group memberships with a single PATCH (Recommended)
14581458
> * Document your SCIM endpoint publicly (Recommended)
1459+
> * [Support schema discovery](https://tools.ietf.org/html/rfc7643#section-6) (Recommended)
14591460
14601461

14611462
### Authorization for provisioning connectors in the application gallery

articles/active-directory/conditional-access/TOC.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
href: overview.md
77
- name: Quickstarts
88
items:
9-
- name: Require MFA for specific apps
10-
href: app-based-mfa.md
119
- name: Require terms of use to be accepted
1210
href: require-tou.md
1311
- name: Block access when a session risk is detected
1412
href: app-sign-in-risk.md
13+
- name: Tutorials
14+
items:
15+
- name: Require Azure Multi-Factor Authentication
16+
href: /authentication/tutorial-enable-azure-mfa.md?toc=/azure/conditional-access/toc.json&bc=/azure/conditional-access/breadcrumb/toc.json
1517
- name: Concepts
1618
expanded: false
1719
items:

articles/active-directory/conditional-access/app-based-mfa.md

Lines changed: 0 additions & 186 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- name: Azure
2+
tocHref: /azure/
3+
topicHref: /azure/index
4+
items:
5+
- name: Active Directory
6+
tocHref: /azure/active-directory/
7+
topicHref: /azure/active-directory/index
8+
items:
9+
- name: Conditional Access
10+
tocHref: /azure/active-directory/conditional-access/
11+
topicHref: /azure/active-directory/authentication/index
78.6 KB
Loading
124 KB
Loading
191 KB
Loading
200 KB
Loading
259 KB
Loading

0 commit comments

Comments
 (0)