Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into akv-reorg-working-branch

Author: msmbaldwin

.openpublishing.redirection.json

@@ -50406,6 +50406,11 @@
       "redirect_url": "/azure/cognitive-services/speech-service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/hdinsight/spark/azure-synapse-analytics-job-definition.md",
+      "redirect_url": "../../synapse-analytics/spark/apache-spark-job-definitions.md",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/media-services/latest/access-api-portal.md",
       "redirect_url": "/azure/media-services/latest/access-api-howto",
@@ -51099,6 +51104,11 @@
       "source_path": "articles/security/fundamentals/database-security-overview.md",
       "redirect_url": "/azure/sql-database/sql-database-security-overview",
       "redirect_document_id": false
+    },
+	{
+      "source_path": "articles/azure-monitor/insights/key-vault-insights-overview.md",
+      "redirect_url": "/azure/azure-monitor/overview",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/security/fundamentals/database-best-practices.md",

.vscode/settings.json

@@ -62,4 +62,4 @@
         "auditd"
     ],
     "git.ignoreLimitWarning": true
-}
+}

articles/active-directory/b2b/invitation-email-elements.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: conceptual
-ms.date: 02/06/2019
+ms.date: 04/15/2020
 
 ms.author: mimart
 author: msmimart

articles/active-directory/b2b/media/invitation-email-elements/invitation-email.png

@@ -116,7 +116,7 @@ If you are migrating from AD FS (or other federation technologies) to Pass-throu
 
 ## Can I use Pass-through Authentication in a multi-forest Active Directory environment?
 
-Yes. Multi-forest environments are supported if there are forest trusts between your Active Directory forests and if name suffix routing is correctly configured.
+Yes. Multi-forest environments are supported if there are forest trusts (two-way) between your Active Directory forests and if name suffix routing is correctly configured.
 
 ## Does Pass-through Authentication provide load balancing across multiple Authentication Agents?
 

articles/active-directory/b2b/media/invitation-email-elements/invitation-message.png

@@ -58,11 +58,6 @@ When UserPrincipalName (UPN)/Alternate Login ID suffix is not verified with the
 
 ![Azure AD replaces UPN](media/tshoot-connect-objectsync/objsynch2.png)
 
-### Changing UPN Suffix from one federated domain to another federated domain
-Azure Active Directory does not allow the synchronization of UserPrincipalName (UPN)/Alternate Login ID suffix change from one federated domain to another federated domain. This applies to domains, that are verified with the Azure AD Tenant and have the Authentication Type as Federated.
-
-![No UPN synch from one federated domain to another](media/tshoot-connect-objectsync/objsynch3.png) 
-
 ### Azure AD Tenant DirSync Feature ‘SynchronizeUpnForManagedUsers’ is disabled
 When the Azure AD Tenant DirSync Feature ‘SynchronizeUpnForManagedUsers’ is disabled, Azure Active Directory does not allow synchronization updates to UserPrincipalName/Alternate Login ID for licensed user accounts with managed authentication.
 

articles/active-directory/hybrid/how-to-connect-pta-faq.md

@@ -113,7 +113,7 @@ The wildcard application is represented with just one tile in the [MyApps panel]
 
 ### Kerberos constrained delegation
 
-For applications using [kerberos constrained delegation (KCD) as the SSO method](application-proxy-configure-single-sign-on-with-kcd.md), the SPN listed for the SSO method may also need a wildcard. For example, the SPN could be: `HTTP/*.adventure-works.com`. You still need to have the individual SPNs configured on your backend servers (for example, `http://expenses.adventure-works.com and HTTP/travel.adventure-works.com`).
+For applications using [kerberos constrained delegation (KCD) as the SSO method](application-proxy-configure-single-sign-on-with-kcd.md), the SPN listed for the SSO method may also need a wildcard. For example, the SPN could be: `HTTP/*.adventure-works.com`. You still need to have the individual SPNs configured on your backend servers (for example, `HTTP/expenses.adventure-works.com and HTTP/travel.adventure-works.com`).
 
 ## Scenario 1: General wildcard application
 

articles/active-directory/hybrid/tshoot-connect-objectsync.md

@@ -149,6 +149,7 @@
     - name: Service plan IDs for licensing
       href: licensing-service-plan-reference.md
   - name: Azure AD administrator roles    
+    expanded: true
     items: 
     - name: Roles and permissions
       href: directory-assign-admin-roles.md
@@ -180,6 +181,20 @@
         href: directory-admin-roles-secure.md  
       - name: Create emergency accounts    
         href: directory-emergency-access.md
