Skip to content

Commit 94cb6a9

Browse files
authored
Merge pull request #69265 from MicrosoftDocs/master
3/12 PM Publish
2 parents 16a6313 + 8c655dc commit 94cb6a9

File tree

890 files changed

+3345
-3573
lines changed

Some content is hidden

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

890 files changed

+3345
-3573
lines changed

.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,23 @@
314314
"branch": "master",
315315
"branch_mapping": {}
316316
},
317+
{
318+
"path_to_root": "samples-fbPageModeration",
319+
"url": "https://github.com/MicrosoftContentModerator/samples-fbPageModeration",
320+
"branch": "master",
321+
"branch_mapping": {}
322+
},
317323
{
318324
"path_to_root": "AIVisualProvision",
319325
"url": "https://github.com/Microsoft/AIVisualProvision",
320326
"branch": "master",
321327
"branch_mapping": {}
328+
},
329+
{
330+
"path_to_root": "VideoReviewConsoleApp",
331+
"url": "https://github.com/MicrosoftContentModerator/VideoReviewConsoleApp",
332+
"branch": "master",
333+
"branch_mapping": {}
322334
}
323335
],
324336
"branch_target_mapping": {

articles/active-directory-b2c/validation-technical-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Define a validation technical profile in a custom policy in Azure Active Directory B2C | Microsoft Docs
3-
description: Define a Azure Active Directory technical profile in a custom policy in Azure Active Directory B2C.
3+
description: Define an Azure Active Directory technical profile in a custom policy in Azure Active Directory B2C.
44
services: active-directory-b2c
55
author: davidmu1
66
manager: daveba

articles/active-directory/develop/azure-ad-federation-metadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ entityID="https://sts.windows.net/{tenant}/">
6969
```
7070

7171
### Token signing certificates
72-
When a service receives a token that is issued by a Azure AD tenant, the signature of the token must be validated with a signing key that is published in the federation metadata document. The federation metadata includes the public portion of the certificates that the tenants use for token signing. The certificate raw bytes appear in the `KeyDescriptor` element. The token signing certificate is valid for signing only when the value of the `use` attribute is `signing`.
72+
When a service receives a token that is issued by an Azure AD tenant, the signature of the token must be validated with a signing key that is published in the federation metadata document. The federation metadata includes the public portion of the certificates that the tenants use for token signing. The certificate raw bytes appear in the `KeyDescriptor` element. The token signing certificate is valid for signing only when the value of the `use` attribute is `signing`.
7373

7474
A federation metadata document published by Azure AD can have multiple signing keys, such as when Azure AD is preparing to update the signing certificate. When a federation metadata document includes more than one certificate, a service that is validating the tokens should support all certificates in the document.
7575

articles/active-directory/fundamentals/active-directory-users-restore.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ You can view your restorable users, restore a deleted user, or permanently delet
2727
## Required permissions
2828
You must have one of the following roles to restore and permanently delete users.
2929

30-
- Company Administrator
30+
- Global administrator
3131

3232
- Partner Tier1 Support
3333

3434
- Partner Tier2 Support
3535

36-
- User Account Administrator
36+
- User administrator
3737

3838
## View your restorable users
3939
You can see all the users that were deleted less than 30 days ago. These users can be restored.

articles/active-directory/fundamentals/users-default-permissions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Default permissions for member users can be restricted in the following ways.
4545

4646
Permission | Setting explanation
4747
---------- | ------------
48-
Ability to create security groups | Setting this option to No prevents users from creating security groups. Global Administrators and User Account Administrators can still create security groups. See [Azure Active Directory cmdlets for configuring group settings](../users-groups-roles/groups-settings-cmdlets.md) to learn how.
49-
Ability to create Office 365 groups | Setting this option to No prevents users from creating Office 365 groups. Setting this option to Some allows a select set of users to create Office 365 groups. Global Administrators and User Account Administrators will still be able to create Office 365 groups. See [Azure Active Directory cmdlets for configuring group settings](../users-groups-roles/groups-settings-cmdlets.md) to learn how.
48+
Ability to create security groups | Setting this option to No prevents users from creating security groups. Global administrators and User administrators can still create security groups. See [Azure Active Directory cmdlets for configuring group settings](../users-groups-roles/groups-settings-cmdlets.md) to learn how.
49+
Ability to create Office 365 groups | Setting this option to No prevents users from creating Office 365 groups. Setting this option to Some allows a select set of users to create Office 365 groups. Global administrators and User administrators will still be able to create Office 365 groups. See [Azure Active Directory cmdlets for configuring group settings](../users-groups-roles/groups-settings-cmdlets.md) to learn how.
5050
Restrict access to Azure AD administration portal | Setting this option to No prevents users from accessing Azure Active Directory.
5151
Ability to read other users | This setting is available in PowerShell only. Setting this to $false prevents all non-admins from reading user information from the directory. This does not prevent reading user information in other Microsoft services like Exchange Online. This setting is meant for special circumstances, and setting this to $false is not recommended.
5252

@@ -61,7 +61,7 @@ When a user adds a new enterprise application, they are automatically added as a
6161

6262
### Group owner permissions
6363

64-
When a user creates a group, they are automatically added as an owner for that group. As an owner, they can manage properties of the group such as the name, as well as manage group membership. An owner can also add or remove other owners. Unlike Global Administrators and User Account Administrators, owners can only manage groups they own. To assign a group owner, see [Managing owners for a group](active-directory-accessmanagement-managing-group-owners.md).
64+
When a user creates a group, they are automatically added as an owner for that group. As an owner, they can manage properties of the group such as the name, as well as manage group membership. An owner can also add or remove other owners. Unlike Global administrators and User administrators, owners can only manage groups they own. To assign a group owner, see [Managing owners for a group](active-directory-accessmanagement-managing-group-owners.md).
6565

6666
## Next steps
6767

articles/active-directory/fundamentals/whats-new.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,11 @@ We've fixed an issue so specific administrator roles can now create and update d
513513

514514
The roles are:
515515

516-
- Global administrator or Company Writer
516+
- Global administrator
517517

518-
- Intune Service Administrator
518+
- Intune administrator
519519

520-
- User Account Administrator
520+
- User administrator
521521

522522
For more information, see [Create a dynamic group and check status](https://docs.microsoft.com/azure/active-directory/users-groups-roles/groups-create-rule)
523523

articles/active-directory/governance/access-reviews-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ If you are ready to deploy access reviews in your organization, follow these ste
7979

8080
To enable access reviews, follow these steps.
8181

82-
1. As a Global Administrator or User Account Administrator, sign in to the [Azure portal](https://portal.azure.com) where you want to use access reviews.
82+
1. As a Global administrator or User administrator, sign in to the [Azure portal](https://portal.azure.com) where you want to use access reviews.
8383

8484
1. Click **All services** and find the access reviews service.
8585

articles/active-directory/governance/conditional-access-exclusion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Let's cover two examples where you can use access reviews to manage exclusions i
9797
Let's say you have a conditional access policy that blocks access from certain countries. It includes a group that is excluded from the policy. Here is a recommended access review where members of the group are reviewed.
9898

9999
> [!NOTE]
100-
> A Global Administrator or User Account Administrator role is required to create access reviews.
100+
> A Global administrator or User administrator role is required to create access reviews.
101101
102102
1. The review will reoccur every week.
103103

articles/active-directory/governance/create-access-review.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This article describes how to create one or more access reviews for group member
2626
## Prerequisites
2727

2828
- [Access reviews enabled](access-reviews-overview.md)
29-
- Global Administrator or User Account Administrator
29+
- Global administrator or User administrator
3030

3131
## Create one or more access reviews
3232

@@ -48,7 +48,7 @@ This article describes how to create one or more access reviews for group member
4848

4949
1. To make the access review recurring, change the **Frequency** setting from **One time** to **Weekly**, **Monthly**, **Quarterly** or **Annually**, and use the **Duration** slider or text box to define how many days each review of the recurring series will be open for input from reviewers. For example, the maximum duration that you can set for a monthly review is 27 days, to avoid overlapping reviews.
5050

51-
1. Use the **End** setting to specify how to end the recurring access review series. The series can end in three ways: it runs continuously to start reviews indefinitely, until a specific date, or after a defined number of occurrences has been completed. You, another User Account Administrator, or another Global Administrator can stop the series after creation by changing the date in **Settings**, so that it ends on that date.
51+
1. Use the **End** setting to specify how to end the recurring access review series. The series can end in three ways: it runs continuously to start reviews indefinitely, until a specific date, or after a defined number of occurrences has been completed. You, another User administrator, or another Global administrator can stop the series after creation by changing the date in **Settings**, so that it ends on that date.
5252

5353
1. In the **Users** section, specify the users that access review applies to. Access reviews can be for the members of a group or for users who were assigned to an application. You can further scope the access review to review only the guest users who are members (or assigned to the application), rather than reviewing all the users who are members or who have access to the application.
5454

articles/active-directory/governance/manage-guest-access-with-access-reviews.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You can also ask guest users to review their own access. For each paid Azure AD
3939

4040
## Create and perform an access review for guests
4141

42-
First, as a global administrator or user account administrator, go to the [access reviews page](https://portal.azure.com/#blade/Microsoft_AAD_ERM/DashboardBlade/) to ensure that access reviews is ready for your organization.
42+
First, as a global administrator or user administrator, go to the [access reviews page](https://portal.azure.com/#blade/Microsoft_AAD_ERM/DashboardBlade/) to ensure that access reviews is ready for your organization.
4343

4444
Azure AD enables several scenarios for reviewing guest users.
4545

0 commit comments

Comments
 (0)