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

Author: Harikrishnan-M-B

articles/backup/restore-sql-database-azure-vm.md

@@ -2,7 +2,7 @@
 title: Restore SQL Server databases on an Azure VM
 description: This article describes how to restore SQL Server databases that are running on an Azure VM and that are backed up with Azure Backup. You can also use Cross Region Restore to restore your databases to a secondary region.
 ms.topic: how-to
-ms.date: 09/11/2024
+ms.date: 09/19/2024
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
@@ -35,6 +35,8 @@ Before you restore a database, note the following:
 - We strongly recommended to restore the "master" database using the [Restore as files](#restore-as-files) option and then restore [using T-SQL commands](/sql/relational-databases/backup-restore/restore-the-master-database-transact-sql).
 - For all system databases (model, msdb), stop the SQL Server Agent service before you trigger the restore.
 - Close any applications that might try to take a connection to any of these databases.
+- For the **master databases**, the **Alternate Location** option for restore isn't supported. We recommend you to restore the **master database** using the **Restore as files** option, and then restore using the `T-SQL` commands.
+- For `msdb` and `model`, the **Alternate Location** option for restore is supported only when the **Restored database name** is different from the **target database** name. If you want to restore the same name with the **target database**, we  recommend you to restore using the **Restore as files** option, and then restore using the `T-SQL` commands.
 
 ## Restore a database
 

articles/container-apps/custom-domains-managed-certificates.md

@@ -6,7 +6,7 @@ author: craigshoemaker
 ms.service: azure-container-apps
 ms.custom: build-2023, devx-track-azurecli
 ms.topic: how-to
-ms.date: 03/08/2024
+ms.date: 09/19/2024
 ms.author: cshoe
 zone_pivot_groups: azure-cli-or-portal
 ---
@@ -26,11 +26,11 @@ Azure Container Apps provides a free managed certificate for your custom domain.
 
 The requirements are:
 
-- Your container app has HTTP ingress enabled and is publicly accessible.
+- Enable HTTP ingress and ensure your container app is publicly accessible.
 
-- For apex domains, you must have an A record pointing to your Container Apps environment's IP address.
+- Must have an A record for apex domains that points to your Container Apps environment's IP address.
 
-- For subdomains, you must have a CNAME record mapped directly to the container app's automatically generated domain name. Mapping to an intermediate CNAME value blocks certificate issuance and renewal. Examples of CNAME values are traffic managers, Cloudflare, and similar services.
+- Establish a CNAME record for subdomains that maps directly to the container app's automatically generated domain name. Mapping to an intermediate CNAME value blocks certificate issuance and renewal. Examples of CNAME values are traffic managers, Cloudflare, and similar services.
 
 > [!NOTE]
 > To ensure the certificate issuance and subsequent renewals proceed successfully, all requirements must be met at all times when the managed certificate is assigned.
@@ -40,7 +40,7 @@ The requirements are:
 
 1. Navigate to your container app in the [Azure portal](https://portal.azure.com)
 
-1. Verify that your app has HTTP ingress enabled by selecting **Ingress** in the *Settings* section.  If ingress isn't enabled, enable it with these steps:
+1. Verify that your app has HTTP ingress enabled by selecting **Ingress** in the *Settings* section. If ingress isn't enabled, enable it with these steps:
 
    1. Set *HTTP Ingress* to **Enabled**.
    1. Select the desired *Ingress traffic* setting.
@@ -62,7 +62,7 @@ The requirements are:
     | Apex domain | A record | An apex domain is a domain at the root level of your domain. For example, if your DNS zone is `contoso.com`, then `contoso.com` is the apex domain. |
     | Subdomain | CNAME | A subdomain is a domain that is part of another domain. For example, if your DNS zone is `contoso.com`, then `www.contoso.com` is an example of a subdomain that can be configured in the zone. |
 
-1. Using the DNS provider that is hosting your domain, create DNS records based on the *Hostname record type* you selected using the values shown in the *Domain validation* section. The records point the domain to your container app and verify that you are the owner.
+1. Using the DNS provider that is hosting your domain, create DNS records based on the *Hostname record type* you selected using the values shown in the *Domain validation* section. The records point the domain to your container app and verify that you're the owner.
 
     - If you selected *A record*, create the following DNS records:
 
@@ -82,7 +82,7 @@ The requirements are:
 
 1. Once validation succeeds, select **Add**.
 
-    It may take several minutes to issue the certificate and add the domain to your container app.
+    It might take several minutes to issue the certificate and add the domain to your container app.
 
 
 1. Once the operation is complete, you see your domain name in the list of custom domains with a status of *Secured*. Navigate to your domain to verify that it's accessible.
@@ -184,7 +184,7 @@ Container Apps supports apex domains and subdomains. Each domain type requires a
     - If you're configuring an *A record*, replace `<VALIDATION_METHOD>` with `HTTP`.
     - If you're configuring a *CNAME*, replace `<VALIDATION_METHOD>` with `CNAME`.
 
-    It may take several minutes to issue the certificate and add the domain to your container app.
+    It might take several minutes to issue the certificate and add the domain to your container app.
 
 1. Once the operation is complete, navigate to your domain to verify that it's accessible.
 

articles/container-apps/index.yml

@@ -21,6 +21,10 @@ landingContent:
             url: overview.md
           - text: Compare container options in Azure
             url: compare-options.md
+          - text: Learn to develop with .NET
+            url: dotnet-overview.md
+          - text: Learn to develop with Java
+            url: java-overview.md
   - title: Get started
     linkLists:
       - linkListType: quickstart

articles/container-apps/java-get-started.md

@@ -31,7 +31,7 @@ The following image is a screenshot of how your application looks once deployed
 | Azure CLI | Install the [Azure CLI](/cli/azure/install-azure-cli).|
 | Container Apps CLI extension | Use version `0.3.47` or higher. Use the `az extension add --name containerapp --upgrade --allow-preview` command to install the latest version. |
 | Java | Install the [Java Development Kit](/java/openjdk/install). Use version 17 or later. |
-| Maven | Install the [Maven](https://maven.apache.org/download.cgi).|
+| Apache Maven | Download and install [Apache Maven](https://maven.apache.org/download.cgi).|
 
 ## Prepare the project
 
@@ -67,7 +67,7 @@ cd spring-petclinic
 Clean the Maven build area, compile the project's code, and create a JAR file, all while skipping any tests.
 
 ```bash
-mvn clean package -DskipTests
+mvn clean verify
 ```
 
 After you execute the build command, a file named *petclinic.jar* is generated in the */target* folder.
@@ -88,7 +88,7 @@ cd spring-framework-petclinic
 Clean the Maven build area, compile the project's code, and create a WAR file, all while skipping any tests.
 
 ```bash
-mvn clean package -DskipTests
+mvn clean verify
 ```
 
 After you execute the build command, a file named *petclinic.war* is generated in the */target* folder.

articles/container-apps/storage-mounts.md

@@ -6,7 +6,7 @@ author: craigshoemaker
 ms.service: azure-container-apps
 ms.custom: devx-track-azurecli
 ms.topic: conceptual
-ms.date: 04/10/2024
+ms.date: 09/19/2024
 ms.author: cshoe
 zone_pivot_groups: arm-azure-cli-portal
 ---
@@ -17,13 +17,13 @@ A container app has access to different types of storage. A single app can take
 
 | Storage type | Description | Persistence | Usage example |
 |--|--|--|
-| [Container-scoped storage](#container-scoped-storage) | Ephemeral storage available to a running container | Data is available until container shuts down | Writing a local app cache.  |
-| [Replica-scoped storage](#replica-scoped-storage) | Ephemeral storage for sharing files between containers in the same replica | Data is available until replica shuts down | The main app container writing log files that are processed by a sidecar container. |
+| [Container-scoped storage](#container-scoped-storage) | Ephemeral storage available to a running container | Data is available until container shuts down | Writing a local app cache. |
+| [Replica-scoped storage](#replica-scoped-storage) | Ephemeral storage for sharing files between containers in the same replica | Data is available until replica shuts down | The main app container writing log files that a sidecar container processes. |
 | [Azure Files](#azure-files) | Permanent storage | Data is persisted to Azure Files | Writing files to a file share to make data accessible by other systems. |
 
 ## Ephemeral storage
 
-A container app can read and write temporary data to ephemeral storage. Ephemeral storage can be scoped to a container or a replica. The total amount of container-scoped and replica-scoped storage available to each replica depends on the total amount of vCPUs allocated to the replica.
+A container app can read and write temporary data to ephemeral storage. Ephemeral storage can be scoped to a container or a replica. The total amount of container-scoped and replica-scoped storage available to each replica depends on the total number of vCPUs allocated to the replica.
 
 | vCPUs | Total ephemeral storage |
 |--|--|
@@ -227,15 +227,15 @@ Azure Files storage has the following characteristics:
 * All containers that mount the share can access files written by any other container or method.
 * More than one Azure Files volume can be mounted in a single container.
 
-Azure Files supports both SMB and NFS protocols. You can mount an Azure Files share using either protocol. The file share you define in the environment must be configured with the same protocol used by the file share in the storage account.
+Azure Files supports both SMB (Server Message Block) and NFS (Network File System) protocols. You can mount an Azure Files share using either protocol. The file share you define in the environment must be configured with the same protocol used by the file share in the storage account.
 
 > [!NOTE]
 > Support for mounting NFS shares in Azure Container Apps is in preview.
 
 To enable Azure Files storage in your container, you need to set up your environment and container app as follows:
 
 * Create a storage definition in the Container Apps environment.
-* If you are using NFS, your environment must be configured with a custom VNet and the storage account must be configured to allow access from the VNet. For more information, see [NFS file shares in Azure Files
+* If you're using NFS, your environment must be configured with a custom VNet and the storage account must be configured to allow access from the VNet. For more information, see [NFS file shares in Azure Files
 ](../storage/files/files-nfs-protocol.md).
 * If your environment is configured with a custom VNet, you must allow ports 445 and 2049 in the network security group (NSG) associated with the subnet.
 * Define a volume of type `AzureFile` (SMB) or `NfsAzureFile` (NFS) in a revision.

articles/virtual-desktop/client-device-redirection-intune.md

@@ -4,15 +4,11 @@ description: Learn how to configure redirection settings for Windows App and the
 ms.topic: how-to
 author: dknappettmsft
 ms.author: daknappe
-ms.date: 05/29/2024
+ms.date: 08/21/2024
 ---
 
 # Configure client device redirection settings for Windows App and the Remote Desktop app using Microsoft Intune
 
-> [!IMPORTANT]
-> Configure redirection settings for Windows App and the Remote Desktop app using Microsoft Intune is currently in PREVIEW.
-> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
-
 > [!TIP]
 > This article contains information for multiple products that use the Remote Desktop Protocol (RDP) to provide remote access to Windows desktops and applications.
 
@@ -49,7 +45,7 @@ For Windows App:
 
 | Device platform | Managed devices | Unmanaged devices |
 |--|:--:|:--:|
-| iOS and iPadOS | <sub>:::image type="icon" source="media/no.svg" border="false":::</sub> | <sub>:::image type="icon" source="media/yes.svg" border="false":::</sub> |
+| iOS and iPadOS | <sub>:::image type="icon" source="media/yes.svg" border="false":::</sub> | <sub>:::image type="icon" source="media/yes.svg" border="false":::</sub> |
 
 For the Remote Desktop app:
 
@@ -188,11 +184,7 @@ You need to create an [app configuration policy for managed apps](/mem/intune/ap
 
 To create and apply an app configuration policy for managed apps, follow the steps in [App configuration policies for Intune App SDK managed apps](/mem/intune/apps/app-configuration-policies-managed-app) and use the following settings:
 
-- On the **Basics** tab, do the following, depending on whether you're targeting Windows App or the Remote Desktop app
-
-   - For Windows App, select **Select custom apps**, then for **Bundle or Package ID**, enter `com.microsoft.rdc.apple` and for platform, select **iOS/iPadOS**.
-
-   - For the Remote Desktop app, select **Select public apps**, then search for and select **Remote Desktop** for each platform you want to target.
+- On the **Basics** tab, search for and select **Windows App** or **Remote Desktop**.
 
 - On the **Settings** tab, expand **General configuration settings**, then enter the following name and value pairs for each redirection setting you want to configure exactly as shown. These values correspond to the RDP properties listed on [Supported RDP properties](/azure/virtual-desktop/rdp-properties#device-redirection), but the syntax is different: 
 
@@ -217,9 +209,9 @@ To create and apply an app protection policy, follow the steps in [How to create
 
 - On the **Apps** tab, do the following, depending on whether you're targeting Windows App or the Remote Desktop app
 
-   - For Windows App on iOS/iPadOS, select **Select custom apps**, then for **Bundle or Package ID**, enter `com.microsoft.rdc.apple`.
+   - For Windows App on iOS/iPadOS, select **Select public apps**, then search for and select  **Windows App**.
 
-   - For the Remote Desktop app, select **Select public apps**, then search for and select **Remote Desktop**.
+   - For the Remote Desktop app on Android, select **Select public apps**, then search for and select **Remote Desktop**.
 
 - On the **Data protection** tab, only the following settings are relevant to Windows App and the Remote Desktop app. The other settings don't apply as Windows App and the Remote Desktop app interact with the session host and not with data in the app. On mobile devices, unapproved keyboards are a source of keystroke logging and theft.