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

Author: RoseHJM

.openpublishing.redirection.azure-vmware.json

@@ -179,6 +179,66 @@
             "source_path_from_root": "/articles/azure-vmware/vrealize-operations-for-avs.md",
             "redirect_url": "/azure/azure-vmware/vrealize-operations-for-azure-vmware-solution",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-api-management.md",
+            "redirect_url": "/azure/azure-vmware/architecture-api-management",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-design-public-internet-access.md",
+            "redirect_url": "/azure/azure-vmware/architecture-design-public-internet-access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-hub-and-spoke.md",
+            "redirect_url": "/azure/azure-vmware/architecture-hub-and-spoke",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-identity.md",
+            "redirect_url": "/azure/azure-vmware/architecture-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-migrate.md",
+            "redirect_url": "/azure/azure-vmware/architecture-migrate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-network-design-considerations.md",
+            "redirect_url": "/azure/azure-vmware/architecture-network-design-considerations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-networking.md",
+            "redirect_url": "/azure/azure-vmware/architecture-networking",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-private-clouds-clusters.md",
+            "redirect_url": "/azure/azure-vmware/architecture-private-clouds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-run-command.md",
+            "redirect_url": "/azure/azure-vmware/using-run-command",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-security-recommendations.md",
+            "redirect_url": "/azure/azure-vmware/security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-storage.md",
+            "redirect_url": "/azure/azure-vmware/architecture-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-vulnerability-management.md",
+            "redirect_url": "/azure/azure-vmware/vulnerability-management",
+            "redirect_document_id": false
         }
     ]
 }

articles/advisor/advisor-reference-performance-recommendations.md

@@ -4,7 +4,7 @@ description: Full list of available performance recommendations in Advisor.
 ms.topic: article
 author: mabrahms
 ms.author: v-mabrahms
-ms.date: 10/15/2023
+ms.date: 3/22/2024
 ---
 
 # Performance recommendations
