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

Author: aahill

articles/aks/csi-secrets-store-identity-access.md

@@ -10,9 +10,14 @@ ms.custom: devx-track-azurecli
 
 # Provide an identity to access the Azure Key Vault Provider for Secrets Store CSI Driver
 
-The Secrets Store CSI Driver on Azure Kubernetes Service (AKS) provides a variety of methods of identity-based access to your Azure key vault. This article outlines these methods and how to use them to access your key vault and its contents from your AKS cluster. For more information, see [Use the Secrets Store CSI Driver][csi-secrets-store-driver].  
+The Secrets Store CSI Driver on Azure Kubernetes Service (AKS) provides a variety of methods of identity-based access to your Azure key vault. This article outlines these methods and how to use them to access your key vault and its contents from your AKS cluster. For more information, see [Use the Secrets Store CSI Driver][csi-secrets-store-driver].
 
-## Use Azure AD workload identity (preview)
+Currently, the following methods of access are available:
+
+- Azure AD Workload identity (preview)
+- User-assigned managed identity
+
+## Access with an Azure AD workload identity (preview)
 
 An [Azure AD workload identity][workload-identity] is an identity used by an application running on a pod that can authenticate itself against other Azure services that support it, such as Storage or SQL. It integrates with the capabilities native to Kubernetes to federate with external identity providers. In this security model, the AKS cluster acts as token issuer where Azure Active Directory uses OpenID Connect to discover public signing keys and verify the authenticity of the service account token before exchanging it for an Azure AD token. Your workload can exchange a service account token projected to its volume for an Azure AD token using the Azure Identity client library using the Azure SDK or the Microsoft Authentication Library (MSAL).
 
@@ -154,7 +159,7 @@ Azure AD workload identity (preview) is supported on both Windows and Linux clus
     EOF   
     ```
 
-## Use the CSI Secret Store addon user-assigned managed identity
+## Access with a user-assigned managed identity
 
 1. To access your key vault, you can use the user-assigned managed identity that you created when you [enabled a managed identity on your AKS cluster][use-managed-identity]:
 

articles/azure-arc/kubernetes/extensions.md

@@ -1011,7 +1011,7 @@ async def main(req: func.HttpRequest, starter: str, instance_id: str) -> func.co
 If you have an orchestration failure for an unexpected reason, you can *rewind* the instance to a previously healthy state by using an API built for that purpose.
 
 > [!NOTE]
-> This API is not intended to be a replacement for proper error handling and retry policies. Rather, it is intended to be used only in cases where orchestration instances fail for unexpected reasons. For more information on error handling and retry policies, see the [Error handling](durable-functions-error-handling.md) article.
+> This API is not intended to be a replacement for proper error handling and retry policies. Rather, it is intended to be used only in cases where orchestration instances fail for unexpected reasons. Orchestrations in states other than `Failed` (e.g., `Running`, `Pending`, `Terminated`, `Completed`) cannot be "rewound". For more information on error handling and retry policies, see the [Error handling](durable-functions-error-handling.md) article.
 
 Use the `RewindAsync` (.NET) or `rewind` (JavaScript) method of the [orchestration client binding](durable-functions-bindings.md#orchestration-client) to put the orchestration back into the *Running* state. This method will also rerun the activity or sub-orchestration execution failures that caused the orchestration failure.
 

articles/azure-functions/durable/durable-functions-instance-management.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: article
+ms.topic: conceptual
 ms.date: 08/08/2022
 ms.author: aahi
 ms.custom: ignite-fall-2021

articles/cognitive-services/language-service/concepts/migrate-language-service-latest.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: article
+ms.topic: conceptual
 ms.date: 11/02/2021
 ms.author: aahi
 ms.custom: ignite-fall-2021

articles/cognitive-services/language-service/concepts/multilingual-emoji-support.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: overview
+ms.topic: conceptual
 ms.date: 10/11/2022
 ms.author: aahi
 ms.custom: language-service-clu

articles/cognitive-services/language-service/conversational-language-understanding/concepts/best-practices.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: overview
+ms.topic: conceptual
 ms.date: 05/13/2022
 ms.author: aahi
 ms.custom: language-service-clu, ignite-fall-2021

articles/cognitive-services/language-service/conversational-language-understanding/concepts/evaluation-metrics.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: overview
+ms.topic: conceptual
 ms.date: 05/13/2022
 ms.author: aahi
 ms.custom: language-service-clu

articles/cognitive-services/language-service/conversational-language-understanding/concepts/none-intent.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: conceptual
+ms.topic: how-to
 ms.date: 09/08/2022
 ms.author: aahi
 ms.custom: language-service-clu, ignite-fall-2021

articles/cognitive-services/language-service/conversational-language-understanding/how-to/migrate-from-luis.md

@@ -5,7 +5,7 @@ author: aahill
 manager: nitinme
 ms.service: cognitive-services
 ms.subservice: language-service
-ms.topic: how-to
+ms.topic: include
 ms.date: 05/13/2022
 ms.author: aahi
 ---