Merge branch 'MicrosoftDocs:main' into docs-editor/defender-for-storage-classic-m-1693319153

Author: LiorTsalovich1

articles/app-service/getting-started.md

@@ -5,7 +5,7 @@ ms.author: msangapu
 author: msangapu-msft
 ms.topic: overview
 ms.custom: devx-track-extended-java, devx-track-python
-ms.date: 4/10/2023
+ms.date: 8/31/2023
 zone_pivot_groups: app-service-getting-started-stacks
 ---
 
@@ -56,8 +56,8 @@ zone_pivot_groups: app-service-getting-started-stacks
 
 | Action | Resources |
 | --- | --- |
-| **Create your first Java app** | Using one of the following tools:<br><br>- [Linux - Maven](./quickstart-java.md?tabs=javase&pivots=platform-linux-development-environment-maven)<br>- [Linux - Azure portal](./quickstart-java.md?tabs=javase&pivots=platform-linux-development-environment-azure-portal)<br>- [Windows - Maven](./quickstart-java.md?tabs=javase&pivots=platform-windows-development-environment-maven)<br>- [Windows - Azure portal](./quickstart-java.md?tabs=javase&pivots=platform-windows-development-environment-azure-portal) |
-| **Deploy your app** | - [Configure Java](./configure-language-java.md?pivots=platform-linux)<br>- [Deploy War](./deploy-zip.md?tabs=cli#deploy-warjarear-packages)<br>- [GitHub actions](./deploy-github-actions.md) |
+| **Create your first Java app** | Using one of the following tools:<br><br>- [Maven deploy with an embedded web server](./quickstart-java.md?pivots=java-maven-quarkus)<br>- [Maven deploy to a Tomcat server](./quickstart-java.md?pivots=java-maven-tomcat)<br>- [Maven deploy to a JBoss server](./quickstart-java.md?pivots=java-maven-jboss) |
+| **Deploy your app** | - [With Maven](configure-language-java.md?pivots=platform-linux#maven)<br>- [With Gradle](configure-language-java.md?pivots=platform-linux#gradle)<br>- [Deploy War](./deploy-zip.md?tabs=cli#deploy-warjarear-packages)<br>- [With popular IDEs (VS Code, IntelliJ, and Eclipse)](configure-language-java.md?pivots=platform-linux#ides)<br>- [Deploy WAR or JAR packages directly](./deploy-zip.md?tabs=cli#deploy-warjarear-packages)<br>- [With GitHub Actions](./deploy-github-actions.md) |
 | **Monitor your app**| - [Log stream](./troubleshoot-diagnostic-logs.md#stream-logs)<br>- [Diagnose and solve tool](./overview-diagnostics.md)|
 | **Add domains & certificates** |- [Map a custom domain](./app-service-web-tutorial-custom-domain.md?tabs=root%2Cazurecli)<br>- [Add SSL certificate](./configure-ssl-certificate.md)|
 | **Connect to a database** |- [Java Spring with Cosmos DB](./tutorial-java-spring-cosmosdb.md)|

articles/app-service/overview.md

@@ -4,7 +4,7 @@ description: Learn how Azure App Service helps you develop and host web applicat
 
 ms.assetid: 94af2caf-a2ec-4415-a097-f60694b860b3
 ms.topic: overview
-ms.date: 07/19/2023
+ms.date: 08/31/2023
 ms.custom: UpdateFrequency3
 ms.author: msangapu
 ---
@@ -31,6 +31,7 @@ Azure App Service is a fully managed platform as a service (PaaS) offering for d
 * **Authentication** - [Authenticate users](overview-authentication-authorization.md) using the built-in authentication component. Authenticate users with [Azure Active Directory](configure-authentication-provider-aad.md), [Google](configure-authentication-provider-google.md), [Facebook](configure-authentication-provider-facebook.md), [Twitter](configure-authentication-provider-twitter.md), or [Microsoft account](configure-authentication-provider-microsoft.md).
 * **Application templates** - Choose from an extensive list of application templates in the [Azure Marketplace](https://azure.microsoft.com/marketplace/), such as WordPress, Joomla, and Drupal.
 * **Visual Studio and Visual Studio Code integration** - Dedicated tools in Visual Studio and Visual Studio Code streamline the work of creating, deploying, and debugging.
+* **Java tools integration** - Develop and deploy to Azure without leaving your favorite development tools, such as Maven, Gradle, Visual Studio Code, IntelliJ, and Eclipse.
 * **API and mobile features** - App Service provides turn-key CORS support for RESTful API scenarios, and simplifies mobile app scenarios by enabling authentication, offline data sync, push notifications, and more.
 * **Serverless code** - Run a code snippet or script on-demand without having to explicitly provision or manage infrastructure, and pay only for the compute time your code actually uses (see [Azure Functions](../azure-functions/index.yml)).
 
@@ -42,7 +43,7 @@ App Service can also host web apps natively on Linux for supported application s
 
 ### Built-in languages and frameworks
 
-App Service on Linux supports a number of language specific built-in images. Just deploy your code. Supported languages include: Node.js, Java (8, 11, and 17), Tomcat, PHP, Python, .NET Core, and Ruby. Run [`az webapp list-runtimes --os linux`](/cli/azure/webapp#az-webapp-list-runtimes) to view the latest languages and supported versions. If the runtime your application requires is not supported in the built-in images, you can deploy it with a custom container.
+App Service on Linux supports a number of language specific built-in images. Just deploy your code. Supported languages include: Node.js, Java (Tomcat, JBoss, or with an embedded web server), PHP, Python, .NET Core, and Ruby. Run [`az webapp list-runtimes --os linux`](/cli/azure/webapp#az-webapp-list-runtimes) to view the latest languages and supported versions. If the runtime your application requires is not supported in the built-in images, you can deploy it with a custom container.
 
 Outdated runtimes are periodically removed from the Web Apps Create and Configuration blades in the Portal. These runtimes are hidden from the Portal when they are deprecated by the maintaining organization or found to have significant vulnerabilities. These options are hidden to guide customers to the latest runtimes where they will be the most successful.
 

articles/azure-resource-manager/bicep/user-defined-data-types.md

@@ -3,7 +3,7 @@ title: User-defined types in Bicep
 description: Describes how to define and use user-defined data types in Bicep.
 ms.topic: conceptual
 ms.custom: devx-track-bicep
-ms.date: 01/09/2023
+ms.date: 08/29/2023
 ---
 
 # User-defined data types in Bicep (Preview)
@@ -29,7 +29,7 @@ To enable this preview, modify your project's [bicepconfig.json](./bicep-config.
 You can use the `type` statement to define user-defined data types. In addition, you can also use type expressions in some places to define custom types.
 
 ```bicep
-type <userDefinedDataTypeName> = <typeExpression>
+type <user-defined-data-type-name> = <type-expression>
 ```
 
 The valid type expressions include:

articles/backup/about-restore-microsoft-azure-recovery-services.md

@@ -3,7 +3,7 @@ title: Restore options with Microsoft Azure Recovery Services (MARS) agent
 description: Learn about the restore options available with the Microsoft Azure Recovery Services (MARS) agent.
 ms.reviewer: mepand
 ms.topic: conceptual
-ms.date: 05/07/2021
+ms.date: 08/14/2023
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
 ---
@@ -29,8 +29,31 @@ Using the MARS agent you can:
 - **[Restore all backed up files in a volume](restore-all-files-volume-mars.md):** This option recovers all backed up data in a specified volume from the recovery point in Azure Backup. It allows a faster transfer speed (up to 40 MBPS).<br>We recommend you to use this option for recovering large amounts of data, or entire volumes.
 - **[Restore a specific set of backed up files and folders in a volume using PowerShell](backup-client-automation.md#restore-data-from-azure-backup):** If the paths to the files and folders relative to the volume root are known, this option allows you to restore the specified set of files and folders from a recovery point, using the faster transfer speed of the full volume restore. However, this option doesn’t provide the convenience of browsing files and folders in the recovery point using the Instant Restore option.
 - **[Restore individual files and folders using Instant Restore](backup-azure-restore-windows-server.md):** This option allows quick access to the backup data by mounting volume in the recovery point as a drive. You can then browse, and copy files and folders. This option offers a copy speed of up to 6 MBPS, which is suitable for recovering individual files and folders of total size less than 80 GB. Once the required files are copied, you can unmount the recovery point.
+- **Cross Region Restore for MARS (preview)**: If your Recovery Services vault uses GRS resiliency and has the [Cross Region Restore setting turned on](backup-create-recovery-services-vault.md#set-cross-region-restore), you can restore the backup data from the secondary region.
+
+## Cross Region Restore (preview)
+
+Cross Region Restore (CRR) allows you to restore MARS backup data from a secondary region, which is an Azure paired region. This enables you to conduct drills for audit and compliance, and recover data during the unavailability of the primary region in Azure in the case of a disaster. 
+
+To use this feature:
+
+1. [Turn on Cross Region Restore in your Recovery Services vault](backup-create-rs-vault.md#set-cross-region-restore). Once Cross Region Restore is enabled, you can't disable it.
+2. After you turn on the feature, it can take up to *48 hours* for the backup items to be available in the secondary region. Currently, the secondary region RPO is *36 hours*, because the RPO in the primary region is *24 hours*, and it can take up to *12 hours* to replicate the backup data from the primary to secondary region.
+3. To restore the backup data for the original machine, you can directly select **Secondary Region** as the source of the backup data in the wizard.
+
+   :::image type="content" source="./media/backup-azure-restore-windows-server/select-source-region-for-restore.png" alt-text="Screenshot shows the selection for secondary region as the backup data source during Cross Region Restore.":::
+
+4. To restore backup data for an alternate server from the secondary region, you need to download the *Secondary Region vault credential* from the Azure portal.
+
+   :::image type="content" source="./media/about-restore-microsoft-azure-recovery-services/download-vault-credentials-for-cross-region-restore.png" alt-text="Screenshot shows how to download vault credentials for secondary region.":::
+
+5. To automate recovery from secondary region for audit or compliance drills, [use this command](backup-client-automation.md#cross-region-restore). 
+
+>[!Note]
+>- Recovery Services vaults with private endpoint are currently not supported for Cross Region Restore with MARS.
+>- Recovery Services vaults enabled with Cross Region Restore will be automatically charged at RA-GRS rates for the MARS backups stored in the vault once the feature is generally available.
 
 ## Next steps
 
-- For more frequently asked questions, see [MARS agent FAQs](backup-azure-file-folder-backup-faq.yml).
+- For additional frequently asked questions, see [MARS agent FAQs](backup-azure-file-folder-backup-faq.yml).
 - For information about supported scenarios and limitations, see [Support Matrix for the backup with the MARS agent](backup-support-matrix-mars-agent.md).

articles/backup/backup-azure-file-folder-backup-faq.yml

@@ -4,7 +4,7 @@ metadata:
   description: Addresses common questions about backing up files and folders with Azure Backup.
   ms.topic: faq
   ms.service: backup
-  ms.date: 02/25/2022
+  ms.date: 08/14/2023
   author: AbhishekMallick-MS
   ms.author: v-abhmallick
 title: Frequently asked questions - Microsoft Azure Recovery Services (MARS) agent
@@ -23,9 +23,18 @@ sections:
       - question: |
           Where can I download the vault credentials file?
         answer: |
-          In the Azure portal, navigate to **Properties** for your vault. Under **Backup Credentials**, select the checkbox for **Already using the latest Recovery Services Agent**. Select **Download**.
+          In the Azure portal, go to **Properties** for your vault. Under **Backup Credentials**, select **Download**.
+
+          - If you want to register your MARS agent or restore data from the primary region, select **Primary Region**, *confirm* that you're using the latest Recovery Services Agent, and then select **Download**.
+          - If you're doing an alternate server restore from the backup data in the secondary region using Cross Region Restore, then select **Secondary Region** to download the vault credentials.
+          
+          :::image type="content" source="./media/backup-azure-file-folder-backup-faq/download-vault-credentials.png" alt-text="Screenshot shows how to initiate downloading vault credential file.":::
+
+          :::image type="content" source="./media/backup-azure-file-folder-backup-faq/download-vault-credential-file.png" alt-text="Screenshot shows the Download option for vault credential files in secondary region.":::
+            >[!Note]
+            >You can't use this secondary region vault credential for registration of the MARS agent.
+          
           
-          ![Download credentials](./media/backup-azure-file-folder-backup-faq/download-credentials.png)
           
       - question: |
           How long are vault credentials valid?

articles/backup/backup-azure-restore-system-state.md

@@ -2,7 +2,7 @@
 title: Restore System State to a Windows Server
 description: Step-by-step explanation for restoring Windows Server System State from a backup in Azure.
 ms.topic: conceptual
-ms.date: 12/09/2022
+ms.date: 08/14/2023
 ms.service: backup
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
@@ -14,6 +14,7 @@ This article explains how to restore Windows Server System State backups from an
 1. Restore System State as files from Azure Backup. When restoring System State as files from Azure Backup, you can either:
    * Restore System State to the same server where the backups were taken, or
    * Restore System State file to an alternate server.
+   * If you have Cross Region Restore enabled in your vault, you can restore the backup data from a secondary region.
 
 2. Apply the restored System State files to a Windows Server using the Windows Server Backup utility.
 
@@ -33,6 +34,10 @@ The following steps explain how to roll back your Windows Server configuration t
 
     ![Choose this server option to restore the data to the same machine](./media/backup-azure-restore-system-state/samemachine.png)
 
+   If you have enabled Cross Region Restore (preview) and want to restore from the secondary region, select **Secondary Region**. Else, select **Primary Region**.
+
+   :::image type="content" source="./media/backup-azure-restore-windows-server/select-source-region-for-restore.png" alt-text="Screenshot shows the selection of the source region of recovery point.":::
+
 4. On the **Select Recovery Mode** pane, choose **System State** and then select **Next**.
 
     ![Browse files](./media/backup-azure-restore-system-state/recover-type-selection.png)
@@ -84,6 +89,10 @@ The terminology used in these steps includes:
 
 5. Provide the vault credential file that corresponds to the *Sample vault*. If the vault credential file is invalid (or expired), download a new vault credential file from the *Sample vault* in the Azure portal. Once the vault credential file is provided, the Recovery Services vault associated with the vault credential file appears.
 
+   If you want to use Cross Region Restore to restore the backup data from the secondary region, you need to download the *Secondary Region vault credential file* from the Azure portal, and then pass the file in the MARS agent.
+
+   :::image type="content" source="./media/backup-azure-restore-windows-server/pass-vault-credentials-in-mars-agent.png" alt-text="Screenshot shows the secondary vault credentials passed in MARS agent.":::
+
 6. On the Select Backup Server pane, select the *Source machine* from the list of displayed machines.
 7. On the Select Recovery Mode pane, choose **System State** and select **Next**.
 

articles/backup/backup-azure-restore-windows-server.md

@@ -1,8 +1,8 @@
 ---
 title: Restore files to Windows Server using the MARS Agent
 description: In this article, learn how to restore data stored in Azure to a Windows server or Windows computer with the Microsoft Azure Recovery Services (MARS) Agent.
-ms.topic: conceptual
-ms.date: 09/07/2018
+ms.topic: how-to
+ms.date: 08/14/2023
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
 ---
@@ -12,8 +12,9 @@ This article explains how to restore data from a backup vault. To restore data,
 
 * Restore data to the same machine from which the backups were taken.
 * Restore data to an alternate machine.
+* If you have Cross Region Restore enabled on your vault, you can restore the backup data from the secondary region.
 
-Use the Instant Restore feature to mount a writeable recovery point snapshot as a recovery volume. You can then explore the recovery volume and copy files to a local computer, in that way selectively restoring files.
+Use the Instant Restore feature to mount a writeable recovery point snapshot as a recovery volume. You can then explore the recovery volume and copy files to a local computer, thus selectively restoring files.
 
 > [!NOTE]
 > The [January 2017 Azure Backup update](https://support.microsoft.com/help/3216528/azure-backup-update-for-microsoft-azure-recovery-services-agent-januar) is required if you want to use Instant Restore to restore data. Also, the backup data must be protected in vaults in locales listed in the support article. Consult the [January 2017 Azure Backup update](https://support.microsoft.com/help/3216528/azure-backup-update-for-microsoft-azure-recovery-services-agent-januar) for the latest list of locales that support Instant Restore.
@@ -39,6 +40,11 @@ If you accidentally deleted a file and want to restore it to the same machine (f
 
     ![Screenshot of Recover Data Wizard Getting Started page (restore to same machine)](./media/backup-azure-restore-windows-server/samemachine_gettingstarted_instantrestore.png)
 
+   If you have enabled Cross Region Restore (preview) and want to restore from the secondary region, select **Secondary Region**. Else, select **Primary Region**.
+
+   :::image type="content" source="./media/backup-azure-restore-windows-server/select-source-region-for-restore.png" alt-text="Screenshot shows the selection of the source region of recovery point.":::
+
+
 4. On the **Select Recovery Mode** page, choose
    **Individual files and folders** > **Next**.
 
@@ -102,10 +108,16 @@ These steps include the following terminology:
 
     ![Screenshot of Recover Data Wizard Getting Started page (restore to alternate machine)](./media/backup-azure-restore-windows-server/alternatemachine_gettingstarted_instantrestore.png)
 
-5. Provide the vault credential file that corresponds to the sample vault, and select **Next**.
+5. Provide the vault credential file that corresponds to the sample vault.
 
     If the vault credential file is invalid (or expired), [download a new vault credential file from the sample vault](backup-azure-file-folder-backup-faq.yml#where-can-i-download-the-vault-credentials-file-) in the Azure portal. After you provide a valid vault credential, the name of the corresponding backup vault appears.
 
+    If you want to use Cross Region Restore to restore backup data from the secondary region, you need to download the *Secondary Region* vault credential file* from the Azure portal, and then pass the file in the MARS agent.
+
+   :::image type="content" source="./media/backup-azure-restore-windows-server/pass-vault-credentials-in-mars-agent.png" alt-text="Screenshot shows the vault credentials added to MARS agent.":::
+
+   Select **Next** to continue.
+
 6. On the **Select Backup Server** page, select the source machine from the list of displayed machines, and provide the passphrase. Then select **Next**.
 
     ![Screenshot of Recover Data Wizard Select Backup Server page (restore to alternate machine)](./media/backup-azure-restore-windows-server/alternatemachine_selectmachine_instantrestore.png)