Merge pull request #189393 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/governance/entitlement-management-onboard-external-user.md

@@ -3,7 +3,7 @@ title: Tutorial - Onboard external users to Azure AD through an approval process
 description: Step-by-step tutorial for how to create an access package for external users requiring approvals in Azure Active Directory entitlement management.
 services: active-directory
 documentationCenter: ''
-author: sama
+author: Sammak
 ms.service: active-directory
 ms.workload: identity
 ms.tgt_pltfrm: na
@@ -62,7 +62,7 @@ For more information, see [License requirements](entitlement-management-overview
 
 2. In the **Users who can request access** section, click **For users not in your directory** and then click **All users (All connected organizations + any new external users)**.
 
-3. Ensure that **Require approval** is set to **Yes**.
+3. Because any user who is not yet in your directory can view and submit a request for this access package, **Yes** is mandatory for the **Require approval** setting.
 
 4. The following settings allow you to configure how your approvals work for your external users:
 

articles/active-directory/saas-apps/smartsheet-provisioning-tutorial.md

@@ -118,7 +118,7 @@ This section guides you through the steps to configure the Azure AD provisioning
 
 	![Screenshot of the Provisioning Mode dropdown list with the Automatic option called out.](common/provisioning-automatic.png)
 
-5. Under the **Admin Credentials** section, input the **SCIM 2.0 base URL and Access Token** values retrieved earlier from Smartsheet in **Tenant URL** and **Secret Token** respectively.. Click **Test Connection** to ensure Azure AD can connect to Smartsheet. If the connection fails, ensure your Smartsheet account has SysAdmin permissions and try again.
+5. Under the **Admin Credentials** section, input the **SCIM 2.0 base URL** of https://scim.smartsheet.com/v2 and **Access Token** value retrieved earlier from Smartsheet in **Secret Token** respectively. Click **Test Connection** to ensure Azure AD can connect to Smartsheet. If the connection fails, ensure your Smartsheet account has SysAdmin permissions and try again.
 
 	![Token](common/provisioning-testconnection-tenanturltoken.png)
 
@@ -182,6 +182,7 @@ Once you've configured provisioning, use the following resources to monitor your
 
 * 06/16/2020 - Added support for enterprise extension attributes "Cost Center", "Division", "Manager" and "Department" for users.
 * 02/10/2021 - Added support for core attributes "emails[type eq "work"]" for users.
+* 02/12/2022 - Added SCIM base/tenant URL of https://scim.smartsheet.com/v2 for SmartSheet integration under Admin Credentials section.
 
 ## Additional resources
 
@@ -190,4 +191,4 @@ Once you've configured provisioning, use the following resources to monitor your
 
 ## Next steps
 
-* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)
+* [Learn how to review logs and get reports on provisioning activity](../app-provisioning/check-status-user-account-provisioning.md)

articles/aks/uptime-sla.md

@@ -81,7 +81,7 @@ Create a new cluster, and don't use Uptime SLA:
 
 ```azurecli-interactive
 # Create a new cluster without uptime SLA
-az aks create --resource-group myResourceGroup --name myAKSCluster--node-count 1
+az aks create --resource-group myResourceGroup --name myAKSCluster --node-count 1
 ```
 
 Use the [`az aks update`][az-aks-update] command to update the existing cluster:

articles/api-management/developer-portal-implement-widgets.md

@@ -35,7 +35,7 @@ Use a `widget` scaffold from the `/scaffolds` folder as a starting point to buil
 
 ## Rename exported module classes
 
-Rename the exported module classes by replacing the `Widget` prefix with `ConferenceSession` in these files:
+Rename the exported module classes by replacing the `Widget` prefix with `ConferenceSession` and change the binding name to avoid name collision, in these files:
 
 - `widget.design.module.ts`
 
@@ -47,11 +47,17 @@ For example, in the `widget.design.module.ts` file, change `WidgetDesignModule`
 
 ```typescript
 export class WidgetDesignModule implements IInjectorModule {
+    public register(injector: IInjector): void {
+        injector.bind("widget", WidgetViewModel);
+        injector.bind("widgetEditor", WidgetEditorViewModel);
 ```
 to 
     
 ```typescript
 export class ConferenceSessionDesignModule implements IInjectorModule {
+    public register(injector: IInjector): void {
+        injector.bind("conferenceSession", WidgetViewModel);
+        injector.bind("conferenceSessionEditor", WidgetEditorViewModel);
 ```
     
    
