Merge branch 'main' into sdw-fix-cloud-shell-links

Author: sdwheeler

articles/aks/azure-ad-integration-cli.md

@@ -283,4 +283,4 @@ For best practices on identity and resource control, see [Best practices for aut
 [operator-best-practices-identity]: operator-best-practices-identity.md
 [azure-ad-rbac]: azure-ad-rbac.md
 [managed-aad]: managed-aad.md
-[managed-aad-migrate]: managed-aad.md#upgrading-to-aks-managed-azure-ad-integration
+[managed-aad-migrate]: managed-aad.md#upgrade-to-aks-managed-azure-ad-integration

articles/aks/kubernetes-portal.md

@@ -111,5 +111,5 @@ This article showed you how to access Kubernetes resources for your AKS cluster.
 [aks-quickstart-cli]: ./learn/quick-kubernetes-deploy-cli.md
 [deployments]: concepts-clusters-workloads.md#deployments-and-yaml-manifests
 [aks-managed-aad]: managed-aad.md
-[cli-aad-upgrade]: managed-aad.md#upgrading-to-aks-managed-azure-ad-integration
+[cli-aad-upgrade]: managed-aad.md#upgrade-to-aks-managed-azure-ad-integration
 [enable-monitor]: ../azure-monitor/containers/container-insights-enable-existing-clusters.md

articles/aks/managed-aad.md

@@ -51,7 +51,7 @@ Once the deployment has succeeded (it might take a few minutes), open a browser
 
 You should see the sample app rendered with no event messages displayed.
 
-[!INCLUDE [event-grid-register-provider-portal.md](../../includes/event-grid-register-provider-portal.md)]
+[!INCLUDE [event-grid-register-provider-portal.md](../../articles/event-grid/includes/register-provider.md)]
 
 ## Subscribe to API Management events
 

articles/api-management/how-to-event-grid.md

@@ -72,7 +72,7 @@ The deployment may take a few minutes to complete. After the deployment has succ
 
 You should see the site with no messages currently displayed.
 
-[!INCLUDE [event-grid-register-provider-cli.md](../../includes/event-grid-register-provider-cli.md)]
+[!INCLUDE [register-provider-cli.md](../../articles/event-grid/includes/register-provider-cli.md)]
 
 ## Subscribe to your App Configuration store
 

articles/azure-app-configuration/howto-app-configuration-event.md

@@ -95,7 +95,7 @@ az storage account create -n $storageName -g $resourceGroupName -l westus --sku
 az storage queue create --name $queueName --account-name $storageName --auth-mode login
 ```
 
-[!INCLUDE [event-grid-register-provider-cli.md](../../includes/event-grid-register-provider-cli.md)]
+[!INCLUDE [register-provider-cli.md](../../articles/event-grid/includes/register-provider-cli.md)]
 
 ## Subscribe to your App Configuration store events
 
@@ -249,7 +249,7 @@ If you don't see the new setting in your secondary store:
 - Make sure the backup function was triggered *after* you created the setting in your primary store.
 - It's possible that Event Grid couldn't send the event notification to the queue in time. Check if your queue still contains the event notification from your primary store. If it does, trigger the backup function again.
 - Check [Azure Functions logs](../azure-functions/functions-create-scheduled-function.md#test-the-function) for any errors or warnings.
-- Use the [Azure portal](../azure-functions/functions-how-to-use-azure-function-app-settings.md#get-started-in-the-azure-portal) to ensure that the Azure function app contains correct values for the application settings that Azure Functions is trying to read.
+- Use the [Azure portal](../azure-functions/functions-how-to-use-azure-function-app-settings.md#get-started-in-the-azure-portal) to ensure that the Azure function app contains correct values for the application settings that the Azure function is trying to read.
 - You can also set up monitoring and alerting for Azure Functions by using [Azure Application Insights](../azure-functions/functions-monitoring.md?tabs=cmd).
 
 ## Clean up resources

articles/azure-app-configuration/howto-backup-config-store.md

@@ -64,7 +64,7 @@ The deployment may take a few minutes to complete. After the deployment has succ
 
 You should see the site with no messages currently displayed.
 
-[!INCLUDE [event-grid-register-provider-cli.md](../../includes/event-grid-register-provider-cli.md)]
+[!INCLUDE [register-provider-cli.md](../../articles/event-grid/includes/register-provider-cli.md)]
 
 ## Subscribe to your Azure Cache for Redis instance
 

articles/azure-cache-for-redis/cache-event-grid-quickstart-cli.md

@@ -29,21 +29,21 @@ Before subscribing to the events for the cache instance, let's create the endpoi
 
 1. Select **Deploy to Azure** in GitHub README to deploy the solution to your subscription.
 
-:::image type="content" source="media/cache-event-grid-portal/deploy-to-azure.png" alt-text="Deploy to Azure button.":::
+    :::image type="content" source="media/cache-event-grid-portal/deploy-to-azure.png" alt-text="Deploy to Azure button.":::
 
 1. On the **Custom deployment** page, do the following steps:
-    1. For **Resource group**, select the resource group that you created when creating the cache instance. It will be easier for you to clean up after you are done with the tutorial by deleting the resource group.  
+    1. For **Resource group**, select the resource group that you created when creating the cache instance. It will be easier for you to clean up after you're done with the tutorial by deleting the resource group.  
     2. For **Site Name**, enter a name for the web app.
     3. For **Hosting plan name**, enter a name for the App Service plan to use for hosting the web app.
     4. Select the check box for **I agree to the terms and conditions stated above**.
     5. Select **Purchase**.
 
     | Setting      | Suggested value  | Description |
     | ------------ |  ------- | -------------------------------------------------- |
-    | **Subscription** | Drop down and select your subscription. | The subscription under which to create this web app. |
+    | **Subscription** | Drop down and select your subscription. | The subscription in which you want to create this web app. |
     | **Resource group** | Drop down and select a resource group, or select **Create new** and enter a new resource group name. | By putting all your app resources in one resource group, you can easily manage or delete them together. |
-    | **Site Name** | Enter a name for your web app. | This value cannot be empty. |
-    | **Hosting plan name** | Enter a name for the App Service plan to use for hosting the web app. | This value cannot be empty. |
+    | **Site Name** | Enter a name for your web app. | This value can't be empty. |
+    | **Hosting plan name** | Enter a name for the App Service plan to use for hosting the web app. | This value can't be empty. |
 
 1. Select Alerts (bell icon) in the portal, and then select **Go to resource group**.
 
@@ -57,15 +57,16 @@ Before subscribing to the events for the cache instance, let's create the endpoi
 
     :::image type="content" source="media/cache-event-grid-portal/blank-event-grid-viewer.png" alt-text="Empty Event Grid Viewer site.":::
 
-[!INCLUDE [event-grid-register-provider-portal.md](../../includes/event-grid-register-provider-portal.md)]
+[!INCLUDE [register-provider.md](../../articles/event-grid/includes/register-provider.md)]
+
 
 ## Subscribe to the Azure Cache for Redis instance
 
 In this step, you'll subscribe to a topic to tell Event Grid which events you want to track, and where to send the events.
 
 1. In the portal, navigate to your cache instance that you created earlier.
 1. On the **Azure Cache for Redis** page, select **Events** on the left menu.
-1. Select **Web Hook**. You are sending events to your viewer app using a web hook for the endpoint.
+1. Select **Web Hook**. You're sending events to your viewer app using a web hook for the endpoint.
 
      :::image type="content" source="media/cache-event-grid-portal/event-grid-web-hook.png" alt-text="Azure portal Events page.":::
 

articles/azure-cache-for-redis/cache-event-grid-quickstart-portal.md

@@ -21,19 +21,19 @@ NFSv3 protocol doesn't provide support for encryption, so this data-in-flight ca
 
 ## Can the storage be encrypted at rest?
 
-All Azure NetApp Files volumes are encrypted using the FIPS 140-2 standard. All keys are managed by the Azure NetApp Files service. 
+All Azure NetApp Files volumes are encrypted using the FIPS 140-2 standard. Learn [how encryption keys managed](#how-are-encryption-keys-managed).
 
 ## Is Azure NetApp Files cross-region replication traffic encrypted?
 
 Azure NetApp Files cross-region replication uses TLS 1.2 AES-256 GCM encryption to encrypt all data transferred between the source volume and destination volume. This encryption is in addition to the [Azure MACSec encryption](../security/fundamentals/encryption-overview.md) that is on by default for all Azure traffic, including Azure NetApp Files cross-region replication. 
 
 ## How are encryption keys managed? 
 
-Key management for Azure NetApp Files is handled by the service. A unique XTS-AES-256 data encryption key is generated for each volume. An encryption key hierarchy is used to encrypt and protect all volume keys. These encryption keys are never displayed or reported in an unencrypted format. When you delete a volume, Azure NetApp Files immediately deletes the volume's encryption keys.
+By default key management for Azure NetApp Files is handled by the service, using [platform-managed keys](../security/fundamentals/key-management.md). A unique XTS-AES-256 data encryption key is generated for each volume. An encryption key hierarchy is used to encrypt and protect all volume keys. These encryption keys are never displayed or reported in an unencrypted format. When you delete a volume, Azure NetApp Files immediately deletes the volume's encryption keys.
 
-Customer-managed keys (Bring Your Own Key) using Azure Dedicated HSM is supported on a controlled basis. Support is currently available in the East US, South Central US, West US 2, and US Gov Virginia regions. You can request access at [[email protected]](mailto:[email protected]). As capacity becomes available, requests will be approved.
+Alternatively, [customer-managed keys for Azure NetApp Files volume encryption](configure-customer-managed-keys.md) can be used where keys are stored in [Azure Key Vault](../key-vault/general/basic-concepts.md). With customer-managed keys, you can fully manage the relationship between a key's life cycle, key usage permissions, and auditing operations on keys.
 
-[Customer-managed keys](configure-customer-managed-keys.md) are available with limited regional support.
+Lastly, customer-managed keys using Azure Dedicated HSM is supported on a controlled basis. Support is currently available in the East US, South Central US, West US 2, and US Gov Virginia regions. You can request access at [[email protected]](mailto:[email protected]). As capacity becomes available, requests will be approved.
 
 ## Can I configure the NFS export policy rules to control access to the Azure NetApp Files service mount target?
 

articles/azure-netapp-files/faq-security.md

@@ -104,6 +104,10 @@ https://support.microsoft.com/topic/april-12-2022-kb5012670-monthly-rollup-cae43
 
 Yes, Azure NetApp Files supports [Alternate Data Streams (ADS)](/openspecs/windows_protocols/ms-fscc/e2b19412-a925-4360-b009-86e3b8a020c8) by default on [SMB volumes](azure-netapp-files-create-volumes-smb.md) and [dual-protocol volumes configured with NTFS security style](create-volumes-dual-protocol.md#considerations) when accessed via SMB.
 
+## What are SMB/CIFS `oplocks` and are they enabled on Azure NetApp Files volumes?
+
+SMB/CIFS oplocks (opportunistic locks) enable the redirector on a SMB/CIFS client in certain file-sharing scenarios to perform client-side caching of read-ahead, write-behind, and lock information. A client can then work with a file (read or write it) without regularly reminding the server that it needs access to the file. This improves performance by reducing network traffic. SMB/CIFS oplocks are enabled on Azure NetApp Files SMB and dual-protocol volumes.
+
 ## Next steps  
 
 - [FAQs about SMB performance for Azure NetApp Files](azure-netapp-files-smb-performance.md)