Merge remote-tracking branch 'refs/remotes/origin/master' into live

devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md

@@ -39,7 +39,14 @@ Surface Hub is designed to be used in communal spaces, such as meeting rooms. Un
 
 ### Saving and browsing files
 
-Users can only access files and folders under My Documents. Files saved locally during a session are deleted when users press **I'm done**. To save content created during a meeting, users should save files to a USB drive or to OneDrive.
+Users have access to a limited set of directories on the Surface Hub:
+- Music
+- Videos
+- Documents
+- Pictures
+- Downloads
+
+Files saved locally in these directories are deleted when users press **I'm done**. To save content created during a meeting, users should save files to a USB drive or to OneDrive.
 
 *Organization policies that this may affect:* <br> Policies related to access permissions and ownership of files and folders don't apply for Surface Hub. Users can't browse and save files to system directories and network folders.
 
@@ -69,7 +76,7 @@ UWP apps pre-installed on Surface Hub:
 - Whiteboard*
 - Word Mobile
 
-*Apps with an asterisk (\*) are unique to Surface Hub*
+*Apps with an asterisk (&ast;) are unique to Surface Hub*
 
 *Organization policies that this may affect:* <br> Use guidelines for Windows 10 Enterprise to determine the features and network requirements for default apps on the Surface Hub.
 

education/windows/school-get-minecraft.md

@@ -97,7 +97,6 @@ Enter email addresses for your students, and each student will get an email with
     ![Minecraft Education Edition product page](images/mc-install-for-me-teacher.png)
 3. Click **Invite people**.
  
-    ![Assign to people](images/minecraft-assign-to-people.png)
 4. Type the name, or email address of the student or group you want to assign the app to, and then click **Assign**. 
 
     You can only assign the app to students with work or school accounts. If you don't find the student, you might need to add a work or school account for the student.    

windows/keep-secure/configure-endpoints-gp-windows-defender-advanced-threat-protection.md

@@ -67,7 +67,7 @@ You can use Group Policy (GP) to configure settings, such as settings for the sa
 
 4.  Click **Policies**, then **Administrative templates**.
 
-5.  Click **Windows components** and then **Windows Advanced Threat Protection**.
+5.  Click **Windows components** and then **Windows Defender ATP**.
 
 6.  Choose to enable or disable sample sharing from your endpoints.
 

windows/keep-secure/configure-proxy-internet-windows-defender-advanced-threat-protection.md

@@ -28,14 +28,17 @@ The embedded Windows Defender ATP sensor runs in system context using the LocalS
 
 The WinHTTP configuration setting is independent of the Windows Internet (WinINet) internet browsing proxy settings and can only discover a proxy server by using the following discovery methods:
 
-- Configure the proxy server manually using a static proxy
+ - Auto-discovery methods:
+    - Transparent proxy
+    - Web Proxy Auto-discovery Protocol (WPAD)
 
-    - Auto-discovery methods:
-        - Transparent proxy
+> [!NOTE]
+> If you're using Transparent proxy or WPAD in your network topology, you don't need special endpoint configuration settings. For more information on Windows Defender ATP URL exclusions in the proxy, see [Enable access to Windows Defender ATP service URLs in the proxy server](#enable-access-to-windows-defender-atp-service-urls-in-the-proxy-server).
 
-    - Manual static proxy configuration
-      - WinHTTP configured using netsh command
-      -	Registry based configuration
+
+ - Manual static proxy configuration:
+    - WinHTTP configured using netsh command
+    - Registry based configuration
 
 ## Configure the proxy server manually using a registry-based static proxy
 Configure a registry-based static proxy to allow only Windows Defender ATP sensor to report telemetry and communicate with Windows Defender ATP services if a computer is not be permitted to connect to the Internet.
@@ -77,12 +80,9 @@ If a proxy or firewall is blocking all traffic by default and allowing only spec
 
 Primary Domain Controller | .Microsoft.com DNS record
 :---|:---
- Central US | winatp-gw-cus.microsoft.com <br> us.vortex-win.data.microsoft.com <br> crl.microsoft.com <br>*.blob.core.windows.net
- East US (2)| winatp-gw-eus.microsoft.com <br> us.vortex-win.data.microsoft.com <br> crl.microsoft.com <br>*.blob.core.windows.net
- West Europe | winatp-gw-weu.microsoft.com <br> eu.vortex-win.data.microsoft.com <br> crl.microsoft.com <br>*.blob.core.windows.net
- North Europe | winatp-gw-neu.microsoft.com <br> eu.vortex-win.data.microsoft.com <br> crl.microsoft.com <br>*.blob.core.windows.net
+ US |```*.blob.core.windows.net``` <br>```crl.microsoft.com```<br> ```us.vortex-win.data.microsoft.com```<br> ```winatp-gw-cus.microsoft.com``` <br> ```winatp-gw-eus.microsoft.com```
+Europe |```*.blob.core.windows.net```<br>```crl.microsoft.com```<br> ```eu.vortex-win.data.microsoft.com```<br>```winatp-gw-neu.microsoft.com```<br> ```winatp-gw-weu.microsoft.com```<br>
 
- <br>
  If a proxy or firewall is blocking anonymous traffic, as Windows Defender ATP  sensor is connecting from system context, make sure anonymous traffic is permitted in the above listed URLs.
 
  If you selected US as your region, you should permit anonymous traffic for URLs listed in both Central US and East US (2).

windows/keep-secure/investigate-files-windows-defender-advanced-threat-protection.md

@@ -122,7 +122,7 @@ If you encounter a problem when trying to submit a file, try each of the followi
 
   a. Change the following registry entry and values to change the policy on specific endpoints:
  ```
-HKLM\SOFTWARE\Policies\Microsoft\Sense\AllowSampleCollection
+HKLM\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection
   Value = 0 - block sample collection
   Value = 1 - allow sample collection
 ```