Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into dns-tb

Author: asudbring

articles/active-directory/manage-apps/toc.yml

@@ -142,7 +142,7 @@
         href: datawiza-with-azure-ad.md 
       - name: F5
         items:
-        - name: F5 and Azure AD integration
+        - name: F5 BIG-IP and Azure AD integration
           href: f5-aad-integration.md
         - name: F5 BIG-IP VE deployment in Azure IaaS
           href: f5-bigip-deployment-guide.md

articles/azure-netapp-files/solutions-windows-virtual-desktop.md

@@ -24,7 +24,7 @@ Azure NetApp Files is a highly performant file storage service from Azure. It ca
 
 ## Sample blueprints
 
-The following sample blueprints show the integration of Azure Virtual Desktop with Azure NetApp Files. In a pooled desktop scenario, users are directed to the best available session (the [breadth-first mode](../virtual-desktop/host-pool-load-balancing.md#breadth-first-load-balancing-method)) host in the pool, using [multi-session virtual machines](../virtual-desktop/windows-10-multisession-faq.yml#what-is-windows-10-enterprise-multi-session). On the other hand, personal desktops are reserved for scenarios in which each user has their own virtual machine.
+The following sample blueprints show the integration of Azure Virtual Desktop with Azure NetApp Files. In a pooled desktop scenario, users are directed to the best available session (the [breadth-first mode](../virtual-desktop/host-pool-load-balancing.md#breadth-first-load-balancing-algorithm)) host in the pool, using [multi-session virtual machines](../virtual-desktop/windows-10-multisession-faq.yml#what-is-windows-10-enterprise-multi-session). On the other hand, personal desktops are reserved for scenarios in which each user has their own virtual machine.
 
 ### Pooled desktop scenario
 

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

@@ -1,40 +1,40 @@
 ---
 title: Azure Virtual Desktop host pool load-balancing - Azure
-description: Learn about host pool load-balancing methods for a Azure Virtual Desktop environment.
+description: Learn about host pool load-balancing algorithms for a Azure Virtual Desktop environment.
 author: Heidilohr
 ms.topic: conceptual
 ms.date: 10/12/2020
 ms.author: helohr
 manager: femila
 ---
-# Host pool load-balancing methods
+# Host pool load-balancing algorithms
 
 >[!IMPORTANT]
 >This content applies to Azure Virtual Desktop with Azure Resource Manager Azure Virtual Desktop objects. If you're using Azure Virtual Desktop (classic) without Azure Resource Manager objects, see [this article](./virtual-desktop-fall-2019/host-pool-load-balancing-2019.md).
 
-Azure Virtual Desktop supports two load-balancing methods. Each method determines which session host will host a user's session when they connect to a resource in a host pool.
+Azure Virtual Desktop supports two load-balancing algorithms. Each algorithm determines which session host will host a user's session when they connect to a resource in a host pool.
 
-The following load-balancing methods are available in Azure Virtual Desktop:
+The following load-balancing algorithms are available in Azure Virtual Desktop:
 
 - Breadth-first load balancing allows you to evenly distribute user sessions across the session hosts in a host pool.
 - Depth-first load balancing allows you to saturate a session host with user sessions in a host pool. Once the first session host reaches its session limit threshold, the load balancer directs any new user connections to the next session host in the host pool until it reaches its limit, and so on.
 
-Each host pool can only configure one type of load-balancing specific to it. However, both load-balancing methods share the following behaviors no matter which host pool they're in:
+Each host pool can only configure one type of load-balancing specific to it. However, both load-balancing algorithms share the following behaviors no matter which host pool they're in:
 
-- If a user already has a session in the host pool and is reconnecting to that session, the load balancer will successfully redirect them to the session host with their existing session. This behavior applies even if that session host's AllowNewConnections property is set to False.
+- If a user already has an active or disconnected session in the host pool and signs in again, the load balancer will successfully redirect them to the session host with their existing session. This behavior applies even if that session host's AllowNewConnections property is set to False (drain mode is enabled).
 - If a user doesn't already have a session in the host pool, then the load balancer won't consider session hosts whose AllowNewConnections property is set to False during load balancing.
 
-## Breadth-first load-balancing method
+## Breadth-first load-balancing algorithm
 
-The breadth-first load-balancing method allows you to distribute user connections to optimize for this scenario. This method is ideal for organizations that want to provide the best experience for users connecting to their pooled virtual desktop environment.
+The breadth-first load-balancing algorithm allows you to distribute user sessions across session hosts to optimize for session performance. This algorithm is ideal for organizations that want to provide the best experience for users connecting to their pooled virtual desktop environment.
 
-The breadth-first method first queries session hosts that allow new connections. The method then selects a session host randomly from half the set of session hosts with the least number of sessions. For example, if there are nine machines with 11, 12, 13, 14, 15, 16, 17, 18, and 19 sessions, a new session you create won't automatically go to the first machine. Instead, it can go to any of the first five machines with the lowest number of sessions (11, 12, 13, 14, 15).
+The breadth-first algorithm first queries session hosts that allow new connections. The algorithm then selects a session host randomly from half the set of session hosts with the least number of sessions. For example, if there are nine machines with 11, 12, 13, 14, 15, 16, 17, 18, and 19 sessions, a new session you create won't automatically go to the first machine. Instead, it can go to any of the first five machines with the lowest number of sessions (11, 12, 13, 14, 15).
 
-## Depth-first load-balancing method
+## Depth-first load-balancing algorithm
 
-The depth-first load-balancing method allows you to saturate one session host at a time to optimize for this scenario. This method is ideal for cost-conscious organizations that want more granular control on the number of virtual machines they've allocated for a host pool.
+The depth-first load-balancing algorithm allows you to saturate one session host at a time to optimize for scale down scenarios. This algorithm is ideal for cost-conscious organizations that want more granular control on the number of virtual machines they've allocated for a host pool.
 
-The depth-first method first queries session hosts that allow new connections and haven't gone over their maximum session limit. The method then selects the session host with highest number of sessions. If there's a tie, the method selects the first session host in the query.
+The depth-first algorithm first queries session hosts that allow new connections and haven't gone over their maximum session limit. The algorithm then selects the session host with highest number of sessions. If there's a tie, the algorithm selects the first session host in the query.
 
 >[!IMPORTANT]
 >The depth-first load balancing algorithm distributes sessions to session hosts based on the maximum session host limit. This parameter is required when you use the depth-first load balancing algorithm. For the best possible user experience, make sure to change the maximum session host limit parameter to a number that best suits your environment.

articles/virtual-desktop/start-virtual-machine-connect.md

@@ -32,20 +32,25 @@ The following Remote Desktop clients support the Start VM on Connect feature:
 
 Before you can configure the Start VM on Connect feature, you'll need to assign your VM a custom RBAC (role-based access control) role. This role will let Azure Virtual Desktop manage the VMs in your subscription. You can also use this role to turn on VMs, check their status, and report diagnostic info. If you want to know more about what each role does, take a look at [Azure custom roles](../role-based-access-control/custom-roles.md).
 
+>[!NOTE]
+>If your VMs and host pool are in different subscriptions, the RBAC role needs to be assigned to the subscription that the VMs are in.
+
 ### Use the Azure portal
 
 To use the Azure portal to assign a custom role for Start VM on Connect:
 
 1. Open the Azure portal and go to **Subscriptions**.
 
-2. Go to **Access control (IAM)** and select **Add a custom role**.
+2. Select the subscription that your VMs are in.
+ 
+3. Go to **Access control (IAM)** and select **Add a custom role**.
 
     > [!div class="mx-imgBorder"]
     > ![A screenshot of a drop-down menu from the Add button in Access control (IAM). "Add a custom role" is highlighted in red.](media/add-custom-role.png)
 
-3. Next, name the custom role and add a description. We recommend you name it “start VM on connect.”
+4. Next, name the custom role and add a description. We recommend you name it “start VM on connect.”
 
-4. On the **Permissions** tab, add one of the two following sets of permissions to the subscription you're assigning the role to: 
+5. On the **Permissions** tab, add one of the two following sets of permissions to the subscription you're assigning the role to: 
 
    - Microsoft.Compute/virtualMachines/start/action
    - Microsoft.Compute/virtualMachines/read 
@@ -56,7 +61,7 @@ To use the Azure portal to assign a custom role for Start VM on Connect:
    - Microsoft.Compute/virtualMachines/start/action
    - Microsoft.Compute/virtualMachines/*/read 
 
-5. When you're finished, select **Ok**.
+6. When you're finished, select **Ok**.
 
 After that, you'll need to assign the role to grant access to Azure Virtual Desktop.
 

articles/virtual-machines/linux/oracle-create-upload-vhd.md

@@ -293,10 +293,10 @@ Preparing an Oracle Linux 7 virtual machine for Azure is very similar to Oracle
 
 15. Run the following commands to deprovision the virtual machine and prepare it for provisioning on Azure:
 
+    **Note:** if you are migrating a specific virtual machine and do not wish to create a generalized image,skip the deprovision step
+    
 	```console
-	# Note: if you are migrating a specific virtual machine and do not wish to create a generalized image,
-    # skip the deprovision step
-    # sudo rm -rf /var/lib/waagent/
+    # sudo cloud-init clean
     # sudo rm -f /var/log/waagent.log
 
     # waagent -force -deprovision+user