@@ -190,7 +196,7 @@ From the design-time perspective, any runtime component is just an HTML tag with
     ```typescript
     ...
     createModel: async () => {
-        var model = new ConferenceSessionModel();
+        var model = new WidgetModel();
         model.sessionNumber = "107";
             return model;
         }

articles/azure-app-configuration/quickstart-feature-flag-dotnet.md

@@ -49,7 +49,7 @@ The .NET Feature Management libraries extend the framework with feature flag sup
 
 ## Connect to an App Configuration store
 
-1. Right-click your project, and select **Manage NuGet Packages**. On the **Browse** tab, search and add the following NuGet packages to your project. If you can't find them, select the **Include prerelease** check box.
+1. Right-click your project, and select **Manage NuGet Packages**. On the **Browse** tab, search and add the following NuGet packages to your project.
 
     ```
     Microsoft.Extensions.DependencyInjection

articles/azure-sql/database/logins-create-manage.md

@@ -112,7 +112,7 @@ You can create accounts for non-administrative users using one of two methods:
   With this approach, the user authentication information is stored in each database, and replicated to geo-replicated databases automatically. However, if the same account exists in multiple databases and you are using Azure SQL Authentication, you must keep the passwords synchronized manually. Additionally, if a user has an account in different databases with different passwords, remembering those passwords can become a problem.
 
 > [!IMPORTANT]
-> To create contained users mapped to Azure AD identities, you must be logged in using an Azure AD account that is an administrator in the database in Azure SQL Database. In SQL Managed Instance, a SQL login with `sysadmin` permissions can also create an Azure AD login or user.
+> To create contained users mapped to Azure AD identities, you must be logged in using an Azure AD account in the database in Azure SQL Database. In SQL Managed Instance, a SQL login with `sysadmin` permissions can also create an Azure AD login or user.
 
 For examples showing how to create logins and users, see:
 

articles/azure-sql/database/long-term-retention-overview.md

@@ -57,12 +57,14 @@ The following table illustrates the cadence and expiration of the long-term back
 W=12 weeks (84 days), M=12 months (365 days), Y=10 years (3650 days), WeekOfYear=20 (week after May 13)
 
    ![ltr example](./media/long-term-retention-overview/ltr-example.png)
-
+  
 
 If you modify the above policy and set W=0 (no weekly backups), Azure only retains the monthly and yearly backups. No weekly backups are stored under the LTR policy. The storage amount needed to keep these backups reduces accordingly.
 
 > [!IMPORTANT]
 > The timing of individual LTR backups is controlled by Azure. You cannot manually create an LTR backup or control the timing of the backup creation. After configuring an LTR policy, it  may take up to 7 days before the first LTR backup will show up on the list of available backups.  
+> 
+> If you delete a server or a managed instance, all databases on that server or managed instance are also deleted and can't be recovered. You can't restore a deleted server or managed instance. However, if you had configured LTR for a database or managed instance, LTR backups are not deleted, and they can be used to restore databases on a different server or managed instance in the same subscription, to a point in time when an LTR backup was taken.
 
 
 ## Geo-replication and long-term backup retention

articles/cdn/cdn-how-caching-works.md

@@ -68,7 +68,7 @@ Azure CDN supports the following HTTP cache-directive headers, which define cach
 - Introduced in HTTP 1.1 to give web publishers more control over their content and to address the limitations of the `Expires` header.
 - Overrides the `Expires` header, if both it and `Cache-Control` are defined.
 - When used in an HTTP request from the client to the CDN POP, `Cache-Control` is ignored by all Azure CDN profiles, by default.