+    - name: Administrative units preview
+      items:
+      - name: Administrative units overview  
+        href: directory-administrative-units.md
+      - name: Add & manage AUs
+        href: roles-admin-units-manage.md
+      - name: Add & manage users in AUs
+        href: roles-admin-units-add-manage-users.md
+      - name: Add & manage groups in AUs
+        href: roles-admin-units-add-manage-groups.md
+      - name: Assign a role with AU scope
+        href: roles-admin-units-assign-roles.md
+      - name: FAQ and troubleshooting
+        href: roles-admin-units-faq-troubleshoot.md
   - name: Manage sign-in
     items:    
     - name: Customize company branding    
@@ -211,4 +226,4 @@
   - name:  Azure AD PowerShell for Graph
     href: https://docs.microsoft.com/powershell/azure/active-directory/install-adv2?view=azureadps-2.0
   - name: Azure AD service limits
-    href: directory-service-limits-restrictions.md
+    href: directory-service-limits-restrictions.md

articles/active-directory/manage-apps/application-proxy-wildcard.md

@@ -9,32 +9,95 @@ ms.service: active-directory
 ms.topic: article
 ms.subservice: users-groups-roles
 ms.workload: identity
-ms.date: 11/13/2019
+ms.date: 04/16/2020
 ms.author: curtand
 ms.reviewer: elkuzmen
 ms.custom: oldportal;it-pro;
 ms.collection: M365-identity-device-management
 ---
 # Administrative units management in Azure Active Directory (preview)
 
-This article describes administrative units in Azure Active Directory (Azure AD). An administrative unit is an Azure AD resource that can be a container for other Azure AD resources. In this preview release, these resources can be only users. For example, an administrative unit-scoped User account admin can update profile information, reset passwords, and assign licenses for users only in their administrative unit.
+This article describes administrative units in Azure Active Directory (Azure AD). An administrative unit is an Azure AD resource that can be a container for other Azure AD resources. In this preview release, an administrative unit can contain only users and groups.
 
