Merge pull request #291205 from MicrosoftDocs/main

Publish to live, Friday 4 AM PST, 11/29

Author: ttorble

articles/backup/encryption-at-rest-with-cmk-for-backup-vault.md

@@ -20,14 +20,11 @@ To allow encryption, you must grant the Backup vault’s managed identity that y
 >[!Note]
 >**Encryption Settings** and **CMK** are used interchangeably.
 
-## Support matrix
-This section provides the supported scenarios for data encryption in a Backup vault.
-
-### Supported regions
+## Supported regions
 
 CMKs for Backup vaults are currently available in all Azure public regions.
 
-### Key Vault and managed HSM key requirements
+## Key Vault and managed HSM key requirements
 
 Before you enable encryption on a Backup vault, review the following requirements:
 
@@ -45,14 +42,6 @@ Before you enable encryption on a Backup vault, review the following requirement
 
 - Encryption settings support Azure Key Vault RSA and RSA-HSM keys only of sizes 2,048, 3,072, and 4,096. [Learn more about keys](/azure/key-vault/keys/about-keys). Before you consider Key Vault regions for encryption settings, see [Key Vault disaster recovery scenarios](/azure/key-vault/general/disaster-recovery-guidance) for regional failover support.
 
-### Known limitation
-
-If you delete the key vault/MHSM key used for encryption settings, the delete Backup Vault operation might fail. 
-
->[!Note]
->- Before performing the delete vault operation on a vault with encryption settings enabled, ensure that the encryption settings details, such as the managed identity, is attached to the vault and have the necessary permissions to access the key vault/MHSM key.
->- Also, ensure that the key vault/MHSM key exists. If the key is deleted, you can recover it from the soft deleted state. Learn about the [troubleshooting steps](#troubleshoot-operation-errors-for-encryption-settings).
-
 ## Considerations
 
 Before you enable encryption on a Backup vault, review the following considerations:

articles/energy-data-services/how-to-deploy-gcz.md

@@ -21,6 +21,7 @@ This guide shows you how to deploy the Geospatial Consumption Zone (GCZ) service
 To deploy the GCZ, you need to create an App Registration in Microsoft Entra ID. The App Registration is used to authenticate the GCZ APIs with Azure Data Manager for Energy to be able to generate the cache of the geospatial data.
 
 1. See [Create an App Registration in Microsoft Entra ID](/azure/active-directory/develop/quickstart-register-app) for instructions on how to create an App Registration.
+
 1. Grant the App Registration permission to read the relevant data in Azure Data Manager for Energy. See [How to add members to an OSDU group](./how-to-manage-users.md#add-members-to-an-osdu-group-in-a-data-partition) for further instructions.
 
 ## Setup
@@ -63,6 +64,7 @@ Through APIM we can add policies to secure, monitor, and manage the APIs.
 1. Download the two OpenAPI specification to your local computer.
    - [GCZ Provider](https://github.com/microsoft/adme-samples/blob/main/services/gcz/gcz-openapi-provider.yaml)
    - [GCZ Transformer](https://github.com/microsoft/adme-samples/blob/main/services/gcz/gcz-openapi-transformer.yaml)
+
 1. Open each OpenAPI specification file in a text editor and replace the `servers` section with the corresponding IPs of the AKS GCZ Services' Load Balancer.
 
    ```yaml
@@ -82,8 +84,8 @@ Through APIM we can add policies to secure, monitor, and manage the APIs.
 
 ## Testing the GCZ service
 
-1. Download the API client collection from the [OSDU GitLab](https://community.opengroup.org/osdu/platform/consumption/geospatial/-/blob/master/docs/test-assets/postman/Geospatial%20Consumption%20Zone%20-%20Provider%20Postman%20Tests.postman_collection.json?ref_type=heads) and import it into your API client of choice (that is, Bruno, Postman).
-1.
+1. Download the API client collection from the [OSDU GitLab](https://community.opengroup.org/osdu/platform/consumption/geospatial/-/blob/master/docs/test-assets/postman/Geospatial%20Consumption%20Zone%20-%20Provider%20Postman%20Tests.postman_collection.json?ref_type=heads) and import it into your API client of choice (i.e. Bruno, Postman).
+
 1. Add the following environment variables to your API client:
 
    - `PROVIDER_URL` - The URL to the GCZ Provider API.

articles/energy-data-services/includes/how-to/how-to-deploy-gcz/deploy-gcz-on-aks.md

@@ -115,7 +115,6 @@ Learn how to deploy Geospatial Consumption Zone (GCZ) on Azure Kubernetes Servic
                type: LoadBalancer
            configuration:
                privateNetwork: "$PRIVATE_NETWORK"
-           configLoaderJs: "../../../../gcz-provider/gcz-provider-core/config/configLoader.js"
        transformer:
            namespace: $NAMESPACE
            image:
@@ -174,7 +173,6 @@ Learn how to deploy Geospatial Consumption Zone (GCZ) on Azure Kubernetes Servic
                type: LoadBalancer
            configuration:
                privateNetwork: "$PRIVATE_NETWORK"
-           configLoaderJs: "../../../../gcz-provider/gcz-provider-core/config/configLoader.js"
        transformer:
            namespace: $NAMESPACE
            image:
@@ -318,7 +316,7 @@ Learn how to deploy Geospatial Consumption Zone (GCZ) on Azure Kubernetes Servic
 1. Deploy the GCZ HELM chart:
 
    ```bash
-   helm upgrade -i $CHART . -n $NAMESPACE -f osdu_gcz_custom_values.yaml
+   helm upgrade -i $CHART . -n $NAMESPACE -f osdu_gcz_custom_values.yaml --set-file global.provider.configLoaderJs="gcz-provider/gcz-provider-core/config/configLoader.js"
    ```
 
 1. Verify the deployment:

articles/migrate/vmware/agent-based-migration-architecture.md

@@ -6,7 +6,7 @@ ms.author: vijain
 ms.manager: kmadnani
 ms.service: azure-migrate
 ms.topic: conceptual
-ms.date: 12/12/2022
+ms.date: 09/26/2024
 ms.custom: vmware-scenario-422, engagement-fy23
 ---
 

articles/migrate/vmware/concepts-vmware-agentless-migration.md

@@ -6,7 +6,7 @@ ms.author: piyushdhore
 ms.manager: vijain
 ms.topic: conceptual
 ms.service: azure-migrate
-ms.date: 10/18/2023
+ms.date: 11/26/2024
 ms.custom: vmware-scenario-422, engagement-fy24
 ---
 # Agentless migration architecture

articles/migrate/vmware/how-to-automate-migration.md

@@ -6,7 +6,7 @@ ms.author: vijain
 ms.manager: kmadnani
 ms.service: azure-migrate
 ms.topic: how-to
-ms.date: 05/11/2023
+ms.date: 08/20/2024
 ms.custom: vmware-scenario-422, engagement-fy23
 ---
 

articles/migrate/vmware/how-to-migrate-vmware-vms-with-cmk-disks.md

@@ -4,8 +4,8 @@ description: Learn how to migrate VMware VMs to Azure with server-side encryptio
 author: v-sreedevank
 ms.author: v-sreedevank
 ms.topic: how-to
-ms.date: 05/31/2023
-ms.custom: vmware-scenario-422, devx-track-azurepowershell, engagement-fy23
+ms.date: 10/20/2024
+ms.custom: vmware-scenario-422, devx-track-azurepowershell, engagement-fy25
 
 ---
 

articles/migrate/vmware/how-to-set-up-appliance-vmware.md

@@ -6,7 +6,7 @@ ms.author: vibansa
 ms.manager: abhemraj
 ms.topic: how-to
 ms.service: azure-migrate
-ms.date: 06/20/2024
+ms.date: 09/26/2024
 ms.custom: vmware-scenario-422, engagement-fy23
 ---
 

articles/migrate/vmware/migrate-support-matrix-vmware-migration.md

@@ -6,8 +6,8 @@ ms.author: piyushdhore
 ms.manager: vijain
 ms.topic: conceptual
 ms.service: azure-migrate
-ms.date: 06/11/2024
-ms.custom: vmware-scenario-422, engagement-fy23
+ms.date: 10/16/2024
+ms.custom: vmware-scenario-422, engagement-fy25
 ---
 
 # Support matrix for VMware vSphere migration

articles/migrate/vmware/migrate-support-matrix-vmware.md

@@ -6,7 +6,7 @@ ms.author: vibansa
 ms.manager: abhemraj
 ms.topic: conceptual
 ms.service: azure-migrate
-ms.date: 11/04/2024
+ms.date: 11/06/2024
 ms.custom: vmware-scenario-422, engagement-fy24
 ---