Skip to content

Commit edceea4

Browse files
committed
terminlogy
1 parent a249766 commit edceea4

21 files changed

+58
-58
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
href: specify-marketplace-images.md
8080
- name: Specify support information (lab account owner)
8181
href: lab-account-owner-support-information.md
82-
- name: Create and configure classroom labs (instructor)
82+
- name: Create and configure classroom labs (educator)
8383
items:
8484
- name: Create and manage classroom labs
8585
href: how-to-manage-classroom-labs.md
@@ -111,9 +111,9 @@
111111
href: how-to-prepare-windows-template.md
112112
- name: Control Windows shutdown behavior
113113
href: how-to-windows-shutdown.md
114-
- name: View support information (instructor)
114+
- name: View support information (educator)
115115
href: lab-creator-support-information.md
116-
- name: Access student VMs from instructor view
116+
- name: Access student VMs from educator view
117117
href: instructor-access-virtual-machines.md
118118
- name: Connect to VMs in classroom labs (student)
119119
items:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 09/30/2019
15+
ms.date: 05/15/2020
1616
ms.author: spelluru
1717

1818
---
@@ -36,7 +36,7 @@ Follow [this tutorial](tutorial-setup-classroom-lab.md) to create a new lab and
3636
| ------------ | ------------------ |
3737
| 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. |
3838
| 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). |
39-
| 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. |
39+
| 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. |
4040

4141
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.
4242

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Follow [this tutorial](tutorial-setup-classroom-lab.md) to create a new lab and
3737
| ------------ | ------------------ |
3838
| Virtual machine (VM) size | Small |
3939
| VM image | Ubuntu Server 18.04 LTS |
40-
| 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>|
40+
| 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>|
4141

4242

4343
## Install desktop and xrdp

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 05/08/2020
15+
ms.date: 05/15/2020
1616
ms.author: spelluru
1717

1818
---
@@ -23,13 +23,13 @@ The following list contains key Lab Services concepts and definitions:
2323

2424
## Quota
2525

26-
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.
26+
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.
2727

28-
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.
28+
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.
2929

3030
## Schedules
3131

32-
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.
32+
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.
3333

3434
There are three types of schedules: Standard, Start only and Stop only.
3535

@@ -53,7 +53,7 @@ Typically, an IT administrator of organization's cloud resources, who owns the A
5353
- Manages and configures policies across all labs.
5454
- Gives permissions to people in the organization to create a lab under the lab account.
5555

56-
### Professor
56+
### Educator
5757

5858
Typically, users such as a teacher or an online trainer creates classroom labs under a lab account. An educator does the following tasks:
5959

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Get answers to some of the most common questions about classroom labs in Azure L
2525
### Is the quota per user or per week or per entire duration of the lab?
2626
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).
2727

28-
### If professor turns on a student VM, does that affect the student quota?
29-
No. It doesn't. When professor turns on the student VM, it doesn't affect the quota allotted to the student.
28+
### If educator turns on a student VM, does that affect the student quota?
29+
No. It doesn't. When educator turns on the student VM, it doesn't affect the quota allotted to the student.
3030

3131
## Schedules
3232

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.author: spelluru
1717

1818
---
1919
# Use Classroom Labs for trainings
20-
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.
20+
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.
2121

2222
![Classroom lab](../media/classroom-labs-scenarios/classroom.png)
2323

@@ -33,10 +33,10 @@ Classroom Labs meets the following requirements that are required to conduct tra
3333
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.
3434

3535
## Create the lab account as a lab account administrator
36-
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).
36+
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).
3737

3838
## Create and manage classroom labs
39-
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).
39+
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).
4040

4141
## Configure usage settings and policies
4242
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The following procedure shows you how to attach an existing shared image gallery
7979

8080
In this example, there are no images in the shared image gallery yet.
8181

82-
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.
82+
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.
8383

8484
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.
8585

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to determine the public IP address and port number range
44
author: emaher
55

66
ms.author: enewman
7-
ms.date: 02/14/2020
7+
ms.date: 05/15/2020
88
ms.topic: article
99
ms.service: lab-services
1010
---

articles/lab-services/classroom-labs/how-to-enable-nested-virtualization-template-vm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.author: spelluru
1818
---
1919
# Enable nested virtualization on a template virtual machine in Azure Lab Services
2020

21-
Currently, Azure Lab Services enables you to set up one template virtual machine in a lab and make a single copy available to each of your users. If you're a professor teaching networking, security, or IT classes, you may need to provide each of your students with an environment in which multiple virtual machines can talk to each other over a network.
21+
Currently, Azure Lab Services enables you to set up one template virtual machine in a lab and make a single copy available to each of your users. If you're an educator teaching networking, security, or IT classes, you may need to provide each of your students with an environment in which multiple virtual machines can talk to each other over a network.
2222

2323
Nested virtualization enables you to create a multi-VM environment inside a lab's template virtual machine. Publishing the template will provide each user in the lab with a virtual machine set up with multiple VMs within it. This article covers how to set up nested virtualization on a template machine in Azure Lab Services.
2424

articles/lab-services/classroom-labs/how-to-enable-remote-desktop-linux.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ ms.author: spelluru
2121
This article shows you how to do the following tasks:
2222

2323
- Enable remote desktop for Linux VM
24-
- How teacher can connect to the template VM via Remote Desktop Connection (RDP).
24+
- How an educator can connect to the template VM via Remote Desktop Connection (RDP).
2525

2626
## Enable remote desktop for Linux VM
27-
During lab creation, teachers can enable **remote desktop connection** for **Linux** images. The **Enable Remote Desktop Connection** option is shown when a Linux image is selected for the template. When this option is enabled, teachers can connect to template VM and student VMs via RDP (Remote Desktop).
27+
During lab creation, educators can enable **remote desktop connection** for **Linux** images. The **Enable Remote Desktop Connection** option is shown when a Linux image is selected for the template. When this option is enabled, educators can connect to template VM and student VMs via RDP (Remote Desktop).
2828

2929
![Enable remote desktop connection for a Linux image](../media/how-to-enable-remote-desktop-linux/enable-rdp-option.png)
3030

@@ -46,7 +46,7 @@ Currently, the remote desktop connection is supported for the following operatin
4646
- Ubuntu Server 16.04 LTS
4747

4848
## Connect to the template VM
49-
Teachers must connect to the template VM using SSH first, and install RDP and GUI packages on it. Then, the teachers can use RDP to connect to the template VM:
49+
Educators must connect to the template VM using SSH first, and install RDP and GUI packages on it. Then, the educators can use RDP to connect to the template VM:
5050

5151
1. If you see **Customize template** on the toolbar, select it. Then, select **Continue** on the **Customize template** dialog box. This action starts the template VM.
5252

0 commit comments

Comments
 (0)