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

Author: MashaMSFT

articles/api-management/api-management-howto-aad-b2c.md

@@ -19,7 +19,7 @@ Azure Active Directory B2C is a cloud identity management solution for consumer-
 In this tutorial, you'll learn the configuration required in your API Management service to integrate with Azure Active Directory B2C. As noted later in this article, if you are using the deprecated legacy developer portal, some steps will differ.
 
 > [!IMPORTANT]
-> * This article has been updated with steps to configure an Azure AD B2C app using the Microsoft Authentication Library ([MSAL](../active-directory/develop/msal-overview.md)) v2.0. 
+> * This article has been updated with steps to configure an Azure AD B2C app using the Microsoft Authentication Library ([MSAL](../active-directory/develop/msal-overview.md)). 
 > * If you previously configured an Azure AD B2C app for user sign-in using the Azure AD Authentication Library (ADAL), we recommend that you [migrate to MSAL](#migrate-to-msal).
 
 For information about enabling access to the developer portal by using classic Azure Active Directory, see [How to authorize developer accounts using Azure Active Directory](api-management-howto-aad.md).

articles/azure-arc/data/toc.yml

@@ -116,72 +116,6 @@ items:
           href: troubleshoot-guide.md
         - name: Get logs
           href: troubleshooting-get-logs.md
-- name: Azure Arc-enabled PostgreSQL Hyperscale (preview) 
-  items:
-    - name: Overview
-      items:
-        - name: What is Azure Arc-enabled PostgreSQL Hyperscale
-          href: what-is-azure-arc-enabled-postgres-hyperscale.md
-        - name: Limitations
-          href: limitations-postgresql-hyperscale.md
-    - name: Quickstarts
-      items:
-        - name: Supported versions
-          href: supported-versions-postgres-hyperscale.md
-        - name: Create PostgreSQL Hyperscale server group (CLI)
-          href: create-postgresql-hyperscale-server-group.md
-        - name: Create PostgreSQL Hyperscale server group (portal)
-          href: create-postgresql-hyperscale-server-group-azure-portal.md
-        - name: Create PostgreSQL Hyperscale server group (Azure Data Studio)
-          href: create-postgresql-hyperscale-server-group-azure-data-studio.md
-        - name: Create PostgreSQL Hyperscale server group - Kubernetes native tools
-          href: create-postgresql-hyperscale-server-group-kubernetes-native-tools.md
-        - name: Connect
-          href: get-connection-endpoints-and-connection-strings-postgres-hyperscale.md
-    - name: Concepts
-      items:
-        - name: Distribute data
-          href: concepts-distributed-postgres-hyperscale.md
-        - name: Server group placement
-          href: postgresql-hyperscale-server-group-placement-on-kubernetes-cluster-nodes.md
-    - name: How-to
-      items:
-        - name: Manage
-          items:
-            - name: Backup & restore
-              href: backup-restore-postgresql-hyperscale.md
-            - name: Change PostgreSQL port
-              href: change-postgresql-port.md
-            - name: Configure & scale
-              items:
-                - name: Show configuration
-                  href: show-configuration-postgresql-hyperscale-server-group.md
-                - name: Scale out|in worker nodes
-                  href: scale-out-in-postgresql-hyperscale-server-group.md
-                - name: Scale up|down memory & vCores
-                  href: scale-up-down-postgresql-hyperscale-server-group-using-cli.md
-                - name: Configure server parameters
-                  href: configure-server-parameters-postgresql-hyperscale.md
-            - name: Delete
-              href: delete-postgresql-hyperscale-server-group.md
-            - name: List server groups
-              href: list-server-groups-postgres-hyperscale.md
-            - name: Monitoring, log analytics, billing information (portal)
-              href: monitoring-log-analytics-azure-portal-postgresql.md
-            - name: Secure
-              href: configure-security-postgres-hyperscale.md
-            - name: Manage server group (Azure Data Studio)
-              href: manage-postgresql-hyperscale-server-group-with-azure-data-studio.md
-            - name: Use PostgreSQL extensions
-              href: using-extensions-in-postgresql-hyperscale-server-group.md
-        - name: Migrate
-          items:
-            - name: Migrate PostgreSQL data into a PostgreSQL Hyperscale server group
-              href: migrate-postgresql-data-into-postgresql-hyperscale-server-group.md
-            - name: Import the sample database AdventureWorks
-              href: restore-adventureworks-sample-db-into-postgresql-hyperscale-server-group.md
-        - name: Troubleshoot
-          href: troubleshoot-postgresql-hyperscale-server-group.md
 - name: Azure Arc-enabled SQL Managed Instance
   items:
     - name: Overview

articles/bastion/configuration-settings.md

@@ -1,13 +1,12 @@
 ---
 title: 'About Azure Bastion configuration settings'
 description: Learn about the available configuration settings for Azure Bastion.
-services: bastion
 author: cherylmc
 ms.service: bastion
 ms.topic: conceptual
-ms.date: 01/14/2022
+ms.date: 08/03/2022
 ms.author: cherylmc
-ms.custom: ignite-fall-2021
+
 ---
 
 # About Bastion configuration settings
@@ -19,19 +18,22 @@ The sections in this article discuss the resources and settings for Azure Bastio
 A SKU is also known as a Tier. Azure Bastion supports two SKU types: Basic and Standard. The SKU is configured in the Azure portal during the workflow when you configure Bastion. You can [upgrade a Basic SKU to a Standard SKU](#upgradesku).
 
 * The **Basic SKU** provides base functionality, enabling Azure Bastion to manage RDP/SSH connectivity to virtual machines (VMs) without exposing public IP addresses on the target application VMs.
-* The **Standard SKU** enables premium features that allow Azure Bastion to manage remote connectivity at a larger scale.
+* The **Standard SKU** enables premium features.
 
-The following table shows features and corresponding SKUs.
+The following table shows the availability of features per corresponding SKU.
 
 [!INCLUDE [Azure Bastion SKUs](../../includes/bastion-sku.md)]
 
+### Specify SKU
+
 Currently, you must use the Azure portal if you want to specify the Standard SKU. If you use the Azure CLI or Azure PowerShell to configure Bastion, the SKU can't be specified and defaults to the Basic SKU.
 
-| Method | Value | Links |
+| Method | SKU Value | Links |
 | --- | --- | --- |
-| Azure portal | Tier - Basic or <br>Standard | [Quickstart - Configure Bastion from VM settings](quickstart-host-portal.md)<br>[Tutorial - Configure Bastion](tutorial-create-host-portal.md) |
-| Azure PowerShell | Basic only - no settings |[Configure Bastion - PowerShell](bastion-create-host-powershell.md) |
-| Azure CLI |  Basic only - no settings | [Configure Bastion - CLI](create-host-cli.md) |
+| Azure portal | Tier - Basic or Standard | [Tutorial](tutorial-create-host-portal.md) |
+| Azure portal | Tier - Basic| [Quickstart](quickstart-host-portal.md) |
+| Azure PowerShell | Basic |[How-to](bastion-create-host-powershell.md) |
+| Azure CLI |  Basic| [How-to](create-host-cli.md) |
 
 ### <a name="upgradesku"></a>Upgrade a SKU
 
@@ -45,7 +47,7 @@ You can configure this setting using the following method:
 
 | Method | Value | Links |
 | --- | --- | --- |
-| Azure portal |Tier  | [Upgrade a SKU](upgrade-sku.md)|
+| Azure portal |Tier  | [How-to](upgrade-sku.md)|
 
 ## <a name="subnet"></a>Azure Bastion subnet
 
@@ -65,7 +67,7 @@ You can configure this setting using the following methods:
 
 | Method | Value | Links |
 | --- | --- |--- |
-| Azure portal | Subnet  |[Quickstart - Configure Bastion from VM settings](quickstart-host-portal.md)<br>[Tutorial - Configure Bastion](tutorial-create-host-portal.md)|
+| Azure portal | Subnet  |[Quickstart](quickstart-host-portal.md)<br>[Tutorial](tutorial-create-host-portal.md)|
 | Azure PowerShell | -subnetName|[cmdlet](/powershell/module/az.network/new-azbastion#parameters) |
 | Azure CLI |  --subnet-name | [command](/cli/azure/network/vnet#az-network-vnet-create) |
 
@@ -80,11 +82,11 @@ Azure Bastion requires a Public IP address. The Public IP must have the followin
 
 You can configure this setting using the following methods:
 
-| Method | Value | Links |
-| --- | --- |--- |
-| Azure portal | Public IP address |[Azure portal](https://portal.azure.com)|
-| Azure PowerShell | -PublicIpAddress| [cmdlet](/powershell/module/az.network/new-azbastion#parameters)  |
-| Azure CLI | --public-ip create |[command](/cli/azure/network/public-ip) |
+| Method | Value | Links | Requires Standard SKU|
+| --- | --- |--- | -- |
+| Azure portal | Public IP address |[Azure portal](https://portal.azure.com)| Yes |
+| Azure PowerShell | -PublicIpAddress| [cmdlet](/powershell/module/az.network/new-azbastion#parameters)  | Yes |
+| Azure CLI | --public-ip create |[command](/cli/azure/network/public-ip) | Yes |
 
 ## <a name="instance"></a>Instances and host scaling
 
@@ -96,16 +98,16 @@ Instances are created in the AzureBastionSubnet. To allow for host scaling, the
 
 You can configure this setting using the following methods:
 
-| Method | Value | Links |
-| --- | --- | --- |
-| Azure portal |Instance count  | [Azure portal steps](configure-host-scaling.md)|
-| Azure PowerShell | ScaleUnit | [PowerShell steps](configure-host-scaling-powershell.md) |
+| Method | Value | Links | Requires Standard SKU |
+| --- | --- | --- | ---|
+| Azure portal |Instance count  | [How-to](configure-host-scaling.md)| Yes
+| Azure PowerShell | ScaleUnit | [How-to](configure-host-scaling-powershell.md) | Yes |
 
 ## <a name="ports"></a>Custom ports
 
-You can specify the port that you want to use to connect to your VMs. By default, the inbound ports used to connect are 3389 for RDP and 22 for SSH. If you configure a custom port value, you need to specify that value when you connect to the VM.
+You can specify the port that you want to use to connect to your VMs. By default, the inbound ports used to connect are 3389 for RDP and 22 for SSH. If you configure a custom port value, specify that value when you connect to the VM.
 
-Custom port values are supported for the Standard SKU only. If your Bastion deployment uses the Basic SKU, you can easily [upgrade a Basic SKU to a Standard SKU](#upgradesku).
+Custom port values are supported for the Standard SKU only.
 
 ## Next steps
 

articles/bastion/media/upgrade-sku/select-sku-expand.png

@@ -2,31 +2,31 @@
 title: 'Upgrade a SKU'
 titleSuffix: Azure Bastion
 description: Learn how to change Tiers from the Basic to the Standard SKU.
-services: bastion
 author: cherylmc
 ms.service: bastion
 ms.topic: how-to
-ms.date: 08/30/2021
+ms.date: 08/02/2022
 ms.author: cherylmc
-# Customer intent: As someone with a networking background, I want to upgrade to the Standard SKU.
-ms.custom: ignite-fall-2021
+
 ---
 
 # Upgrade a SKU
 
-This article helps you upgrade from the Basic Tier (SKU) to Standard. Once you upgrade, you can't revert back to the Basic SKU without deleting and reconfiguring Bastion. Currently, this setting can be configured in the Azure portal only. For more information about host scaling, see [Configuration settings- SKUs](configuration-settings.md#skus). 
+This article helps you upgrade from the Basic Tier (SKU) to Standard. Once you upgrade, you can't revert back to the Basic SKU without deleting and reconfiguring Bastion. Currently, this setting can be configured in the Azure portal only. For more information about features and SKUs, see [Configuration settings](configuration-settings.md).
 
 ## Configuration steps
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. In the Azure portal, go to your Bastion host.
-1. On the **Configuration** page, for **Tier**, select **Standard** from the dropdown.
+1. On the **Configuration** page, for **Tier**, select **Standard**.
+
+   :::image type="content" source="./media/upgrade-sku/select-sku.png" alt-text="Screenshot of tier select dropdown with Standard selected." lightbox="./media/upgrade-sku/select-sku.png":::
 
-   :::image type="content" source="./media/upgrade-sku/select-sku.png" alt-text="Screenshot of tier select dropdown with Standard selected." lightbox="./media/upgrade-sku/select-sku-expand.png":::
+1. You can add features at the same time you upgrade the SKU. You don't need to upgrade the SKU and then go back to add the features as a separate step.
 
-1. Click **Apply** to apply changes.
+1. Click **Apply** to apply changes. The bastion host will update. This takes about 10 minutes to complete.
 
 ## Next steps
 
-* See [Configuration settings](configuration-settings.md) for additional configuration information.
+* See [Configuration settings](configuration-settings.md) for more configuration information.
 * Read the [Bastion FAQ](bastion-faq.md).