Merged PR 8288: 5/16 PM Publish

education/trial-in-a-box/educator-tib-get-started.md

@@ -27,7 +27,8 @@ ms.date: 03/18/2018
 | [![Try Learning Tools Immersive Reader](images/edu-TIB-setp-2-v3.png)](#edu-task2) | **Interested in significantly improving your students' reading speed and comprehension?<sup>[1](#footnote1)</sup>** </br>Try the [Learning Tools Immersive Reader](#edu-task2) to see how kids can learn to read faster, using text read aloud, and highlighting words for syntax. |
 | [![Launch Microsoft Teams](images/edu-TIB-setp-3-v3.png)](#edu-task3) | **Looking to foster collaboration, communication, and critical thinking in the classroom?** </br>Launch [Microsoft Teams](#edu-task3) and learn how to set up digital classroom discussions, respond to student questions, and organize class content. |
 | [![Open OneNote](images/edu-TIB-setp-4-v3.png)](#edu-task4) | **Trying to expand classroom creativity and interaction between students?** </br>Open [OneNote](#edu-task4) and create an example group project for your class. |
-| [![Play with Minecraft: Education Edition](images/edu-TIB-setp-5-v3.png)](#edu-task5) | **Want to teach kids to further collaborate and problem solve?** </br>Play with [Minecraft: Education Edition](#edu-task5) to see how it can be used as a collaborative and versatile platform across subjects to encourage 21st century skills. |
+| [![Try Photos app](images/edu-tib-setp-5-v4.png)](#edu-task5) | **Curious about telling stories through video?** </br>Try the [Photos app](#edu-task5) to make your own example video. |
+| [![Play with Minecraft: Education Edition](images/edu-tib-setp-6-v4.png)](#edu-task6) | **Want to teach kids to further collaborate and problem solve?** </br>Play with [Minecraft: Education Edition](#edu-task6) to see how it can be used as a collaborative and versatile platform across subjects to encourage 21st century skills. | 
 |  |  |
 
 </br>
@@ -68,13 +69,17 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse
 **Try this!**
 
 1. On the **Start** menu, click the Word document titled **Design Think**.
+
 2. Click **Edit Document** and select **Edit in Browser**.
+
 3. Select the **View** menu.
+
 4. Select the **Immersive Reader** button.  
 
   ![Word Online's Immersive Reader](images/word_online_immersive_reader.png)
 
 5. Press the **Play** button to hear text read aloud.
+
 6. Select these various settings to see different ways to configure Immersive Reader for your students.
 
   | Text to Speech | Text Preferences | Grammar Options | Line Focus |
@@ -101,6 +106,7 @@ Take a guided tour of Microsoft Teams and test drive this digital hub.
 **Try this!**
 
 1. Take a guided tour of Microsoft Teams and test drive some teaching tasks. Open the Microsoft Edge browser and navigate to <a href="https://msteamsdemo.azurewebsites.net/" target="_blank">https://msteamsdemo.azurewebsites.net</a>.
+
 2. Use your school credentials provided in the **Credentials Sheet**.
 
 </br>
@@ -121,7 +127,9 @@ See how a group project comes together with opportunities to interact with other
 When you're not using the pen, just use the magnet to stick it to the left side of the screen until you need it again. 
 
 1. On the **Start** menu, click the OneNote shortcut named **Imagine Giza** to open the **Reimagine the Great Pyramid of Giza project**.
+
 2. Take the digital pen out of the box and make notes or draw.
+
 3. Follow the instructions for the project. Look for the **Try this!** callouts to experiment with these engaging activities.
   - Discover the power of digital ink by selecting the Draw tab. Choose your pen and get scribbling.
 
@@ -139,10 +147,11 @@ When you're not using the pen, just use the magnet to stick it to the left side
 </br>
 </br>
 
-<!-- ![Inspire your students to tell their stories through video!](images/edu-tib-setp-5-jump2.png)
+![Inspire your students to tell their stories through video!](images/edu-tib-setp-5-jump2.png)
 ## <a name="edu-task5"></a>5. Engage with students by creating videos
 
-PHOTOS APP VIDEO COMING SOON!
+> [!VIDEO https://www.youtube.com/embed/Ko7XLM1VBRE]
+
 </br>
 
 The Photos app now has a built-in video editor, making it easy for you and your students to create movies using photos, video clips, music, 3D models, and special effects.  Improve comprehension, unleash creativity, and capture your student’s imagination through video.
@@ -150,20 +159,29 @@ The Photos app now has a built-in video editor, making it easy for you and your
 **Try this!**
 Use video to create a project summary.
 
-1. Check you have the latest version of Microsoft Photos. Open the **Start** menu and search for **Store**. Select the **See more** button (**…**) and select **Downloads and updates**. Select **Get updates**.   
-2. Open Microsoft Edge and visit <a href="http://aka.ms/PhotosTIB" target="_blank">http://aka.ms/PhotosTIB</a> to download a zip file of the project media.   
+1. Check you have the latest version of Microsoft Photos. Open the **Start** menu and search for **Store**. Select the **See more** button (**…**) and select **Downloads and updates**. Select **Get updates**. 
+
+2. Open Microsoft Edge and visit <a href="http://aka.ms/PhotosTIB" target="_blank">http://aka.ms/PhotosTIB</a> to download a zip file of the project media. 
+
 3. Once the download has completed, open the zip file and select **Extract** > **Extract all**.  Select **Browse** and choose the **Pictures** folder as the destination, and then select **Extract**.  
+
 4. In the **Start** menu, search for **Photos** or select the Photos tile to launch the app.  
+
 5. Select the first video to preview it full screen. Select **Edit & Create**, then select **Create a video with text**.
   1. If you don't see the **Edit & Create** menu, select the video and the menu will appear at the top of the screen. 
+
 6. Name your project “Laser Maze Project.” Hit Enter to continue.   
+
 7. Select **Add photos and videos** and then **From my collection**. Scroll to select the 6 additional videos and select **Add**.
+
 8. Drag the videos to the Storyboard, one by one. Your project should look roughly like this:
 
   ![Photos app layout showing videos added in previous steps](images/photo_app_1.png)
 
 9. Select the first card in the Storyboard (the video of the project materials) and select **Text**, type a title in, a text style, a layout, and select **Done**. 
+
 10.	Select the third card in the Storyboard (the video of the children assembling the maze) and select **Trim**.  Drag the trim handle on the left to shorten the duration of the clip and select **Done**. 
+
 11.	Select the last card on the Storyboard and select **3D effects**.
   1. Position the playback indicator to be roughly 1 second into the video clip, or when the boy moves down to examine the laser.  
   2. Find the **lightning bolt** effect and click or drag to add it to the scene.  Rotate, scale, and position the effect so it looks like the lightning is coming out of the laser beam and hitting the black back of the mirror.
@@ -176,17 +194,20 @@ Use video to create a project summary.
 12. Select **Music** and select a track from the **Recommended** music collection.
   1. The music will update automatically to match the length of your video project, even as you make changes.
   2. If you don’t see more than a few music options, confirm that you’re connected to Wi-Fi and then close and re-open Microsoft Photos (returning to your project via the **Albums** tab). Additional music files should download in the background.
+
 13. You can adjust the volume for the background music using the **Music volume** button.  
+
 14. Preview your video to see how it all came together.
+
 15. Select **Export or share** and select either the **Small** or **Medium** file size. You can share your video to social media, email, or another apps.  
 
 Check out this use case video of the Photos team partnering with the Bureau Of Fearless Ideas in Seattle to bring the Photos app to local middle school students: <a href="https://www.youtube.com/watch?v=0dFFAu6XwPg" target="_blank">https://www.youtube.com/watch?v=0dFFAu6XwPg</a>
 </br>
 </br>
-</br> -->
+</br>
 
 ![Further collaborate and problem solve with Minecraft: Education Edition](images/edu-TIB-setp-5-jump.png) 
-## <a name="edu-task5"></a>5. Get kids to further collaborate and problem solve
+## <a name="edu-task6"></a>6. Get kids to further collaborate and problem solve
 
 > [!VIDEO https://www.youtube.com/embed/QI_bRNUugog]
 
@@ -198,24 +219,31 @@ Minecraft: Education Edition provides an immersive environment to develop creati
 Today, we'll explore a Minecraft world through the eyes of a student.
 
 1. Connect the included mouse to your computer for optimal interaction. 
+
 2. Open Microsoft Edge and visit <a href="https://aka.ms/lessonhub" target="_blank">https://aka.ms/lessonhub</a>.
+
 3. Scroll down to the **Details** section and select **Download World**.
 
   ![Select the download world link](images/mcee_downloadworld.png)
 
 4. When prompted, save the world.
+
 5. Enter your same teacher username and password and click **Accept**.
+
 6. Click **OK** on the **Minecraft: Education Edition Free Trial** box.
+
 7. Click **Play**.
+
 8. Click **Lesson Hub Vol 1** to enter the downloaded world.
+
 9. Explore the world by using the keys on your keyboard.
   * **W** moves forward.
   * **A** moves left.
   * **S** moves right.
   * **D** moves backward.
   
-
 10. Use your mouse as your "eyes". Just move it to look around.
+
 11. For a bird's eye view, double-tap the SPACE BAR. Now press the SPACE BAR to fly higher. And then hold the SHIFT key to safely land.
 
   To try more advanced movements or building within Minecraft, use the Minecraft Controls Diagram.
@@ -233,6 +261,45 @@ Today, we'll explore a Minecraft world through the eyes of a student.
   ![Access and adapt over 300 Minecraft lesson plans](images/minecraft_lesson_plans.png)
 
 </br>
+</br>
+</br>
+
+<!-- [![Do Math with Ink](images/edu-tib-setp-7-v1.png)](#edu-task7) | **Attempting to show students how to solve math equations step-by-step?** </br>Use the [Math Assistant](#edu-task7) in OneNote to show students the steps of solving problems and graph equations.
+![Help students understand new math concepts with the Math Assistant in OneNote](images/edu-TIB-setp-7-jump.png) 
+## <a name="edu-task7"></a>7. Go digital in your Math classroom
+
+Whether you are an Ink user or prefer to type your math as text, Math Assistant can: 
+*	give your students step-by-step instructions on how to solve their math problems. 
+*	help them visualize math functions on an interactive 2D graph.
+This digital tutor is available in the OneNote app for Windows 10 and OneNote Online.
+
+**Try this in OneNote!**
+To solve x^2-3x+2=0:
+1. Write your equation in ink or type it as text. Use the **Lasso** tool to select the inked equation (or select the text if you typed it) and then, on the **Draw** tab, click the **Math** button.
+
+2. From the drop-down menu in the Math pane, select the option to **Solve for x**. You can now see the final solution of the equation.
+
+3. From the second drop down below, choose **Steps Using the Quadratic Formula**, which shows you the step-by-step solution of this equation.
+  
+  ![Select the Math button and use the dropdown menus](images/Math1.png)
+
+4. Finally, **drag and drop** the steps to your page.
+
+5. On the **View** tab, click the **Replay** button and select the written equation to watch it replay your text. 
+
+To graph y=sin(x):
+1. Write your equation in ink or type it as text (make sure the "y" isn't capitalized). Use the **Lasso** tool to select the inked equation (or select the text if you typed it) and then, on the **Draw** tab, click the **Math** button.
+
+2. From the drop-down menu in the Math pane, select the option to **Graph in 2D**. 
+  >You can play with the interactive graph of your equation - use a **single finger** to move the graph position or **two fingers** to change the zoom level, or use a mouse to **click and drag** to move the position or use the **magnification** buttons to change the zoom level.
+  
+  > ![Select the Math button and use the dropdown menu](images/Math2.png)
+
+3. Expand **Key Graph Features** to understand the properties of your function, such as minima, maxima, zeros, etc.
+
+4. Finally, click the **Insert on Page** button below the graph to add a screenshot of the graph to your page.
+</br>
+</br> -->
 
 **Watch what Educators say about Microsoft Education delivering better learning outcomes**
 Bring out the best in students by providing a platform for collaborating, exploring, personalized learning, and getting things done across all devices.

education/windows/change-to-pro-education.md

@@ -90,7 +90,7 @@ You can use Windows Configuration Designer to create a provisioning package that
 
 ## Education customers with Azure AD joined devices
 
-Academic institutions can easily move from Windows 10 Pro to Windows 10 Pro Education without using activation keys or reboots. When one of your users enters their Azure AD credentials associated with a Windows 10 Pro Education license, the operating system changees to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have an Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
+Academic institutions can easily move from Windows 10 Pro to Windows 10 Pro Education without using activation keys or reboots. When one of your users enters their Azure AD credentials associated with a Windows 10 Pro Education license, the operating system changes to Windows 10 Pro Education and all the appropriate Windows 10 Pro Education features are unlocked. Previously, only schools or organizations purchasing devices as part of the Shape the Future K-12 program or with a Microsoft Volume Licensing Agreement could deploy Windows 10 Pro Education to their users. Now, if you have an Azure AD for your organization, you can take advantage of the Windows 10 Pro Education features.
 
 When you change to Windows 10 Pro Education, you get the following benefits:
 
@@ -284,10 +284,10 @@ Once the automatic change to Windows 10 Pro Education is turned off, the change
 
     ![Revert to Windows 10 Pro](images/msfe_manage_reverttowin10pro.png)
 
-4. You will be asked if you're sure that you want to turn off automatic changees to Windows 10 Pro Education. Click **Yes**.
+4. You will be asked if you're sure that you want to turn off automatic changes to Windows 10 Pro Education. Click **Yes**.
 5. Click **Close** in the **Success** page.
 
-    All global admins get a confirmation email that a request was made to roll back your organization to Windows 10 Pro. If you, or another global admin, decide later that you want to turn on automatic changees again, you can do this by selecting **change to Windows 10 Pro Education for free** from the **Manage > Benefits** in the Microsoft Store for Education.
+    All global admins get a confirmation email that a request was made to roll back your organization to Windows 10 Pro. If you, or another global admin, decide later that you want to turn on automatic changes again, you can do this by selecting **change to Windows 10 Pro Education for free** from the **Manage > Benefits** in the Microsoft Store for Education.
 
 
 ## Preparing for deployment of Windows 10 Pro Education licenses

windows/configuration/wcd/wcd-accounts.md

@@ -42,7 +42,7 @@ Specifies the settings you can configure when joining a device to a domain, incl
 | Setting | Value | Description |
 | --- | --- | --- |
 | Account | string  | Account to use to join computer to domain  |
-| AccountOU | string  | Name of organizational unit for the computer account  |
+| AccountOU | Enter the full path for the organizational unit. For example: OU=testOU,DC=domain,DC=Domain,DC=com.  | Name of organizational unit for the computer account  |
 | ComputerName | Specify a unique name for the domain-joined computers using %RAND:x%, where x is an integer less than 15 digits long, or using %SERIAL% characters in the name.</br></br>ComputerName is a string with a maximum length of 15 bytes of content:</br></br>- ComputerName can use ASCII characters (1 byte each) and/or multi-byte characters such as Kanji, so long as you do not exceed 15 bytes of content.</br></br>- ComputerName cannot use spaces or any of the following characters: \{ &#124; \} ~ \[ \\ \] ^ ' : ; < = > ? @ ! " \# $ % ` \( \) + / . , \* &, or contain any spaces.</br></br>- ComputerName cannot use some non-standard characters, such as emoji.</br></br>Computer names that cannot be validated through the DnsValidateName function cannot be used, for example, computer names that only contain numbers (0-9). For more information, see the [DnsValidateName function](http://go.microsoft.com/fwlink/?LinkId=257040). | Specifies the name of the Windows device (computer name on PCs)  |
 | DomainName | string (cannot be empty) | Specify the name of the domain that the device will join  |
 | Password | string (cannot be empty) | Corresponds to the password of the user account that's authorized to join the computer account to the domain.  |

windows/security/threat-protection/windows-defender-atp/configure-splunk-windows-defender-advanced-threat-protection.md

@@ -139,6 +139,10 @@ Use the solution explorer to view alerts in Splunk.
 5. Find the query you saved in the list and click **Run**. The results are displayed based on your query.
 
 
+>[!TIP]
+> To mininimize alert duplications, you can use the following query:
+>```source="rest://windows atp alerts" | spath | dedup _raw | table *``` 
+
 ## Related topics
 - [Enable SIEM integration in Windows Defender ATP](enable-siem-integration-windows-defender-advanced-threat-protection.md)
 - [Configure ArcSight to pull Windows Defender ATP alerts](configure-arcsight-windows-defender-advanced-threat-protection.md)