updating

Author: billmath

articles/active-directory/hybrid/cloud-sync/concept-attributes.md

@@ -64,7 +64,7 @@ The following table lists common attributes and how they're synchronized to Azur
 
 ## View the schema
 > [!WARNING]
-> The cloud sync configuration creates a service principal. The service principal is visible in the Azure portal. You should not modify the attribute mappings using the service principal experience in the Azure portal.  This is not supported.
+> The cloud sync configuration creates a service principal. The service principal is visible in the Entra portal. You should not modify the attribute mappings using the service principal experience in the Entra portal.  This is not supported.
 
 To view the schema and verify it, follow these steps.
 

articles/active-directory/hybrid/cloud-sync/exchange-hybrid.md

@@ -41,15 +41,13 @@ Before deploying Exchange Hybrid with cloud sync you must meet the following pre
 ## How to enable
 Exchange Hybrid Writeback is disabled by default.  
 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
- 4.  Click on an existing configuration.
- 5.  At the top, select **Properties**.  You should see Exchange hybrid writeback disabled.
- 6.  Select the pencil next to **Basic**. 
+ [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
+ 3.  Click on an existing configuration.
+ 4.  At the top, select **Properties**.  You should see Exchange hybrid writeback disabled.
+ 5.  Select the pencil next to **Basic**. 
    :::image type="content" source="media/exchange-hybrid/exchange-hybrid-1.png" alt-text="Screenshot of the basic properties." lightbox="media/exchange-hybrid/exchange-hybrid-1.png":::
 
- 7. On the right, place a check in **Exchange hybrid writeback** and click **Apply**. 
+ 6. On the right, place a check in **Exchange hybrid writeback** and click **Apply**. 
    :::image type="content" source="media/exchange-hybrid/exchange-hybrid-2.png" alt-text="Screenshot of enabling Exchange writeback." lightbox="media/exchange-hybrid/exchange-hybrid-2.png":::
 
  >[!NOTE]
@@ -79,17 +77,15 @@ Provisioning on-demand with Exchange hybrid writeback requires two steps.  You n
 Provisioning on-demand with Exchange hybrid use the following steps
 
 
- 1. In the Azure portal, select **Azure Active Directory**.
- 2. On the left, select **Azure AD Connect**.
- 3. On the left, select **Cloud sync**.
- 4. Under **Configuration**, select your configuration.
- 5. On the left, select **Provision on demand**.
- 6. Enter the distinguished name of a user and select the **Provision** button.
- 7. A success screen appears with four green check marks. 
+ [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
+ 3. Under **Configuration**, select your configuration.
+ 4. On the left, select **Provision on demand**.
+ 5. Enter the distinguished name of a user and select the **Provision** button.
+ 6. A success screen appears with four green check marks. 
     :::image type="content" source="media/exchange-hybrid/exchange-hybrid-3.png" alt-text="Screenshot of the initial Exchange writeback." lightbox="media/exchange-hybrid/exchange-hybrid-3.png":::
 
- 8. Click **Next**.  On the **Writeback exchange attributes to Active Directory** tab, the synchronization starts.  
- 9. You should see the success details.
+ 7. Click **Next**.  On the **Writeback exchange attributes to Active Directory** tab, the synchronization starts.  
+ 8. You should see the success details.
     :::image type="content" source="media/exchange-hybrid/exchange-hybrid-4.png" alt-text="Screenshot of Exchange attributes being written back." lightbox="media/exchange-hybrid/exchange-hybrid-4.png":::
 
     >[!NOTE]

articles/active-directory/hybrid/cloud-sync/how-to-accidental-deletes.md

@@ -32,13 +32,11 @@ For more information and an example, see the following video.
 To use the new feature, follow the steps below.
 
 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
-4. Under **Configuration**, select your configuration.
-5. Select **View default properties**.
-6. Click the pencil next to **Basics**
-5. On the right, fill in the following information.
+ [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
+ 3. Under **Configuration**, select your configuration.
+ 4. Select **Properties**.
+ 5. Click the pencil next to **Basics**
+ 6. On the right, fill in the following information.
 	- **Notification email** - email used for notifications
 	- **Prevent accidental deletions** - check this box to enable the feature
 	- **Accidental deletion threshold** - enter the number of objects to stop synchronization and send a notification

articles/active-directory/hybrid/cloud-sync/how-to-attribute-mapping.md

@@ -22,7 +22,7 @@ You can use the cloud sync attribute mapping feature to map attributes between y
 You can customize (change, delete, or create) the default attribute mappings according to your business needs. For a list of attributes that are synchronized, see [Attributes synchronized to Azure Active Directory](../connect/reference-connect-sync-attributes-synchronized.md).
 
 > [!NOTE]
-> This article describes how to use the Azure portal to map attributes.  For information on using Microsoft Graph, see [Transformations](how-to-transformation.md).
+> This article describes how to use the Entra portal to map attributes.  For information on using Microsoft Graph, see [Transformations](how-to-transformation.md).
 
 ## Understand types of attribute mapping
 With attribute mapping, you control how attributes are populated in Azure AD. Azure AD supports four mapping types:
@@ -97,51 +97,45 @@ The following are the attributes supported by an expression mapping:
 
 To use attribute mapping, follow these steps:
 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
- 
- :::image type="content" source="media/how-to-on-demand-provision/new-ux-1.png" alt-text="Screenshot of new UX screen." lightbox="media/how-to-on-demand-provision/new-ux-1.png":::
 
- 4. Under **Configuration**, select your configuration.
- 5. On the left, select **Attribute mapping**.
- 6. At the top, ensure that you have the correct object type selected.  That is, user, group, or contact.
- 7. Click **Add attribute mapping**.
+[!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
+ 3. Under **Configuration**, select your configuration.
+ 4. On the left, select **Attribute mapping**.
+ 5. At the top, ensure that you have the correct object type selected.  That is, user, group, or contact.
+ 6. Click **Add attribute mapping**.
 
  :::image type="content" source="media/how-to-attribute-mapping/new-ux-mapping-3.png" alt-text="Screenshot of adding an attribute mapping." lightbox="media/how-to-attribute-mapping/new-ux-mapping-3.png":::
 
- 8. Select the mapping type. This can be one of the following:
+ 7. Select the mapping type. This can be one of the following:
      - **Direct**: The target attribute is populated with the value of an attribute of the linked object in Active Directory.
      - **Constant**: The target attribute is populated with a specific string that you specify.
      - **Expression**: The target attribute is populated based on the result of a script-like expression. 
      - **None**: The target attribute is left unmodified. 
 
- 9. Depending on what you have selected in the previous step, different options will be available for filling in.  
- 10. Select when to apply this mapping, and then select **Apply**.
+ 8. Depending on what you have selected in the previous step, different options will be available for filling in.  
+ 9. Select when to apply this mapping, and then select **Apply**.
  :::image type="content" source="media/how-to-attribute-mapping/new-ux-mapping-4.png" alt-text="Screenshot of saving an attribute mapping." lightbox="media/how-to-attribute-mapping/new-ux-mapping-4.png":::
 
- 11. Back on the **Attribute mappings** screen, you should see your new attribute mapping.
- 12. Select **Save schema**.  You will be notified that once you save the schema, a synchronization will occur.  Click **OK**.
+ 10. Back on the **Attribute mappings** screen, you should see your new attribute mapping.
+ 11. Select **Save schema**.  You will be notified that once you save the schema, a synchronization will occur.  Click **OK**.
  :::image type="content" source="media/how-to-attribute-mapping/new-ux-mapping-5.png" alt-text="Screenshot of saving schema." lightbox="media/how-to-attribute-mapping/new-ux-mapping-5.png":::
 
- 13. Once the save is successful you will see a notification on the right.
+ 12. Once the save is successful you will see a notification on the right.
 
  :::image type="content" source="media/how-to-attribute-mapping/new-ux-mapping-6.png" alt-text="Screenshot of successful schema save." lightbox="media/how-to-attribute-mapping/new-ux-mapping-6.png":::
 
 ## Test your attribute mapping
 
 To test your attribute mapping, you can use [on-demand provisioning](how-to-on-demand-provision.md): 
 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
- 4. Under **Configuration**, select your configuration.
- 5. On the left, select **Provision on demand**.
- 6. Enter the distinguished name of a user and select the **Provision** button.
+[!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
+ 3. Under **Configuration**, select your configuration.
+ 4. On the left, select **Provision on demand**.
+ 5. Enter the distinguished name of a user and select the **Provision** button.
 
  :::image type="content" source="media/how-to-on-demand-provision/new-ux-2.png" alt-text="Screenshot of user distinguished name." lightbox="media/how-to-on-demand-provision/new-ux-2.png":::    
 
- 7. After provisioning finishes, a success screen appears with four green check marks. Any errors appear to the left.
+ 6. After provisioning finishes, a success screen appears with four green check marks. Any errors appear to the left.
 
  :::image type="content" source="media/how-to-on-demand-provision/new-ux-3.png" alt-text="Screenshot of on-demand success." lightbox="media/how-to-on-demand-provision/new-ux-3.png":::  
 

articles/active-directory/hybrid/cloud-sync/how-to-cloud-sync-workbook.md

@@ -16,7 +16,7 @@ ms.collection: M365-identity-device-management
 
 
 # Azure AD cloud sync insights workbook
-The Cloud sync workbook provides a flexible canvas for data analysis. The workbook allows you to create rich visual reports within the Azure portal. To learn more, see Azure Monitor Workbooks overview.
+The Cloud sync workbook provides a flexible canvas for data analysis. The workbook allows you to create rich visual reports within the Entra portal. To learn more, see Azure Monitor Workbooks overview.
 
 This workbook is intended for Hybrid Identity Admins who use cloud sync to sync users from AD to Azure AD.  It allows admins to gain insights into sync status and details.
 

articles/active-directory/hybrid/cloud-sync/how-to-configure.md

@@ -30,23 +30,21 @@ For additional information and an example of how to configure cloud sync, see th
 ## Configure provisioning
 To configure provisioning, follow these steps.
 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
+ [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
 
  :::image type="content" source="media/how-to-on-demand-provision/new-ux-1.png" alt-text="Screenshot of new UX screen." lightbox="media/how-to-on-demand-provision/new-ux-1.png":::
 
- 4. Select **New configuration**.
+ 3. Select **New configuration**.
  :::image type="content" source="media/how-to-configure/new-ux-configure-1.png" alt-text="Screenshot of adding a configuration." lightbox="media/how-to-configure/new-ux-configure-1.png":::
- 5. On the configuration screen, select your domain and whether to enable password hash sync.  Click **Create**.  
+ 4. On the configuration screen, select your domain and whether to enable password hash sync.  Click **Create**.  
 
  :::image type="content" source="media/how-to-configure/new-ux-configure-2.png" alt-text="Screenshot of a new configuration." lightbox="media/how-to-configure/new-ux-configure-2.png":::
 
- 6.  The **Get started** screen will open.  From here, you can continue configuring cloud sync.
+ 5.  The **Get started** screen will open.  From here, you can continue configuring cloud sync.
 
   :::image type="content" source="media/how-to-configure/new-ux-configure-3.png" alt-text="Screenshot of the getting started screen." lightbox="media/how-to-configure/new-ux-configure-3.png":::
 
- 7. The configuration is split in to the following 5 sections.
+ 6. The configuration is split in to the following 5 sections.
 
 |Section|Description|
 |-----|-----|
@@ -151,9 +149,7 @@ Cloud sync monitors the health of your configuration and places unhealthy object
 
 ## Restart provisioning 
 If you don't want to wait for the next scheduled run, trigger the provisioning run by using the **Restart sync** button. 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
+ [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
  4. Under **Configuration**, select your configuration.
 
  :::image type="content" source="media/how-to-configure/new-ux-configure-14.png" alt-text="Screenshot of restarting sync." lightbox="media/how-to-configure/new-ux-configure-14.png":::
@@ -163,14 +159,12 @@ If you don't want to wait for the next scheduled run, trigger the provisioning r
 ## Remove a configuration
 To delete a configuration, follow these steps.
 
- 1.  In the Azure portal, select **Azure Active Directory**.
- 2.  On the left, select **Azure AD Connect**.
- 3.  On the left, select **Cloud sync**.
- 4. Under **Configuration**, select your configuration.
+ [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
+ 3. Under **Configuration**, select your configuration.
 
  :::image type="content" source="media/how-to-configure/new-ux-configure-15.png" alt-text="Screenshot of deletion." lightbox="media/how-to-configure/new-ux-configure-15.png":::
 
- 5. At the top of the configuration screen, select **Delete configuration**.
+ 4. At the top of the configuration screen, select **Delete configuration**.
 
 >[!IMPORTANT]
 >There's no confirmation prior to deleting a configuration. Make sure this is the action you want to take before you select **Delete**.

articles/active-directory/hybrid/cloud-sync/how-to-install-pshell.md

@@ -31,107 +31,61 @@ The Windows server must have TLS 1.2 enabled before you install the Azure AD Con
 
 [!INCLUDE [portal updates](~/articles/active-directory/includes/portal-update.md)]
 
-<<<<<<< HEAD
 [!INCLUDE [sign in](../../../../includes/cloud-sync-sign-in.md)]
  3. Select **Manage**.
  4. Click **Download provisioning agent**
  5. On the right, click **Accept terms and download**.
  6. For the purposes of these instructions, the agent was downloaded to the C:\temp folder.
  7. Install ProvisioningAgent in quiet mode.
-=======
- 1. Sign in to the server you use with enterprise admin permissions.
- 2. Sign in to the [Azure portal](https://portal.azure.com), and then go to **Azure Active Directory**.
- 3. On the menu on the left, select **Azure AD Connect**.
- 4. Select **Manage cloud sync**.
-     [![Screenshot that shows manage cloud sync](media/how-to-install/new-install-1.png)](media/how-to-install/new-install-1.png#lightbox)</br>
- 5. At the top, click **Download agent**.
-    [![Screenshot that the download agent](media/how-to-install/new-install-2.png)](media/how-to-install/new-install-2.png#lightbox)</br>
- 6. On the right, click **Accept terms and download**.
- 7. For the purposes of these instructions, the agent was downloaded to the C:\temp folder.
- 8. Install ProvisioningAgent in quiet mode. [If Installing against US Government Cloud, click here for alternate code block.](how-to-install-pshell.md#installing-against-us-government-cloud)
->>>>>>> c060fcac9d668527475ba7fd03d5b7e4d8c5bbba
        ```
       $installerProcess = Start-Process 'c:\temp\AADConnectProvisioningAgentSetup.exe' /quiet -NoNewWindow -PassThru 
       $installerProcess.WaitForExit()
 
        ```
-<<<<<<< HEAD
  8. Import the Provisioning Agent PS module.
        ```
        Import-Module "C:\Program Files\Microsoft Azure AD Connect Provisioning Agent\Microsoft.CloudSync.PowerShell.dll" 
        ```
  9. Connect to Azure AD by using an account with the hybrid identity role. You can customize this section to fetch a password from a secure store. 
-=======
- 10. Import the Provisioning Agent PS module.
-       ```
-       Import-Module "C:\Program Files\Microsoft Azure AD Connect Provisioning Agent\Microsoft.CloudSync.PowerShell.dll" 
-       ```
- 11. Connect to Azure AD by using an account with the hybrid identity role. You can customize this section to fetch a password from a secure store. 
->>>>>>> c060fcac9d668527475ba7fd03d5b7e4d8c5bbba
        ```
        $hybridAdminPassword = ConvertTo-SecureString -String "Hybrid identity admin password" -AsPlainText -Force 
 
        $hybridAdminCreds = New-Object System.Management.Automation.PSCredential -ArgumentList ("[email protected]", $hybridAdminPassword) 
 
        Connect-AADCloudSyncAzureAD -Credential $hybridAdminCreds 
        ```
-<<<<<<< HEAD
  10. Add the gMSA account, and provide credentials of the domain admin to create the default gMSA account.
-=======
- 12. Add the gMSA account, and provide credentials of the domain admin to create the default gMSA account.
->>>>>>> c060fcac9d668527475ba7fd03d5b7e4d8c5bbba
        ```
        $domainAdminPassword = ConvertTo-SecureString -String "Domain admin password" -AsPlainText -Force 
     
        $domainAdminCreds = New-Object System.Management.Automation.PSCredential -ArgumentList ("DomainName\DomainAdminAccountName", $domainAdminPassword) 
     
        Add-AADCloudSyncGMSA -Credential $domainAdminCreds 
        ```
-<<<<<<< HEAD
  11. Or use the preceding cmdlet to provide a precreated gMSA account.
        ```
        Add-AADCloudSyncGMSA -CustomGMSAName preCreatedGMSAName$ 
        ```
  12. Add the domain.
-=======
- 13. Or use the preceding cmdlet to provide a precreated gMSA account.
-       ```
-       Add-AADCloudSyncGMSA -CustomGMSAName preCreatedGMSAName$ 
-       ```
- 14. Add the domain.
->>>>>>> c060fcac9d668527475ba7fd03d5b7e4d8c5bbba
        ```
        $contosoDomainAdminPassword = ConvertTo-SecureString -String "Domain admin password" -AsPlainText -Force 
     
        $contosoDomainAdminCreds = New-Object System.Management.Automation.PSCredential -ArgumentList ("DomainName\DomainAdminAccountName", $contosoDomainAdminPassword) 
     
        Add-AADCloudSyncADDomain -DomainName contoso.com -Credential $contosoDomainAdminCreds 
        ```
-<<<<<<< HEAD
  13. Or use the preceding cmdlet to configure preferred domain controllers.
-=======
- 15. Or use the preceding cmdlet to configure preferred domain controllers.
->>>>>>> c060fcac9d668527475ba7fd03d5b7e4d8c5bbba
        ```
        $preferredDCs = @("PreferredDC1", "PreferredDC2", "PreferredDC3") 
     
        Add-AADCloudSyncADDomain -DomainName contoso.com -Credential $contosoDomainAdminCreds -PreferredDomainControllers $preferredDCs 
        ```
-<<<<<<< HEAD
  14. Repeat the previous step to add more domains. Provide the account names and domain names of the respective domains.
  15. Restart the service.
        ```
        Restart-Service -Name AADConnectProvisioningAgent  
        ```
  16. Go to the Azure portal to create the cloud sync configuration.
-=======
- 16. Repeat the previous step to add more domains. Provide the account names and domain names of the respective domains.
- 17. Restart the service.
-       ```
-       Restart-Service -Name AADConnectProvisioningAgent  
-       ```
- 18. Go to the Azure portal to create the cloud sync configuration.
->>>>>>> c060fcac9d668527475ba7fd03d5b7e4d8c5bbba
 
 ## Provisioning agent gMSA PowerShell cmdlets
 Now that you've installed the agent, you can apply more granular permissions to the gMSA. For information and step-by-step instructions on how to configure the permissions, see [Azure AD Connect cloud provisioning agent gMSA PowerShell cmdlets](how-to-gmsa-cmdlets.md).