Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-rbac

Author: HeidiSteen

articles/active-directory/external-identities/add-users-administrator.md

@@ -125,14 +125,14 @@ To add B2B collaboration users to an application, follow these steps:
 
 ## Resend invitations to guest users
 
-If a guest user has not yet redeemed their invitation, you can resend the invitation email.
+If a guest user hasn't yet redeemed their invitation, you can resend the invitation email.
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as an Azure AD administrator.
 2. Search for and select **Azure Active Directory** from any page.
 3. Under **Manage**, select **Users**.
 4. In the list, select the user's name to open their user profile.
 5. Under **My Feed**, in the **B2B collaboration** tile, select the **Manage (resend invitation / reset status** link.
-6. If the user has not yet accepted the invitation, Select the **Yes** option to resend.
+6. If the user hasn't yet accepted the invitation, Select the **Yes** option to resend.
 
     ![Screenshot showing the Resend Invite radio button.](./media/add-users-administrator/resend-invitation.png)
 
@@ -142,3 +142,4 @@ If a guest user has not yet redeemed their invitation, you can resend the invita
 
 - To learn how non-Azure AD admins can add B2B guest users, see [How users in your organization can invite guest users to an app](add-users-information-worker.md)
 - For information about the invitation email, see [The elements of the B2B collaboration invitation email](invitation-email-elements.md).
+- To learn about the B2B collaboration user types, see the [B2B collaboration user properties](user-properties.md) article.

articles/active-directory/external-identities/tutorial-bulk-invite.md

@@ -136,8 +136,6 @@ For example: `Remove-MgUser -UserId "lstokes_fabrikam.com#EXT#@contoso.onmicroso
 
 ## Next steps
 
-In this tutorial, you sent bulk invitations to guest users outside of your organization. Next, learn how the invitation redemption process works, and how to enforce multi-factor authentication for guest users.
-
-
 - [Learn about the Azure AD B2B collaboration invitation redemption process](redemption-experience.md)
 - [Enforce multi-factor authentication for B2B guest users](b2b-tutorial-require-mfa.md)
+- [Billing model for guest user collaboration usage](external-identities-pricing.md#about-monthly-active-users-mau-billing)

articles/active-directory/fundamentals/active-directory-data-storage-eu.md

@@ -2,9 +2,9 @@
 title: Customer data storage and processing for European customers in Azure Active Directory
 description: Learn about where Azure Active Directory stores identity-related data for its European customers.
 services: active-directory
-author: barclayn
-manager: amycolannino
-ms.author: barclayn
+author: davidmu1
+manager: CelesteDG
+ms.author: davidmu
 
 ms.service: active-directory
 ms.subservice: fundamentals

articles/azure-functions/functions-reference-powershell.md

@@ -390,15 +390,15 @@ The following table shows the PowerShell versions available to each major versio
 
 | Functions version | PowerShell version                               | .NET version  | 
 |-------------------|--------------------------------------------------|---------------|
-| 4.x (recommended) | PowerShell 7.2 (recommended) | .NET 6 |
+| 4.x | PowerShell 7.2 | .NET 6 |
 
 You can see the current version by printing `$PSVersionTable` from any function.
 
 To learn more about Azure Functions runtime support policy, please refer to this [article](./language-support-policy.md)
 
 ### Running local on a specific version
 
-Support for PowerShell 7.0 in Azure Functions ended on 3 December 2022. To use PowerShell 7.2 when running locally, you need to add the setting `"FUNCTIONS_WORKER_RUNTIME_VERSION" : "7.2"` to the `Values` array in the local.setting.json file in the project root. When running locally on PowerShell 7.2, your local.settings.json file looks like the following example: 
+Support for PowerShell 7.0 in Azure Functions has ended on 3 December 2022. To use PowerShell 7.2 when running locally, you need to add the setting `"FUNCTIONS_WORKER_RUNTIME_VERSION" : "7.2"` to the `Values` array in the local.setting.json file in the project root. When running locally on PowerShell 7.2, your local.settings.json file looks like the following example: 
 
 ```json
 {
@@ -411,9 +411,12 @@ Support for PowerShell 7.0 in Azure Functions ended on 3 December 2022. To use P
 }
 ```
 
+> [!NOTE]
+> In PowerShell Functions, the value "~7" for FUNCTIONS_WORKER_RUNTIME_VERSION refers to "7.0.x". We do not automatically upgrade PowerShell Function apps that have "~7" to "7.2". Going forward, for PowerShell Function Apps, we will require that apps specify both the major and minor version they want to target. Hence, it is necessary to mention "7.2" if you want to target "7.2.x"
+
 ### Changing the PowerShell version
 
-Support for PowerShell 7.0 in Azure Functions ended on 3 December 2022. Your function app must be running on version 4.x to be able to upgrade to PowerShell 7.2. To learn how to do this, see [View and update the current runtime version](set-runtime-version.md#view-and-update-the-current-runtime-version).
+Support for PowerShell 7.0 in Azure Functions has ended on 3 December 2022. To upgrade your Function App to PowerShell 7.2, ensure the value of FUNCTIONS_EXTENSION_VERSION is set to ~4. To learn how to do this, see [View and update the current runtime version](set-runtime-version.md#view-and-update-the-current-runtime-version).
 
 
 Use the following steps to change the PowerShell version used by your function app. You can do this either in the Azure portal or by using PowerShell.

articles/energy-data-services/faq-energy-data-services.yml

@@ -24,6 +24,12 @@ sections:
           answer: >
             Microsoft Energy Data Services requires registration and is currently only available to approved customers and partners during the preview period. Request access to Microsoft Energy Data Services Preview [here](https://aka.ms/MicrosoftEnergyDataServices-create)
 
+    - name: Data Residency
+      questions:
+        - question: Where does Microsoft Energy Data Services Preview store customer data?
+          answer: >
+            Microsoft Energy Data Services Preview stores/process customer data. By default, customer data is replicated to the paired region. For region with data residency requirements, customer data is always kept within the same region
+
     - name: Pricing and Billing
       questions:
         - question: Where can I learn about the pricing for Microsoft Energy Data Services?