Merge pull request #229000 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/active-directory-b2c/oauth2-technical-profile.md

@@ -124,7 +124,7 @@ The following table lists the token endpoint metadata.
 | `HttpBinding` | No | The expected HTTP binding to the token endpoint. Possible values: `GET` or `POST`.  |
 | `AccessTokenResponseFormat` | No | The format of the access token endpoint call. For example, Facebook requires an HTTP GET method, but the access token response is in JSON format. Possible values: `Default`, `Json`, and `JsonP`. |
 | `ExtraParamsInAccessTokenEndpointResponse` | No | Contains the extra parameters that can be returned in the response from **AccessTokenEndpoint** by some identity providers. For example, the response from **AccessTokenEndpoint** contains an extra parameter such as `openid`, which is a mandatory parameter besides the access_token in a **ClaimsEndpoint** request query string. Multiple parameter names should be escaped and separated by the comma ',' delimiter. |
-|`token_endpoint_auth_method`| No| Specifies how Azure AD B2C sends the authentication header to the token endpoint. Possible values: `client_secret_post` (default), and `client_secret_basic` (public preview), `private_key_jwt` (public preview). For more information, see [OpenID Connect client authentication section](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication). |
+|`token_endpoint_auth_method`| No| Specifies how Azure AD B2C sends the authentication header to the token endpoint. Possible values: `client_secret_post` (default), and `client_secret_basic`, `private_key_jwt`. For more information, see [OpenID Connect client authentication section](https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication). |
 |`token_signing_algorithm`| No | Specifies the signing algorithm to use when `token_endpoint_auth_method` is set to `private_key_jwt`. Possible values: `RS256` (default) or `RS512`.|
 
 ### Configure HTTP binding method

articles/active-directory/governance/understanding-lifecycle-workflows.md

@@ -25,7 +25,7 @@ The following document provides an overview of a workflow created using Lifecycl
 
 ## Permissions and Roles
 
