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

Author: duongau

articles/active-directory/fundamentals/multi-tenant-user-management-introduction.md

@@ -98,7 +98,7 @@ There are several mechanisms available for creating and managing the lifecycle o
 
 | Mechanism |  Description | Best when |
 | - | - | - |
-| [End-user-initiated](multi-tenant-user-management-scenarios.md#end-user-initiated-scenario) | Resource tenant admins delegate the ability to invite guest users to the tenant, an app, or a resource to users within the resource tenant. Users from the home tenant are invited or sign up individually. |  <li>Users need improvised access to resources. <li>No automatic synchronization of user attributes is necessary.<li>Unified GAL is not needed.a |
+| [End-user-initiated](multi-tenant-user-management-scenarios.md#end-user-initiated-scenario) | Resource tenant admins delegate the ability to invite guest users to the tenant, an app, or a resource to users within the resource tenant. Users from the home tenant are invited or sign up individually. |  <li>Users need improvised access to resources. <li>No automatic synchronization of user attributes is necessary.<li>Unified GAL is not needed. |
 |[Scripted](multi-tenant-user-management-scenarios.md#scripted-scenario) | Resource tenant administrators deploy a scripted “pull” process to automate discovery and provisioning of guest users to support sharing scenarios. |  <li>No more than two tenants.<li>No automatic synchronization of user attributes is necessary.<li>Users need pre-configured (not improvised) access to resources.|
 |[Automated](multi-tenant-user-management-scenarios.md#automated-scenario)|Resource tenant admins use an identity provisioning system to automate the provisioning and deprovisioning processes. |  <li>Full identity lifecycle management with provisioning and deprovisioning must be automated.<li>Attribute syncing is required to populate the GAL details and support dynamic entitlement scenarios.<li>Users need pre-configured (not ad hoc) access to resources on “Day One”.|
 

articles/active-directory/governance/what-are-lifecycle-workflows.md

@@ -23,7 +23,7 @@ Azure AD Lifecycle Workflows is a new Azure AD Identity Governance service that
 
 Workflows contain specific processes, which run automatically against users as they move through their life cycle. Workflows are made up of [Tasks](lifecycle-workflow-tasks.md) and [Execution conditions](understanding-lifecycle-workflows.md#understanding-lifecycle-workflows). 
 
-Tasks are specific actions that run automatically when a workflow is triggered. An Execution condition defines the 'Scope' of "“who” and the 'Trigger' of “when” a workflow will be performed. For example, send a manager an email 7 days before the value in the NewEmployeeHireDate attribute of new employees, can be described as a workflow.  It consists of:
+Tasks are specific actions that run automatically when a workflow is triggered. An Execution condition defines the 'Scope' of "who" and the 'Trigger' of "when" a workflow will be performed. For example, sending a manager an email 7 days before the value in the NewEmployeeHireDate attribute of new employees can be described as a workflow.  It consists of:
    - Task:  send email
    - When (trigger):  Seven days before the NewEmployeeHireDate attribute value
    - Who (scope):  new employees
@@ -40,17 +40,17 @@ Finally, Lifecycle Workflows can even [integrate with Logic Apps](lifecycle-work
 Anyone who wants to modernize their identity lifecycle management process for employees, needs to ensure: 
 
   - **New employee on-boarding** - That when a user joins the organization, they're ready to go on day one.  They have the correct access to the information, membership to groups, and applications they need. 
-  - **Employee retirement/terminations/off-boarding** - That users who are no longer tied to the company for various reasons (termination, separation, leave of absence or retirement), have their access revoked in a timely manner
+  - **Employee retirement/terminations/off-boarding** - That users who are no longer tied to the company for various reasons (termination, separation, leave of absence or retirement), have their access revoked in a timely manner.
   - **Easy to administer in my organization** - That there's a seamless process to accomplish the above tasks, that isn't overly burdensome or time consuming for Administrators.
   - **Robust troubleshooting/auditing/compliance** - That there's the ability to easily troubleshoot issues when they arise and that there's sufficient logging to help with this and compliance related issues.
 
 The following are key reasons to use Lifecycle workflows.
 -  **Extend** your HR-driven provisioning process with other workflows that simplify and automate tasks.  
 - **Centralize** your workflow process so you can easily create and manage workflows all in one location.
-- Easily **troubleshoot** workflow scenarios with the Workflow history and Audit logs
+- Easily **troubleshoot** workflow scenarios with the Workflow history and Audit logs.
 - **Manage** user lifecycle at scale.  As your organization grows, the need for other resources to manage user lifecycles are reduced.
-- **Reduce** or remove manual tasks that were done in the past with automated lifecycle workflows
-- **Apply** logic apps to extend workflows for more complex scenarios using your existing Logic apps
+- **Reduce** or remove manual tasks that were done in the past with automated lifecycle workflows.
+- **Apply** logic apps to extend workflows for more complex scenarios using your existing Logic apps.
 
 
 All of the above can help ensure a holistic experience by allowing you to remove other dependencies and applications to achieve the same result.  Thus translating into, increased on-boarding and off-boarding efficiency.
@@ -73,4 +73,4 @@ You can use Lifecycle workflows to address any of the following conditions.
 
 ## Next steps
 - [Create a custom workflow using the Azure portal](tutorial-onboard-custom-workflow-portal.md)
-- [Create a Lifecycle workflow](create-lifecycle-workflow.md)
+- [Create a Lifecycle workflow](create-lifecycle-workflow.md)

articles/app-service/overview.md

@@ -72,14 +72,14 @@ First, validate that the new platform update which contains Debian 11 has reache
 Next, create a deployment slot to test that your application works properly with Debian 11 before applying the change to production.
 
 1. [Create a deployment slot](deploy-staging-slots.md#add-a-slot) if you do not already have one, and clone your settings from the production slot. A deployment slot will allow you to safely test changes to your application (such as upgrading to Debian 11) and swap those changes into production after review. 
-1. To upgrade to Debian 11 (Bullseye), create an app setting on your slot named `ORYX_DEFAULT_OS` with a value of `bullseye`.
+1. To upgrade to Debian 11 (Bullseye), create an app setting on your slot named `WEBSITE_LINUX_OS_VERSION` with a value of `DEBIAN|BULLSEYE`.
 
     ```bash
-    az webapp config appsettings set -g MyResourceGroup -n MyUniqueApp --settings ORYX_DEFAULT_OS=bullseye
+    az webapp config appsettings set -g MyResourceGroup -n MyUniqueApp --settings WEBSITE_LINUX_OS_VERSION="DEBIAN|BULLSEYE"
     ```
 1. Deploy your application to the deployment slot using the tool of your choice (VS Code, Azure CLI, GitHub Actions, etc.)
 1. Confirm your application is functioning as expected in the deployment slot.
-1. [Swap your production and staging slots](deploy-staging-slots.md#swap-two-slots). This will apply the `ORYX_DEFAULT_OS=bullseye` app setting to production.
+1. [Swap your production and staging slots](deploy-staging-slots.md#swap-two-slots). This will apply the `WEBSITE_LINUX_OS_VERSION=DEBIAN|BULLSEYE` app setting to production.
 1. Delete the deployment slot if you are no longer using it.
 
 ##### Resources

articles/app-service/toc.yml

@@ -243,12 +243,6 @@
           href: app-service-hybrid-connections.md
         - name: Virtual network integration
           href: overview-vnet-integration.md
-        - name: Application Gateway integration
-          href: networking/app-gateway-with-service-endpoints.md
-        - name: NAT gateway integration
-          href: networking/nat-gateway-integration.md
-        - name: Traffic Manager integration
-          href: web-sites-traffic-manager.md
     - name: Local cache
       href: overview-local-cache.md
     - name: Diagnostics
@@ -335,7 +329,7 @@
               href: configure-authentication-provider-twitter.md
             - name: Authenticate with an OpenID Connect provider
               href: configure-authentication-provider-openid-connect.md
-            - name: Authenticate using Sign in with Apple (Preview)
+            - name: Authenticate using Sign-in with Apple (Preview)
               href: configure-authentication-provider-apple.md
         - name: Customize sign-ins/outs
           href: configure-authentication-customize-sign-in-out.md
@@ -391,7 +385,7 @@
       items:
         - name: Manage the hosting plan
           href: app-service-plan-manage.md
-        - name: Backup and restore
+        - name: Back up and restore
           href: manage-backup.md
         - name: Clone an app
           href: app-service-web-app-cloning.md
@@ -401,12 +395,18 @@
           href: manage-create-arc-environment.md
     - name: Networking
       items:
-        - name: Enable VNet integration
+        - name: Enable virtual network integration
           href: configure-vnet-integration-enable.md
-        - name: Configure VNet integration routing
+        - name: Configure network routing
           href: configure-vnet-integration-routing.md
         - name: Control outbound traffic with Azure Firewall
           href: network-secure-outbound-traffic-azure-firewall.md
+        - name: Integrate with Application Gateway
+          href: networking/app-gateway-with-service-endpoints.md
+        - name: Configure NAT gateway integration
+          href: networking/nat-gateway-integration.md
+        - name: Integrate with Traffic Manager
+          href: web-sites-traffic-manager.md
     - name: Move app
       items:
         - name: Move between regions

articles/cost-management-billing/reservations/prepay-hana-large-instances-reserved-capacity.md

@@ -50,7 +50,7 @@ armclient post /providers/Microsoft.Capacity/calculatePrice?api-version=2019-04-
         'billingScopeId': '/subscriptions/11111111-1111-1111-111111111111',
         'term': 'P1Y',
         'quantity': '1',
-        'billingplan': 'Monthly'
+        'billingplan': 'Monthly',
         'displayName': 'testreservation_S224om',
         'appliedScopes': ['/subscriptions/11111111-1111-1111-111111111111'],
         'appliedScopeType': 'Single',
@@ -105,7 +105,7 @@ The following example response resembles what you get returned. Note the value y
 
 ### Make your purchase
 
-Make your purchase using the returned `quoteId` and the `reservationOrderId` that you got from the preceding [Get the reservation order and price](#get-the-reservation-order-and-price) section.
+Make your purchase using the returned `reservationOrderId` that you got from the preceding [Get the reservation order and price](#get-the-reservation-order-and-price) section.
 
 Here's an example request:
 
@@ -120,14 +120,13 @@ armclient put /providers/Microsoft.Capacity/reservationOrders/22222222-2222-2222
         'billingScopeId': '/subscriptions/11111111-1111-1111-111111111111',
         'term': 'P1Y',
         'quantity': '1',
-               'billingplan': 'Monthly'
+               'billingplan': 'Monthly',
 
         'displayName': ' testreservation_S224om',
         'appliedScopes': ['/subscriptions/11111111-1111-1111-111111111111/resourcegroups/123'],
         'appliedScopeType': 'Single',
        'instanceFlexibility': 'NotSupported',
-       'renew': true,
-       'quoteId': 'd0fd3a890795'
+       'renew': true       
     }
 }"
 ```
@@ -254,4 +253,4 @@ location. You can also go to https://aka.ms/corequotaincrease to learn about quo
 ## Next steps
 
 - Learn about [How to call Azure REST APIs with Postman and cURL](/rest/api/azure/#how-to-call-azure-rest-apis-with-postman).
-- See [SKUs for SAP HANA on Azure (Large Instances)](../../virtual-machines/workloads/sap/hana-available-skus.md) for the available SKU list and regions.
+- See [SKUs for SAP HANA on Azure (Large Instances)](../../virtual-machines/workloads/sap/hana-available-skus.md) for the available SKU list and regions.

articles/cost-management-billing/reservations/save-compute-costs-reservations.md

@@ -98,6 +98,7 @@ For more information, see [Self-service exchanges and refunds for Azure Reservat
 - **Azure Cache for Redis** - Only the compute costs are included with a reservation. A reservation doesn't cover networking or storage charges associated with the Redis cache instances.
 - **Azure Dedicated Host** - Only the compute costs are included with the Dedicated host.
 - **Azure Disk Storage reservations** - A reservation only covers premium SSDs of P30 size or greater. It doesn't cover any other disk types or sizes smaller than P30.
+- **Azure Backup Storage reserved capacity** - A capacity reservation lowers storage costs of backup data in a Recovery Services Vault.
 
 Software plans:
 

articles/energy-data-services/quickstart-create-microsoft-energy-data-services-instance.md

@@ -13,11 +13,11 @@ ms.custom: template-quickstart #Required; leave this attribute/value as-is.
 
 [!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
 
-Get started by creating a Microsoft Energy Data Services instance on Azure portal on a web browser. You first register an Azure application on Active Directory and then use the application ID to create a Microsoft Energy Data Services instance in your chosen Azure Subscription and region. 
+Get started by creating a Microsoft Energy Data Services Preview instance on Azure portal on a web browser. You first register an Azure application on Active Directory and then use the application ID to create a Microsoft Energy Data Services instance in your chosen Azure Subscription and region. 
 
-The setup of Microsoft Energy Data Services instance can be triggered using a simple interface on Azure portal and takes about 50 minutes to complete.
+The setup of Microsoft Energy Data Services Preview instance can be triggered using a simple interface on Azure portal and takes about 50 minutes to complete.
 
-Microsoft Energy Data Services is a managed "Platform as a service (PaaS)" offering from Microsoft that builds on top of the [OSDU™](https://osduforum.org/) Data Platform. Microsoft Energy Data Services lets you ingest, transform, and export subsurface data by letting you connect your consuming in-house or third-party applications.
+Microsoft Energy Data Services Preview is a managed "Platform as a service (PaaS)" offering from Microsoft that builds on top of the [OSDU™](https://osduforum.org/) Data Platform. Microsoft Energy Data Services Preview lets you ingest, transform, and export subsurface data by letting you connect your consuming in-house or third-party applications.
 
 ## Prerequisites
 
@@ -28,7 +28,7 @@ Application ID | You'll need an [application ID](../active-directory/develop/app
 Client Secret | Sometimes called an application password, a client secret is a string value that your app can use in place of a certificate to identity itself. You can [create a client secret](../active-directory/develop/quickstart-register-app.md#add-a-client-secret) by selecting *Certificates & secrets* > *Client secrets* > *New client secret*. Record the secret's value for use in your client application code. This secret value is never displayed again after you leave this page.
 
 
-## Create a Microsoft Energy Data Services instance
+## Create a Microsoft Energy Data Services Preview instance
 
 
 1. Save your **Application (client) ID** and **client secret** from Azure Active Directory to refer to them later in this quickstart.  
@@ -92,7 +92,7 @@ Client Secret | Sometimes called an application password, a client secret is a s
     [![Screenshot of the overview of Microsoft Energy Data Services instance page. Details as such data partitions, instance URI, and app ID are accessible.](media/quickstart-create-microsoft-energy-data-services-instance/overview-energy-data-services.png)](media/quickstart-create-microsoft-energy-data-services-instance/overview-energy-data-services.png#lightbox)
 
 
-## Delete a Microsoft Energy Data Services instance
+## Delete a Microsoft Energy Data Services Preview instance
 
 Deleting a Microsoft Energy Data instance also deletes any data that you've ingested. This action is permanent and the ingested data can't be recovered. To delete a Microsoft Energy Data Services instance, complete the following steps:
 

articles/logic-apps/create-integration-service-environment-rest-api.md

@@ -47,7 +47,7 @@ Deployment usually takes within two hours to finish. Occasionally, deployment mi
 
 > [!NOTE]
 > If deployment fails or you delete your ISE, Azure might take up to an hour before releasing your subnets. 
-> This delay means means you might have to wait before reusing those subnets in another ISE.
+> This delay means you might have to wait before reusing those subnets in another ISE.
 >
 > If you delete your virtual network, Azure generally takes up to two hours 
 > before releasing up your subnets, but this operation might take longer. 

articles/machine-learning/how-to-auto-train-forecast.md

@@ -126,7 +126,7 @@ automl_config = AutoMLConfig(task='forecasting',
                              cv_step_size = "auto", # Could be customized as an integer
                              enable_ensembling=False,
                              verbosity=logging.INFO,
-                             **forecasting_parameters)
+                             forecasting_parameters=forecasting_parameters)
 ```
 
 The amount of data required to successfully train a forecasting model with automated ML is influenced by the `forecast_horizon`, `n_cross_validations`, and `target_lags` or `target_rolling_window_size` values specified when you configure your `AutoMLConfig`. 
@@ -229,7 +229,7 @@ To enable deep learning, set the `enable_dnn=True` in the `AutoMLConfig` object.
 automl_config = AutoMLConfig(task='forecasting',
                              enable_dnn=True,
                              ...
-                             **forecasting_parameters)
+                             forecasting_parameters=forecasting_parameters)
 ```
 > [!Warning]
 > When you enable DNN for experiments created with the SDK, [best model explanations](how-to-machine-learning-interpretability-automl.md) are disabled.

articles/storage/files/storage-files-identity-ad-ds-assign-permissions.md

@@ -64,7 +64,7 @@ In order for share-level permissions to work, you must:
 Share-level permissions must be assigned to the Azure AD identity representing the same user or group in your AD DS to support AD DS authentication to your Azure file share. Authentication and authorization against identities that only exist in Azure AD, such as Azure Managed Identities (MSIs), are not supported with AD DS authentication.
 
 > [!TIP]
-> Customers who want to migrate SMB server share-level permissions to RBAC permissions can use the `Move-OnPremSharePermissionsToAzureFileShare` PowerShell cmdlet to migrate directory and file-level permissions from on-premises to Azure. This cmdlet evaluates the groups of a particular share on premises, then writes the appropriate users and groups to the Azure file share using the three RBAC roles. You provide the information for the on-premises share and the Azure file share when invoking the cmdlet.
+> Optional: Customers who want to migrate SMB server share-level permissions to RBAC permissions can use the `Move-OnPremSharePermissionsToAzureFileShare` PowerShell cmdlet to migrate directory and file-level permissions from on-premises to Azure. This cmdlet evaluates the groups of a particular on-premises file share, then writes the appropriate users and groups to the Azure file share using the three RBAC roles. You provide the information for the on-premises share and the Azure file share when invoking the cmdlet.
 
 You can use the Azure portal, Azure PowerShell module, or Azure CLI to assign the built-in roles to the Azure AD identity of a user for granting share-level permissions.