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

Author: timlt

articles/ai-services/document-intelligence/managed-identities-secured-access.md

@@ -1,5 +1,5 @@
 ---
-title: "Configure secure access with managed identities and private endpoints"
+title: "Configure secure access with managed identities and virtual networks"
 titleSuffix: Azure AI services
 description: Learn how to configure secure communications between Document Intelligence and other Azure Services.
 author: laujan
@@ -14,7 +14,7 @@ monikerRange: '<=doc-intel-4.0.0'
 ---
 
 
-# Configure secure access with managed identities and private endpoints
+# Configure secure access with managed identities and virtual networks
 
 [!INCLUDE [applies to v4.0, v3.1, v3.0, and v2.1](includes/applies-to-v40-v31-v30-v21.md)]
 
@@ -28,7 +28,7 @@ This how-to guide walks you through the process of enabling secure connections f
 
  You're setting up your environment to secure the resources:
 
-  :::image type="content" source="media/managed-identities/secure-config.png" alt-text="Screenshot of secure configuration with managed identity and private endpoints.":::
+  :::image type="content" source="media/managed-identities/secure-config-di.png" alt-text="Screenshot of secure configuration with managed identity and virtual networks.":::
 
 ## Prerequisites
 
@@ -64,7 +64,7 @@ Configure each of the resources to ensure that the resources can communicate wit
 
 You now have a working implementation of all the components needed to build a Document Intelligence solution with the default security model:
 
-  :::image type="content" source="media/managed-identities/default-config.png" alt-text="Screenshot of default security configuration.":::
+  :::image type="content" source="media/managed-identities/default-config-di.png" alt-text="Screenshot of default security configuration.":::
 
 Next, complete the following steps:
 
@@ -74,7 +74,7 @@ Next, complete the following steps:
 
 * Configure the Document Intelligence managed identity to communicate with the storage account.
 
-* Disable public access to the Document Intelligence resource and create a private endpoint to make it accessible from the virtual network.
+* Disable public access to the Document Intelligence resource and create a private endpoint to make it accessible from only specific virtual networks and IP addresses.
 
 * Add a private endpoint for the storage account in a selected virtual network.
 
@@ -155,7 +155,7 @@ When you connect to resources from a virtual network, adding private endpoints e
 
 Next, configure the virtual network to ensure only resources within the virtual network or traffic router through the network have access to the Document Intelligence resource and the storage account.
 
-### Enable your virtual network and private endpoints
+### Enable your firewalls and virtual networks
 
 1. In the Azure portal, navigate to your Document Intelligence resource.
 
@@ -165,7 +165,7 @@ Next, configure the virtual network to ensure only resources within the virtual
 
 > [!NOTE]
 >
->If you try accessing any of the Document Intelligence Studio features, you'll see an access denied message. To enable access from the Studio on your machine, select the **client IP address checkbox** and **Save** to restore access.
+>If you try accessing any of the Document Intelligence Studio features, you'll see an access denied message. To enable access from the Studio on your machine, select the **Add your client IP address** checkbox and **Save** to restore access.
 
   :::image type="content" source="media/managed-identities/v2-fr-network.png" alt-text="Screenshot showing how to disable public access to Document Intelligence.":::
 
@@ -242,7 +242,7 @@ Navigate to your **storage account** on the Azure portal.
 Great work! You now have all the connections between the Document Intelligence resource and storage configured to use managed identities.
 
 > [!NOTE]
-> The resources are only accessible from the virtual network.
+> The resources are only accessible from the virtual network and allowed IPs.
 >
 > Studio access and analyze requests to your Document Intelligence resource will fail unless the request originates from the virtual network or is routed via the virtual network.
 
@@ -264,13 +264,16 @@ That's it! You can now configure secure access for your Document Intelligence re
 
    :::image type="content" source="media/managed-identities/cors-error.png" alt-text="Screenshot of error message when CORS config is required":::
 
