Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: tynevi

.openpublishing.publish.config.json

@@ -314,11 +314,23 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "samples-fbPageModeration",
+      "url": "https://github.com/MicrosoftContentModerator/samples-fbPageModeration",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "AIVisualProvision",
       "url": "https://github.com/Microsoft/AIVisualProvision",
       "branch": "master",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "VideoReviewConsoleApp",
+      "url": "https://github.com/MicrosoftContentModerator/VideoReviewConsoleApp",
+      "branch": "master",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

articles/active-directory/authentication/concept-sspr-policy.md

@@ -32,19 +32,19 @@ The two-gate policy requires two pieces of authentication data, such as an **ema
   * Billing administrator
   * Partner Tier1 Support
   * Partner Tier2 Support
-  * Exchange service administrator
-  * Lync service administrator
-  * User account administrator
+  * Exchange administrator
+  * Skype for Business administrator
+  * User administrator
   * Directory writers
   * Global administrator or company administrator
-  * SharePoint service administrator
+  * SharePoint administrator
   * Compliance administrator
   * Application administrator
   * Security administrator
   * Privileged role administrator
-  * Microsoft Intune service administrator
+  * Intune administrator
   * Application proxy service administrator
-  * CRM service administrator
+  * Dynamics 365 administrator
   * Power BI service administrator
   * Authentication administrator
   * Privileged Authentication administrator

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

@@ -27,13 +27,13 @@ You can view your restorable users, restore a deleted user, or permanently delet
 ## Required permissions
 You must have one of the following roles to restore and permanently delete users.
 
-- Company Administrator
+- Global administrator
 
 - Partner Tier1 Support
 
 - Partner Tier2 Support
 
-- User Account Administrator
+- User administrator
 
 ## View your restorable users
 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

@@ -45,8 +45,8 @@ Default permissions for member users can be restricted in the following ways.
 
 Permission | Setting explanation
 ---------- | ------------
-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.
-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.
+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.
+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.
 Restrict access to Azure AD administration portal | Setting this option to No prevents users from accessing Azure Active Directory.
 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.
 
@@ -61,7 +61,7 @@ When a user adds a new enterprise application, they are automatically added as a
 
 ### Group owner permissions
 
-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).
+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).
 
 ## Next steps
 

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

@@ -513,11 +513,11 @@ We've fixed an issue so specific administrator roles can now create and update d
 
 The roles are:
 
-- Global administrator or Company Writer
+- Global administrator
 
-- Intune Service Administrator
+- Intune administrator
 
-- User Account Administrator
+- User administrator
 
 For more information, see [Create a dynamic group and check status](https://docs.microsoft.com/azure/active-directory/users-groups-roles/groups-create-rule)
 

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

@@ -79,7 +79,7 @@ If you are ready to deploy access reviews in your organization, follow these ste
 
 To enable access reviews, follow these steps.
 
-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.
+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.
 
 1. Click **All services** and find the access reviews service.
 

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

@@ -97,7 +97,7 @@ Let's cover two examples where you can use access reviews to manage exclusions i
 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.
 
 > [!NOTE]
-> A Global Administrator or User Account Administrator role is required to create access reviews.
+> A Global administrator or User administrator role is required to create access reviews.
 
 1. The review will reoccur every week.
 

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

@@ -26,7 +26,7 @@ This article describes how to create one or more access reviews for group member
 ## Prerequisites
 
 - [Access reviews enabled](access-reviews-overview.md)
-- Global Administrator or User Account Administrator
+- Global administrator or User administrator
 
 ## Create one or more access reviews
 
@@ -48,7 +48,7 @@ This article describes how to create one or more access reviews for group member
 
 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.
 
-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.
+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.
 
 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.
 

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

@@ -39,7 +39,7 @@ You can also ask guest users to review their own access. For each paid Azure AD
 
 ## Create and perform an access review for guests
 
-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. 
+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.
 
 Azure AD enables several scenarios for reviewing guest users.
 

articles/active-directory/governance/manage-programs-controls.md

@@ -23,11 +23,11 @@ ms.collection: M365-identity-device-management
 Azure Active Directory (Azure AD) includes access reviews of group members and application access. These examples of controls ensure oversight for who has access to your organization's group memberships and applications. Organizations can use these controls to efficiently address their governance, risk management, and compliance requirements.
 
 ## Create and manage programs and their controls
-You can simplify how to track and collect access reviews for different purposes by organizing them into programs. Each access review can be linked to a program. Then when you prepare reports for an auditor, you can focus on the access reviews in scope for a particular initiative.  Programs and access review results are visible to users in the Global Administrator, User Account Administrator, Security Administrator, or Security Reader role.
+You can simplify how to track and collect access reviews for different purposes by organizing them into programs. Each access review can be linked to a program. Then when you prepare reports for an auditor, you can focus on the access reviews in scope for a particular initiative.  Programs and access review results are visible to users in the Global administrator, User administrator, Security administrator, or Security reader role.
 
 To see a list of programs, go to the [access reviews page](https://portal.azure.com/#blade/Microsoft_AAD_ERM/DashboardBlade/) and select **Programs**.
 
-**Default Program** is always present. If you're in a global administrator or user account administrator role, you can create additional programs. For example, you can choose to have one program for each compliance initiative or business goal.
+**Default Program** is always present. If you're in a global administrator or user administrator role, you can create additional programs. For example, you can choose to have one program for each compliance initiative or business goal.
 
 If you no longer need a program and it doesn't have any controls linked to it, you can delete it.