Merge branch 'main' into 2587172

Author: nickdoelman

powerapps-docs/developer/data-platform/powerapps-cli.md

@@ -6,7 +6,7 @@ ms.subservice: dataverse-developer
 ms.author: nabuthuk
 author: Nkrb
 manager: kvivek
-ms.date: 06/14/2021
+ms.date: 02/01/2022
 ms.service: "powerapps"
 ms.suite: ""
 ms.tgt_pltfrm: ""
@@ -19,7 +19,7 @@ ms.assetid: f393f227-7a88-4f25-9036-780b3bf14070
 
 
 > [!NOTE] 
-> Effective June 2021, Microsoft Power Apps CLI is rebranded to Microsoft Power Platform CLI. More information: [Blog: Microsoft Power Platform is the best way for teams to build together](https://cloudblogs.microsoft.com/powerplatform/2021/05/25/microsoft-power-platform-is-the-best-way-for-teams-to-build-together/)<p/>Microsoft Power Platform CLI is currently not available for use in the GCC and GCC High regions.
+> Effective June 2021, Microsoft Power Apps CLI is rebranded to Microsoft Power Platform CLI. More information: [Blog: Microsoft Power Platform is the best way for teams to build together](https://cloudblogs.microsoft.com/powerplatform/2021/05/25/microsoft-power-platform-is-the-best-way-for-teams-to-build-together/)<p/>Microsoft Power Platform CLI is now available for use in the GCC and GCC High (US Sovereign cloud) regions. Use the command `pac auth create` for help on the `--cloud` parameter to find out about supported US Sovereign cloud environments.
 
 Microsoft Power Platform CLI is a simple, one-stop developer CLI that empowers developers and ISVs to perform various operations in Microsoft Power Platform related to environment lifecycle, authentication, and work with Microsoft Dataverse environments, solution packages, portals, code components, and so on.  
 

powerapps-docs/maker/portals/configure/configure-site-settings.md

@@ -1,11 +1,11 @@
 ---
 title: Configure site settings for portals
-description: Learnhow to add and configure site settings for a portal and global settings for all portals in your organization.
+description: Learn how to add and configure site settings for a portal and global settings for all portals in your organization.
 author: sandhangitmsft
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 01/21/2022
+ms.date: 02/01/2022
 ms.subservice: portals
 ms.author: sandhan
 ms.reviewer: ndoelman
@@ -24,7 +24,6 @@ You can manage the following types of site settings:
 - **Global Portal settings**: These settings apply to all portals associated with the Microsoft Dataverse environment in which they are being added.
 - **Portal site settings**: These settings apply to specific portals (website records) that are associated with the Dataverse environment in which they are being added.
 
-
 ## Manage portal site settings
 
 1. Go to [portal settings](../manage-existing-portals.md#settings) and select **Site settings**.
@@ -71,7 +70,6 @@ You can manage the following types of site settings:
 > [!NOTE]
 > It is recommended to set *Authentication/[Protocol]/[Provider]/AllowContactMappingWithEmail* to **False** when allowing authentication from unknown Azure AD tenants. Use [invitations](invite-contacts.md) to allow users to authenticate to your portal.
 
-
 For site settings related to various portal features, see:
 
 - [Authentication identity](set-authentication-identity.md)
@@ -89,28 +87,22 @@ For site settings related to various portal features, see:
 
 ## Manage global portal settings
 
-1. Go to [portal settings](../manage-existing-portals.md#settings) and select **Site settings**.
+1. Open the [Portal Management app](configure-portal.md).
 
-2. Go to **Settings** > **Settings**.
+1. Go to the **Website** section and select **Settings**.
 
-3. To create a new setting, select **New**.
+1. To create a new setting, select **New**.
 
-4. To edit an existing setting, select the **Site Setting** listed in the grid.
+1. To edit an existing setting, select the **Setting** listed in the grid.
 
-5. Specify values for the fields provided: 
+1. Specify values for the fields provided: 
 
     - **Name**:  A unique name referenced by code to retrieve the appropriate setting.
 
     - **Value**: The setting
 
     - **Description**: The purpose of the setting or special instructions.
 
-6. Select **Save & Close**.
-
-> [!NOTE] 
-> Bing Maps integration is not supported in the German Sovereign Cloud. If you try to create the BinMap/Key or Adxstudio/ProductivityPack/BingMap/Key setting in this environment, an error message will be displayed.
-
-
-
+1. Select **Save & Close**.
 
 [!INCLUDE[footer-include](../../../includes/footer-banner.md)]

powerapps-docs/maker/portals/portal-templates.md

@@ -45,7 +45,7 @@ If you select an environment that contains customer engagement apps (Dynamics 36
 - **Portal from blank**: Create a website to share data with external and internal users. This template comes with sample pages to get you quickly started.
 - **Customer Portal (preview)**: A Supply Chain Management Customer Portal template provisions an externally facing B2B order placing website. This template allows external users to create and view orders to the associated Dynamics 365 for Supply Chain Management environment. Customer Portal template is in *Preview*. For more information about *preview* features, see [Understand preview features in Power Apps](../canvas-apps/working-with-experimental-preview.md).
 
-For creating a portal with any of the above templates, go to [Create a portal with an environment containing customer engagement apps](create-portal.md).
+For creating a portal with any of the above templates, go to [Create a portal with an environment containing customer engagement apps](create-dynamics-portal.md).
 
 ## Portal templates features