-  **Resolution**: [Configure CORS](quickstarts/try-document-intelligence-studio.md#prerequisites-for-new-users).
+  **Resolution**:
+    1. [Configure CORS](quickstarts/try-document-intelligence-studio.md#prerequisites-for-new-users).
+ 
+    1. Make sure the client computer can access Document Intelligence resource and storage account, either they are in the same VNET, or client IP address is allowed in **Networking > Firewalls and virtual networks** setting page of both Document Intelligence resource and storage account.
 
 * **AuthorizationFailure**:
 
   :::image type="content" source="media/managed-identities/auth-failure.png" alt-text="Screenshot of authorization failure error.":::
 
-  **Resolution**: Ensure that there's a network line-of-sight between the computer accessing the Document Intelligence Studio and the storage account. For example, you can add the client IP address in the storage account's networking tab.
+  **Resolution**: Make sure the client computer can access Document Intelligence resource and storage account, either they are in the same VNET, or client IP address is allowed in **Networking > Firewalls and virtual networks** setting page of both Document Intelligence resource and storage account.
 
 * **ContentSourceNotAccessible**:
 

articles/ai-services/document-intelligence/media/managed-identities/default-config-di.png

@@ -39,9 +39,6 @@ Request parameters passed on the query string are:
 
 ### Optional parameters
 
-| Query parameter | Description |
-| --- | --- |
-
 | Query parameter | Description |
 | --- | --- |
 | from | _Optional parameter_.  <br>Specifies the language of the input text. Find which languages are available to translate from by looking up [supported languages](../reference/v3-0-languages.md) using the `translation` scope. If the `from` parameter isn't specified, automatic language detection is applied to determine the source language.  <br>  <br>You must use the `from` parameter rather than autodetection when using the [dynamic dictionary](../dynamic-dictionary.md) feature. **Note**: the dynamic dictionary feature is case-sensitive. |

articles/ai-services/document-intelligence/media/managed-identities/secure-config-di.png

@@ -715,6 +715,8 @@
           href: windows-aks-partner-solutions.md
         - name: Windows AKS customer stories
           href: windows-aks-customer-stories.md
+        - name: Migration and modernization solutions for Windows containers on AKS
+          href: windows-aks-migration-modernization-solutions.md
     - name: Develop and run applications
       items:
         - name: Install existing applications with Helm

articles/ai-services/translator/reference/v3-0-translate.md

@@ -155,21 +155,10 @@ The Azure Linux container host for AKS is an open-source Linux distribution avai
 
 ### Migrate Ubuntu nodes to Azure Linux nodes
 
-1. [Add an Azure Linux node pool into your existing cluster](#add-an-azure-linux-node-pool).
+You can migrate your existing Ubuntu nodes to Azure Linux using one of the following methods:
 
-    > [!NOTE]
-    > When adding a new Azure Linux node pool, you need to add at least one as `--mode System`. Otherwise, AKS won't allow you to delete your existing Ubuntu node pool.
-
-2. [Cordon the existing Ubuntu nodes](resize-node-pool.md#cordon-the-existing-nodes).
-3. [Drain the existing Ubuntu nodes](resize-node-pool.md#drain-the-existing-nodes).
-4. Remove the existing Ubuntu nodes using the [`az aks delete`][az-aks-delete] command.
-
-    ```azurecli-interactive
-    az aks nodepool delete \
-        --resource-group myResourceGroup \
-        --cluster-name myAKSCluster \
-        --name mynodepool
-    ```
+* [Remove existing node pools and add new Azure Linux node pools](../azure-linux/tutorial-azure-linux-migration.md#add-azure-linux-node-pools-and-remove-existing-node-pools).
+* [In-place OS SKU migration (preview)](../azure-linux/tutorial-azure-linux-migration.md#in-place-os-sku-migration-preview).
 
 ## Node pools with unique subnets
 

articles/aks/TOC.yml

@@ -0,0 +1,37 @@
+---
+title: Migration and modernization solutions for Windows AKS
+titleSuffix: Migration and modernization solutions for Windows Server containers on AKS
+description: Read end-to-end walkthroughs of assessing your applications to find containerization and PaaS blockers.
+ms.topic: article
+ms.date: 01/31/2024
+---
+
+# Migration and modernization solutions for Windows AKS 
+
+Microsoft has collaborated with leading partners to ensure customers have a seamless experience with  migrating and modernizing their applications to Windows containers.  
+
+Our partners featured below have published guides on how to migrate and modernize the legacy eShop application published by the dotnet team to Windows containers.  
+
+## Migration and modernization solutions
+
+- [Azure Migrate](#azure-migrate)
+- [CAST](#cast)
+- [UnifyCloud](#unifycloud)
+
+### Azure Migrate 
+
+Azure Migrate's latest blog walks you through the process of migrating ASP.NET web apps to Windows containers on Azure Kubernetes Service, detailing a straightforward approach from initial discovery and TCO comparison to cloud readiness assessment and containerization.  
+
+You can [follow their article](https://techcommunity.microsoft.com/t5/containers/azure-migrate-modernizing-your-net-apps-to-windows-containers-on/ba-p/4037551) for details on their end-to-end walkthrough.  
+
+### CAST
+
+CAST offers a detailed guide using CAST Highlight to identify containerization blockers and provides remediation strategies. This enhances the migration process with insights into application code, architecture, and third-party compliance.  
+
+For more information on their Windows container migration guidance, case studies and PaaS integrations you can [follow their article](https://techcommunity.microsoft.com/t5/containers/cast-modernizing-your-net-apps-to-windows-containers-on-azure/ba-p/4037740). 
+
+### UnifyCloud
+
+UnifyCloud introduces its CloudAtlas platform, an end-to-end migration tool, for streamlining the modernization of .NET applications to Windows containers on Azure Kubernetes Services.
+
+To explore more about their guidance on Windows container migration, along with valuable migration learnings and insights for modernization plans, you can [explore their article](https://techcommunity.microsoft.com/t5/containers/unifycloud-modernizing-your-net-apps-to-windows-containers-on/ba-p/4037872). 

articles/aks/create-node-pools.md

@@ -15,7 +15,7 @@ Azure Functions runtime is built around various components, including operating
 
 ### Notification phase
 
-The Functions team sends notification emails to function app users about upcoming language version retirements. The notifications are sent at least one year before the date of retirement. When you receive the notification, you should prepare to upgrade functions apps to use to a supported version.
+The Functions team sends notification emails to function app users about upcoming language version retirements. When you receive the notification, you should prepare to upgrade functions apps to use to a supported version.
 
 ### Retirement phase