Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

@@ -6,7 +6,7 @@ ms.assetid: ef2797d7-d440-4a9a-a648-db32ad137494
 ms.service: active-directory
 ms.topic: reference
 ms.workload: identity
-ms.date: 1/31/2022
+ms.date: 3/24/2022
 ms.subservice: hybrid
 ms.author: rodejo
 ms.custom: has-adal-ref
@@ -82,10 +82,9 @@ To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-t
 ### Release status
 3/24/2022: Released for download only, not available for auto upgrade
 
-
 ### Bug fixes
  - Fixed an issue where some sync rule functions were not parsing surrogate pairs properly.
- - Fixed an issue where, under certain circumstances, the sync service would not start due to a model db corruption.
+ - Fixed an issue where, under certain circumstances, the sync service would not start due to a model db corruption. You can read more about the model db corroption issue in [this article](https://docs.microsoft.com/troubleshoot/azure/active-directory/resolve-model-database-corruption-sqllocaldb)
 
 ## 2.0.91.0
 

articles/active-directory/hybrid/reference-connect-version-history.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: app-mgmt
 ms.topic: quickstart
 ms.workload: identity
-ms.date: 09/22/2021
+ms.date: 03/24/2022
 ms.author: davidmu
 ms.reviewer: alamaral
 ms.custom: mode-other

articles/active-directory/manage-apps/add-application-portal-assign-users.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: app-mgmt
 ms.topic: quickstart
 ms.workload: identity
-ms.date: 09/22/2021
+ms.date: 03/24/2022
 ms.author: davidmu
 ms.reviewer: ergleenl
 ms.custom: mode-other

articles/active-directory/manage-apps/add-application-portal.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: app-mgmt
 ms.topic: quickstart
 ms.workload: identity
-ms.date: 09/22/2021
+ms.date: 03/24/2022
 ms.author: davidmu
 ms.reviewer: ergleenl
 ms.custom: mode-other

articles/active-directory/manage-apps/delete-application-portal.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.subservice: app-mgmt
 ms.workload: identity
 ms.topic: quickstart
-ms.date: 09/07/2021
+ms.date: 03/24/2022
 ms.author: davidmu
 ms.reviewer: arvinh
 ms.custom: mode-other
@@ -45,15 +45,15 @@ To view the enterprise applications registered in your tenant:
 
 To search for a particular application:
 
-1. In the **Application Type** menu, select **All applications**, and choose **Apply**.
+1. Select the **Application Type** filter option. Select **All applications** from the **Application Type** drop-down menu, and choose **Apply**.
 1. Enter the name of the application you want to find. If the application has been added to your Azure AD tenant, it appears in the search results. For example, you can search for the **Azure AD SAML Toolkit 1** application that is used in the previous quickstarts. 
 1. Try entering the first few letters of an application name.
 
 ## Select viewing options
 
 Select options according to what you're looking for:
 
-1. You can view the applications by **Application Type**, **Application Status**, and **Application visibility**.
+1. You can view the applications by **Application Type**, **Application Status**, and **Application visibility**. These three options are the default filters. 
 1. Under **Application Type**, choose one of these options:
     - **Enterprise Applications** shows non-Microsoft applications.
     - **Microsoft Applications** shows Microsoft applications.
@@ -62,6 +62,14 @@ Select options according to what you're looking for:
 1. Under **Application Status**, choose **Any**, **Disabled**, or **Enabled**. The **Any** option includes both disabled and enabled applications.
 1. Under **Application Visibility**, choose **Any**, or **Hidden**. The **Hidden** option shows applications that are in the tenant, but aren't visible to users.
 1. After choosing the options you want, select **Apply**.
+1. Select **Add filters** to add more options for filtering the search results. The other that exist are:
+   - **Application ID**
+   - **Created on**
+   - **Assignment required**
+   - **Is App Proxy**
+   - **Owner**
+1. To remove any of the filter options already added, select the **X** icon next to the filter option.
+
 
 ## Clean up resources
 

articles/active-directory/manage-apps/media/view-applications-portal/view-enterprise-applications.png

@@ -3,7 +3,7 @@ title: Use Container Storage Interface (CSI) drivers for Azure Files on Azure Ku
 description: Learn how to use the Container Storage Interface (CSI) drivers for Azure Files in an Azure Kubernetes Service (AKS) cluster.
 services: container-service
 ms.topic: article
-ms.date: 03/22/2021
+ms.date: 03/24/2021
 author: palma21
 
 ---
@@ -112,6 +112,9 @@ storageclass.storage.k8s.io/my-azurefile created
 
 The Azure Files CSI driver supports creating [snapshots of persistent volumes](https://kubernetes-csi.github.io/docs/snapshot-restore-feature.html) and the underlying file shares.
 
+> [!NOTE]
+> This driver only supports snapshot creation, restore from snapshot is not supported by this driver, snapshot could be restored from Azure portal or CLI. To get the snapshot created, you can go to Azure Portal -> access the Storage Account -> File shares -> access the file share associated -> Snapshots. There you can click on it and restore. 
+
 Create a [volume snapshot class](https://github.com/kubernetes-sigs/azurefile-csi-driver/blob/master/deploy/example/snapshot/volumesnapshotclass-azurefile.yaml) with the [kubectl apply][kubectl-apply] command:
 
 ```console

articles/active-directory/manage-apps/view-applications-portal.md

@@ -111,7 +111,7 @@ You now have a running pod with an Azure Files share mounted at */mnt/azure*. Yo
 
 ## Mount file share as a persistent volume
  - Mount options
-> The default value for *fileMode* and *dirMode* is *0777* for Kubernetes version 1.15 and above.
+> The default value for *fileMode* and *dirMode* is *0777*.
 
 ```yaml
 apiVersion: v1
@@ -156,6 +156,7 @@ spec:
   accessModes:
     - ReadWriteMany
   storageClassName: ""
+  volumeName: azurefile
   resources:
     requests:
       storage: 5Gi
@@ -195,10 +196,6 @@ kubectl delete pod mypod
 kubectl apply -f azure-files-pod.yaml
 ```
 
-## Using Azure tags
-
-For more details on using Azure tags, see [Use Azure tags in Azure Kubernetes Service (AKS)][use-tags].
-
 ## Next steps
 
 For Azure File CSI driver parameters, see [CSI driver parameters][CSI driver parameters].

articles/aks/azure-files-csi.md

@@ -3,7 +3,7 @@ title: Use the migration feature to migrate App Service Environment v2 to App Se
 description: Learn how to migrate your App Service Environment v2 to App Service Environment v3 using the migration feature
 author: seligj95
 ms.topic: tutorial
-ms.date: 2/2/2022
+ms.date: 3/25/2022
 ms.author: jordanselig
 zone_pivot_groups: app-service-cli-portal
 ---
@@ -25,7 +25,7 @@ The recommended experience for the migration feature is using the [Azure portal]
 
 For this guide, [install the Azure CLI](/cli/azure/install-azure-cli) or use the [Azure Cloud Shell](https://shell.azure.com/).
 
-## 1. Get your App Service Environment ID
+## Get your App Service Environment ID
 
 Run these commands to get your App Service Environment ID and store it as an environment variable. Replace the placeholders for name and resource group with your values for the App Service Environment you want to migrate.
 
@@ -35,7 +35,7 @@ ASE_RG=<Your-Resource-Group>
 ASE_ID=$(az appservice ase show --name $ASE_NAME --resource-group $ASE_RG --query id --output tsv)
 ```
 
-## 2. Validate migration is supported
+## Validate migration is supported
 
 The following command will check whether your App Service Environment is supported for migration. If you receive an error or if your App Service Environment is in an unhealthy or suspended state, you can't migrate at this time. If your environment [won't be supported for migration](migrate.md#supported-scenarios) or you want to migrate to App Service Environment v3 without using the migration feature, see the [manual migration options](migration-alternatives.md).
 
@@ -45,7 +45,7 @@ az rest --method post --uri "${ASE_ID}/migrate?api-version=2021-02-01&phase=vali
 
 If there are no errors, your migration is supported and you can continue to the next step.
 
-## 3. Generate IP addresses for your new App Service Environment v3
+## Generate IP addresses for your new App Service Environment v3
 
 Run the following command to create the new IPs. This step will take about 15 minutes to complete. Don't scale or make changes to your existing App Service Environment during this time.
 
@@ -65,11 +65,11 @@ If it's in progress, you'll get a status of "Migrating". Once you get a status o
 az rest --method get --uri "${ASE_ID}/configurations/networking?api-version=2021-02-01"
 ```
 
-## 4. Update dependent resources with new IPs
+## Update dependent resources with new IPs
 
 Don't move on to migration immediately after completing the previous step. Using the new IPs, update any resources and networking components to ensure your new environment functions as intended once migration is complete. It's your responsibility to make any necessary updates.
 
-## 5. Delegate your App Service Environment subnet
+## Delegate your App Service Environment subnet
 
 App Service Environment v3 requires the subnet it's in to have a single delegation of `Microsoft.Web/hostingEnvironments`. Previous versions didn't require this delegation. You'll need to confirm your subnet is delegated properly and update the delegation if needed before migrating. You can update the delegation either by running the following command or by navigating to the subnet in the [Azure portal](https://portal.azure.com).
 
@@ -79,7 +79,7 @@ az network vnet subnet update -g $ASE_RG -n <subnet-name> --vnet-name <vnet-name
 
 ![subnet delegation sample](./media/migration/subnet-delegation.png)
 
-## 6. Migrate to App Service Environment v3
+## Migrate to App Service Environment v3
 
 Only start this step once you've completed all pre-migration actions listed previously and understand the [implications of migration](migrate.md#migrate-to-app-service-environment-v3) including what will happen during this time. There will be about one hour of downtime. Scaling and modifications to your existing App Service Environment will be blocked during this step.
 
@@ -105,7 +105,7 @@ az appservice ase show --name $ASE_NAME --resource-group $ASE_RG
 
 ::: zone pivot="experience-azp"
 
-## 1. Validate migration is supported
+## Validate migration is supported
 
 From the [Azure portal](https://portal.azure.com), navigate to the **Overview** page for the App Service Environment you'll be migrating. The platform will validate if migration is supported for your App Service Environment. Wait a couple seconds after the page loads for this validation to take place.
 
@@ -121,25 +121,25 @@ The migration page will guide you through the series of steps to complete the mi
 
 ![migration page sample](./media/migration/migration-ux-pre.png)
 
-## 2. Generate IP addresses for your new App Service Environment v3
+## Generate IP addresses for your new App Service Environment v3
 
 Under **Generate new IP addresses**, confirm you understand the implications and start the process. This step will take about 15 minutes to complete. Don't scale or make changes to your existing App Service Environment during this time. If you may see a message a few minutes after starting this step asking you to refresh the page, select refresh as shown in the sample to allow your new IP addresses to appear.
 
 ![pre-migration request to refresh](./media/migration/pre-migration-refresh.png)
 
-## 3. Update dependent resources with new IPs
+## Update dependent resources with new IPs
 
 When the previous step finishes, you'll be shown the IP addresses for your new App Service Environment v3. Using the new IPs, update any resources and networking components to ensure your new environment functions as intended once migration is complete. It's your responsibility to make any necessary updates. Don't move on to the next step until you confirm that you have made these updates.
 
 ![sample IPs](./media/migration/ip-sample.png)
 
-## 4. Delegate your App Service Environment subnet
+## Delegate your App Service Environment subnet
 
 App Service Environment v3 requires the subnet it's in to have a single delegation of `Microsoft.Web/hostingEnvironments`. Previous versions didn't require this delegation. You'll need to confirm your subnet is delegated properly and update the delegation if needed before migrating. A link to your subnet is given so that you can confirm and update as needed.
 
 ![ux subnet delegation sample](./media/migration/subnet-delegation-ux.png)
 
-## 5. Migrate to App Service Environment v3
+## Migrate to App Service Environment v3
 
 Once you've completed all of the above steps, you can start migration. Make sure you understand the [implications of migration](migrate.md#migrate-to-app-service-environment-v3) including what will happen during this time. There will be about one hour of downtime. Scaling and modifications to your existing App Service Environment will be blocked during this step.