Merge pull request #301517 from MicrosoftDocs/main

6/18/2025 AM Publish

Author: Taojunshen

articles/api-center/synchronize-api-management-apis.md

@@ -4,7 +4,7 @@ description: Integrate an API Management instance to Azure API Center for automa
 author: dlepow
 ms.service: azure-api-center
 ms.topic: how-to
-ms.date: 06/02/2025
+ms.date: 06/18/2025
 ms.author: danlep 
 ms.custom: devx-track-azurecli
 # Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
@@ -32,6 +32,7 @@ API Management APIs automatically synchronize to the API center whenever existin
 > [!NOTE]
 > * Integration of Azure API Management is currently in preview.
 > * There are [limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json#azure-api-center-limits) for the number of integrated API Management instances (API sources).
+> * An integrated API Management instance can be configured in a virtual network.
 > * API updates in API Management typically synchronize to your API center within minutes, but synchronization can take up to 24 hours.
 > * API definitions also synchronize to the API center if you select the option to include them during integration.
 

articles/azure-functions/durable/durable-functions-best-practice-reference.md

@@ -80,7 +80,7 @@ As with activity functions, external events have an _at-least-once_ delivery gua
 
 ### Invest in stress testing
 
-As with anything performance related, the ideal concurrency settings and architechture of your app ultimately depends on your application's workload. Therefore, it's recommended that users to invest in a performance testing harness that simulates their expected workload and to use it to run performance and reliability experiments for their app.
+As with anything performance related, the ideal concurrency settings and architecture of your app ultimately depends on your application's workload. Therefore, it's recommended that users to invest in a performance testing harness that simulates their expected workload and to use it to run performance and reliability experiments for their app.
 
 ### Avoid sensitive data in inputs, outputs, and exceptions
 

articles/azure-functions/durable/quickstart-mssql.md

@@ -176,7 +176,7 @@ In _local.settings.json_, assign the connection string of the Docker-based SQL s
 
 ### Test locally
 
-Open a termimal window in your app's root folder and run `azurite start`. Azurite is the Azure Storage emulator, which is needed for running any Function app. 
+Open a terminal window in your app's root folder and run `azurite start`. Azurite is the Azure Storage emulator, which is needed for running any Function app. 
 
 Open another terminal window in your app's root folder and start the Function app by running `func host start`.
 

articles/azure-vmware/includes/disk-capabilities-of-the-host.md

@@ -3,7 +3,7 @@ title: Hardware specifications of the hosts
 description: Hosts used to build or scale clusters come from an isolated pool of hosts.
 ms.topic: include
 ms.service: azure-vmware
-ms.date: 4/4/2025
+ms.date: 6/18/2025
 author: suzizuber
 ms.author: v-szuber
 ms.custom: engagement-fy23
@@ -13,13 +13,13 @@ ms.custom: engagement-fy23
 
 Azure VMware Solution clusters are based on a hyperconverged infrastructure. The following table shows the CPU, memory, disk, and network specifications of the host.
 
-| Host type | CPU (cores/GHz)   | RAM (GB)  | vSAN cache tier (TB, raw***)  | vSAN capacity tier (TB, raw***)  | Regional availability |
-| :---      | :---: | :---:     | :---:                      | :---:                                        | :---:                 |
-| AV36      | Dual Intel Xeon Gold 6140 CPUs (Skylake microarchitecture) with 18 cores/CPU @ 2.3 GHz, Total 36 physical cores (72 logical cores with hyperthreading) |  576  | 3.2 (NVMe)               | 15.20 (SSD)  | Selected regions (*) |
-| AV36P     |  Dual Intel Xeon Gold 6240 CPUs (Cascade Lake microarchitecture) with 18 cores/CPU @ 2.6 GHz / 3.9 GHz Turbo, Total 36 physical cores (72 logical cores with hyperthreading) |  768  | 1.5 (Intel Cache) | 19.20 (NVMe) | Selected regions (*) |
-| AV48      | Dual Intel Xeon Gold 6442Y CPUs (Sapphire Rapids microarchitecture) with 24 cores/CPU @ 2.6 GHz / 4.0 GHz Turbo, Total 48 physical cores (96 logical cores with hyperthreading) | 1,024  | 3.2 (NVMe) | 19.20 (NVMe) | Selected regions (*) |
-| AV52      | Dual Intel Xeon Platinum 8270 CPUs (Cascade Lake microarchitecture) with 26 cores/CPU @ 2.7 GHz / 4.0 GHz Turbo, Total 52 physical cores (104 logical cores with hyperthreading) | 1,536  | 1.5 (Intel Cache) | 38.40 (NVMe) | Selected regions (*) |
-| AV64      | Dual Intel Xeon Platinum 8370C CPUs (Ice Lake microarchitecture) with 32 cores/CPU @ 2.8 GHz / 3.5 GHz Turbo, Total 64 physical cores (128 logical cores with hyperthreading) |  1,024  | 3.84 (NVMe) | 15.36 (NVMe) | Selected regions (**) |
+| Host type | CPU (cores/GHz)   | RAM (GB)  | vSAN Architecture| vSAN cache tier (TB, raw***)  | vSAN capacity tier (TB, raw***)  | Regional availability |
+| :---      | :---: | :---:     | :---:                      | :---:                                        | :---:                 | :---:| 
+| AV36      | Dual Intel Xeon Gold 6140 CPUs (Skylake microarchitecture) with 18 cores/CPU @ 2.3 GHz, Total 36 physical cores (72 logical cores with hyperthreading) |  576 | OSA | 3.2 (NVMe) | 15.20 (SSD)  | Selected regions (*) |
+| AV36P     |  Dual Intel Xeon Gold 6240 CPUs (Cascade Lake microarchitecture) with 18 cores/CPU @ 2.6 GHz / 3.9 GHz Turbo, Total 36 physical cores (72 logical cores with hyperthreading) |  768 | OSA | 1.5 (Intel Cache) | 19.20 (NVMe) | Selected regions (*) |
+| AV48      | Dual Intel Xeon Gold 6442Y CPUs (Sapphire Rapids microarchitecture) with 24 cores/CPU @ 2.6 GHz / 4.0 GHz Turbo, Total 48 physical cores (96 logical cores with hyperthreading) | 1,024 | ESA | N/A | 25.6 (NVMe) | Selected regions (*) |
+| AV52      | Dual Intel Xeon Platinum 8270 CPUs (Cascade Lake microarchitecture) with 26 cores/CPU @ 2.7 GHz / 4.0 GHz Turbo, Total 52 physical cores (104 logical cores with hyperthreading) | 1,536 | OSA | 1.5 (Intel Cache) | 38.40 (NVMe) | Selected regions (*) |
+| AV64      | Dual Intel Xeon Platinum 8370C CPUs (Ice Lake microarchitecture) with 32 cores/CPU @ 2.8 GHz / 3.5 GHz Turbo, Total 64 physical cores (128 logical cores with hyperthreading) |  1,024 | OSA | 3.84 (NVMe) | 15.36 (NVMe) | Selected regions (**) |
 
 An Azure VMware Solution cluster requires a minimum number of three hosts. You can use hosts of the same type only in a single Azure VMware Solution private cloud. Hosts used to build or scale clusters come from an isolated pool of hosts. Those hosts passed hardware tests and had all data securely deleted before being added to a cluster.
 

articles/backup/backup-azure-enhanced-soft-delete-tutorial.md

@@ -2,7 +2,7 @@
 title: Tutorial - Recover soft deleted data and recovery points using enhanced soft delete in Azure Backup
 description: Learn how to enable enhanced soft delete and recover your data and recover backups, if they're deleted.
 ms.topic: tutorial
-ms.date: 09/11/2023
+ms.date: 06/18/2025
 ms.service: azure-backup
 author: jyothisuri
 ms.author: jsuri
@@ -17,8 +17,10 @@ This tutorial describes how to enable enhanced soft delete and recover your data
 >[!Note]
 >Once you enable the *always-on* state for soft delete, you can't disable it for that vault.
 
-## Before you start
+## Considerations
 
+Before you start using the Enhanced soft delete feature, review the following considetations:
+
 - Enhanced soft delete is supported for Recovery Services vaults and Backup vaults.
 - Enhanced soft delete applies to all vaulted workloads alike in Recovery Services vaults and Backup vaults. However, it currently doesn't support operational tier workloads, such as Azure Files backup, Operational backup for Blobs, and Disk and VM snapshot backups.
 - For hybrid backups (using MARS, DPM, or MABS), enabling always-on soft delete will disallow server deregistration and  deletion of backups via the Azure portal. If you don't want to retain the backed-up data, we recommend you not to enable the *always-on soft-delete* for the vault or perform *stop protection with delete data* before the server is decommissioned.
@@ -32,7 +34,7 @@ Soft delete is enabled by default for all new vaults you create. To make enabled
 
 # [Recovery Services vault](#tab/recovery-services-vault)
 
-Follow these steps:
+To enable soft delete with always-on state on a Recovery Services vault, follow these steps:
 
 1. Go to **Recovery Services vault** > **Properties**.
 
@@ -64,7 +66,7 @@ Follow these steps:
 
 # [Backup vault](#tab/backup-vault)
 
-Follow these steps:
+To enable soft delete with always-on state on a Backup vault, follow these steps:
 
 1. Go to **Backup vault** > **Properties**.
 
@@ -100,7 +102,7 @@ You can delete backup items/instances even if the soft delete settings are enabl
 
 # [Recovery Services vault](#tab/recovery-services-vault)
 
-Follow these steps:
+To delete a backup item from a Recovery Services vault, follow these steps:
 
 1. Go to the *backup item* that you want to delete.
 1. Select **Stop backup**.
@@ -120,7 +122,7 @@ Follow these steps:
 
 # [Backup vault](#tab/backup-vault)
 
-Follow these steps:
+To delete a backup item from a Backup vault, follow these steps:
 
 1. In the **Backup center**, go to the *backup instance* that you want to delete.
 
@@ -150,7 +152,7 @@ If a backup item/ instance is soft deleted, you can recover it before it's perma
 
 # [Recovery Services vault](#tab/recovery-services-vault)
 
-Follow these steps:
+To recover a soft-deleted backup item to a Recovery Services vault, follow these steps:
 
 1. Go to the *backup item* that you want to retrieve from the *soft deleted* state.
 
@@ -166,7 +168,7 @@ Follow these steps:
 
 # [Backup vault](#tab/backup-vault)
 
-Follow these steps:
+To recover a soft-deleted backup item to a Backup vault, follow these steps:
 
 1. Go to the *deleted backup instance* that you want to recover.
 
@@ -188,7 +190,7 @@ Follow these steps:
 
 >- MUA for soft delete is currently supported for Recovery Services vaults only.
 
-## Next steps
+## Related content
 
-- Learn more about [enhanced soft delete for Azure Backup](backup-azure-enhanced-soft-delete-about.md).
-- Learn more about [soft delete of recovery points](backup-azure-enhanced-soft-delete-about.md#soft-delete-of-recovery-points).
+- [About enhanced soft delete for Azure Backup](backup-azure-enhanced-soft-delete-about.md).
+- [About soft delete of recovery points](backup-azure-enhanced-soft-delete-about.md#soft-delete-of-recovery-points).

articles/backup/backup-azure-manage-mars.md

@@ -3,7 +3,7 @@ title: Manage and monitor MARS Agent backups
 description: Learn how to manage and monitor Microsoft Azure Recovery Services (MARS) Agent backups by using the Azure Backup service.
 ms.reviewer: srinathv
 ms.topic: how-to
-ms.date: 11/27/2024
+ms.date: 06/18/2025
 ms.service: azure-backup
 ms.custom: engagement-fy23
 author: jyothisuri
@@ -332,5 +332,5 @@ To list recovery points for a data source, follow these steps:
 ## Next steps
 
 - For information about supported scenarios and limitations, refer to the [Support Matrix for the MARS Agent](./backup-support-matrix-mars-agent.md).
-- Learn more about [On demand backup policy retention behavior](backup-windows-with-mars-agent.md#set-up-on-demand-backup-policy-retention-behavior).
+- Learn more about [On demand backup policy retention behavior](backup-windows-with-mars-agent.md#on-demand-backup-policy-retention-behavior).
 - For more frequently asked questions, see the [MARS agent FAQ](backup-azure-file-folder-backup-faq.yml).

articles/backup/backup-windows-with-mars-agent.md

@@ -2,23 +2,25 @@
 title: Back up Windows machines by using the MARS agent
 description: Use the Microsoft Azure Recovery Services (MARS) agent to back up Windows machines.
 ms.topic: how-to
-ms.date: 08/18/2023
+ms.date: 06/18/2025
 author: jyothisuri
 ms.author: jsuri
 ms.custom: engagement-fy23
 ---
 
 # Back up Windows Server files and folders to Azure
 
-This article describes how to back up Windows machines by using the [Azure Backup](backup-overview.md) service and the Microsoft Azure Recovery Services (MARS) agent. MARS is also known as the Azure Backup agent.
+This article describes how to back up Windows machines by using the [Azure Backup](backup-overview.md) service and the Microsoft Azure Recovery Services (MARS) agent or Azure Backup agent. 
 
-## Before you start
+## Prerequisites
 
-* Learn how [Azure Backup uses the MARS agent to back up Windows machines](backup-architecture.md#architecture-direct-backup-of-on-premises-windows-server-machines-or-azure-vm-files-or-folders).
-* Learn about the [backup architecture](backup-architecture.md#architecture-back-up-to-dpmmabs) that runs the MARS agent on a secondary MABS or Data Protection Manager server.
-* Review [what's supported and what you can back up](backup-support-matrix-mars-agent.md) by the MARS agent.
+Before you back up Windows Server files and folders to Azure, review the following prerequisites:
+
+* Understand how [Azure Backup uses the MARS agent to back up Windows machines](backup-architecture.md#architecture-direct-backup-of-on-premises-windows-server-machines-or-azure-vm-files-or-folders).
+* Review the [backup architecture](backup-architecture.md#architecture-back-up-to-dpmmabs) that runs the MARS agent on a secondary MABS or Data Protection Manager server.
+* Check the [supported backup scenarios](backup-support-matrix-mars-agent.md) by the MARS agent.
 * [Verify internet access](install-mars-agent.md#verify-internet-access) on the machines that you want to back up.
-* If the MARS agent isn't installed, learn how to install it [here](install-mars-agent.md).
+* [Install the MARS agent](install-mars-agent.md), if not done.
 
 ## Create a backup policy
 
@@ -139,7 +141,7 @@ To run an on-demand backup, follow these steps:
 
 After the initial backup finishes, the **Job completed** status appears in the Backup console.
 
-## Set up on-demand backup policy retention behavior
+## On-demand backup policy retention behavior
 
 The following table shows the data retention duration for various backup schedules:
 

articles/cost-management-billing/manage/ea-billing-administration-partners.md

@@ -1,7 +1,7 @@
 ---
 title: EA billing administration for partners in the Azure portal
 description: This article explains the common tasks that a partner administrator accomplishes in the Azure portal to manage indirect enterprise agreements.
-author: RaniChegondi
+author: racheg-microsoft
 ms.author: racheg
 ms.date: 04/01/2025
 ms.topic: conceptual
@@ -135,4 +135,4 @@ By default, all active enrollments are shown. You can change the status filter t
 
 ## Related content
 
-- To view usage and charges for a specific enrollment, see the [View your usage summary details and download reports for EA enrollments](direct-ea-azure-usage-charges-invoices.md) article.
+- To view usage and charges for a specific enrollment, see the [View your usage summary details and download reports for EA enrollments](direct-ea-azure-usage-charges-invoices.md) article.

articles/deployment-environments/how-to-create-configure-projects.md

@@ -22,7 +22,7 @@ A platform engineering team typically creates projects and provides project acce
 
 |Category|Requirement|
 |-|-|
-|**Subcription**|An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).|
+|**Subscription**|An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).|
 |**Permissions**| Azure role-based access control role with permissions to create and manage resources in the subscription, such as [Contributor](../role-based-access-control/built-in-roles.md#contributor) or [Owner](../role-based-access-control/built-in-roles.md#owner).|
 |**Resource**|- A [dev center](how-to-create-configure-dev-center.md).|
 

articles/iot-operations/discover-manage-assets/howto-manage-assets-remotely.md

@@ -156,6 +156,41 @@ To use the `UsernamePassword` authentication mode, complete the following steps:
 
 ---
 
+### Import and export asset endpoints
+
+Use the **Import** and **Export** buttons to import or export an asset endpoint in the operations experience:
+
+:::image type="content" source="media/howto-manage-assets-remotely/export-import-asset-endpoints.png" alt-text="Screenshot showing the options to import and export an asset endpoint.":::
+
+The JSON file that you export contains the asset endpoint definition. You can use this file to import the asset endpoint into another instance of Azure IoT Operations or modify it to create a new asset endpoint in the current instance:
+
+```yml
+{
+  "name": "<your asset endpoint name>",
+  "type": "microsoft.deviceregistry/assetendpointprofiles",
+  "location": "<your location>",
+  "extendedLocation": {
+    "type": "CustomLocation",
+    "name": "/subscriptions/<your subscription id>/resourceGroups/<your resource group>/providers/Microsoft.ExtendedLocation/customLocations/<your custom location>"
+  },
+  "properties": {
+    "targetAddress": "<your target address>",
+    "endpointProfileType": "Microsoft.OpcUa",
+    "additionalConfiguration": "{\"runAssetDiscovery\":true}",
+    "authentication": {
+      "method": "Anonymous"
+    }
+  },
+  "apiVersion": "2024-11-01"
+}
+```
+
+> [!TIP]
+> Export an existing asset endpoint to discover the `extendedLocation Name` value.
+
+> [!TIP]
+> You can also use the `az iot ops asset endpoint show` and `az iot ops asset endpoint create` commands to view and create asset endpoints.
+
 ## Add an asset, tags, and events
 
 # [Operations experience](#tab/portal)
@@ -441,6 +476,66 @@ az iot ops asset delete --name thermostat -g {your resource group name}
 
 ---
 
+## Import and export assets
+
+Use the **Import** and **Export** buttons to import or export an asset in the operations experience:
+
+:::image type="content" source="media/howto-manage-assets-remotely/export-import-assets.png" alt-text="Screenshot showing the options to import and export an asset.":::
+
+The JSON file that you export contains the asset definition. You can use this file to import the asset into another instance of Azure IoT Operations or modify it to create a new asset in the current instance. The following JSON example shows an example import file to use to create a thermostat asset:
+
+```yml
+{
+  "name": "thermostat",
+  "type": "microsoft.deviceregistry/assets",
+  "location": "<your location>",
+  "extendedLocation": {
+    "type": "CustomLocation",
+    "name": "/subscriptions/<your subscription id>/resourceGroups/<your resource group>/providers/Microsoft.ExtendedLocation/customLocations/<your custom location>"
+  },
+  "properties": {
+    "enabled": true,
+    "displayName": "thermostat",
+    "description": "A simulated thermostat asset",
+    "assetEndpointProfileRef": "opc-ua-connector-1",
+    "version": 1,
+    "attributes": {
+      "batch": "102",
+      "customer": "Contoso",
+      "equipment": "Boiler",
+      "isSpare": "true",
+      "location": "Seattle"
+    },
+    "defaultDatasetsConfiguration": "{\"publishingInterval\":1000,\"samplingInterval\":1000,\"queueSize\":1}",
+    "defaultEventsConfiguration": "{\"publishingInterval\":1000,\"queueSize\":1}",
+    "defaultTopic": {
+      "path": "azure-iot-operations/data/thermostat",
+      "retain": "Never"
+    },
+    "datasets": [
+      {
+        "name": "default",
+        "dataPoints": [
+          {
+            "name": "temperature",
+            "dataSource": "ns=3;s=SpikeData",
+            "observabilityMode": "None",
+            "dataPointConfiguration": "{}"
+          }
+        ]
+      }
+    ]
+  },
+  "apiVersion": "2024-11-01"
+}
+```
+
+> [!TIP]
+> Export an existing asset endpoint to discover the `extendedLocation Name` value.
+
+> [!TIP]
+> You can also use the `az iot ops asset show` and `az iot ops asset create` commands to view and create asset endpoints.
+
 ## Notifications
 
 Whenever you make a change to asset in the operations experience, you see a notification that reports the status of the operation: