Merge pull request #285257 from dknappettmsft/avd-rdp-reformat

AVD custom RDP properties reformatted and added CLI

Author: Jill Grant

articles/virtual-desktop/TOC.yml

@@ -394,7 +394,8 @@
       href: enroll-per-user-access-pricing.md
     - name: Host pools
       items:
-      - name: Customize RDP properties
+      - name: Set custom RDP properties
+        displayName: customize
         href: customize-rdp-properties.md
       - name: Configure load balancing method
         displayName: load-balancing, lb

articles/virtual-desktop/app-attach-create-msix-image.md

@@ -52,7 +52,7 @@ You should create a new folder for the destination because a CIM disk image is m
    msixmgr.exe -Unpack -packagePath "C:\msix\myapp.msix" -destination "C:\msix\myapp\myapp.cim" -applyACLs -create -fileType cim -rootDirectory apps
    ```
 
-   The output should be as follows:
+   The output should be similar to the following example:
 
    ```Output
    Successfully created the CIM file: C:\msix\myapp\myapp.cim
@@ -72,7 +72,7 @@ Here's an example command to create a VHDX disk image from an MSIX image. A sing
    msixmgr.exe -Unpack -packagePath "C:\msix\myapp.msix" -destination "C:\msix\myapp.vhdx" -applyACLs -create -fileType vhdx -rootDirectory apps
    ```
 
-   The output should be as follows:
+   The output should be similar to the following example:
 
    ```Output
    Successfully created virtual disk

articles/virtual-desktop/app-attach-setup.md

@@ -164,10 +164,7 @@ Here's how to add an MSIX or Appx image as an app attach package using the Azure
 
 # [Azure PowerShell](#tab/powershell)
 
-Here's how to add an MSIX or Appx image as an app attach package using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization/) PowerShell module.
-
-> [!IMPORTANT]
-> In the following examples, you'll need to change the `<placeholder>` values for your own.
+Here's how to add an MSIX or Appx image as an app attach package using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization/) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
@@ -254,7 +251,7 @@ Here's how to add an MSIX or Appx image as an app attach package using the [Az.D
    Get-AzWvdAppAttachPackage @parameters | FL Name, ImagePackageApplication, ImagePackageFamilyName, ImagePath, ImageVersion, ImageIsActive, ImageIsRegularRegistration, SystemDataCreatedAt
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    Name                       : My App
@@ -698,10 +695,7 @@ Here's how to add an MSIX image using the Azure portal:
 
 # [Azure PowerShell](#tab/powershell)
 
