Merge branch 'MicrosoftDocs:main' into dev/richardgao/include-linux-for-storage-explorer-platforms

Author: richardMSFT

articles/aks/TOC.yml

@@ -849,7 +849,7 @@
 - name: Resources
   items:
     - name: Build your skills with Microsoft Learn training
-      href: /training/browse/?products=azure-container-instances&azure-container-registry
+      href: /training/browse/?products=azure-kubernetes-service
     - name: Region availability
       href: https://azure.microsoft.com/global-infrastructure/services/
     - name: Pricing

articles/aks/howto-deploy-java-liberty-app.md

@@ -5,7 +5,7 @@ description: Deploy a Java application with Open Liberty/WebSphere Liberty on an
 author: KarlErickson
 ms.author: edburns
 ms.topic: how-to
-ms.date: 01/16/2024
+ms.date: 04/02/2024
 ms.subservice: aks-developer
 keywords: java, jakartaee, javaee, microprofile, open-liberty, websphere-liberty, aks, kubernetes
 ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-liberty, devx-track-javaee-liberty-aks, devx-track-javaee-websphere, build-2023, devx-track-extended-java, devx-track-azurecli
@@ -23,28 +23,24 @@ The Open Liberty Operator simplifies the deployment and management of applicatio
 
 For more information on Open Liberty, see [the Open Liberty project page](https://openliberty.io/). For more information on IBM WebSphere Liberty, see [the WebSphere Liberty product page](https://www.ibm.com/cloud/websphere-liberty).
 
-This article uses the Azure Marketplace offer for Open/WebSphere Liberty to accelerate your journey to AKS. The offer automatically provisions a number of Azure resources including an Azure Container Registry (ACR) instance, an AKS cluster, an Azure App Gateway Ingress Controller (AGIC) instance, the Liberty Operator, and optionally a container image including Liberty and your application. To see the offer, visit the [Azure portal](https://aka.ms/liberty-aks). If you prefer manual step-by-step guidance for running Liberty on AKS that doesn't utilize the automation enabled by the offer, see [Manually deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster](/azure/developer/java/ee/howto-deploy-java-liberty-app-manual).
+This article uses the Azure Marketplace offer for Open/WebSphere Liberty to accelerate your journey to AKS. The offer automatically provisions a number of Azure resources including an Azure Container Registry (ACR) instance, an AKS cluster, an Azure App Gateway Ingress Controller (AGIC) instance, the Liberty Operators, and optionally a container image including Liberty and your application. To see the offer, visit the [Azure portal](https://aka.ms/liberty-aks). If you prefer manual step-by-step guidance for running Liberty on AKS that doesn't utilize the automation enabled by the offer, see [Manually deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster](/azure/developer/java/ee/howto-deploy-java-liberty-app-manual).
 
 This article is intended to help you quickly get to deployment. Before going to production, you should explore [Tuning Liberty](https://www.ibm.com/docs/was-liberty/base?topic=tuning-liberty).
 
 [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
-* You can use Azure Cloud Shell or a local terminal.
-
 [!INCLUDE [azure-cli-prepare-your-environment.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment.md)]
 
-* This article requires at least version 2.31.0 of Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
-
 > [!NOTE]
 > You can also execute this guidance from the [Azure Cloud Shell](/azure/cloud-shell/quickstart). This approach has all the prerequisite tools pre-installed, with the exception of Docker.
 >
 > :::image type="icon" source="~/reusable-content/ce-skilling/azure/media/cloud-shell/launch-cloud-shell-button.png" alt-text="Button to launch the Azure Cloud Shell." border="false" link="https://shell.azure.com":::
 
-* If running the commands in this guide locally (instead of Azure Cloud Shell):
-  * Prepare a local machine with Unix-like operating system installed (for example, Ubuntu, Azure Linux, macOS, Windows Subsystem for Linux).
-  * Install a Java SE implementation, version 17 or later. (for example, [Eclipse Open J9](https://www.eclipse.org/openj9/)).
-  * Install [Maven](https://maven.apache.org/download.cgi) 3.5.0 or higher.
-  * Install [Docker](https://docs.docker.com/get-docker/) for your OS.
+* Prepare a local machine with a Unix-like operating system installed (for example, Ubuntu, macOS, Windows Subsystem for Linux).
+* This article requires at least version 2.31.0 of Azure CLI.
+* Install a Java SE implementation, version 17 or later. (for example, [Eclipse Open J9](https://www.eclipse.org/openj9/)).
+* Install [Maven](https://maven.apache.org/download.cgi) 3.5.0 or higher.
+* Install [Docker](https://docs.docker.com/get-docker/) for your OS.
 * Make sure you're assigned either the `Owner` role or the `Contributor` and `User Access Administrator` roles in the subscription. You can verify it by following steps in [List role assignments for a user or group](../role-based-access-control/role-assignments-list-portal.md#list-role-assignments-for-a-user-or-group).
 
 ## Create a Liberty on AKS deployment using the portal

articles/aks/limit-egress-traffic.md

@@ -5,7 +5,7 @@ ms.subservice: aks-networking
 ms.custom: devx-track-azurecli
 ms.topic: how-to
 ms.author: allensu
-ms.date: 12/05/2023
+ms.date: 04/02/2024
 author: asudbring
 #Customer intent: As a cluster operator, I want to restrict egress traffic for nodes to only access defined ports and addresses and improve cluster security.
 ---
@@ -178,8 +178,7 @@ For information on how to override Azure's default system routes or add addition
 This section covers three network rules and an application rule you can use to configure on your firewall. You may need to adapt these rules based on your deployment.
 
 * The first network rule allows access to port 9000 via TCP.
-* The second network rule allows access to port 1194 and 123 via UDP. If you're deploying to Microsoft Azure operated by 21Vianet, see the [Azure operated by 21Vianet required network rules](./outbound-rules-control-egress.md#microsoft-azure-operated-by-21vianet-required-network-rules). Both these rules will only allow traffic destined to the Azure Region CIDR in this article, which is East US.
-* The third network rule opens port 123 to `ntp.ubuntu.com` FQDN via UDP. Adding an FQDN as a network rule is one of the specific features of Azure Firewall, so you'll need to adapt it when using your own options.
+* The second network rule allows access to port 1194 via UDP. If you're deploying to Microsoft Azure operated by 21Vianet, see the [Azure operated by 21Vianet required network rules](./outbound-rules-control-egress.md#microsoft-azure-operated-by-21vianet-required-network-rules). Both these rules will only allow traffic destined to the Azure Region CIDR in this article, which is East US.
 * The fourth and fifth network rules allow access to pull containers from GitHub Container Registry (ghcr.io) and Docker Hub (docker.io).
 
 1. Create the network rules using the [`az network firewall network-rule create`][az-network-firewall-network-rule-create] command.
@@ -189,8 +188,6 @@ This section covers three network rules and an application rule you can use to c
 
     az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'apitcp' --protocols 'TCP' --source-addresses '*' --destination-addresses "AzureCloud.$LOC" --destination-ports 9000
 
-    az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'time' --protocols 'UDP' --source-addresses '*' --destination-fqdns 'ntp.ubuntu.com' --destination-ports 123
-
     az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'ghcr' --protocols 'TCP' --source-addresses '*' --destination-fqdns ghcr.io pkg-containers.githubusercontent.com --destination-ports '443'
 
     az network firewall network-rule create -g $RG -f $FWNAME --collection-name 'aksfwnr' -n 'docker' --protocols 'TCP' --source-addresses '*' --destination-fqdns docker.io registry-1.docker.io production.cloudflare.docker.com --destination-ports '443'

articles/app-service/quickstart-python.md

@@ -59,6 +59,66 @@ To run the application locally:
     pip install -r requirements.txt
     ```
 
+1. Integrate a database:
+
+    ```Python
+    
+    from azure.cosmos.aio import CosmosClient
+    from azure.cosmos import exceptions
+    from azure.cosmos.partition_key import PartitionKey
+
+    from configs.credential import HOST, MASTER_KEY, DATABASE_ID
+
+
+    def get_database_client():
+         # Initialize the Cosmos client
+         client = CosmosClient(HOST, MASTER_KEY)
+
+         # Create or get a reference to a database
+         try:
+             database = client.create_database_if_not_exists(id=DATABASE_ID)
+             print(f'Database "{DATABASE_ID}" created or retrieved successfully.')
+
+         except exceptions.CosmosResourceExistsError:
+             database = client.get_database_client(DATABASE_ID)
+             print('Database with id \'{0}\' was found'.format(DATABASE_ID))
+
+         return database
+
+
+    def get_container_client(container_id):
+         database = get_database_client()
+         # Create or get a reference to a container
+         try:
+             container = database.create_container(id=container_id, partition_key=PartitionKey(path='/partitionKey'))
+             print('Container with id \'{0}\' created'.format(container_id))
+
+         except exceptions.CosmosResourceExistsError:
+             container = database.get_container_client(container_id)
+             print('Container with id \'{0}\' was found'.format(container_id))
+
+         return container
+
+    async def create_item(container_id, item):
+        async with CosmosClient(HOST, credential=MASTER_KEY) as client:
+            database = client.get_database_client(DATABASE_ID)
+            container = database.get_container_client(container_id)
+            await container.upsert_item(body=item)
+
+    async def get_items(container_id):
+        items = []
+        try:
+            async with CosmosClient(HOST, credential=MASTER_KEY) as client:
+                database = client.get_database_client(DATABASE_ID)
+                container = database.get_container_client(container_id)
+                async for item in container.read_all_items():
+                    items.append(item)
+        except Exception as e:
+            print(f"An error occurred: {e}")
+
+        return items
+    ```
+
 1. Run the app:
 
     ```Console

articles/azure-government/compliance/azure-services-in-fedramp-auditscope.md

@@ -285,7 +285,7 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
 | [Application Gateway](../../application-gateway/index.yml) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Automation](../../automation/index.yml) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Microsoft Entra ID (Free)](../../active-directory/fundamentals/active-directory-whatis.md#what-are-the-azure-ad-licenses) | ✅ | ✅ | ✅ | ✅ | ✅ |
-| [Microsoft Entra ID (P1 + P2)](../../active-directory/fundamentals/active-directory-whatis.md#what-are-the-azure-ad-licenses) | ✅ | ✅ | ✅ | ✅ | |
+| [Microsoft Entra ID (P1 + P2)](../../active-directory/fundamentals/active-directory-whatis.md#what-are-the-azure-ad-licenses) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Microsoft Entra Domain Services](../../active-directory-domain-services/index.yml) | ✅ | ✅ | ✅ | ✅ | |
 | [Microsoft Entra multifactor authentication](../../active-directory/authentication/concept-mfa-howitworks.md) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Azure API for FHIR](../../healthcare-apis/azure-api-for-fhir/index.yml) | ✅ | ✅ | ✅ | ✅ | |

articles/communication-services/quickstarts/email/add-azure-managed-domains.md

@@ -13,28 +13,28 @@ ms.service: azure-communication-services
 
 # Quickstart: How to add Azure Managed Domains to Email Communication Service
 
-In this quick start, you learn about how to provision the Azure Managed domain in Azure Communication Services to send email.
+In this quick start, you learn how to provision the Azure Managed Domain to Email Communication Service in Azure Communication Services.
 
 ## Prerequisites
 
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/dotnet/).
-- An Azure Email Communication Services Resource created and ready to provision the domains [Get started with Creating Email Communication Resource](../../quickstarts/email/create-email-communication-resource.md)
+- An Azure Communication Services Email Resource created and ready to add the domains. See [Get started with Creating Email Communication Resource](../../quickstarts/email/create-email-communication-resource.md).
 
-## Azure Managed Domains vs. Custom Domains
+## Azure Managed Domains compared to Custom Domains
 
-Before provisioning an Azure Managed Domain, review the following table to determine which domain type is most appropriate for your particular use case.
+Before provisioning an Azure Managed Domain, review the following table to decide which domain type best meets your needs.
 
 | | [Azure Managed Domains](./add-azure-managed-domains.md) | [Custom Domains](./add-custom-verified-domains.md) | 
 |---|---|---|
 |**Pros:** | - Setup is quick & easy<br/>- No domain verification required<br /> | - Emails are sent from your own domain |
-|**Cons:** | - Sender domain is not personalized and cannot be changed<br/>- Sender usernames cannot be personalized<br/>- Very limited sending volume<br />- User Engagement Tracking cannot be enabled <br /> | - Requires verification of domain records <br /> - Longer setup for verification |
+|**Cons:** | - Sender domain is not personalized and cannot be changed<br/>- Sender usernames can't be personalized<br/>- Very limited sending volume<br />- User Engagement Tracking can't be enabled <br /> | - Requires verification of domain records <br /> - Longer setup for verification |
 
 
 ## Provision Azure Managed Domain
 
-1. Go the overview page of the Email Communications Service resource that you created earlier.
-2. Create the Azure Managed Domain.   
-    - (Option 1) Click the **1-click add** button under **Add a free Azure subdomain**. Move to the next step.
+1. Open the Overview page of the Email Communications Service resource that you created in [Get started with Creating Email Communication Resource](../../quickstarts/email/create-email-communication-resource.md).
+2. Create an Azure Managed Domain using one of the following options.
+    - (Option 1) Click the **1-click add** button under **Add a free Azure subdomain**. Continue to **step 3**.
 
     :::image type="content" source="./media/email-add-azure-domain.png" alt-text="Screenshot that highlights the adding a free Azure Managed Domain.":::
 
@@ -44,30 +44,32 @@ Before provisioning an Azure Managed Domain, review the following table to deter
 
     - Click **Add domain** on the upper navigation bar.
     - Select **Azure domain** from the dropdown.
+    
 3. Wait for the deployment to complete.
 
     :::image type="content" source="./media/email-add-azure-domain-progress.png" alt-text="Screenshot that shows the Deployment Progress." lightbox="media/email-add-azure-domain-progress-expanded.png":::
 
-4. After domain creation is completed, you'll see a list view with the created domain.
+4. Once the domain is created, you see a list view with the new domain.
 
     :::image type="content" source="./media/email-add-azure-domain-created.png" alt-text="Screenshot that shows the list of provisioned email domains." lightbox="media/email-add-azure-domain-created-expanded.png":::
 
-5. Click the name of the provisioned domain, which navigates you to the overview page for the domain resource type.
+5. Click the name of the provisioned domain to open the overview page for the domain resource type.
 
     :::image type="content" source="./media/email-azure-domain-overview.png"  alt-text="Screenshot that shows Azure Managed Domain overview page." lightbox="media/email-azure-domain-overview-expanded.png":::
 
 ## Sender authentication for Azure Managed Domain
-Azure communication Services Email automatically configures the required email authentication protocols to set proper authentication for the email as detailed in [Email Authentication best practices](../../concepts/email/email-authentication-best-practice.md). 
+
+Azure Communication Services automatically configures the required email authentication protocols for the email as described in [Email Authentication best practices](../../concepts/email/email-authentication-best-practice.md). 
 
 **Your email domain is now ready to send emails.**
 
 ## Next steps
 
-* [Get started by connecting Email Communication Service with Azure Communication Service resource](../../quickstarts/email/connect-email-communication-resource.md)
+* [Quickstart: How to connect a verified email domain](../../quickstarts/email/connect-email-communication-resource.md)
 
 * [How to send an email using Azure Communication Service](../../quickstarts/email/send-email.md)
 
-The following documents may be interesting to you:
+## Related articles
 
-- Familiarize yourself with the [Email client library](../../concepts/email/sdk-features.md)
-- How to send emails with custom verified domains? [Add custom domains](../../quickstarts/email/add-custom-verified-domains.md)
+* Familiarize yourself with the [Email client library](../../concepts/email/sdk-features.md)
+* Learn how to send emails with custom verified domains in [Quickstart: How to add custom verified email domains](../../quickstarts/email/add-custom-verified-domains.md)