Merge pull request #230744 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/hybrid/how-to-connect-sync-change-the-configuration.md

@@ -137,7 +137,7 @@ String attributes are indexable by default, and the maximum length is 448 charac
 The userPrincipalName attribute in Active Directory is not always known by the users and might not be suitable as the sign-in ID. With the Azure AD Connect sync installation wizard, you can choose a different attribute--for example, *mail*. But in some cases, the attribute must be calculated.
 
 For example, the company Contoso has two Azure AD directories, one for production and one for testing. They want the users in their test tenant to use another suffix in the sign-in ID:  
-`userPrincipalName` <- `Word([userPrincipalName],1,"@") & "@contosotest.com"`.
+`Word([userPrincipalName],1,"@") & "@contosotest.com"`.
 
 In this expression, take everything left of the first @-sign (Word) and concatenate with a fixed string.
 

articles/application-gateway/application-gateway-components.md

@@ -140,6 +140,8 @@ An application gateway can also communicate with on-premises servers when they'r
 
 You can create different backend pools for different types of requests. For example, create one backend pool for general requests, and then another backend pool for requests to the microservices for your application.
 
+After you add virtual machine scale sets as a backend pool member, you need to upgrade virtual machine scale sets instances. Until you upgrade scale sets instances, the backend will be unhealthy.
+
 ## Health probes
 
 By default, an application gateway monitors the health of all resources in its backend pool and automatically removes unhealthy ones. It then monitors unhealthy instances and adds them back to the healthy backend pool when they become available and respond to health probes.

articles/container-instances/container-instances-tutorial-deploy-confidential-containers-cce-arm.md

@@ -184,7 +184,7 @@ With the ARM template that you've crafted and the Azure CLI confcom extension, y
 
    ![Screenshot of Build your own template in the editor button on deployment screen, PNG.](./media/container-instances-confidential-containers-tutorials/confidential-containers-cce-build-template.png)
 
-1. Select **Load file** and upload **template.json**, which you've modified by generating adding a CCE policy. 
+1. Select **Load file** and upload **template.json**, which you've modified by adding the CCE policy you generated in the previous steps. 
 
    ![Screenshot of Load file button on template screen, PNG.](./media/container-instances-confidential-containers-tutorials/confidential-containers-cce-load-file.png)
 

articles/dns/dns-alerts-metrics.md

@@ -46,9 +46,9 @@ To view this metric, select **Metrics** explorer experience from the **Monitor**
 
 ### Record Set Count
 
-The *Record Set Count* metric shows the number of Recordsets in Azure DNS for your DNS zone. All the Recordsets defined in your zone are counted. The unit of measurement is `Count` and the aggregation is the `Maximum` of all the Recordsets.
+The *Record Set Count* metric shows the number of Record sets in Azure DNS for your DNS zone. All the Record sets defined in your zone are counted. The unit of measurement is `Count` and the aggregation is the `Maximum` of all the Record sets.
 
-To view this metric, select **Metrics** explorer experience from the **Monitor** tab in the Azure portal. Scope down to your DNS zone and then select **Apply**. In the drop-down for *Metrics*, select`Query Volume`, and then select `Sum` from the drop-down for *Aggregation*.
+To view this metric, select **Metrics** explorer experience from the **Monitor** tab in the Azure portal. Scope down to your DNS zone and then select **Apply**. In the drop-down for *Metrics*, select `Query Volume`, and then select `Sum` from the drop-down for *Aggregation*.
 
 Select your DNS zone from the **Resource** drop-down, select the **Record Set Count** metric, and then select **Max** as the **Aggregation**. 
 
@@ -58,13 +58,13 @@ Select your DNS zone from the **Resource** drop-down, select the **Record Set Co
 
 ### Record Set Capacity Utilization
 
