Merge pull request #115428 from spelluru/labpeervnet0516

Peer VNet & Cleanup

Author: denrea

articles/lab-services/classroom-labs/TOC.yml

@@ -28,6 +28,24 @@
     items:  
     - name: Use labs for conducting classes
       href: classroom-labs-scenarios.md
+    - name: Classroom labs - class types
+      items:
+      - name: Class types overview
+        href: class-types.md
+      - name: Deep learning in natural language processing
+        href: class-type-deep-learning-natural-language-processing.md
+      - name: Shell scripting on Linux
+        href: class-type-shell-scripting-linux.md
+      - name: Ethical hacking
+        href: class-type-ethical-hacking.md
+      - name: Database management
+        href: class-type-database-management.md
+      - name: Python and Jupyter Notebooks
+        href: class-type-jupyter-notebook.md
+      - name: Mobile app development with Android Studio
+        href: class-type-mobile-dev-android-studio.md
+      - name: Big data analytics
+        href: class-type-big-data-analytics.md
 - name: How-to guides
   items:
   - name: Administrator guide
@@ -36,29 +54,13 @@
     href: account-setup-guide.md
   - name: Accelerated lab set up guide
     href: setup-guide.md
-  - name: Classroom labs - class types
-    items:
-    - name: Class types overview
-      href: class-types.md
-    - name: Deep learning in natural language processing
-      href: class-type-deep-learning-natural-language-processing.md
-    - name: Shell scripting on Linux
-      href: class-type-shell-scripting-linux.md
-    - name: Ethical hacking
-      href: class-type-ethical-hacking.md
-    - name: Database management
-      href: class-type-database-management.md
-    - name: Python and Jupyter Notebooks
-      href: class-type-jupyter-notebook.md
-    - name: Mobile app development with Android Studio
-      href: class-type-mobile-dev-android-studio.md
-    - name: Big data analytics
-      href: class-type-big-data-analytics.md
   - name: Create and configure lab accounts (lab account owner)
     items:
     - name: Create and manage lab accounts
       href: how-to-manage-lab-accounts.md
-    - name: Configure lab accounts
+    - name: Manage labs in a lab account
+      href: manage-labs.md
+    - name: Configure automatic shutdown of VMs
       href: how-to-configure-lab-accounts.md
     - name: Add a lab creator
       href: add-lab-creator.md
@@ -76,7 +78,7 @@
       href: specify-marketplace-images.md
     - name: Specify support information (lab account owner)
       href: lab-account-owner-support-information.md
-  - name: Create and configure classroom labs (instructor)
+  - name: Create and configure classroom labs (educator)
     items:        
     - name: Create and manage classroom labs
       href: how-to-manage-classroom-labs.md
@@ -108,9 +110,9 @@
       href: how-to-prepare-windows-template.md
     - name: Control Windows shutdown behavior
       href: how-to-windows-shutdown.md
-    - name: View support information (instructor)
+    - name: View support information (educator)
       href: lab-creator-support-information.md
-    - name: Access student VMs from instructor view
+    - name: Access student VMs from educator view
       href: instructor-access-virtual-machines.md      
   - name: Connect to VMs in classroom labs (student)
     items:        

articles/lab-services/classroom-labs/class-type-deep-learning-natural-language-processing.md

@@ -12,7 +12,7 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 09/30/2019
+ms.date: 05/15/2020
 ms.author: spelluru
 
 ---
