diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index d8095c6843..c6924029c5 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -6,6 +6,11 @@ "redirect_document_id": true }, { +"source_path": "windows/security/threat-protection/windows-defender-application-control.md", +"redirect_url": "/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control", +"redirect_document_id": true +}, +{ "source_path": "windows/security/threat-protection/applocker/administer-applocker-using-mdm.md", "redirect_url": "/windows/security/threat-protection/windows-defender-application-control/applocker/administer-applocker-using-mdm", "redirect_document_id": true diff --git a/education/trial-in-a-box/educator-tib-get-started.md b/education/trial-in-a-box/educator-tib-get-started.md index f65f3f3998..2c4fd4b739 100644 --- a/education/trial-in-a-box/educator-tib-get-started.md +++ b/education/trial-in-a-box/educator-tib-get-started.md @@ -43,8 +43,11 @@ ms.date: 03/18/2018 To try out the educator tasks, start by logging in as a teacher. 1. Turn on **Device A** and ensure you plug in the PC to an electrical outlet. -2. Log in to **Device A** using the **Teacher Username** and **Teacher Password** included in the **Credentials Sheet** located in your kit. -3. Connect to your school's Wi-Fi network or connect with a local Ethernet connection. +2. Connect to your school's Wi-Fi network or connect with a local Ethernet connection. + >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet you should connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration you should consider using Device A from a different network. + +3. Log in to **Device A** using the **Teacher Username** and **Teacher Password** included in the **Credentials Sheet** located in your kit. +

@@ -82,6 +85,7 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse
+ ![Spark communication, critical thinking, and creativity with Microsoft Teams](images/edu-TIB-setp-3-jump.png) ## 3. Spark communication, critical thinking, and creativity in the classroom diff --git a/education/trial-in-a-box/itadmin-tib-get-started.md b/education/trial-in-a-box/itadmin-tib-get-started.md index f919d9d755..a6c87bbb9a 100644 --- a/education/trial-in-a-box/itadmin-tib-get-started.md +++ b/education/trial-in-a-box/itadmin-tib-get-started.md @@ -45,8 +45,10 @@ If you run into any problems while following the steps in this guide, or you hav To try out the IT admin tasks, start by logging in as an IT admin. 1. Turn on **Device A** and ensure you plug in the PC to an electrical outlet. -2. Log in to **Device A** using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit. -3. Connect to your school's Wi-Fi network or connect with a local Ethernet connection. +2. Connect to your school's Wi-Fi network or connect with a local Ethernet connection. + >**Note**: If your Wi-Fi network requires a web browser login page to connect to the Internet you should connect using the Ethernet port. If your Wi-Fi network has additional restrictions that will prevent the device from connecting to the internet without registration you should consider using Device A from a different network. + +3. Log in to **Device A** using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit. 4. Note the serial numbers on the Trial in a Box devices and register both devices with the hardware manufacturer to activate the manufacturer's warranty.