@@ -167,9 +167,9 @@ Learn more about [Synapse workspace - UpgradeSynapseManagementClientSDK (Update
 
 ### vSAN capacity utilization has crossed critical threshold
 
-Your vSAN capacity utilization has reached 75%. The cluster utilization is required to remain below the 75% critical threshold for SLA compliance. Add new nodes to VSphere cluster to increase capacity or delete VMs to reduce consumption or adjust VM workloads
+Your vSAN capacity utilization has reached 75%. The cluster utilization is required to remain below the 75% critical threshold for SLA compliance. Add new nodes to the vSphere cluster to increase capacity or delete VMs to reduce consumption or adjust VM workloads
 
-Learn more about [AVS Private cloud - vSANCapacity (vSAN capacity utilization has crossed critical threshold)](../azure-vmware/concepts-private-clouds-clusters.md).
+Learn more about [Azure VMware Solution private cloud - vSANCapacity (vSAN capacity utilization has crossed critical threshold)](../azure-vmware/architecture-private-clouds.md).
 
 ### Update Automanage to the latest API Version
 

articles/ai-services/openai/concepts/models.md

@@ -73,7 +73,7 @@ The DALL-E models generate images from text prompts that the user provides. DALL
 
 ## Whisper
 
-The Whisper models, can be used for speech to text.
+The Whisper models can be used for speech to text.
 
 You can also use the Whisper model via Azure AI Speech [batch transcription](../../speech-service/batch-transcription-create.md) API. Check out [What is the Whisper model?](../../speech-service/whisper-overview.md) to learn more about when to use Azure AI Speech vs. Azure OpenAI Service.
 
@@ -254,7 +254,7 @@ The following Embeddings models are available with [Azure Government](/azure/azu
 
 ### Assistants (Preview)
 
-For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. For example [parallel function](../how-to/assistant-functions.md) calling requires the latest 1106 models.
+For Assistants you need a combination of a supported model and a supported region. Certain tools and capabilities require the latest models. For example, [parallel function calling](../how-to/assistant-functions.md) requires the latest 1106 models.
 
 | Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | 
 |-----|---|---|---|---|---|

articles/ai-studio/how-to/prompt-flow-tools/index-lookup-tool.md

@@ -164,20 +164,20 @@ If you have a flow that contains one of these tools, follow the steps below to u
    :::image type="content" source="../../media/prompt-flow/upgrade-index-tools/mlindex-box.png" alt-text="Screenshot of the expanded Index Lookup node with the mlindex_content box outlined in red." lightbox="../../media/prompt-flow/upgrade-index-tools/mlindex-box.png":::
 
 1. In the Generate drawer that appears, follow the instructions below to upgrade from the three legacy tools:
-- If using the legacy **Vector Index Lookup** tool, select “Registered Index" in the “index_type” dropdown. Select your vector index asset from the “mlindex_asset_id” dropdown.
-- If using the legacy **Faiss Index Lookup** tool, select “Faiss” in the “index_type” dropdown and specify the same path as in the legacy tool.
-- If using the legacy **Vector DB Lookup** tool, select AI Search or Pinecone depending on the DB type in the “index_type” dropdown and fill in the information as necessary.
-8. After filling in the necessary information, click save. 
-9. Upon returning to the node, there should be information populated in the “mlindex_content” textbox. Click on the “queries” textbox next, and select the search terms you want to query. You’ll want to select the same value as the input to the “embed_the_question” node, typically either “\${inputs.question}” or “${modify_query_with_history.output}” (the former if you’re in a standard flow and the latter if you’re in a chat flow).
+    - If using the legacy **Vector Index Lookup** tool, select “Registered Index" in the “index_type” dropdown. Select your vector index asset from the “mlindex_asset_id” dropdown.
+    - If using the legacy **Faiss Index Lookup** tool, select “Faiss” in the “index_type” dropdown and specify the same path as in the legacy tool.
+    - If using the legacy **Vector DB Lookup** tool, select AI Search or Pinecone depending on the DB type in the “index_type” dropdown and fill in the information as necessary.
+1. After filling in the necessary information, click save. 
+1. Upon returning to the node, there should be information populated in the “mlindex_content” textbox. Click on the “queries” textbox next, and select the search terms you want to query. You’ll want to select the same value as the input to the “embed_the_question” node, typically either “\${inputs.question}” or “${modify_query_with_history.output}” (the former if you’re in a standard flow and the latter if you’re in a chat flow).
 
    :::image type="content" source="../../media/prompt-flow/upgrade-index-tools/mlindex-with-content.png" alt-text="Screenshot of the expanded Index Lookup node with index information in the cells." lightbox="../../media/prompt-flow/upgrade-index-tools/mlindex-with-content.png":::
 
-10. Select a query type by clicking on the dropdown next to “query_type.” “Vector” will produce identical results as the legacy flow, but depending on your index configuration, other options including "Hybrid" and "Semantic" may be available.
+1. Select a query type by clicking on the dropdown next to “query_type.” “Vector” will produce identical results as the legacy flow, but depending on your index configuration, other options including "Hybrid" and "Semantic" may be available.
 
     :::image type="content" source="../../media/prompt-flow/upgrade-index-tools/vector-search.png" alt-text="Screenshot of the expanded Index Lookup node with vector search outlined in red." lightbox="../../media/prompt-flow/upgrade-index-tools/vector-search.png":::
 
-11. Edit downstream components to consume the output of your newly added node, instead of the output of the legacy Vector Index Lookup node. 
-12. Delete the Vector Index Lookup node and its parent embedding node. 
+1. Edit downstream components to consume the output of your newly added node, instead of the output of the legacy Vector Index Lookup node. 
+1. Delete the Vector Index Lookup node and its parent embedding node. 
 
 ## Next steps
 

articles/aks/auto-upgrade-cluster.md

@@ -34,7 +34,7 @@ If you’re using cluster auto-upgrade, you can no longer upgrade the control pl
 
 If using the `node-image` cluster auto-upgrade channel or the `NodeImage` node image auto-upgrade channel, Linux [unattended upgrades][unattended-upgrades] are disabled by default.
 
-## Use cluster auto-upgrade
+## Cluster auto-upgrade channels
 
 Automatically completed upgrades are functionally the same as manual upgrades. The [selected auto-upgrade channel][planned-maintenance] determines the timing of upgrades. When making changes to auto-upgrade, allow 24 hours for the changes to take effect. Automatically upgrading a cluster follows the same process as manually upgrading a cluster. For more information, see [Upgrade an AKS cluster][upgrade-aks-cluster].
 
@@ -62,38 +62,61 @@ The following upgrade channels are available:
 >
 > * Each cluster can only be associated with a single auto-upgrade channel. This is because your specified channel determines the Kubernetes version that runs on the cluster.
 
-### Use cluster auto-upgrade with a new AKS cluster
+## Use cluster auto-upgrade with a new AKS cluster
+
+### [Azure CLI](#tab/azure-cli)
 
 * Set the auto-upgrade channel when creating a new cluster using the [`az aks create`][az-aks-create] command and the `auto-upgrade-channel` parameter.
 
     ```azurecli-interactive
     az aks create --resource-group myResourceGroup --name myAKSCluster --auto-upgrade-channel stable --generate-ssh-keys
     ```
 
-### Use cluster auto-upgrade with an existing AKS cluster
+### [Azure portal](#tab/azure-portal)
+
+1. In the Azure portal, select **Create a resource** > **Containers** > **Azure Kubernetes Service (AKS)**.
+2. In the **Basics** tab, under **Cluster details**, select the desired auto-upgrade channel from the **Automatic upgrade** dropdown. We recommend selecting the **Enabled with patch (recommended)** option.
+
+    :::image type="content" source="./media/auto-upgrade-cluster/portal-autoupgrade-new-cluster.png" alt-text="The screenshot of the create blade for an AKS cluster in the Azure portal. The automatic upgrade field shows 'Enabled with patch (recommended)' selected.":::
+
+3. Complete the remaining steps to create the cluster.
+
+---
+
+## Use cluster auto-upgrade with an existing AKS cluster
+
+### [Azure CLI](#tab/azure-cli)
 
 * Set the auto-upgrade channel on an existing cluster using the [`az aks update`][az-aks-update] command with the `auto-upgrade-channel` parameter.
 
     ```azurecli-interactive
     az aks update --resource-group myResourceGroup --name myAKSCluster --auto-upgrade-channel stable
     ```
 
-## Auto-upgrade in the Azure portal
+### [Azure portal](#tab/azure-portal)
+
+1. In the Azure portal, navigate to your AKS cluster.
+2. In the **Settings** section, select **Cluster configuration**.
+3. Under **Upgrade** > **Kubernetes version**, select **Upgrade version**.
 
-If using the Azure portal, you can find auto-upgrade settings under the **Settings** > **Cluster configuration** blade by selecting **Upgrade version**. The `Patch` channel is selected by default.
+    :::image type="content" source="./media/auto-upgrade-cluster/portal-autoupgrade-existing-cluster.png" alt-text="The screenshot of the upgrade blade for an AKS cluster in the Azure portal.":::
 
-:::image type="content" source="./media/auto-upgrade-cluster/portal-upgrade.png" alt-text="The screenshot of the upgrade blade for an AKS cluster in the Azure portal. The automatic upgrade field shows 'patch' selected, and several APIs deprecated between the selected Kubernetes version and the cluster's current version are described.":::
+4. On the **Upgrade Kubernetes version** page, select the desired auto-upgrade channel from the **Automatic upgrade** dropdown. We recommend selecting the **Enabled with patch (recommended)** option.
 
-The Azure portal also highlights all the deprecated APIs between your current version and newer, available versions you intend to migrate to. For more information, see the [Kubernetes API removal and deprecation process][k8s-deprecation].
+    :::image type="content" source="./media/auto-upgrade-cluster/portal-autoupgrade-upgrade-page-existing-cluster.png" alt-text="The screenshot of the Upgrade Kubernetes page for an AKS cluster in the Azure portal.":::
+
+5. Select **Save**.
+
+---
 
 ## Use auto-upgrade with Planned Maintenance
 
-If using  Planned Maintenance and cluster auto-upgrade, your upgrade starts during your specified maintenance window.
+If using Planned Maintenance and cluster auto-upgrade, your upgrade starts during your specified maintenance window.
 
 > [!NOTE]
 > To ensure proper functionality, use a maintenance window of *four hours or more*.
 
-For more information on Planned Maintenance, see [Use Planned Maintenance to schedule maintenance windows for your Azure Kubernetes Service (AKS) cluster][planned-maintenance].
+For more information on how to set a maintenance window with Planned Maintenance, see [Use Planned Maintenance to schedule maintenance windows for your Azure Kubernetes Service (AKS) cluster][planned-maintenance].
 
 ## Best practices for cluster auto-upgrade