@@ -36,7 +36,7 @@ Follow [this tutorial](tutorial-setup-classroom-lab.md) to create a new lab and
 | ------------ | ------------------ |
 | Virtual machine (VM) size | Small GPU (Compute). This size is best suited for compute-intensive and network-intensive applications like Artificial Intelligence and Deep Learning. |
 | VM image | [Data Science Virtual Machine for Linux (Ubuntu)](https://azuremarketplace.microsoft.com/marketplace/apps/microsoft-dsvm.ubuntu-1804). This image provides deep learning frameworks and tools for machine learning and data science. To view the full list of installed tools on this image, see the following article: [What’s included on the DSVM?](../../machine-learning/data-science-virtual-machine/overview.md#whats-included-on-the-dsvm). |
-| Enable remote desktop connection | <p>Enabling this setting will allow teachers and students to connect to their Virtual Machines (VM) using Remote Desktop (RDP).</p><p>**Important**: Enabling this setting only opens the **RDP** port on Linux machines. If RDP is already installed and configured on the virtual machine image, you/students can connect to VMs via RDP without following any additional steps. <p>If the VM image doesn't have RDP installed and configured, you need to connect to the Linux machine using SSH for the first time, and install RDP and GUI packages so that you/students can connect to the Linux machine using RDP later. For more information, see [Install and configure Remote Desktop to connect to a Linux VM in Azure](../../virtual-machines/linux/use-remote-desktop.md). Then, you publish the image so that students can RDP in to the student Linux VMs.  |
+| Enable remote desktop connection | <p>Enabling this setting will allow educators and students to connect to their Virtual Machines (VM) using Remote Desktop (RDP).</p><p>**Important**: Enabling this setting only opens the **RDP** port on Linux machines. If RDP is already installed and configured on the virtual machine image, you/students can connect to VMs via RDP without following any additional steps. <p>If the VM image doesn't have RDP installed and configured, you need to connect to the Linux machine using SSH for the first time, and install RDP and GUI packages so that you/students can connect to the Linux machine using RDP later. For more information, see [Install and configure Remote Desktop to connect to a Linux VM in Azure](../../virtual-machines/linux/use-remote-desktop.md). Then, you publish the image so that students can RDP in to the student Linux VMs.  |
 
 The Data Science Virtual Machine for Linux image provides the necessary deep learning frameworks and tools required for this type of class. As a result, after the template machine creation, you don't need to customize it further. It can be published for students to use. Select the **Publish** button on template page to publish the template to the lab.  
 

articles/lab-services/classroom-labs/class-type-shell-scripting-linux.md

@@ -37,7 +37,7 @@ Follow [this tutorial](tutorial-setup-classroom-lab.md) to create a new lab and
 | ------------ | ------------------ |
 | Virtual machine (VM) size | Small  |
 | VM image | Ubuntu Server 18.04 LTS |
-| Enable remote desktop connection | Enable. <p>Enabling this setting will allow teachers and students to connect to their VMs using the remote desktop (RDP). For more information, see [Enable remote desktop for Linux virtual machines in a lab in Azure Lab Services](how-to-enable-remote-desktop-linux.md#connect-to-the-template-vm). </p>|
+| Enable remote desktop connection | Enable. <p>Enabling this setting will allow educators and students to connect to their VMs using the remote desktop (RDP). For more information, see [Enable remote desktop for Linux virtual machines in a lab in Azure Lab Services](how-to-enable-remote-desktop-linux.md#connect-to-the-template-vm). </p>|
 
 
 ## Install desktop and xrdp

articles/lab-services/classroom-labs/classroom-labs-concepts.md

@@ -12,7 +12,7 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 05/08/2020
+ms.date: 05/15/2020
 ms.author: spelluru
 
 ---
@@ -23,13 +23,13 @@ The following list contains key Lab Services concepts and definitions:
 
 ## Quota
 
-Quota is the time limit (in hours) that a teacher can set for a student to use a lab VM. It can be set to 0, or a specific number of hours. If the quota is set to 0, a student can only use the virtual machine when a schedule is running or when a teacher manually turns on the virtual machine for the student.  
+Quota is the time limit (in hours) that an educator can set for a student to use a lab VM. It can be set to 0, or a specific number of hours. If the quota is set to 0, a student can only use the virtual machine when a schedule is running or when an educator manually turns on the virtual machine for the student.  
 
-Quota hours are counted when the student starts the lab VM themselves.  If a teacher manually starts the lab VM for a student, quota hours aren't used for that student.
+Quota hours are counted when the student starts the lab VM themselves.  If an educator manually starts the lab VM for a student, quota hours aren't used for that student.
 
 ## Schedules
 
-Schedules are the time slots that a teacher can create for the class so the student VMs are available for class time.  Schedules can be one-time or recurring.  Quota hours aren't used when a schedule is running.
+Schedules are the time slots that an educator can create for the class so the student VMs are available for class time.  Schedules can be one-time or recurring.  Quota hours aren't used when a schedule is running.
 
 There are three types of schedules: Standard, Start only and Stop only.
 
@@ -53,7 +53,7 @@ Typically, an IT administrator of organization's cloud resources, who owns the A
 - Manages and configures policies across all labs.
 - Gives permissions to people in the organization to create a lab under the lab account.
 
-### Professor
+### Educator
 
 Typically, users such as a teacher or an online trainer creates classroom labs under a lab account. An educator does the following tasks:
 

articles/lab-services/classroom-labs/classroom-labs-faq.md

@@ -25,8 +25,8 @@ Get answers to some of the most common questions about classroom labs in Azure L
 ### Is the quota per user or per week or per entire duration of the lab? 
 The quota you set for a lab is for each student for entire duration of the lab. And, the [scheduled running time of VMs](how-to-create-schedules.md) doesn't count against the quota allotted to a user. The quota is for the time outside of schedule hours that a student spends on VMs.  For more information on quotas, see [Set quotas for users](how-to-configure-student-usage.md#set-quotas-for-users).
 
-### If professor turns on a student VM, does that affect the student quota? 
-No. It doesn't. When professor turns on the student VM, it doesn't affect the quota allotted to the student. 
+### If educator turns on a student VM, does that affect the student quota? 
+No. It doesn't. When educator turns on the student VM, it doesn't affect the quota allotted to the student. 
 
 ## Schedules
 

articles/lab-services/classroom-labs/classroom-labs-scenarios.md

@@ -17,7 +17,7 @@ ms.author: spelluru
 
 ---
 # Use Classroom Labs for trainings
-Azure Labs Services allows professors, trainers, or teaching assistants to quickly and easily create an online lab to provision pre-configured learning environments for the trainees. Each trainee would be able use identical and isolated environments for the training. Policies can be applied to ensure that the training environments are available to each trainee only when they need them and contain enough resources - such as virtual machines - required for the training. 
+Azure Labs Services allows educators (teachers, professors, trainers, or teaching assistants, etc.) to quickly and easily create an online lab to provision pre-configured learning environments for the trainees. Each trainee would be able use identical and isolated environments for the training. Policies can be applied to ensure that the training environments are available to each trainee only when they need them and contain enough resources - such as virtual machines - required for the training. 
 
 ![Classroom lab](../media/classroom-labs-scenarios/classroom.png)
 
@@ -33,10 +33,10 @@ Classroom Labs meets the following requirements that are required to conduct tra
 In this article, you learn about various Azure Lab Services features that can be used to meet the previously described training requirements and detailed steps that you can follow to set up a lab for training.  
 
 ## Create the lab account as a lab account administrator
-The first step in using Azure Lab Services is to create a lab account in the Azure portal. After a lab account administrator creates the lab account, the admin adds users who want to create labs to the **Lab Creator** role. The trainers create labs with virtual machines for students to do exercises for the course they are teaching. For details, see [Create and manage lab account](how-to-manage-lab-accounts.md).
+The first step in using Azure Lab Services is to create a lab account in the Azure portal. After a lab account administrator creates the lab account, the admin adds users who want to create labs to the **Lab Creator** role. The educators create labs with virtual machines for students to do exercises for the course they are teaching. For details, see [Create and manage lab account](how-to-manage-lab-accounts.md).
 
 ## Create and manage classroom labs
-A trainer, who is a member of the Lab Creator role in a lab account, can create one or more labs in the lab account. You create and configure a template VM with all the required software for doing exercises in your course. You pick a ready-made image from the available images for creating a classroom lab and then customize it by installing the software required for the lab. For details, see [Create and manage classroom labs](how-to-manage-classroom-labs.md).
+An educator, who is a member of the Lab Creator role in a lab account, can create one or more labs in the lab account. You create and configure a template VM with all the required software for doing exercises in your course. You pick a ready-made image from the available images for creating a classroom lab and then customize it by installing the software required for the lab. For details, see [Create and manage classroom labs](how-to-manage-classroom-labs.md).
 
 ## Configure usage settings and policies
 The lab creator can add or remove users to the lab, get registration link to send to lab users, set up policies such as setting individual quotas per user, update the number of VMs available in the lab, and more. For details, see [Configure usage settings and policies](how-to-configure-student-usage.md).

articles/lab-services/classroom-labs/how-to-attach-detach-shared-image-gallery.md

@@ -79,7 +79,7 @@ The following procedure shows you how to attach an existing shared image gallery
 
     In this example, there are no images in the shared image gallery yet.
 
-    Azure Lab Services identity is added as a contributor to the shared image gallery that is attached to the lab. It allows teachers/IT admin to save virtual machine images to the shared image gallery. All labs created in this lab account have access to the attached shared image gallery. 
+    Azure Lab Services identity is added as a contributor to the shared image gallery that is attached to the lab. It allows educators/IT admins to save virtual machine images to the shared image gallery. All labs created in this lab account have access to the attached shared image gallery. 
 
     All images in the attached shared image gallery are enabled by default. You can enable or disable selected images by selecting them in the list and using the **Enable selected images** or **Disable selected images** button. 
 

articles/lab-services/classroom-labs/how-to-configure-firewall-settings.md

@@ -4,7 +4,7 @@ description: Learn how to determine the public IP address and port number range
 author: emaher
 
 ms.author: enewman
-ms.date: 02/14/2020
+ms.date: 05/15/2020
 ms.topic: article
 ms.service: lab-services
 ---
@@ -19,7 +19,7 @@ Each lab uses single public IP address and multiple ports.  All VMs, both the te
 
 ## Find public IP for a lab
 
-The public IP addresses for each lab are listed in the **All labs** page of the Lab Services lab account.  For directions how to find the **All labs** page, see [how to manage labs in a lab account](how-to-manage-lab-accounts.md#view-and-manage-labs-in-the-lab-account).  
+The public IP addresses for each lab are listed in the **All labs** page of the Lab Services lab account.  For directions how to find the **All labs** page, see [View labs in a lab account](manage-labs.md#view-labs-in-a-lab-account).  
 
 > [!div class="mx-imgBorder"]
 > ![All labs page](../media/how-to-configure-firewall-settings/all-labs-properties.png)