Merge pull request #296187 from MicrosoftDocs/main

3/12/2025 AM Publish

Author: Taojunshen

articles/azure-app-configuration/enable-dynamic-configuration-aspnet-core.md

@@ -43,7 +43,7 @@ A *sentinel key* is a key that you update after you complete the change of all o
     // Load configuration from Azure App Configuration
     builder.Configuration.AddAzureAppConfiguration(options =>
     {
-        options.Connect(new Uri(endpoint), new DefaultAzureCredential());
+        options.Connect(new Uri(endpoint), new DefaultAzureCredential())
                 // Load all keys that start with `TestApp:` and have no label
                 .Select("TestApp:*", LabelFilter.Null)
                 // Configure to reload configuration if the registered sentinel key is modified

articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-encryption.md

@@ -73,7 +73,7 @@ In the **Flash Optimized** tier, keys and values are also partially stored on-di
 
 1. Select your chosen user assigned managed identity, and then choose the key input method to use.
 
-1. If using the **Select Azure key vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
+1. If using the **Select Azure Key Vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
 
     > [!NOTE]
     > For instructions on how to set up an Azure Key Vault instance, see the [Azure Key Vault quickstart guide](/azure/key-vault/secrets/quick-create-portal). You can also select the _Create a key vault_ link beneath the Key Vault selection to create a new Key Vault instance. Remember that both purge protection and soft delete must be enabled in your Key Vault instance.
@@ -99,7 +99,7 @@ In the **Flash Optimized** tier, keys and values are also partially stored on-di
 
 1. Select your chosen user assigned managed identity, and then choose which key input method to use.
 
-1. If using the **Select Azure key vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
+1. If using the **Select Azure Key Vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
 
     > [!NOTE]
     > For instructions on how to set up an Azure Key Vault instance, see the [Azure Key Vault quickstart guide](/azure/key-vault/secrets/quick-create-portal). You can also select the _Create a key vault_ link beneath the Key Vault selection to create a new Key Vault instance.  

articles/azure-netapp-files/configure-customer-managed-keys.md

@@ -259,7 +259,7 @@ The process to configure a NetApp account with customer-managed keys in the Azur
 1. Update your NetApp account with the key vault information.
 
     ```azurepowershell
-    Update-AzNetAppFilesAccount -ResourceGroupName $netappAccount.ResourceGroupName -AccountName $netappAccount.ResourceGroupName   -KeyVaultEncryption -KeyVaultUri <keyVaultUri> -KeyName <keyName>
+    Update-AzNetAppFilesAccount -ResourceGroupName $netappAccount.ResourceGroupName -AccountName $netappAccount.Name -KeyVaultEncryption -KeyVaultUri <keyVaultUri> -KeyName <keyName>
     ```
 
 #### Enable access for user-assigned identity

articles/azure-resource-manager/management/manage-resource-groups-python.md

@@ -157,7 +157,7 @@ You can deploy Azure resources by using Python classes or by deploying an Azure
 
 ### Deploy resources by using Python classes
 
-The following example creates a storage account by using [StorageManagementClient.storage_accounts.begin_create](/python/api/azure-mgmt-storage/azure.mgmt.storage.v2022_09_01.operations.storageaccountsoperations#azure-mgmt-storage-v2022-09-01-operations-storageaccountsoperations-begin-create). The name for the storage account must be unique across Azure.
+The following example creates a storage account by using [StorageManagementClient.storage_accounts.begin_create](/azure/storage/blobs/storage-blob-python-get-started). The name for the storage account must be unique across Azure.
 
 ```python
 import os

articles/azure-resource-manager/management/manage-resources-python.md

@@ -19,7 +19,7 @@ You can deploy Azure resources directly by using Python, or deploy an Azure Reso
 
 ### Deploy resources by using Python classes
 
-The following example creates a storage account by using [StorageManagementClient.storage_accounts.begin_create](/python/api/azure-mgmt-storage/azure.mgmt.storage.v2022_09_01.operations.storageaccountsoperations#azure-mgmt-storage-v2022-09-01-operations-storageaccountsoperations-begin-create). The name for the storage account must be unique across Azure.
+The following example creates a storage account by using [StorageManagementClient.storage_accounts.begin_create](/azure/storage/blobs/storage-blob-python-get-started). The name for the storage account must be unique across Azure.
 
 ```python
 import os

articles/azure-vmware/configure-vsan.md

@@ -61,7 +61,11 @@ Run the `Set-AVSVSANClusterUNMAPTRIM` cmdlet to enable or disable TRIM/UNMAP.
    >- disk.scsiUnmapAllowed flag is not set to false. The default is implied true. This setting can be used as a "stop switch" at the virtual machine level should you wish to disable this behavior on a per VM basis and do not want to use in guest configuration to disable this behavior. VMX file changes require a reboot to take effect.
    >- The guest operating system must be able to identify the virtual disk as thin.
    >- After enabling at a cluster level, the VM must be powered off and back on (a reboot is insufficient).
-
+   
+   >[!TIP]
+   >Articles on reclaiming space for Windows and Linux systems for TRIM/UNMAP to execute.
+   >-https://knowledge.broadcom.com/external/article/340005/reclaiming-disk-space-from-thin-provisio.html
+   >-https://knowledge.broadcom.com/external/article/326595/procedure-to-enable-trimunmap.html
 ## Set VMware vSAN Space Efficiency
 
 Run the `Set-vSANCompressDedupe` cmdlet to set preferred space efficiency model.

articles/cost-management-billing/reservations/buy-vm-software-reservation.md

@@ -26,7 +26,7 @@ There are two ways to purchase a virtual machine software reservation:
 
 **Option 1**
 
-1. Navigate to Reservations, select **Add**, and then select **Virtual Machine**. The Azure Marketplace shows offers that have reservation pricing.
+1. Navigate to Reservations, select **Add**, and then select **Virtual Machine software reservation**. The Azure Marketplace shows offers that have reservation pricing.
 2. Select the desired Virtual machine software plan that you want to buy.  
     Any virtual machine software reservation that matches the attributes of what you buy gets a discount. The actual number of deployments that get the discount depend on the scope and quantity selected.
 3. Select a subscription. It's used to pay for the plan.  

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

@@ -128,7 +128,7 @@ In the configuration manager, select **Set up prerequisites**, and then complete
     > This is a new user experience in Azure Migrate appliance which is available only if you have set up an appliance using the latest OVA/Installer script downloaded from the portal. The appliances which have already been registered will continue seeing the older version of the user experience and will continue to work without any issues.
 
     1. For the appliance to run auto-update, paste the project key that you copied from the portal. If you don't have the key, go to **Azure Migrate: Discovery and assessment** > **Overview** > **Manage existing appliances**. Select the appliance name you provided when you generated the project key, and then copy the key that's shown.
-	2. The appliance verifies the key and start the auto-update service, which updates all the services on the appliance to their latest versions. When the auto-update has run, you can select **View appliance services** to see the status and versions of the services running on the appliance server.
+	2. The appliance verifies the key and starts the auto-update service, which updates all the services on the appliance to their latest versions. When the auto-update has run, you can select **View appliance services** to see the status and versions of the services running on the appliance server.
     3. To register the appliance, you need to select **Login**. In **Continue with Azure Login**, select **Copy code & Login** to copy the device code (you must have a device code to authenticate with Azure) and open an Azure sign in prompt in a new browser tab. Make sure you've disabled the pop-up blocker in the browser to see the prompt.
 
         :::image type="content" source="./media/tutorial-discover-vmware/device-code.png" alt-text="Screenshot that shows where to copy the device code and sign in.":::
@@ -160,21 +160,31 @@ Now, connect from the appliance to the physical servers to be discovered, and st
    > [!Note]
    > By default, the credentials will be used to gather data about the installed applications, roles, and features, and also to collect dependency data from Windows and Linux servers, unless you disable the slider to not perform these features (as instructed in the last step).
 1. In **Step 2:Provide physical or virtual server details​**, select **Add discovery source** to specify the server **IP address/FQDN** and the friendly name for credentials to connect to the server.
+
+    * The appliance communicates with Windows servers over WinRM port 5986 (HTTPS) by default and with Linux servers over port 22 (TCP). 
+    * If the HTTPS [prerequisites](/troubleshoot/windows-client/system-management-components/configure-winrm-for-https) are not configured on the target Hyper-V servers, appliance communication falls back to WinRM port 5985 (HTTP).
+
+      :::image type="content" source="./media/tutorial-assess-physical/provide-physical-or-virtual-server-details.png" lightbox="./media/tutorial-assess-physical/provide-physical-or-virtual-server-details.png" alt-text="Screenshot shows the physical and virtual server details." :::
+
+    * To enforce https communication without fallback, enable the https protocol toggle in Appliance Config Manager.
+    * After enabling the checkbox, ensure that the prerequisites are configured on the target servers. If certificates aren't configured on the target servers, discovery would fail on the current discovered servers and on newly added servers. 
+        * WinRM HTTPS requires a local computer Server Authentication certificate with a CN matching the hostname to be installed. The certificate mustn't be expired, revoked, or self-signed. Refer to this [article](/troubleshoot/windows-client/system-management-components/configure-winrm-for-https) for configuring WINRM for HTTPS.
+
 1. You can either **Add single item** at a time or **Add multiple items** in one go. There's also an option to provide server details through **Import CSV**.
 
     ![Screenshot of selections for adding discovery source.](./media/tutorial-assess-physical/add-discovery-source-physical.png)
 
     - If you choose **Add single item**, you can choose the OS type, specify friendly name for credentials, add server **IP address/FQDN**, and select **Save**.
     - If you choose **Add multiple items**, you can add multiple records at once by specifying server **IP address/FQDN** with the friendly name for credentials in the text box. Verify** the added records and select **Save**.
     - If you choose **Import CSV** _(selected by default)_, you can download a CSV template file, populate the file with the server **IP address/FQDN** and friendly name for credentials. You then import the file into the appliance, **verify** the records in the file, and select **Save**.
-
-1. On selecting Save, appliance tries validating the connection to the servers added and show the **Validation status** in the table against each server.
-    - If validation fails for a server, review the error by selecting on **Validation failed** in the Status column of the table. Fix the issue, and validate again.
+1. On selecting **Save**, the appliance tries validating the connection to the servers added and shows the **Validation status** in the table against each server.
+    - If validation fails for a server, review the error by selecting on **Validation failed** in the Status column of the table. Fix the issue and validate again.
     - To remove a server, select **Delete**.
-1. You can **revalidate** the connectivity to servers anytime before starting the discovery.
+1. You can **revalidate** the connectivity to servers any time before starting the discovery.
 1. Before initiating discovery, you can choose to disable the slider to not perform software inventory and agentless dependency analysis on the added servers. You can change this option at any time.
 
    :::image type="content" source="./media/tutorial-discover-physical/disable-slider.png" alt-text="Screenshot that shows where to disable the slider.":::
+
 1. To perform discovery of SQL Server instances and databases, you can add additional credentials (Windows domain/non-domain, SQL authentication credentials) and the appliance attempts to automatically map the credentials to the SQL servers. If you add domain credentials, the appliance authenticates the credentials against Active Directory of the domain to prevent any user accounts from locking out. To check validation of the domain credentials, follow these steps:
   - In the configuration manager credentials table, see **Validation status** for domain credentials. Only the domain credentials are validated.
   - If validation fails, you can select a Failed status to see the validation error. Fix the issue, and then select **Revalidate credentials** to reattempt validation of the credentials.

articles/migrate/media/tutorial-assess-physical/provide-physical-or-virtual-server-details.png

@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/network-watcher/quickstart-configure-network-security-group-flow-logs-from-arm-template.md",
+            "redirect_url": "/azure/network-watcher/nsg-flow-logs-template",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/network-watcher/nsg-flow-logs-azure-resource-manager.md",
+            "redirect_url": "/azure/network-watcher/quickstart-configure-network-security-group-flow-logs-from-arm-template",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/network-watcher/network-insights-troubleshooting.md",
             "redirect_url": "/azure/network-watcher/network-insights-overview",