Merge pull request #278512 from mimckitt/bug-updates

updates

Author: prmerger-automator[bot]

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-change-upgrade-policy.md

@@ -23,7 +23,7 @@ The upgrade policy for a Virtual Machine Scale Set can be changed at any point i
 Select the Virtual Machine Scale Set you want to change the upgrade policy for. In the menu under **Settings**, select **Upgrade Policy** and from the drop-down menu, select the upgrade policy you want to enable. 
 
 > [!NOTE]
-> Setting or changing the upgrade policy to automatic in the Azure Portal on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set or change the upgrade policy to automatic, use CLI, PowerShell, ARM Template, or any other SDK. 
+> Setting or changing the upgrade policy to automatic using the Azure Portal on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To change the upgrade policy to automatic, use CLI, PowerShell, ARM Template, or any other SDK. 
 
 If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for more configuration options and suggestions.
 

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-configure-rolling-upgrades.md

@@ -20,8 +20,6 @@ ms.custom: upgradepolicy, devx-track-azurepowershell
 >
 > Previews are made available to you on the condition that you agree to the [supplemental terms of use](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). Some aspects of these features may change prior to general availability (GA). 
 
-
-
 Rolling upgrade policy is the safest way to apply updates to instances in a Virtual Machine Scale Set. Performing updates in batches ensures that your scale set maintains a set number of instances available to take traffic, meaning you don't need to take down your entire workload to make a change. 
 
 Rolling upgrade policy is best suited for production workloads.
@@ -79,12 +77,14 @@ Update an existing Virtual Machine Scale Set using [az vmss update](/cli/azure/v
 az vmss update \
 	--name myScaleSet \
 	--resource-group myResourceGroup \
+  --set upgradePolicy.mode=Rolling \
 	--max-batch-instance-percent 10 \
 	--max-unhealthy-instance-percent 20 \
 	--max-unhealthy-upgraded-instance-percent 20 \
 	--prioritize-unhealthy-instances true \
 	--pause-time-between-batches PT2S \
 	--max-surge true 
+
 ```
 
 ### [PowerShell](#tab/powershell1)

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-set-upgrade-policy.md

@@ -23,13 +23,17 @@ The upgrade policy can be set during scale set creation or changed post deployme
 During the Virtual Machine Scale Set creation in the Azure portal, under the **Management** tab, set the upgrade policy to **Rolling**, **Automatic**, or **Manual**. 
 
 > [!NOTE]
-> Setting or changing the upgrade policy to automatic in the Azure Portal on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set or change the upgrade policy to automatic, use CLI, PowerShell, ARM Template, or any other SDK. 
+> Setting the upgrade policy to automatic during scale set creation using the Azure Portal, Azure CLI or Azure PowerShell on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set the upgrade policy to automatic, update the upgrade policy after scale set deployment. See [changing the upgrade policy on a Virtual Machine Scale Set](virtual-machine-scale-sets-change-upgrade-policy.md). 
 
 If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
 
 :::image type="content" source="../virtual-machine-scale-sets/media/upgrade-policy/pick-upgrade-policy.png" alt-text="Screenshot showing deploying a scale set and enabling MaxSurge.":::
 
 ### [CLI](#tab/cli)
+
+> [!NOTE]
+> Setting the upgrade policy to automatic during scale set creation using the Azure Portal, Azure CLI or Azure PowerShell on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set the upgrade policy to automatic, update the upgrade policy after scale set deployment. See [changing the upgrade policy on a Virtual Machine Scale Set](virtual-machine-scale-sets-change-upgrade-policy.md). 
+
 When creating a new scale set using Azure CLI, use [az vmss create](/cli/azure/vmss#az-vmss-create) and the `-upgrade-policy-mode` to set the upgrade policy mode.  
 
 If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
@@ -41,13 +45,17 @@ az vmss create \
     --orchestration-mode Flexible \
     --image Ubuntu2204 \
     --lb myLoadBalancer \
-    --upgrade-policy-mode automatic \
+    --upgrade-policy-mode manual \
     --instance-count 5 \
     --admin-username azureuser \
     --generate-ssh-keys
 ```
 
 ### [PowerShell](#tab/powershell)
+
+> [!NOTE]
+> Setting the upgrade policy to automatic during scale set creation using the Azure Portal, CLI or PowerShell on Virtual Machine Scale Sets with Flexible Orchestration is not yet available. To set the upgrade policy to automatic, update the upgrade policy after scale set deployment. See [changing the upgrade policy on a Virtual Machine Scale Set](virtual-machine-scale-sets-change-upgrade-policy.md). 
+
 When creating a new scale set using Azure PowerShell, use [New-AzVmss](/powershell/module/az.compute/new-azvmss) and the `-UpgradePolicyMode` parameter to set the upgrade policy mode.
 
 If using a rolling upgrade policy, see [configure rolling upgrade policy](virtual-machine-scale-sets-configure-rolling-upgrades.md) for configuration settings and suggestions.
@@ -73,7 +81,7 @@ If using a rolling upgrade policy, see [configure rolling upgrade policy](virtua
 ```ARM
 "properties": {
         "upgradePolicy": {
-            "mode": "Automatic",
+            "mode": "manual",
         }
     }
 ```