-- When used in an HTTP response from the client to the CDN POP:
+- When used in an HTTP response from the origin server  to the CDN POP:
      - **Azure CDN Standard/Premium from Verizon** and **Azure CDN Standard from Microsoft** support all `Cache-Control` directives.
      - **Azure CDN Standard/Premium from Verizon** and **Azure CDN Standard from Microsoft** honors caching behaviors for Cache-Control directives in [RFC 7234 - Hypertext Transfer Protocol (HTTP/1.1): Caching (ietf.org)](https://tools.ietf.org/html/rfc7234#section-5.2.2.8).
      - **Azure CDN Standard from Akamai** supports only the following `Cache-Control` directives; all others are ignored:

articles/data-factory/concepts-data-flow-performance-sinks.md

@@ -21,7 +21,7 @@ With Azure SQL Database, the default partitioning should work in most cases. The
 
 ### Best practice for deleting rows in sink based on missing rows in source
 
-Here is a video walk through of how to use data flows with exits, alter row, and sink transformations to achieve this common pattern: 
+Here is a video walk through of how to use data flows with exists, alter row, and sink transformations to achieve this common pattern: 
 
 > [!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RWMLr5]
 
@@ -70,19 +70,23 @@ When writing files, you have a choice of naming options that each have a perform
 
 Selecting the **Default** option will write the fastest. Each partition will equate to a file with the Spark default name. This is useful if you are just reading from the folder of data.
 
-Setting a naming **Pattern** will rename each partition file to a more user-friendly name. This operation happens after write and is slightly slower than choosing the default. Per partition allows you to name each individual partition manually.
+Setting a naming **Pattern** will rename each partition file to a more user-friendly name. This operation happens after write and is slightly slower than choosing the default.
 
-If a column corresponds to how you wish to output the data, you can select **As data in column**. This reshuffles the data and can impact performance if the columns are not evenly distributed.
+**Per partition** allows you to name each individual partition manually.
+
+If a column corresponds to how you wish to output the data, you can select **Name file as column data**. This reshuffles the data and can impact performance if the columns are not evenly distributed.
+
+If a column corresponds to how you wish to generate folder names, select **Name folder as column data**.
 
 **Output to single file** combines all the data into a single partition. This leads to long write times, especially for large datasets. This option is strongly discouraged unless there is an explicit business reason to use it.
 
-## CosmosDB sinks
+## Azure Cosmos DB sinks
 
-When writing to CosmosDB, altering throughput and batch size during data flow execution can improve performance. These changes only take effect during the data flow activity run and will return to the original collection settings after conclusion. 
+When writing to Azure Cosmos DB, altering throughput and batch size during data flow execution can improve performance. These changes only take effect during the data flow activity run and will return to the original collection settings after conclusion. 
 
 **Batch size:** Usually, starting with the default batch size is sufficient. To further tune this value, calculate the rough object size of your data, and make sure that object size * batch size is less than 2MB. If it is, you can increase the batch size to get better throughput.
 
-**Throughput:** Set a higher throughput setting here to allow documents to write faster to CosmosDB. Keep in mind the higher RU costs based upon a high throughput setting.
+**Throughput:** Set a higher throughput setting here to allow documents to write faster to Azure Cosmos DB. Keep in mind the higher RU costs based upon a high throughput setting.
 
 **Write throughput budget:** Use a value which is smaller than total RUs per minute. If you have a data flow with a high number of Spark partitions, setting a budget throughput will allow more balance across those partitions.
 

articles/iot-hub/iot-hub-automatic-device-management.md

@@ -36,7 +36,7 @@ Automatic module configurations require the use of module twins to synchronize s
 
 ## Use tags to target twins
 
-Before you create a configuration, you must specify which devices or modules you want to affect. Azure IoT Hub identifies devices and using tags in the device twin, and identifies modules using tags in the module twin. Each device or modules can have multiple tags, and you can define them any way that makes sense for your solution. For example, if you manage devices in different locations, add the following tags to a device twin:
+Before you create a configuration, you must specify which devices or modules you want to affect. Azure IoT Hub identifies devices using tags in the device twin, and identifies modules using tags in the module twin. Each device or modules can have multiple tags, and you can define them any way that makes sense for your solution. For example, if you manage devices in different locations, add the following tags to a device twin:
 
 ```json
 "tags": {
@@ -69,7 +69,7 @@ There are five steps to create a configuration. The following sections walk thro
 
 ### Specify Settings
 
-This section defines the content to be set in targeted device or module twins. There are two inputs for each set of settings. The first is the twin path, which is the path to the JSON section within the twin desired properties that will be set.  The second is the JSON content to be inserted in that section. 
+This section defines the content to be set in targeted device twin or module twin desired properties. There are two inputs for each set of settings. The first is the twin path, which is the path to the JSON section within the twin desired properties that will be set. The second is the JSON content to be inserted in that section. 
 
 For example, you could set the twin path to `properties.desired.chiller-water` and then provide the following JSON content: 
 
@@ -151,7 +151,7 @@ To view the details of a configuration and monitor the devices running it, use t
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub. 
 
-2. Select **IoT device configuration**.
+2. Select **Configurations** in Device management.
 
 3. Inspect the configuration list. For each configuration, you can view the following details:
 
@@ -195,16 +195,16 @@ To modify a configuration, use the following steps:
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub. 
 
-2. Select **IoT device configuration**. 
+2. Select **Configurations** in Device management. 
 
 3. Select the configuration that you want to modify. 
 
 4. Make updates to the following fields: 
 
-   * Target condition 
-   * Labels 
    * Priority 
    * Metrics
+   * Target condition 
+   * Labels 
 
 4. Select **Save**.
 
@@ -216,7 +216,7 @@ When you delete a configuration, any device twins take on their next highest pri
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub. 
 
-2. Select **IoT device configuration**. 
+2. Select **Configurations** in Device management.
 
 3. Use the checkbox to select the configuration that you want to delete. 
 
@@ -238,4 +238,4 @@ To further explore the capabilities of IoT Hub, see:
 
 To explore using the IoT Hub Device Provisioning Service to enable zero-touch, just-in-time provisioning, see: 
 
-* [Azure IoT Hub Device Provisioning Service](../iot-dps/index.yml)
+* [Azure IoT Hub Device Provisioning Service](../iot-dps/index.yml)