-You can use administrative units to delegate administrative permissions over subsets of users and applying policies to a subset of users. You can use administrative units to delegate permissions to regional administrators or to set policy at a granular level.
+Administrative units allow you to grant admin permissions that are restricted to a department, region, or other segment of your organization that you define. You can use administrative units to delegate permissions to regional administrators or to set policy at a granular level. For example, a User account admin could update profile information, reset passwords, and assign licenses for users only in their administrative unit.
+
+ For example, delegating to regional support specialists the [Helpdesk Administrator](directory-assign-admin-roles.md#helpdesk-administrator) role restricted to managing just the users in the region they support.
 
 ## Deployment scenario
 
-Administrative units can be useful in organizations with independent divisions. Consider the example of a large university that is made up of many autonomous schools (School of Business, School of Engineering, and so on) that each has their own IT administrators who control access, manage users, and set policies for their school. A central administrator could create an administrative unit for the School of Business and populate it with only the business school students and staff. Then the central administrator can add the Business school IT staff to a scoped role that grants administrative permissions over only Azure AD users in the business school administrative unit.
+Restricting administrative scope using administrative units can be useful in organizations that are made up of independent divisions of any kind. Consider the example of a large university that is made up of many autonomous schools (School of Business, School of Engineering, and so on) that each has a team of IT admins who control access, manage users, and set policies for their school. A central administrator could:
+
+- Create a role with administrative permissions over only Azure AD users in the business school administrative unit
+- Create an administrative unit for the School of Business
+- Populate the admin unit with only the business school students and staff
+- Add the Business school IT team to the role with their scope
 
 ## License requirements
 
-To use administrative units requires an Azure Active Directory Premium license for each administrative unit admin. For more information, see [Getting started with Azure AD Premium](../fundamentals/active-directory-get-started-premium.md).
+Using administrative units requires an Azure Active Directory Premium license for each administrative unit admin, and Azure Active Directory Free licenses for administrative unit members. For more information, see [Getting started with Azure AD Premium](../fundamentals/active-directory-get-started-premium.md).
+
+## Manage administrative units
+
+In this preview release, you can manage administrative units using the Azure portal, PowerShell cmdlets and scripts, or the Microsoft Graph. You can refer to our documentation for details:
+
+- [Create, remove, populate, and add roles to administrative units](roles-admin-units-manage.md): Complete how-to procedures
+- [Working with Admin Units](https://docs.microsoft.com/powershell/azure/active-directory/working-with-administrative-units?view=azureadps-2.0): How to work with administrative units using PowerShell
+- [Administrative Unit Graph support](https://docs.microsoft.com/graph/api/resources/administrativeunit?view=graph-rest-beta): Detailed documentation on Microsoft Graph for administrative units.
+
+### Planning your administrative units
+
+Administrative units can be used to logically group Azure AD resources. For example, for an organization whose IT department is scattered globally, it might make sense to create administrative units that define those geographical boundaries. In another scenario where a multi-national organization has different "sub-organizations", that are semi-autonomous in operations, each sub-organization may be represented by an administrative unit.
+
+The criteria on which administrative units are created will be guided by the unique requirements of an organization. Administrative Units are a common way to define structure across M365 services. We recommend that you prepare your administrative units with their use across M365 services in mind. You can get maximum value out of administrative units when you can associate common resources across M365 under an administrative unit.
+
+You can expect the creation of administrative units in the organization to go through the following stages:
+
+1. Initial Adoption: Your organization will start creating administrative units based on initial criteria and the number of administrative units will increase as the criteria is refined.
+1. Pruning: Once the criteria is well defined, administrative units that are no longer required will be deleted.
+1. Stabilization: Your organizational structure is well defined and the number of administrative units is not going to change significantly over short durations.
+
+## Currently supported scenarios
+
+Global administrators or Privileged role administrators can use the Azure AD portal to create administrative units, add users as members of administrative units, and then assign IT staff to administrative unit-scoped administrator roles. The administrative unit-scoped admins can then use the Office 365 portal for basic management of users in their administrative units.
+
+Additionally, groups can be added as members of administrative unit, and an admin unit-scoped group administrator can manage them using PowerShell, the Microsoft Graph, and the Azure AD portal.
+
+The below table describes current support for administrative unit scenarios.
+
+### Administrative unit management
+
+Permissions |   MS Graph/PowerShell   | Azure AD portal | Microsoft 365 admin center
+----------- | ----------------------- | --------------- | -----------------
+Creating and deleting administrative units   |    Supported    |   Supported   |    Not supported
+Adding and removing administrative unit members individually    |   Supported    |   Supported   |    Not supported
+Bulk adding and removing administrative unit members using .csv file   |    Not supported     |  Supported   |    No plan to support
+Assigning administrative unit-scoped administrators  |     Supported    |   Supported    |   Not supported
+Adding and removing AU members dynamically based on attributes | Not supported | Not supported | Not supported
+
+### User management
+
+Permissions |   MS Graph/PowerShell   | Azure AD portal | Microsoft 365 admin center
+----------- | ----------------------- | --------------- | -----------------
+administrative unit-scoped management of user properties, passwords, licenses   |    Supported     |  Supported   |   Supported
+administrative unit-scoped blocking and unblocking of user sign-ins    |   Supported   |    Supported   |    Supported
+administrative unit-scoped management of user MFA credentials   |    Supported   |   Supported   |   Not supported
+
+### Group management
 
-## Managing administrative units
+Permissions |   MS Graph/PowerShell   | Azure AD portal | Microsoft 365 admin center
+----------- | ----------------------- | --------------- | -----------------
+administrative unit-scoped management of group properties and members     |  Supported   |    Supported    |  Not supported
+administrative unit-scoped management of group licensing   |    Supported  |    Supported   |   Not supported
 
-In this preview release, the only way you can create and manage administrative units is to use the Azure Active Directory Module for Windows PowerShell cmdlets as described in [Working with Administrative Units](https://docs.microsoft.com/powershell/azure/active-directory/working-with-administrative-units?view=azureadps-2.0)
+> [!NOTE]
+>
+> Administrators with an administrative unit scope can't manage dynamic group membership rules.
 
-For more information on software requirements and installing the Azure AD module, and for reference information on the Azure AD Module cmdlets for managing administrative units, including syntax, parameter descriptions, and examples, see [Azure Active Directory PowerShell](https://docs.microsoft.com/powershell/azure/active-directory/overview?view=azureadps-2.0).
+Administrative units apply scope only to management permissions. They don't prevent members or administrators from using their [default user permissions](../fundamentals/users-default-permissions.md) to browse other users, groups, or resources outside of the administrative unit. In the Office 365 portal, users outside of a scoped admin's administrative units are filtered out, but you can browse other users in the Azure AD portal, PowerShell, and other Microsoft services.
 
 ## Next steps
 
-[Azure Active Directory editions](../fundamentals/active-directory-whatis.md)
+- [Managing AUs](roles-admin-units-manage.md)
+- [Manage users in AUs](roles-admin-units-add-manage-users.md)
+- [Manage groups in AUs](roles-admin-units-add-manage-groups.md)
+- [Assign scoped roles to an AU](roles-admin-units-assign-roles.md)