-The *Record Set Capacity Utilization* metric shows the percent used of your Recordset capacity for a DNS Zone. Each Azure DNS zone has a Recordset limit that defines the maximum number of Recordsets allowed for the zone. For more information, see [DNS limits](dns-zones-records.md#limits) section. The unit of measurement is a `Percentage` and the aggregation type is `Maximum`.
+The *Record Set Capacity Utilization* metric shows the percentage used of your Record set capacity for a DNS Zone. Each Azure DNS zone has a Recordset limit that defines the maximum number of Record sets allowed for the zone. For more information, see [DNS limits](dns-zones-records.md#limits) section. The unit of measurement is a `Percentage` and the aggregation type is `Maximum`.
 
-For example, if you have 500 Recordsets configured in your DNS zone, and the zone has the default Recordset limit of 5000. The RecordSetCapacityUtilization metric will show the value of 10%, which is obtained by dividing 500 by 5000. 
+For example, if you have 500 Record sets configured in your DNS zone, and the zone has the default Record set limit of 5000. The RecordSetCapacityUtilization metric will show the value of 10%, which is obtained by dividing 500 by 5000. 
 
 To view this metric, select **Metrics** explorer experience from the **Monitor** tab in the Azure portal. Scope down to your DNS zone and then select **Apply**. In the drop-down for *Metrics*, select `Record Set Capacity Utilization`, and then select `Sum` from the drop-down for *Aggregation*. 
 
-![Screenshot that whows an example of how to view metrics.](./media/dns-alerts-metrics/dns-metrics-record-set-capacity-uitlization.png)
+![Screenshot that shows an example of how to view metrics.](./media/dns-alerts-metrics/dns-metrics-record-set-capacity-uitlization.png)
 
 *Figure: Azure DNS Record Set Capacity Utilization metrics*
 
@@ -81,7 +81,7 @@ Azure Monitor has alerting that you can configure for each available metric valu
 
     :::image type="content" source="./media/dns-alerts-metrics/select-resource.png" alt-text="Screenshot of select resource page in configuring alerts.":::
 
-1. Next, click the **Add condition** link in the Conditions section to open the *Select a signal* page. Select one of the three *Metric* signal type you want to configure the alert for.
+1. Next, click the **Add condition** link in the Conditions section to open the *Select a signal* page. Select one of the three *Metric* signal types you want to configure the alert for.
 
     :::image type="content" source="./media/dns-alerts-metrics/select-signal.png" alt-text="Screenshot of available metrics on the select a signal page.":::
 

articles/dns/dns-zones-records.md

@@ -19,7 +19,7 @@ This article explains the key concepts of domains, DNS zones, DNS records, and r
 
 The Domain Name System is a hierarchy of domains. The hierarchy starts from the 'root' domain, whose name is simply '**.**'.  Below this come top-level domains, such as 'com', 'net', 'org', 'uk' or 'jp'.  Below the top-level domains are second-level domains, such as 'org.uk' or 'co.jp'. The domains in the DNS hierarchy are globally distributed, hosted by DNS name servers around the world.
 
-A domain name registrar is an organization that allows you to purchase a domain name, such as `contoso.com`.  Purchasing a domain name gives you the right to control the DNS hierarchy under that name, for example allowing you to direct the name `www.contoso.com` to your company web site. The registrar may host the domain in its own name servers on your behalf, or allow you to specify alternative name servers.
+A domain name registrar is an organization that allows you to purchase a domain name, such as `contoso.com`.  Purchasing a domain name gives you the right to control the DNS hierarchy under that name, for example allowing you to direct the name `www.contoso.com` to your company web site. The registrar may host the domain in its own name servers on your behalf or allow you to specify alternative name servers.
 
 Azure DNS provides a globally distributed and high-availability name server infrastructure that you can use to host your domain. By hosting your domains in Azure DNS, you can manage your DNS records with the same credentials, APIs, tools, billing, and support as your other Azure services.
 
@@ -35,7 +35,7 @@ Azure DNS currently doesn't support purchasing of domain names. If you want to p
 
 ### Time-to-live
 
-The time to live, or TTL, specifies how long each record is cached by clients before being requeried. In the above example, the TTL is 3600 seconds or 1 hour.
+The time to live, or TTL, specifies how long each record is cached by clients before being queried. In the above example, the TTL is 3600 seconds or 1 hour.
 
 In Azure DNS, the TTL gets specified for the record set, not for each record, so the same value is used for all records within that record set.  You can specify any TTL value between 1 and 2,147,483,647 seconds.
 
@@ -65,7 +65,7 @@ These constraints arise from the DNS standards and aren't limitations of Azure D
 
 ### NS records
 
-The NS record set at the zone apex (name '\@') gets created automatically with each DNS zone, and gets deleted automatically when the zone gets deleted. It can't be deleted separately.
+The NS record set at the zone apex (name '\@') gets created automatically with each DNS zone and gets deleted automatically when the zone gets deleted. It can't be deleted separately.
 
 This record set contains the names of the Azure DNS name servers assigned to the zone. You can add more name servers to this NS record set, to support cohosting domains with more than one DNS provider. You can also modify the TTL and metadata for this record set. However, removing or modifying the pre-populated Azure DNS name servers isn't allowed. 
 

articles/postgresql/flexible-server/concepts-query-store.md

@@ -18,6 +18,10 @@ The Query Store feature in Azure Database for PostgreSQL provides a way to track
 > Do not modify the **azure_sys** database or its schema. Doing so will prevent Query Store and related performance features from functioning correctly.
 ## Enabling Query Store
 Query Store is an opt-in feature, so it isn't enabled by default on a server. Query store is enabled or disabled globally for all databases on a given server and cannot be turned on or off per database.
+> [!IMPORTANT]
+> Do not enable Query Store on Burstable pricing tier as it would cause performance impact.
+
+
 ### Enable Query Store using the Azure portal
 1. Sign in to the Azure portal and select your Azure Database for PostgreSQL server.
 2. Select **Server Parameters** in the **Settings** section of the menu.

articles/postgresql/flexible-server/how-to-restore-server-cli.md

@@ -57,10 +57,10 @@ az postgres flexible-server restore --restore-time
 Restore a server from this ```2021-03-03T13:10:00Z``` backup snapshot.
 
 ```azurecli
-az postgres server restore \
+az postgres flexible-server restore \
 --name mydemoserver-restored \
 --resource-group myresourcegroup \
---restore-point-in-time "2021-05-05T13:10:00Z" \
+--restore-time "2021-05-05T13:10:00Z" \
 --source-server mydemoserver
 ```
 

articles/postgresql/single-server/concepts-server-logs.md

@@ -65,7 +65,7 @@ To enable resource logs using the Azure portal:
    2. Select *Add Diagnostic Setting*.
    3. Name this setting. 
    4. Select your preferred endpoint (storage account, event hub, log analytics). 
-   5. Select the log type **PostgreSQLLogs**.
+   5. Select the log type **PostgreSQL Server Logs**.
    7. Save your setting.
 
 To enable resource logs using PowerShell, CLI, or REST API, visit the [diagnostic settings](../../azure-monitor/essentials/diagnostic-settings.md) article.

articles/postgresql/single-server/how-to-deploy-github-action.md

@@ -131,7 +131,7 @@ You'll use the connection string as a GitHub secret.
        with:
         connection-string: ${{ secrets.AZURE_POSTGRESQL_CONNECTION_STRING }}
         server-name: POSTGRESQL_SERVER_NAME
-        sql-file: './data.sql'
+        plsql-file: './data.sql'
     ```
 
 3. Complete your workflow by adding an action to logout of Azure. Here's the completed workflow. The file appears in the `.github/workflows` folder of your repository.
@@ -161,7 +161,7 @@ You'll use the connection string as a GitHub secret.
       with:
         server-name: POSTGRESQL_SERVER_NAME
         connection-string: ${{ secrets.AZURE_POSTGRESQL_CONNECTION_STRING }}
-        sql-file: './data.sql'
+        plsql-file: './data.sql'
 
         # Azure logout
     - name: logout
@@ -196,7 +196,7 @@ You'll use the connection string as a GitHub secret.
       with:
         server-name: POSTGRESQL_SERVER_NAME
         connection-string: ${{ secrets.AZURE_POSTGRESQL_CONNECTION_STRING }}
-        sql-file: './data.sql'
+        plsql-file: './data.sql'
 
         # Azure logout
     - name: logout

articles/search/index-add-scoring-profiles.md

@@ -229,7 +229,7 @@ Use functions when simple relative weights are insufficient or don't apply, as i
 | functions > distance > boostingDistance | A number that indicates the distance in kilometers from the reference location where the boosting range ends.|  
 | functions > tag | The tag scoring function is used to affect the score of documents based on tags in documents and search queries. Documents that have tags in common with the search query will be boosted. The tags for the search query are provided as a scoring parameter in each search request (using the scoringParameter query parameter). |  
 | functions > tag > tagsParameter | A parameter to be passed in queries to specify tags for a particular request (using the scoringParameter query parameter). The parameter consists of a comma-delimited list of whole terms. If a given tag within the list is itself a comma-delimited list, you can [use a text normalizer](search-normalizers.md) on the field to strip out the commas at query time (map the comma character to a space). This approach will "flatten" the list so that all terms are a single, long string of comma-delimited terms. |  
-| functions > functionAggregation | Optional. Applies only when functions are specified. Valid values include: sum (default), average, minimum, maximum, and firstMatching. A search score is single value that is computed from multiple variables, including multiple functions. This attribute indicates how the boosts of all the functions are combined into a single aggregate boost that then is applied to the base document score. The base score is based on the [tf-idf](http://www.tfidf.com/) value computed from the document and the search query.|  
+| functionAggregation | Optional. Applies only when functions are specified. Valid values include: sum (default), average, minimum, maximum, and firstMatching. A search score is single value that is computed from multiple variables, including multiple functions. This attribute indicates how the boosts of all the functions are combined into a single aggregate boost that then is applied to the base document score. The base score is based on the [tf-idf](http://www.tfidf.com/) value computed from the document and the search query.|  
 | defaultScoringProfile | When executing a search request, if no scoring profile is specified, then default scoring is used ([tf-idf](http://www.tfidf.com/) only). </br></br>You can override the built-in default, substituting a custom profile as the one to use when no specific profile is given in the search request.|  
 
 <a name="bkmk_interpolation"></a>