-For a full list of supported delegate and application permissions required to use Lifecycle Workflows, see: [Lifecycle workflows permissions](/graph/permissions-reference#lifecycle-workflows-permissions).
+For a full list of supported delegated and application permissions required to use Lifecycle Workflows, see: [Lifecycle workflows permissions](/graph/permissions-reference#lifecycle-workflows-permissions).
 
 For delegated scenarios, the admin needs one of the following [Azure AD roles](/azure/active-directory/users-groups-roles/directory-assign-admin-roles#available-roles):
 

articles/aks/use-mariner.md

@@ -59,7 +59,7 @@ Mariner currently has the following limitations:
 [mariner-doc]: https://microsoft.github.io/CBL-Mariner/docs/#cbl-mariner-linux
 [mariner-capabilities]: https://microsoft.github.io/CBL-Mariner/docs/#key-capabilities-of-cbl-mariner-linux
 [mariner-cluster-config]: cluster-configuration.md
-[mariner-node-pool]: use-multiple-node-pools.md
-[ubuntu-to-mariner]: use-multiple-node-pools.md
+[mariner-node-pool]: use-multiple-node-pools.md#add-a-mariner-node-pool
+[ubuntu-to-mariner]: use-multiple-node-pools.md#migrate-ubuntu-nodes-to-mariner
 [auto-upgrade-aks]: auto-upgrade-cluster.md
 [kured]: node-updates-kured.md

articles/azure-functions/durable/durable-functions-overview.md

@@ -1116,7 +1116,7 @@ Durable entities are currently not supported in Java.
 
 Clients can enqueue *operations* for (also known as "signaling") an entity function using the [entity client binding](durable-functions-bindings.md#entity-client).
 
-# [C# (InProc)](#tab/csharp-isolated)
+# [C# (InProc)](#tab/csharp-inproc)
 
 ```csharp
 [FunctionName("EventHubTriggerCSharp")]
@@ -1136,7 +1136,7 @@ public static async Task Run(
 > [!NOTE]
 > Dynamically generated proxies are also available in .NET for signaling entities in a type-safe way. And in addition to signaling, clients can also query for the state of an entity function using [type-safe methods](durable-functions-dotnet-entities.md#accessing-entities-through-interfaces) on the orchestration client binding.
 
-# [C# (Isolated)](#tab/csharp-inproc)
+# [C# (Isolated)](#tab/csharp-isolated)
 
 Durable entities are currently not supported in the .NET-isolated worker.
 

articles/cost-management-billing/savings-plan/utilization-cost-reports.md

@@ -120,11 +120,19 @@ You can charge back savings plan use to other organizations by subscription, res
 
 ### Determine savings resulting from savings plan
 
-Get the Amortized costs data and filter the data for a savings plan instance. Then:
+Get the Amortized costs data and filter the data for a `PricingModel` = `SavingsPlan`. Then:
 
-1. Get estimated pay-as-you-go costs. Multiply the `UnitPrice` value with `Quantity` values to get estimated pay-as-you-go costs if the savings plan discount didn't apply to the usage.
+1. Get estimated pay-as-you-go costs or customer discounted cost. Multiply the `UnitPrice` value with `Quantity` values to get estimated pay-as-you-go costs if the savings plan discount didn't apply to the usage.
 2. Get the savings plan costs. Sum the `Cost` values to get the monetary value of what you paid for the savings plan. It includes the used and unused costs of the savings plan.
-3. Subtract savings plan costs from estimated pay-as-you-go costs to get the estimated savings.
+3. Subtract estimated pay-as-you-go costs from savings plan costs to get the estimated savings.
+
+To know the Savings made out of public list price:
+Get public or list price cost.  Multiply the `PayGPrice` value with `Quantity` values to get public-list-price costs.
+Get Savings made out of savings plan against public list price. Subtract estimated public-list-price costs from `Cost`.
+
+To know the % savings made out of discounted price for customer:
+Get Savings made out of savings plan against discounts given to customer. Subtract estimated pay-as-you-go from `Cost`.
+Get % discount applied on each line item. Divide `Cost` with public-list-price and then divide by 100.
 
 Keep in mind that if you have an underutilized savings plan, the `UnusedBenefit` entry for `ChargeType` becomes a factor to consider. When you have a fully utilized savings plan, you receive the maximum savings possible. Any `UnusedBenefit` quantity reduces savings.
 
@@ -138,4 +146,4 @@ Group by **Charge Type** to see a breakdown of usage, purchases, and refunds; or
 
 ## Next steps
 
-- Learn more about how to [Charge back Azure saving plan costs](charge-back-costs.md).
+- Learn more about how to [Charge back Azure saving plan costs](charge-back-costs.md).

articles/dms/tutorial-azure-postgresql-to-azure-postgresql-online-portal.md

@@ -1,7 +1,7 @@
 ---
-title: "Tutorial: Migrate Azure DB for PostgreSQL to Azure DB for PostgreSQL online via the Azure portal"
+title: "Tutorial: Migrate Azure Database for PostgreSQL to Azure Database for PostgreSQL online via the Azure portal"
 titleSuffix: Azure Database Migration Service
-description: Learn to perform an online migration from one Azure DB for PostgreSQL to another Azure Database for PostgreSQL by using Azure Database Migration Service via the Azure portal.
+description: Learn to perform an online migration from one Azure Database for PostgreSQL to another Azure Database for PostgreSQL by using Azure Database Migration Service via the Azure portal.
 services: dms
 author: croblesm
 ms.author: roblescarlos
@@ -14,7 +14,7 @@ ms.topic: tutorial
 ms.date: 07/21/2020
 ---
 
-# Tutorial: Migrate/Upgrade Azure DB for PostgreSQL - Single Server to Azure DB for PostgreSQL - Single Server  online using DMS via the Azure portal
+# Tutorial: Migrate/Upgrade Azure Database for PostgreSQL - Single Server to Azure Database for PostgreSQL - Single Server  online using DMS via the Azure portal
 
 You can use Azure Database Migration Service to migrate the databases from an [Azure Database for PostgreSQL - Single Server](../postgresql/overview.md#azure-database-for-postgresql---single-server) instance to same or different version of Azure Database for PostgreSQL - Single Server instance or Azure Database for PostgreSQL - Flexible Server with minimal downtime. In this tutorial, you migrate the **DVD Rental** sample database from an Azure Database for PostgreSQL v10 to Azure Database for PostgreSQL - Single Server by using the online migration activity in Azure Database Migration Service.
 
@@ -52,7 +52,7 @@ To complete this tutorial, you need to:
 * Ensure that the Network Security Group (NSG) rules for your virtual network don't block the outbound port 443 of ServiceTag for ServiceBus, Storage and AzureMonitor. For more detail on virtual network NSG traffic filtering, see the article [Filter network traffic with network security groups](../virtual-network/virtual-network-vnet-plan-design-arm.md).
 * Create a server-level [firewall rule](/azure/azure-sql/database/firewall-configure) for Azure Database for PostgreSQL source to allow Azure Database Migration Service to access to the source databases. Provide the subnet range of the virtual network used for Azure Database Migration Service.
 * Create a server-level [firewall rule](/azure/azure-sql/database/firewall-configure) for Azure Database for PostgreSQL target to allow Azure Database Migration Service to access to the target databases. Provide the subnet range of the virtual network used for Azure Database Migration Service.
-* [Enable logical replication](../postgresql/concepts-logical.md) in the Azure DB for PostgreSQL source. 
+* [Enable logical replication](../postgresql/concepts-logical.md) in the Azure Database for PostgreSQL source. 
 * Set the following Server parameters in the Azure Database for PostgreSQL instance being used as a source:
 
   * max_replication_slots = [number of slots], recommend setting to **ten slots**
@@ -195,13 +195,13 @@ After the service is created, locate it within the Azure portal, open it, and th
 
 * Select **Run migration**.
 
-The migration activity window appears, and the **Status** of the activity should update to show as **Backup in Progress**. You may encounter the following error when upgrading from Azure DB for PostgreSQL 9.5 or 9.6:
+The migration activity window appears, and the **Status** of the activity should update to show as **Backup in Progress**. You may encounter the following error when upgrading from Azure Database for PostgreSQL 9.5 or 9.6:
 
 **A scenario reported an unknown error. 28000: no pg_hba.conf entry for replication connection from host "40.121.141.121", user "sr"**
 
 This is because the PostgreSQL does not have appropriate privileges to create required logical replication artifacts. To enable required privileges, you can do the following:
 
-1. Open "Connection security" settings for the source Azure DB for PostgreSQL server you are trying to migrate/upgrade from.
+1. Open "Connection security" settings for the source Azure Database for PostgreSQL server you are trying to migrate/upgrade from.
 2. Add a new firewall rule with a name ending with "_replrule" and add the IP address from the error message to the start IP and End IP fields. For the above error example -
 > Firewall rule name = sr_replrule;
 > Start IP = 40.121.141.121;

articles/governance/resource-graph/how-to/get-resource-changes.md

@@ -15,8 +15,6 @@ Resources change through the course of daily use, reconfiguration, and even rede
 
 This article shows how to query resource configuration changes through Resource Graph.
 
-> [!WARNING]
-> There has been a temporary reduction in lookback retention to **seven days**.
 
 ## Prerequisites
 

articles/machine-learning/media/how-to-understand-automated-ml/forecast-horizon.png

@@ -93,9 +93,11 @@ For more information on minimum .NET Standard platform support, see [.NET implem
 
 ## Reusing factories and clients
 # [Azure.Messaging.ServiceBus SDK](#tab/net-standard-sdk-2)
-The Service Bus objects that interact with the service, such as [ServiceBusClient](/dotnet/api/azure.messaging.servicebus.servicebusclient), [ServiceBusSender](/dotnet/api/azure.messaging.servicebus.servicebussender), [ServiceBusReceiver](/dotnet/api/azure.messaging.servicebus.servicebusreceiver), and [ServiceBusProcessor](/dotnet/api/azure.messaging.servicebus.servicebusprocessor), should be registered for dependency injection as singletons (or instantiated once and shared). ServiceBusClient can be registered for dependency injection with the [ServiceBusClientBuilderExtensions](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/servicebus/Azure.Messaging.ServiceBus/src/Compatibility/ServiceBusClientBuilderExtensions.cs). 
+The Service Bus clients that interact with the service, such as [ServiceBusClient](/dotnet/api/azure.messaging.servicebus.servicebusclient), [ServiceBusSender](/dotnet/api/azure.messaging.servicebus.servicebussender), [ServiceBusReceiver](/dotnet/api/azure.messaging.servicebus.servicebusreceiver), and [ServiceBusProcessor](/dotnet/api/azure.messaging.servicebus.servicebusprocessor), should be registered for dependency injection as singletons (or instantiated once and shared).  ServiceBusClient can be registered for dependency injection with the [ServiceBusClientBuilderExtensions](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/servicebus/Azure.Messaging.ServiceBus/src/Compatibility/ServiceBusClientBuilderExtensions.cs). 
 
-We recommend that you don't close or dispose these objects after sending or receiving each message. Closing or disposing the entity-specific objects (ServiceBusSender/Receiver/Processor) results in tearing down the link to the Service Bus service. Disposing the ServiceBusClient results in tearing down the connection to the Service Bus service. 
+We recommend that you don't close or dispose these clients after sending or receiving each message. Closing or disposing the entity-specific objects (ServiceBusSender/Receiver/Processor) results in tearing down the link to the Service Bus service. Disposing the ServiceBusClient results in tearing down the connection to the Service Bus service. 
+
+This guidance does not apply to the [ServiceBusSessionReceiver](/dotnet/api/azure.messaging.servicebus.servicebussessionreceiver), as its lifetime is the same as the session itself.  For applications working with the `ServiceBusSessionReceiver`, it is recommended to use a singleton instance of the `ServiceBusClient` to accept each session, which will spawn a new `ServiceBusSessionReceiver` bound to that session.  Once the application finishes processing that session it should dispose the associated `ServiceBusSessionReceiver`.
 
 # [Microsoft.Azure.ServiceBus SDK](#tab/net-standard-sdk)