-Here's how to add an MSIX package using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization/) PowerShell module.
-
-> [!IMPORTANT]
-> In the following examples, you'll need to change the `<placeholder>` values for your own.
+Here's how to add an MSIX package using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization/) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
@@ -718,7 +712,7 @@ Here's how to add an MSIX package using the [Az.DesktopVirtualization](/powershe
    $app = Expand-AzWvdMsixImage @parameters
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    Name
@@ -776,7 +770,7 @@ Here's how to add an MSIX package using the [Az.DesktopVirtualization](/powershe
    Get-AzWvdMsixPackage @parameters | ? PackageFamilyName -eq $app.PackageFamilyName | FL *
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    DisplayName                  : My App
@@ -836,7 +830,7 @@ Here's how to change a package's registration type and state using the [Az.Deskt
    Get-AzWvdMsixPackage @parameters | Select-Object DisplayName, ImagePath, Name, Version, IsRegularRegistration, IsActive
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    DisplayName ImagePath                        Name                                      Version IsRegularRegistration IsActive
@@ -1011,7 +1005,7 @@ Here's how to remove applications using the [Az.DesktopVirtualization](/powershe
    Get-AzWvdMsixPackage @parameters | Select-Object DisplayName, ImagePath, PackageFamilyName, Version
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    DisplayName ImagePath                        Name                                      Version

articles/virtual-desktop/autoscale-create-assign-scaling-plan.md

@@ -198,10 +198,7 @@ Now that you've assigned the *Desktop Virtualization Power On Off Contributor* r
 
 ### [PowerShell](#tab/powershell)
 
-Here's how to create a scaling plan using the Az.DesktopVirtualization PowerShell module. The following examples show you how to create a scaling plan and scaling plan schedule.
-
-> [!IMPORTANT]
-> In the following examples, you'll need to change the `<placeholder>` values for your own.
+Here's how to create a scaling plan using the Az.DesktopVirtualization PowerShell module. The following examples show you how to create a scaling plan and scaling plan schedule. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 

articles/virtual-desktop/configure-host-pool-load-balancing.md

@@ -50,11 +50,12 @@ To configure load balancing for a pooled host pool, you need:
 
 - An Azure account assigned the [Desktop Virtualization Host Pool Contributor](rbac.md#desktop-virtualization-host-pool-contributor) role.
 
-- If you want to use Azure PowerShell locally, see [Use Azure CLI and Azure PowerShell with Azure Virtual Desktop](cli-powershell.md) to make sure you have the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module installed. Alternatively, use the [Azure Cloud Shell](../cloud-shell/overview.md).
-
+- If you want to use Azure CLI or Azure PowerShell locally, see [Use Azure CLI and Azure PowerShell with Azure Virtual Desktop](cli-powershell.md) to make sure you have the [desktopvirtualization](/cli/azure/desktopvirtualization) Azure CLI extension or the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module installed. Alternatively, use the [Azure Cloud Shell](../cloud-shell/overview.md).
 
 ## Configure load balancing
 
+Select the relevant tab for your scenario.
+
 ### [Azure portal](#tab/portal) 
 
 Here's how to configure load balancing with the Azure portal:
@@ -73,7 +74,7 @@ Here's how to configure load balancing with the Azure portal:
 
 ### [Azure PowerShell](#tab/powershell)
 
-Here's how to configure load balancing with Azure PowerShell:
+Here's how to configure load balancing with Azure PowerShell. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
@@ -115,7 +116,7 @@ Here's how to configure load balancing with Azure PowerShell:
    Get-AzWvdHostPool @parameters | Format-Table Name, LoadBalancerType, MaxSessionLimit
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    Name        LoadBalancerType MaxSessionLimit
@@ -160,7 +161,7 @@ Here's how to configure load balancing with Azure CLI:
        --output table
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    Name         LoadBalancerType    MaxSessionLimit

articles/virtual-desktop/configure-host-pool-personal-desktop-assignment-type.md

@@ -49,30 +49,30 @@ To configure automatic assignment in the Azure portal:
 
 1. Select **Save**.
 
-#### [PowerShell](#tab/powershell)
+#### [Azure PowerShell](#tab/powershell)
 
-Here's how to configure a host pool to automatically assign users to VMs using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module.
+Here's how to configure a host pool to automatically assign users to VMs using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
-2. Run the `Update-AzWvdHostPool` command in the following example to configure a host pool to automatically assign users to VMs. For more information about the parameters,see the [az-desktopvirtualization-hostpool Azure CLI reference](/cli/azure/desktopvirtualization/hostpool).
+2. Run the command in the following example to configure a host pool to automatically assign users to session hosts:
 
    ```powershell
-   Update-AzWvdHostPool -ResourceGroupName $resourceGroupName -Name $hostPoolName -PersonalDesktopAssignmentType Automatic
+   Update-AzWvdHostPool -ResourceGroupName <ResourceGroupName> -Name <HostPoolName> -PersonalDesktopAssignmentType Automatic
    ```
 
 #### [Azure CLI](#tab/cli)
 
-Here's how to configure a host pool to automatically assign users to VMs using the [az-desktopvirtualization-hostpool-update](/cli/azure/desktopvirtualization/hostpool#az-desktopvirtualization-hostpool-update) command.
+Here's how to configure a host pool to automatically assign users to VMs using the [desktopvirtualization](/cli/azure/desktopvirtualization) command. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-cli](includes/include-cloud-shell-local-cli.md)]
 
-2. Run the command in the following example to configure a host pool to automatically assign users to VMs. For more information about the parameters, see the [az-desktopvirtualization-hostpool Azure CLI reference](/cli/azure/desktopvirtualization/hostpool).
+2. Run the command in the following example to configure a host pool to automatically assign users to session hosts:
 
    ```azurecli
    az desktopvirtualization hostpool update \
-       --resource-group $resourceGroupName \
-       --name $hostPoolName \
+       --resource-group <ResourceGroupName> \
+       --name <HostPoolName> \
        --personal-desktop-assignment-type Automatic
    ```
 
@@ -96,38 +96,38 @@ To configure direct assignment in the Azure portal:
 
 1. Select **Save**.
 
-#### [PowerShell](#tab/powershell)
+#### [Azure PowerShell](#tab/powershell)
 
-Here's how to configure a host pool to require direct assignment of users to session hosts using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module.
+Here's how to configure a host pool to require direct assignment of users to session hosts using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
-2. Run the `Update-AzWvdHostPool` command in the following example to configure a host pool to require direct assignment. For more information about the parameters, see the [Update-AzWvdHostPool](/powershell/module/az.desktopvirtualization/update-azwvdhostpool) reference.
+2. Run the command in the following example to configure a host pool to require direct assignment:
 
    ```powershell
-   Update-AzWvdHostPool -ResourceGroupName $resourceGroupName -Name $hostPoolName -PersonalDesktopAssignmentType Direct
+   Update-AzWvdHostPool -ResourceGroupName <ResourceGroupName> -Name <HostPoolName> -PersonalDesktopAssignmentType Direct
    ```
 
 #### [Azure CLI](#tab/cli)
 
-Here's how to configure a host pool to automatically assign users to VMs using the [az-desktopvirtualization-hostpool-update](/cli/azure/desktopvirtualization/hostpool#az-desktopvirtualization-hostpool-update) command.
+Here's how to configure a host pool to automatically assign users to VMs using the [desktopvirtualization](/cli/azure/desktopvirtualization) command.  Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-cli](includes/include-cloud-shell-local-cli.md)]
 
-2. Run the command in the following example to configure a host pool to automatically assign users to VMs. For more information about the parameters, see the [az-desktopvirtualization-hostpool Azure CLI reference](/cli/azure/desktopvirtualization/hostpool).
+2. Run the command in the following example to configure a host pool to automatically assign users to session hosts:
 
    ```azurecli
    az desktopvirtualization hostpool update \
-       --resource-group $resourceGroupName \
-       --name $hostPoolName \
+       --resource-group <ResourceGroupName> \
+       --name <HostPoolName> \
        --personal-desktop-assignment-type Direct
    ```
 
 ---
 
 ### Directly assign users to session hosts
 
-Here's how to directly assign users to session hosts using the Azure portal or PowerShell. You can't assign users to session hosts using Azure CLI.
+Here's how to directly assign users to session hosts using the Azure portal or Azure PowerShell. You can't assign users to session hosts using Azure CLI.
 
 #### [Azure portal](#tab/azure2)
 
@@ -157,24 +157,23 @@ To directly assign a user to a session host in the Azure portal:
 
 1. When you're done, select **Select**.
 
-#### [PowerShell](#tab/powershell2)
+#### [Azure PowerShell](#tab/powershell2)
 
-Here's how to configure a host pool to assign a user to a specific session host using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module.
+Here's how to configure a host pool to assign a user to a specific session host using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
 2. Run the `Update-AzWvdHostPool` command in the following example to assign a user to a session host. For more information about the parameters, see the [Update-AzWvdHostPool](/powershell/module/az.desktopvirtualization/update-azwvdhostpool) reference.
 
    ```powershell
-   Update-AzWvdSessionHost -HostPoolName $hostPoolName -Name $sessionHostName -ResourceGroupName $resourceGroupName -AssignedUser $userupn
+   Update-AzWvdSessionHost -HostPoolName <HostPoolName> -Name <SessionHostName> -ResourceGroupName <ResourceGroupName> -AssignedUser <UserUPN>
    ```
 
-
 ---
 
 ## Unassign a personal desktop
 
-Here's how to unassign a personal desktop using the Azure portal or PowerShell. You can't unassign a personal desktop using Azure CLI. 
+Here's how to unassign a personal desktop using the Azure portal or Azure PowerShell. You can't unassign a personal desktop using Azure CLI. 
 
 #### [Azure portal](#tab/azure2)
 
@@ -202,9 +201,9 @@ To unassign a personal desktop in the Azure portal:
 
 1. Select **Unassign** when prompted with the warning.
 
-#### [PowerShell](#tab/powershell2)
+#### [Azure PowerShell](#tab/powershell2)
 
-Here's how to configure a host pool to unassign a personal desktop using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module.
+Here's how to configure a host pool to unassign a personal desktop. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
@@ -222,12 +221,11 @@ Here's how to configure a host pool to unassign a personal desktop using the [Az
    Invoke-AzRestMethod @unassignDesktopParams
    ```
 
-
 ---
 
 ## Reassign a personal desktop
 
-Here's how to reassign a personal desktop using the Azure portal or PowerShell. You can't reassign a personal desktop using Azure CLI. 
+Here's how to reassign a personal desktop using the Azure portal or Azure PowerShell. You can't reassign a personal desktop using Azure CLI. 
 
 #### [Azure portal](#tab/azure2)
 
@@ -256,9 +254,9 @@ To reassign a personal desktop in the Azure portal:
 
 1. When you're done, select **Select**.
 
-#### [PowerShell](#tab/powershell2)
+#### [Azure PowerShell](#tab/powershell2)
 
-Here's how to reassign a personal desktop using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module.
+Here's how to reassign a personal desktop using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 [!INCLUDE [include-cloud-shell-local-powershell](includes/include-cloud-shell-local-powershell.md)]
 
@@ -291,7 +289,6 @@ You can give personal desktops you create *friendly names* to help users disting
 
 [!INCLUDE [include-session-hosts-friendly-name](includes/include-session-hosts-friendly-name.md)]
 
-
 ## Next steps
 
 Now that you've configured the personal desktop assignment type and given your session host a friendly name, you can sign in to an Azure Virtual Desktop client to test it as part of a user session. These articles will show you how to connect to a session using the client of your choice:
@@ -300,4 +297,4 @@ Now that you've configured the personal desktop assignment type and given your s
 - [Connect with the web client](./users/connect-web.md)
 - [Connect with the Android client](./users/connect-android-chrome-os.md)
 - [Connect with the iOS client](./users/connect-ios-ipados.md)
-- [Connect with the macOS client](./users/connect-macos.md)
+- [Connect with the macOS client](./users/connect-macos.md)

articles/virtual-desktop/configure-rdp-shortpath.md

@@ -153,7 +153,7 @@ For session hosts, UDP is enabled by default in Windows. To check the RDP transp
    }
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    The RDP transport protocols setting hasn't been changed from its default value.
@@ -199,7 +199,7 @@ Here's how to configure RDP Shortpath in the host pool networking settings using
 
 # [Azure PowerShell](#tab/powershell)
 
-Here's how to configure RDP Shortpath in the host pool networking settings using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module. In the following examples, you need to change the `<placeholder>` values for your own.
+Here's how to configure RDP Shortpath in the host pool networking settings using the [Az.DesktopVirtualization](/powershell/module/az.desktopvirtualization) PowerShell module. Be sure to change the `<placeholder>` values for your own.
 
 > [!TIP]
 > Be sure to use version 5.2.1 preview of the Az.DesktopVirtualization module.
@@ -217,7 +217,7 @@ Here's how to configure RDP Shortpath in the host pool networking settings using
    Get-AzWvdHostPool @parameters | FL ManagedPrivateUdp, DirectUdp, PublicUdp, RelayUdp
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    ManagedPrivateUdp : Default
@@ -310,7 +310,7 @@ Here's how to configure RDP Shortpath in the host pool networking settings using
    }
    ```
 
-   The output should be similar to the following output:
+   The output should be similar to the following example:
 
    ```output
    The default setting hasn't been changed from its default value. UDP is enabled.