Merge branch 'master' of https://github.com/MicrosoftDocs/windows-docs-pr into mdt

.openpublishing.redirection.json

@@ -1005,11 +1005,7 @@
 "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/configure-attack-surface-reduction",
 "redirect_document_id": true
 },
-{
+
-"source_path": "windows/security/threat-protection/windows-defender-atp/view-incidents-queue.md",
-"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/view-incidents-queue",
-"redirect_document_id": true
-},
 {
 "source_path": "windows/security/threat-protection/windows-defender-atp/configuration-score.md",
 "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/configuration-score",
@@ -1611,12 +1607,22 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/keep-secure/preferences-setup-windows-defender-advanced-threat-protection.md",
+"redirect_url": "/windows/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection.md",
 "redirect_url": "/windows/security/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection",
 "redirect_document_id": true
 },
 {
 "source_path": "windows/security/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/use-apis",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/threat-protection/microsoft-defender-atp/use-apis.md",
 "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/preferences-setup",
 "redirect_document_id": true
 },
@@ -1696,6 +1702,16 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/security/threat-protection/microsoft-defender-atp/response-actions.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/keep-secure/response-actions-windows-defender-advanced-threat-protection.md",
+"redirect_url": "/windows/threat-protection/windows-defender-atp/response-actions-windows-defender-advanced-threat-protection",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/threat-protection/windows-defender-atp/response-actions-windows-defender-advanced-threat-protection.md",
 "redirect_url": "/windows/security/threat-protection/windows-defender-atp/response-actions-windows-defender-advanced-threat-protection",
 "redirect_document_id": true
@@ -1811,11 +1827,6 @@
 "redirect_document_id": true
 },
 {
-"source_path": "windows/security/threat-protection/windows-defender-atp/troubleshoot-windows-defender-advanced-threat-protection.md",
-"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-mdatp",
-"redirect_document_id": true
-},
-{
 "source_path": "windows/security/threat-protection/windows-defender-atp/troubleshoot-overview.md",
 "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-overview",
 "redirect_document_id": true
@@ -12036,11 +12047,6 @@
 "redirect_document_id": true
 },
 {
-"source_path": "windows/keep-secure/preferences-setup-windows-defender-advanced-threat-protection.md",
-"redirect_url": "/windows/threat-protection/windows-defender-atp/preferences-setup-windows-defender-advanced-threat-protection",
-"redirect_document_id": true
-},
-{
 "source_path": "windows/keep-secure/prepare-your-organization-for-bitlocker-planning-and-policies.md",
 "redirect_url": "/windows/device-security/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies",
 "redirect_document_id": true
@@ -12191,11 +12197,6 @@
 "redirect_document_id": true
 },
 {
-"source_path": "windows/keep-secure/response-actions-windows-defender-advanced-threat-protection.md",
-"redirect_url": "/windows/threat-protection/windows-defender-atp/response-actions-windows-defender-advanced-threat-protection",
-"redirect_document_id": true
-},
-{
 "source_path": "windows/keep-secure/restore-files-and-directories.md",
 "redirect_url": "/windows/device-security/security-policy-settings/restore-files-and-directories",
 "redirect_document_id": true
@@ -14446,11 +14447,6 @@
 "redirect_document_id": true
 },
 {
-"source_path":"windows/security/threat-protection/windows-defender-atp/use-apis.md",
-"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/use-apis",
-"redirect_document_id": false
-},
-{
 "source_path":"windows/security/threat-protection/windows-defender-atp/exposed-apis-create-app-nativeapp.md",
 "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/exposed-apis-create-app-nativeapp",
 "redirect_document_id": false
@@ -14796,6 +14792,11 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/security/threat-protection/microsoft-defender-atp/get-started.md",
+"redirect_url": "/windows/security/threat-protection/index.md",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/security/threat-protection/windows-defender-atp/get-package-sas-uri-windows-defender-advanced-threat-protection.md",
 "redirect_url": "/windows/security/threat-protection/windows-defender-atp/use-apis",
 "redirect_document_id": false
@@ -14956,11 +14957,6 @@
 "redirect_document_id": true
 },
 {
-"source_path": "windows/security/threat-protection/windows-defender-atp/incidents-queue.md",
-"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/incidents-queue",
-"redirect_document_id": true
-},
-{
 "source_path": "windows/security/threat-protection/windows-defender-atp/get-ti-indicator-by-id-windows-defender-advanced-threat-protection.md",
 "redirect_url": "/windows/security/threat-protection/windows-defender-atp/use-apis",
 "redirect_document_id": false
@@ -15041,6 +15037,31 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/security/threat-protection/windows-defender-atp/incidents-queue.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/incidents-queue",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/threat-protection/microsoft-defender-atp/incidents-queue.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/view-incidents-queue",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/threat-protection/windows-defender-atp/troubleshoot-windows-defender-advanced-threat-protection.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-mdatp",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/security/threat-protection/microsoft-defender-atp/troubleshoot-overview.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/troubleshoot-mdatp",
+"redirect_document_id": true
+},
+{
+"source_path":"windows/security/threat-protection/windows-defender-atp/use-apis.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/use-apis",
+"redirect_document_id": false
+},
+{
 "source_path": "windows/security/threat-protection/windows-defender-atp/user-alert-windows-defender-advanced-threat-protection-new.md",
 "redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/user",
 "source_path": "windows/deployment/planning/windows-10-fall-creators-deprecation.md",
@@ -15063,18 +15084,23 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/security/threat-protection/microsoft-defender-atp/manage-allowed-blocked-list.md",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/manage-indicators",
+"redirect_document_id": false
+},
+{
 "source_path": "windows/security/threat-protection/windows-defender-atp/manage-indicators-windows-defender-advanced-threat-protection.md",
 "redirect_url": "/windows/security/threat-protection/windows-defender-atp/manage-indicators",
 "redirect_document_id": true
 },
 {
-"source_path": "windows/deployment/windows-10-enterprise-subscription-activation.md",
+"source_path": "windows/security/threat-protection/windows-defender-atp/manage-indicators.md",
-"redirect_url": "/windows/deployment/windows-10-subscription-activation",
+"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/manage-allowed-blocked-list",
-"redirect_document_id": true
+"redirect_document_id": false
 },
 {
-"source_path": "windows/security/threat-protection/windows-defender-atp/manage-indicators.md",
+"source_path": "windows/deployment/windows-10-enterprise-subscription-activation.md",
-"redirect_url": "/windows/security/threat-protection/microsoft-defender-atp/manage-indicators",
+"redirect_url": "/windows/deployment/windows-10-subscription-activation",
 "redirect_document_id": true
 },
 {

browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md

@@ -6,7 +6,8 @@ author: dansimp
 ms.prod: ie11
 ms.assetid: a145e80f-eb62-4116-82c4-3cc35fd064b6
 ms.reviewer: 
-audience: itpro
manager: dansimp
+audience: itpro
+manager: dansimp
 ms.author: dansimp
 title: Collect data using Enterprise Site Discovery
 ms.sitesec: library

browsers/internet-explorer/ie11-deploy-guide/install-ie11-using-microsoft-intune.md

@@ -6,7 +6,7 @@ author: lomayor
 ms.prod: ie11
 ms.assetid: b2dfc08c-78af-4c22-8867-7be3b92b1616
 ms.reviewer: 
-audience: itpro
manager: dansimp
+manager: dansimp
 ms.author: lomayor
 title: Install Internet Explorer 11 (IE11) using Microsoft Intune (Internet Explorer 11 for IT Pros)
 ms.sitesec: library

browsers/internet-explorer/ie11-ieak/platform-selection-ieak11-wizard.md

@@ -6,7 +6,7 @@ author: lomayor
 ms.prod: ie11
 ms.assetid: 9cbf5abd-86f7-42b6-9810-0b606bbe8218
 ms.reviewer: 
-audience: itpro
manager: dansimp
+manager: dansimp
 ms.author: lomayor
 title: Use the Platform Selection page in the IEAK 11 Wizard (Internet Explorer Administration Kit 11 for IT Pros)
 ms.sitesec: library

browsers/internet-explorer/ie11-ieak/programs-ieak11-wizard.md

@@ -6,7 +6,7 @@ author: lomayor
 ms.prod: ie11
 ms.assetid: f715668f-a50d-4db0-b578-e6526fbfa1fc
 ms.reviewer: 
-audience: itpro
manager: dansimp
+manager: dansimp
 ms.author: lomayor
 title: Use the Programs page in the IEAK 11 Wizard (Internet Explorer Administration Kit 11 for IT Pros)
 ms.sitesec: library

devices/hololens/TOC.md

@@ -1,36 +1,45 @@
-# [Microsoft HoloLens](index.md)
+# [HoloLens overview](index.md)
-# [What's new in HoloLens](hololens-whats-new.md)
+# [Hololens status](hololens-status.md)
-# [Set up HoloLens](hololens-setup.md)
 
-# Deploy HoloLens in a commercial environment
+# Get started with HoloLens (gen 1)
+## [Start your HoloLens (1st gen) for the first time](hololens-start.md)
+## [Install localized version of HoloLens](hololens-install-localized.md)
+
+# Get started with HoloLens in commercial environments
 ## [Overview and deployment planning](hololens-requirements.md)
+## [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md)
 ## [Configure HoloLens using a provisioning package](hololens-provisioning.md)
 ## [Enroll HoloLens in MDM](hololens-enroll-mdm.md)
+## [Set up ring based updates for HoloLens](hololens-updates.md)
+## [Manage custom enterprise apps](hololens-install-apps.md)
+## [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md)
 
-# Device Management
+# Navigating Windows Holographic
-## [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md)
+## [Windows Mixed Reality home](holographic-home.md)
-## [Install localized version of HoloLens](hololens-install-localized.md)
+## [Voice and Cortana](hololens-cortana.md)
-## [Manage updates to HoloLens](hololens-updates.md)
+## [Find and save files](hololens-find-and-save-files.md)
-## [Restore HoloLens 2 using Advanced Recovery Companion](hololens-recovery.md)
+## [Create, share, and view photos and video](holographic-photos-and-video.md)
-## [Use the HoloLens Clicker](hololens-clicker.md)
+
-## [Restart, reset, or recover the HoloLens](hololens-restart-recover.md)
+# Accessories and connectivity
-## [Restart or recover the HoloLens clicker](hololens-clicker-restart-recover.md)
+## [Connect to Bluetooth and USB-C devices](hololens-connect-devices.md)
+## [Restart or recover the HoloLens (1st gen) clicker](hololens-clicker-restart-recover.md)
+## [Connect to a network](hololens-network.md)
+## [Use HoloLens offline](hololens-offline.md)
 
 # Application Management 
-## [Install apps on HoloLens](hololens-install-apps.md)
 ## [Share HoloLens with multiple people](hololens-multiple-users.md)
-## [Cortana on HoloLens](hololens-cortana.md)
 ## [Get apps for HoloLens](hololens-get-apps.md)
 ## [Use apps on HoloLens](hololens-use-apps.md)
 ## [Use HoloLens offline](hololens-offline.md)
 ## [Spaces on HoloLens](hololens-spaces-on-hololens.md)
+## [How HoloLens stores data for spaces](hololens-spaces.md)
+
+# Recovery and troubleshooting
+## [Restore HoloLens 2 using Advanced Recovery Companion](hololens-recovery.md)
+## [Restart, reset, or recover the HoloLens](hololens-restart-recover.md)
 
 # User/Access Management
 ## [Set up single application access](hololens-kiosk.md)
-## [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md)
-## [How HoloLens stores data for spaces](hololens-spaces.md)
-## [Find and save files](hololens-find-and-save-files.md)
 
 # [Insider preview for Microsoft HoloLens](hololens-insider.md)
 # [Change history for Microsoft HoloLens documentation](change-history-hololens.md)
-

devices/hololens/change-history-hololens.md

@@ -50,11 +50,6 @@ New or changed topic | Description
 --- | ---
 Insider preview for Microsoft HoloLens | New (topic retired on release of Windows 10, version 1809)
 
-## June 2018
-
-New or changed topic | Description
---- | ---
-[HoloLens in the enterprise: requirements and FAQ](hololens-requirements.md#pin) | Added instructions for creating a sign-in PIN. 
 
 ## May 2018
 
@@ -86,12 +81,6 @@ New or changed topic | Description
 --- | ---
 [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md) | New
 
-## May 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [Microsoft HoloLens in the enterprise: requirements](hololens-requirements.md) | Changed title to **Microsoft HoloLens in the enterprise: requirements and FAQ**, added questions and answers in new [FAQ section](hololens-requirements.md#faq-for-hololens) |
-
 ## January 2017
 
 | New or changed topic | Description |

devices/hololens/holographic-home.md

@@ -0,0 +1,90 @@
+---
+title: Navigate the Windows Mixed Reality home
+description: Navigate the Windows Mixed Reality home in Windows Holographic.
+ms.assetid: 742bc126-7996-4f3a-abb2-cf345dff730c
+ms.date: 08/07/2019
+keywords: hololens
+ms.prod: hololens
+ms.sitesec: library
+author: scooley
+ms.author: scooley
+ms.topic: article
+ms.localizationpriority: medium
+---
+
+# Navigate the Windows Mixed Reality home
+
+## [Navigating MR Home](https://docs.microsoft.com/en-us/windows/mixed-reality/navigating-the-windows-mixed-reality-home)
+
+## Use the Start menu
+
+The **Start** menu on HoloLens is where you'll open apps and get to the HoloLens camera.
+
+Wherever you are in HoloLens, you can always open the **Start** menu by using the [bloom gesture](https://support.microsoft.com/help/12644/hololens-use-gestures) on HoloLens (1st gen) or tapping your wrist on HoloLens 2. Usually, you'll use it once to get to **Start**, but sometimes you might need to use it twice.
+
+> [!TIP]
+> When the **Start** menu is open, use the start gesture to hide it again.
+
+At the top of the **Start** menu, you'll see status indicators for Wi-Fi, battery, and volume, plus a clock. The tiles are your pinned apps. To talk to Cortana, select her tile, or just say "Hey Cortana" from anywhere on HoloLens. At the bottom you'll find the photo and video icons, which open the camera app.
+
+To see the rest of your apps, select **All apps**. To get back to **Start** from the **All apps** list, select **Pinned apps**.
+
+## Use apps on HoloLens
+
+Apps on HoloLens use either 2D view or holographic view. Apps with 2D view look like windows, and apps with holographic view surround you and become the only app you see.
+
+### Open apps
+
+You'll find your apps either pinned to **Start** or in the **All apps** list. To get to the **All apps** list, use the bloom gesture to go to **Start**, then select **All apps**.
+
+On **Start** or in the **All apps** list, select an app. It will open in a good position for viewing.
+
+>[!NOTE]
+>- Up to three 2D app windows can be active at a time. You can open more, but only three will remain active.
+>- Each open app can have one active window at a time, except Microsoft Edge, which can have up to three.
+>- If you're having problems with apps, make sure there's enough light in your space, and walk around so HoloLens has a current scan. If you keep having trouble, see [HoloLens and holograms: FAQ](https://support.microsoft.com/help/13456/hololens-and-holograms-faq) for more info.
+
+## Move, resize, and rotate apps
+
+Moving and resizing apps on HoloLens works a bit differently than it does on a PC. Instead of dragging the app, you'll use your gaze, along with a [gesture](https://support.microsoft.com/help/12644/hololens-use-gestures) or the [clicker](hololens-clicker.md). You can also rotate an app window in 3D space.
+
+> [!TIP]
+> Rearrange apps using your voice—gaze at an app and say "Face me," "Bigger," or "Smaller." Or have Cortana move an app for you: say "Hey Cortana, move <*app name*> here."
+
+### Move an app
+
+Gaze at the app, and then do one of the following.
+
+- Tap and hold to select the app. Move your hand to position the app, and raise your finger to place it.
+
+- Select **Adjust**, tap and hold, and move your hand to position the app. Raise your finger to place it, then select **Done**.
+- Select **Adjust**, click and hold the clicker, and move your hand to position the app. Release the clicker, then select **Done**.
+
+> [!TIP]
+> If you drop apps when you move them, make sure to keep your hand in the gesture frame by following it with your gaze.
+
+### Resize an app
+
+Gaze at the app, and then do one of the following.
+
+- Gaze at a corner or edge of an app window, and tap and hold. Move your hand to change the app's size, and raise your finger when you're done.
+
+- Select **Adjust**. Gaze at one of the blue squares at the corners of the app, tap and hold, then move your hand to resize the app. Raise your finger to release it, then select **Done**.
+- Select **Adjust**. Gaze at one of the blue squares at the corners of the app, click and hold the clicker, then move your hand to resize the app. Release the clicker, then select **Done**.
+
+> [!TIP]
+> In Adjust mode, you can move or resize any hologram.
+
+### Rotate an app
+
+Gaze at the app, and tap and hold with both hands to select it. Rotate the app by keeping one hand steady and moving your other hand around it. When you're done, raise both index fingers.
+
+## Close apps
+
+To close an app that uses 2D view, gaze at it, then select **Close**.
+
+To close an app that uses holographic view, use the bloom gesture to leave holographic view, then select **Close**.
+
+## Pin apps
+
+Keep your favorite apps handy by pinning them to **Start**. In the **All apps** list, gaze at an app to highlight it. Tap and hold until the menu appears, then select **Pin**. To unpin an app, gaze at the app on **Start**, then tap and hold and select **Unpin**.

devices/hololens/holographic-photos-and-video.md

@@ -0,0 +1,42 @@
+---
+title: Create, share, and view photos and video
+description: Create, share, and view photos and video
+ms.assetid: 1b636ec3-6186-4fbb-81b2-71155aef0593
+keywords: hololens
+ms.prod: hololens
+ms.sitesec: library
+author: Teresa-Motiv
+ms.author: v-tea
+ms.topic: article
+ms.localizationpriority: medium
+ms.date: 8/12/19
+ms.reviewer: 
+manager: jarrettr
+appliesto:
+- Hololens (1st gen)
+---
+
+# Create, share, and view photos and video
+
+Use your HoloLens to take photos and videos that capture the holograms you've placed in your world.
+
+To sync your photos and videos to OneDrive, open the OneDrive app and select **Settings** > **Camera upload**, and then turn on **Camera upload**.
+
+## Take a photo
+
+Use the [bloom](https://support.microsoft.com/help/12644/hololens-use-gestures) gesture to go to **Start**, then select **Photo**. Use gaze to position the photo frame, then air tap to take the picture. The picture will be saved to your collection in the Photos app.</p>
+
+Want to snap a quick pic? Press the volume up and volume down buttons at the same time. [Where are the buttons?](https://support.microsoft.com/help/12649/hololens-whats-in-the-box)
+
+## Take a video
+
+Use the bloom gesture to go to **Start**, then select **Video**. Use gaze to position the video frame, then air tap to start recording. To stop recording, use bloom once. The video will be saved to your collection in the Photos app.
+
+To start recording more quickly, press and hold the volume up and volume down buttons simultaneously until a 3-second countdown begins. To stop recording, tap both buttons.
+
+> [!TIP]
+> You can always have Cortana take a photo or a video for you. Just say "Hey Cortana, take a photo" or "Hey Cortana, take a video." [What else can I say to Cortana?](hololens-cortana.md)
+
+[Take + share photos and video with Mixed reality capture](https://docs.microsoft.com/en-us/windows/mixed-reality/mixed-reality-capture)
+
+[Find and view your photos](https://docs.microsoft.com/en-us/windows/mixed-reality/see-your-photos)

devices/hololens/hololens-clicker-restart-recover.md

@@ -16,6 +16,8 @@ ms.localizationpriority: medium
 
 # Restart or recover the HoloLens clicker
 
+[Clicker recovery](https://support.microsoft.com/en-us/help/15555)
+
 Here are some things to try if the HoloLens clicker is unresponsive or isn’t working well.
 
 ## Restart the clicker

devices/hololens/hololens-connect-devices.md

@@ -0,0 +1,46 @@
+---
+title: Connect to Bluetooth and USB-C devices
+description: This guide walks through connecting to Bluetooth and USB-C devices and accessories.
+ms.assetid: 01af0848-3b36-4c13-b797-f38ad3977e30
+ms.prod: hololens
+ms.sitesec: library
+author: Teresa-Motiv
+ms.author: v-tea
+ms.topic: article
+ms.localizationpriority: medium
+ms.date: 8/12/19
+manager: jarrettr
+appliesto:
+- HoloLens (1st gen)
+- HoloLens 2
+---
+
+# Connect devices and accessories
+
+## Pair Bluetooth devices
+
+Pair a Bluetooth mouse and keyboard with HoloLens, then use them to interact with holograms and to type anywhere you'd use the holographic keyboard. Pair the HoloLens [clicker](hololens-clicker.md) for a different way to interact with HoloLens.
+
+> [!NOTE]
+> Other types of Bluetooth devices, such as speakers, headsets, smartphones, and game pads, may appear as available in HoloLens settings, but aren't supported. [Learn more](http://go.microsoft.com/fwlink/p/?LinkId=746660).
+
+### Pair a Bluetooth keyboard or mouse
+
+1. Turn on your keyboard or mouse and make it discoverable. The way you make it discoverable depends on the device. Check the device or visit the manufacturer's website to learn how.
+
+1. Go to **Start**, then select **Settings**.
+1. Select **Devices** and make sure Bluetooth is on. When you see the device name, select **Pair** and follow the instructions.
+
+### Pair the clicker
+
+1. Use the bloom gesture to go to **Start**, then select **Settings**.
+
+1. Select **Devices** and make sure Bluetooth is on.
+1. Use the tip of a pen to press and hold the clicker's pairing button until the status light blinks white. Make sure to hold the button down until the light starts blinking. [Where's the pairing button?](hololens-clicker.md)
+1. On the pairing screen, select **Clicker** > **Pair**.
+
+## Connect USB-C devices
+
+## Connect to Miracast
+
+> Applies to HoloLens 2 only.

devices/hololens/hololens-cortana.md

@@ -2,26 +2,63 @@
 title: Cortana on HoloLens
 description: Cortana can help you do all kinds of things on your HoloLens
 ms.assetid: fd96fb0e-6759-4dbe-be1f-58bedad66fed
-ms.reviewer: jarrettrenshaw
+ms.date: 08/14/2019
-ms.date: 07/01/2019
-manager: v-miegge
 keywords: hololens
 ms.prod: hololens
 ms.sitesec: library
 author: v-miegge
 ms.author: v-miegge
 ms.topic: article
+manager: jarrettr
 ms.localizationpriority: medium
 ---
 
-# Cortana on HoloLens
+# Use your voice with HoloLens
+
+You can use your voice to do many of the same things you do with gestures on HoloLens, like taking a quick photo or opening an app.
+
+## Voice commands
+
+Get around HoloLens faster with these basic commands.  If you turn Cortana off, "Hey Cortana" voice commands won't be available, but you'll still be able to use the following built-in voice commands.
+
+**Select**. Use this instead of air tap. Gaze at a hologram, then say "Select."
+
+**Go to start**. Say "Go to Start" anytime to bring up the **Start** menu. Or when you're in an immersive app, say "Go to Start" to get to the quick actions menu.
+
+**Move this**. Instead of air tapping and dragging an app, say "Move this" and use gaze to move it.
+
+**Face me**. Gaze at a hologram, and then say "Face me" to turn it your way.
+
+**Bigger/Smaller**. Gaze at a hologram, and then say "Bigger" or "Smaller" to resize it.
+
+Many buttons and other elements on HoloLens also respond to your voice—for example, **Adjust** and **Close** on the app bar. To find out if a button is voice-enabled, rest your gaze on it for a moment. If it is, you'll see a voice tip.
+
+## Dictation mode
+
+Tired of typing? Switch to dictation mode any time the holographic keyboard is active. Select the microphone icon to get started, or say "Start dictating." To stop dictating, select **Done** or say "Stop dictating." To delete what you just dictated, say "Delete that."
+
+> [!NOTE]
+> You need an Internet connection to use dictation mode.
+
+HoloLens dictation uses explicit punctuation, meaning that you say the name of the punctuation you want to use. For instance, you might say "Hey **comma** what are you up to **question mark**."
+
+Here are the punctuation keywords you can use:
+
+- Period, comma, question mark, exclamation point/exclamation mark
+- New line/new paragraph
+- Semicolon, colon
+- Open quote(s), close quote(s)
+- Hashtag, smiley/smiley face, frowny, winky
+- Dollar, percent
+
+Sometimes it's helpful to spell out things like email addresses. For instance, to dictate example@outlook.com, you'd say "E X A M P L E at outlook dot com."
+
+## Do more with Cortana
 
 Cortana can help you do all kinds of things on your HoloLens, from searching the web to shutting down your device. To get her attention, select Cortana  on Start or say "Hey Cortana" anytime.
 
 ![Hey Cortana!](images/cortana-on-hololens.png)
 
-## What do I say to Cortana
-
 Here are some things you can try saying (remember to say "Hey Cortana" first):
 
 - What can I say?
@@ -44,7 +81,8 @@ Here are some things you can try saying (remember to say "Hey Cortana" first):
 - Tell me a joke.
 
 >[!NOTE]
->- Some Cortana features you're used to from Windows on your PC or phone (for example, reminders and notifications) aren't supported in Microsoft HoloLens Development Edition. Cortana on HoloLens is English only, and the Cortana experience may vary among regions.
+>
->- Cortana is on the first time you use HoloLens. You can turn her off in Cortana's settings. In the All apps list, select Cortana > Settings. Then turn off Cortana can give you suggestions, ideas, reminders, alerts, and more.
+>- Some Cortana features you're used to from Windows on your PC or phone (for example, reminders and notifications) aren't supported in Microsoft HoloLens Development Edition. Cortana on HoloLens is English-only, and the Cortana experience may vary among regions.
+>- Cortana is on the first time you use HoloLens. You can turn her off in Cortana's settings. In the **All apps** list, select **Cortana > Settings**. Then turn off Cortana can give you suggestions, ideas, reminders, alerts, and more.
 >- If Cortana isn't responding to "Hey Cortana," go to Cortana's settings and check to make sure she's on.
->- If you turn Cortana off, "Hey Cortana" voice commands won't be available, but you'll still be able to use other commands (like "Select" and "Place").
+>- If you turn Cortana off, "Hey Cortana" voice commands won't be available, but you'll still be able to use other commands (such as "Select" and "Place").

devices/hololens/hololens-find-and-save-files.md

@@ -16,6 +16,9 @@ ms.localizationpriority: medium
 
 # Find and save files on HoloLens
 
+Add content from [Find and save files](https://docs.microsoft.com/en-us/windows/mixed-reality/saving-and-finding-your-files)
+
+
 Files you create on HoloLens, including Office documents, photos, and videos, are saved to your HoloLens. To view and manage them, you can use the File Explorer app on HoloLens or File Explorer on your PC. To sync photos and other files to the cloud, use the OneDrive app on HoloLens.
 
 ## View files on HoloLens

devices/hololens/hololens-install-apps.md

@@ -1,16 +1,15 @@
 ---
-title: Install apps on HoloLens (HoloLens)
+title: Install apps on HoloLens
 description: The recommended way to install apps on HoloLens is to use Microsoft Store for Business.
 ms.prod: hololens
 ms.mktglfcycl: manage
 ms.sitesec: library
-author: dansimp
+author: scooley
-ms.author: dansimp
+ms.author: scooley
 ms.topic: article
 ms.localizationpriority: medium
 ms.date: 10/23/2018
 ms.reviewer: 
-manager: dansimp
 ---
 
 # Install apps on HoloLens
@@ -74,7 +73,7 @@ Using Intune, you can also [monitor your app deployment](https://docs.microsoft.
 
 1. [Set up the HoloLens to use the Windows Device Portal](https://developer.microsoft.com/windows/mixed-reality/using_the_windows_device_portal#setting_up_hololens_to_use_windows_device_portal). The Device Portal is a web server on your HoloLens that you can connect to from a web browser on your PC.
 
-2. On a PC, connect to the HoloLens using [Wi-Fi](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#connecting_over_wi-fi) or [USB](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#connecting_over_usb).
+2. On a PC, connect to the HoloLens using [Wi-Fi](https://docs.microsoft.com/windows/mixed-reality/connecting-to-wi-fi-on-hololens) or USB.
 
 3. [Create a user name and password](https://developer.microsoft.com/windows/mixed-reality/Using_the_Windows_Device_Portal.html#creating_a_username_and_password) if this is the first time you connect to the Windows Device Portal, or enter the user name and password that you previously set up.
 
@@ -88,9 +87,3 @@ Using Intune, you can also [monitor your app deployment](https://docs.microsoft.
 5. In **Install app**, select an **app package** from a folder on your computer or network. If the app package requires additional software, such as dependency frameworks, select **I want to specify framework packages**.
 
 6. In **Deploy**, click **Go** to deploy the app package and added dependencies to the connected HoloLens.
-
-
-
-
-
-

devices/hololens/hololens-network.md

@@ -0,0 +1,40 @@
+---
+title: Connect to a network
+description: Connect to a wi-fi or ethernet network with HoloLens.
+ms.assetid: 0895606e-96c0-491e-8b1c-52e56b00365d
+ms.prod: hololens
+ms.sitesec: library
+author: Teresa-Motiv
+ms.author: v-tea
+ms.topic: article
+ms.localizationpriority: medium
+ms.date: 8/12/19
+manager: jarrettr
+ms.reviewer: 
+appliesto:
+- Hololens
+- HoloLens (1st gen)
+- HoloLens 2
+---
+
+# Connect to a network
+
+You'll need to be connected to a network to do most things on your HoloLens. [What can I do offline](hololens-offline.md)?
+
+## Connecting for the first time
+
+The first time you use your HoloLens, you'll be guided through connecting to a Wi-Fi network. If you have trouble connecting to Wi-Fi during setup, make sure your network is either open, password protected, or a captive portal network and doesn't require using certificates to connect. After setup, you can connect to other types of Wi-Fi networks.
+
+## Connecting to Wi-Fi after setup
+
+1. Go to **Start**, then select **Settings**.
+
+1. _HoloLens (1st gen) only_ - Use your gaze to position the Settings app, then air tap to place it, or say "Place."
+
+1. Select **Network & Internet** > **Wi-Fi**. If you don't see your network, scroll down the list.
+
+1. Select a network > **Connect**.
+
+1. Type the network password if asked for one, then select **Next**.
+
+Also see [Connect to Wifi](https://docs.microsoft.com/en-us/windows/mixed-reality/connecting-to-wi-fi-on-hololens)

devices/hololens/hololens-offline.md

@@ -16,6 +16,9 @@ ms.localizationpriority: medium
 
 # Use HoloLens offline
 
+[Use offline](https://support.microsoft.com/en-us/help/12645)
+
+
 To set up HoloLens, you'll need to connect to a Wi-Fi network—the setup tutorial will show you how.
 
 ## HoloLens limitations

devices/hololens/hololens-requirements.md

@@ -1,32 +1,142 @@
 ---
-title: HoloLens in the enterprise requirements and FAQ (HoloLens)
+title: Set up HoloLens in a commercial environment
-description: Requirements and FAQ for general use, Wi-Fi, and device management for HoloLens in the enterprise.
+description: Learn more about deploying and managing HoloLens in enterprise environments.
 ms.prod: hololens
 ms.sitesec: library
-author: dansimp
+ms.assetid: 88bf50aa-0bac-4142-afa4-20b37c013001
-ms.author: dansimp
+author: scooley
+ms.author: scooley
 ms.topic: article
 ms.localizationpriority: medium
-ms.date: 06/04/2018
+ms.date: 07/15/2019
-ms.reviewer: 
-manager: dansimp
 ---
 
-# Microsoft HoloLens in the enterprise: requirements and FAQ
+# Deploy HoloLens in a commercial environment
 
-When you develop for HoloLens, there are [system requirements and tools](https://developer.microsoft.com/windows/mixed-reality/install_the_tools) that you need. In an enterprise environment, there are also a few requirements to use and manage HoloLens which are listed below.
+TODO - [Commercial features](https://docs.microsoft.com/en-us/windows/mixed-reality/commercial-features)
 
-## Requirements
+Deploy and configure HoloLens at scale in a commercial setting.  
 
-### General use
+This article includes:
-- Microsoft account or Azure Active Directory (Azure AD) account
-- Wi-Fi network to set up HoloLens
 
->[!NOTE]
+- infrastructure requirements and recommendations for HoloLens management
->After you set up HoloLens, you can use it offline [with some limitations](https://support.microsoft.com/help/12645/hololens-use-hololens-offline).
+- tools for provisioning HoloLens
+- instructions for remote device management
+- options for application deployment
 
+This guide assumes basic familiarity with HoloLens. Follow the [get started guide](./hololens-setup.md) to set up HoloLens for the first time.
+
+## Infrastructure for managing HoloLens
+
+HoloLens are, at their core, a Windows mobile device integrated with Azure.  They work best in commercial environments with wireless network availability (wi-fi) and access to Microsoft services.
+
+Critical cloud services include:
+
+- Azure active directory (AAD)
+- Windows Update (WU)
+
+Commercial customers will need enterprise mobility management (EMM) or mobile device management (MDM) infrastructure in order to manage HoloLens devices at scale.  This guide uses [Microsoft Intune](https://www.microsoft.com/en-us/enterprise-mobility-security/microsoft-intune) as an example though any provider with full support for Microsoft Policy can support HoloLens.  Ask your mobile device management provider if they support HoloLens 2.
+
+HoloLens does support a limited set of cloud disconnected experiences.
+
+## Initial set up at scale
+
+The HoloLens out of box experience is great for setting up one or two devices or for experiencing HoloLens for the first time.  If you're provisioning many HoloLens devices, however, picking your language and settings manually for each device gets tedious and limits scale.
+
+This section:
+
+1. introduces Windows provisioning using provisioning packages
+1. walks through applying a provisioning package during first setup
+
+### Create and apply a provisioning package
+
+The best way to configure many new HoloLens devices is with Windows provisioning.  Using Windows provisioning, you can specify desired configuration and settings required to enroll the devices into management and then apply that configuration to target devices in minutes.
+
+A [provisioning package](https://docs.microsoft.com/windows/configuration/provisioning-packages/provisioning-packages)  (.ppkg) is a collection of configuration settings. With Windows 10, you can create provisioning packages that let you quickly and efficiently configure a device.
+
+### Upgrade to Windows Holographic for Business
+
+- HoloLens Enterprise license XML file
+
+Some of the HoloLens configurations that you can apply in a provisioning package:
+
+- Apply certificates to the device
+- Set up a Wi-Fi connection
+- Pre-configure out of box questions like language and locale.
+- (HoloLens 2) bulk enroll in mobile device management
+- (HoloLens v1) Apply key to enable Windows Holographic for Business
+
+Follow [this guide](https://docs.microsoft.com/hololens/hololens-provisioning) to create and apply a provisioning package to HoloLens.
+
+### Set up user identity and enroll in device management
+
+The last step setting up HoloLens for management at scale is to enroll devices with mobile device management infrastructure.  There are several ways to enroll:
+
+1. Bulk enrollment with a security token in a provisioning package.  
+  Pros: this is the most automated approach  
+  Cons: takes initial server-side setup  
+1. Auto-enroll on user sign in
+  Pros: easiest approach  
+  Cons: users will need to complete set up after the provisioning package has been applied  
+1. _not recommended_ - Manually enroll post-setup  
+  Pros: possible to enroll after set up  
+  Cons: most manual approach and devices aren't centrally manageable until they're manually enrolled.
+
+Learn more about MDM enrollment [here](hololens-enroll-mdm.md).
+
+## Ongoing device management
+
+Ongoing device management will depend on your mobile device management infrastructure.  Most have the same general functionality but the user interface may vary widely.
+
+This article outlines [policies and capabilities HoloLens supports](https://docs.microsoft.com/windows/client-management/mdm/configuration-service-provider-reference#hololens).
+
+[This article](https://docs.microsoft.com/intune/windows-holographic-for-business) talks about Intune's management tools for HoloLens.
+
+### Push compliance policy via Intune
+
+[Compliance policies](https://docs.microsoft.com/intune/device-compliance-get-started) are rules and settings that devices must meet to be compliant in your corporate infrastructure. Use these policies with Conditional Access to block access to company resources for devices that are not-compliant.
+
+For example, you can create a policy that requires Bitlocker be enabled.
+
+[Create compliance policies with Intune](https://docs.microsoft.com/intune/compliance-policy-create-windows).
+
+### Manage updates
+
+Intune includes a feature called update rings for Windows 10 devices, including HoloLens 2 and HoloLens v1 (with Holographic for Business). Update rings include a group of settings that determine how and when updates are installed.
+
+For example, you can create a maintenance window to install updates, or choose to restart after updates are installed.  You can also choose to pause updates indefinitely until you're ready to update.
+
+Read more about [configuring update rings with Intune](https://docs.microsoft.com/en-us/intune/windows-update-for-business-configure).
+
+## Application management
+
+Manage holoLens applications through:
+
+1. Microsoft Store  
+  The Microsoft Store is the best way to distribute and consume application on HoloLens.  There is a great set of core HoloLens applications already available in the store or you can [publish your own](https://docs.microsoft.com/en-us/windows/uwp/publish/).  
+  All applications in the store are available publicly to everyone, if that isn't acceptable, checkout the Microsoft Store for Business.  
+
+1. [Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/)  
+  Microsoft Store for Business and Education is a custom store for your corporate environment.  It lets you use the Microsoft Store built into Windows 10 and HoloLens to find, acquire, distribute, and manage apps for your organization.  It lets you deploy apps that are specific to your commercial environment but not to the world.
+
+1. Application deployment and management via Intune or another mobile device management solution  
+  Most mobile device management solutions, including Intune, provide a way to deploy line of business applications directly to a set of enrolled devices.  See this article for [Intune app install](https://docs.microsoft.com/intune/apps-deploy).
+
+1. _not recommended_ Device Portal  
+  Applications can also be installed on HoloLens directly using the Windows Device Portal.  This isn't recommended since Developer Mode has to be enabled to use device portal.
+
+Read more about [installing apps on HoloLens](https://docs.microsoft.com/hololens/hololens-install-apps).
+
+## Get support
+
+Get support through the Microsoft support site.
+
+[File a support request](https://support.microsoft.com/en-us/supportforbusiness/productselection?sapid=e9391227-fa6d-927b-0fff-f96288631b8f).
+
+## Technical Reference
+
+### Wireless network EAP support
 
-### Supported wireless network EAP methods 
 - PEAP-MS-CHAPv2
 - PEAP-TLS
 - TLS
@@ -35,54 +145,3 @@ When you develop for HoloLens, there are [system requirements and tools](https:/
 - TTLS-MS-CHAPv2
 - TTLS-PAP
 - TTLS-TLS
-
-### Device management 
-   - Users have Azure AD accounts with [Intune license assigned](https://docs.microsoft.com/intune/get-started/start-with-a-paid-subscription-to-microsoft-intune-step-4)
-   - Wi-Fi network
-   - Intune or a 3rd party mobile device management (MDM) provider that uses Microsoft MDM APIs
-   
-### Upgrade to Windows Holographic for Business 
-- HoloLens Enterprise license XML file
-
-
-## FAQ for HoloLens
-
-<span id="pin"/>
-#### Is Windows Hello for Business supported on HoloLens?
-
-Windows Hello for Business (using a PIN to sign in) is supported for HoloLens. To allow Windows Hello for Business PIN sign-in on HoloLens:
-
-1. The HoloLens device must be [managed by MDM](hololens-enroll-mdm.md).
-2. You must enable Windows Hello for Business for the device. ([See instructions for Microsoft Intune.](https://docs.microsoft.com/intune/windows-hello))
-3. On HoloLens, the user can then set up a PIN from **Settings** > **Sign-in Options** > **Add PIN**.
-
->[!NOTE]
->Users who sign in with a Microsoft account can also set up a PIN in **Settings** > **Sign-in Options** > **Add PIN**. This PIN is associated with [Windows Hello](https://support.microsoft.com/help/17215/windows-10-what-is-hello), rather than [Windows Hello for Business](https://docs.microsoft.com/windows/security/identity-protection/hello-for-business/hello-overview).
-
-#### Does the type of account change the sign-in behavior?
-
-Yes, the behavior for the type of account impacts the sign-in behavior. If you apply policies for sign-in, the policy is always respected. If no policy for sign-in is applied, these are the default behaviors for each account type.
-
-- Microsoft account: signs in automatically
-- Local account: always asks for password, not configurable in **Settings**
-- Azure AD: asks for password by default; configurable by **Settings** to no longer ask for password. 
-
->[!NOTE]
->Inactivity timers are currently not supported, which means that the **AllowIdleReturnWithoutPassword** policy is respected only when the device goes into StandBy. 
-
-
-#### How do I remove a HoloLens device from the Intune dashboard?
-
-You cannot [unenroll](https://docs.microsoft.com/intune-user-help/unenroll-your-device-from-intune-windows) HoloLens from Intune remotely. If the administrator unenrolls the device using MDM, the device will age out of the Intune dashboard.
-
-
-## Related resources
-
-[Getting started with Azure Active Directory Premium](https://azure.microsoft.com/documentation/articles/active-directory-get-started-premium/)
-
-[Get started with Intune](https://docs.microsoft.com/intune/understand-explore/get-started-with-a-30-day-trial-of-microsoft-intune)
-
-[Enroll devices for management in Intune](https://docs.microsoft.com/intune/deploy-use/enroll-devices-in-microsoft-intune#supported-device-platforms)
-
-[Azure AD editions](https://azure.microsoft.com/documentation/articles/active-directory-editions/)
-

devices/hololens/hololens-start.md

@@ -0,0 +1,57 @@
+---
+title: HoloLens (1st gen) first start
+description: Go through the first start experience for HoloLens (1st gen).
+ms.assetid: 0136188e-1305-43be-906e-151d70292e87
+ms.prod: hololens
+author: Teresa-Motiv
+ms.author: v-tea
+ms.topic: article
+ms.date: 8/12/19
+manager: jarrettr
+ms.topic: article
+ms.localizationpriority: medium
+---
+
+# Set up HoloLens for the first time
+
+The first time you turn on your HoloLens, you'll be guided through calibrating your device, setting up your device, and signing in.  This section walks through the HoloLens (1st gen) first start experience.
+
+In the next section, you'll learn how to work with HoloLens and interact with holograms.  Skip ahead to [Get started with HoloLens (1st gen)](holographic-home.md)
+
+## Before you start
+
+Before you get started, make sure you have the following available:
+
+**A Wi-Fi connection**. You'll need to connect your HoloLens to a Wi-Fi network to set it up. The first time you connect, you'll need an open or password-protected network that doesn't require navigating to a website or using certificates to connect. After setup, you can [use your device offline](hololens-offline.md).
+
+**A Microsoft account**. You'll also need to sign in to HoloLens with a Microsoft account (or with your work account, if your organization owns the device). If you don't have a Microsoft account, go to [account.microsoft.com](http://account.microsoft.com) and set one up for free.
+
+**A safe, well-lit space with no tripping hazards**. [Health and safety info](http://go.microsoft.com/fwlink/p/?LinkId=746661).
+
+**The optional comfort accessories** that came with your HoloLens, to help you get the most comfortable fit. [More on fit and comfort](https://support.microsoft.com/help/12632/hololens-fit-your-hololens).
+
+> [!NOTE]
+> [Cortana](hololens-cortana.md) is already on and ready to guide you the first time you use your HoloLens (though she won't be able to respond to your questions until after you set up your device). You can turn Cortana off at any time in Cortana's settings.
+
+## Set up your HoloLens
+
+Set up your HoloLens and your user account.
+
+1. The first time you use your HoloLens, you'll be guided through connecting to a Wi-Fi network. If you have trouble connecting to Wi-Fi during setup, make sure your network is either open, password protected, or a captive portal network and doesn't require using certificates to connect. After setup, you can connect to other types of Wi-Fi networks.
+1. Sign in to your user account.  You'll choose between **My work or school owns it** and **I own it**.
+    - When you choose **My work or school owns it**, you sign in by using an Azure AD account. If your organization uses Azure AD Premium and has configured automatic MDM enrollment, HoloLens will be enrolled in MDM. If your organization does not use Azure AD Premium, automatic MDM enrollment isn't available, so you will need to [enroll HoloLens in device management manually](hololens-enroll-mdm.md#enroll-through-settings-app).
+        1. Enter your organizational account information.
+        1. Accept the privacy statement.
+        1. Sign in by using your Azure AD credentials. This may redirect to your organization's sign-in page.
+        1. Continue with device setup.
+    - When you choose **I own it**, you sign in by using a Microsoft account. After setup is complete, you can [enroll HoloLens in device management manually](hololens-enroll-mdm.md#enroll-through-settings-app).
+        1. Enter your Microsoft account information.
+        1. Enter your password. If your Microsoft account requires [two-step verification (2FA)](https://blogs.technet.microsoft.com/microsoft_blog/2013/04/17/microsoft-account-gets-more-secure/), complete the verification process.
+1. The device sets your time zone based on information obtained from the Wi-Fi network.
+1. Follow the first-start guides to learn how to interact with holograms, control the HoloLens with your voice, and access the start menu.
+
+Congratulations!  Setup is complete and you can begin using HoloLens.
+
+## Next steps
+
+- [Get started with HoloLens (1st gen)](holographic-home.md)

devices/hololens/hololens-status.md

@@ -0,0 +1,36 @@
+---
+title: HoloLens status
+description: Shows the status of HoloLens online services. 
+author: todmccoy
+ms.author: v-todmc
+ms.reviewer: luoreill
+manager: jarrettr
+audience: Admin
+ms.topic: article
+ms.prod: hololens
+localization_priority: Medium 
+ms.sitesec: library
+---
+
+# HoloLens status
+
+✔️ **All services are active**
+
+**Key** ✔️ Good, ⓘ Information, ⚠ Warning, ❌ Critical 
+
+Area|HoloLens (1st gen)|HoloLens 2
+----|:----:|:----:
+[Azure services](https://status.azure.com/en-us/status)|✔️|✔️
+[Store app](https://www.microsoft.com/en-us/store/collections/hlgettingstarted/hololens)|✔️|✔️
+[Apps](https://www.microsoft.com/en-us/hololens/apps)|✔️|✔️
+[MDM](https://docs.microsoft.com/en-us/hololens/hololens-enroll-mdm)|✔️|✔️
+
+## Notes and related topics
+
+[Frequently asked questions about using Skype for HoloLens](https://support.skype.com/en/faq/FA34641/frequently-asked-questions-about-using-skype-for-hololens)
+
+For more details about the status of the myriad Azure Services that can connect to HoloLens, see [Azure status](https://azure.microsoft.com/en-us/status/).
+
+For more details about current known issues, see [HoloLens known issues](https://docs.microsoft.com/en-us/windows/mixed-reality/hololens-known-issues).
+
+Follow HoloLens on [Twitter](https://twitter.com/HoloLens) and subscribe on [Reddit](https://www.reddit.com/r/HoloLens/).

devices/surface-hub/General-Data-Privacy-Regulation-and-Surface-Hub.md

@@ -2,8 +2,6 @@
 title: General Data Privacy Regulation and Surface Hub
 description: Informs users who are subject to EU data protection laws of their options regarding how to delete or restrict diagnostic data produced by Surface Hub.
 ms.assetid: 087713CF-631D-477B-9CC6-EFF939DE0186
-ms.reviewer: 
-manager: 
 keywords: GDPR
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/connect-app-in-surface-hub-unexpectedly-exits.md

@@ -2,8 +2,6 @@
 title: What to do if the Connect app in Surface Hub exits unexpectedly
 description: Describes how to resolve an issue where the Connect app in Surface Hub exits to the Welcome screen after cycling through inputs.
 ms.assetid: 9576f4e4-d936-4235-8a03-d8a6fe9e8fec
-ms.reviewer: 
-manager: 
 keywords: surface, hub, connect, input, displayport
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/known-issues-and-additional-info-about-surface-hub.md

@@ -2,8 +2,6 @@
 title: Known issues and additional information about Microsoft Surface Hub
 description: Outlines known issues with Microsoft Surface Hub.
 ms.assetid: aee90a0c-fb05-466e-a2b1-92de89d0f2b7
-ms.reviewer: 
-manager: 
 keywords: surface, hub, issues
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/surface-Hub-installs-updates-and-restarts-outside-maintenance-hours.md

@@ -2,8 +2,6 @@
 title: Surface Hub may install updates and restart outside maintenance hours
 description: troubleshooting information for Surface Hub regarding automatic updates
 ms.assetid: 6C09A9F8-F9CF-4491-BBFB-67A1A1DED0AA
-ms.reviewer: 
-manager: 
 keywords: surface hub, maintenance window, update
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/surface-hub-start-menu.md

@@ -3,12 +3,12 @@ title: Configure Surface Hub Start menu
 description: Use MDM to customize the Start menu on Surface Hub. 
 ms.prod: surface-hub
 ms.sitesec: library
-author: levinec
+author: robmazz
-ms.author: ellevin
+ms.author: robmazz
 ms.topic: article
-ms.date: 01/17/2018
+ms.date: 08/15/2018
 ms.reviewer: 
-manager: dansimp
+manager: laurawi
 ms.localizationpriority: medium
 ---
 
@@ -107,7 +107,7 @@ There are a few key differences between Start menu customization for Surface Hub
 <span id="edge" />
 ## Example: Start layout that includes a Microsoft Edge link
 
-This example shows a link to a website and a link to a .pdf file.
+This example shows a link to a website and a link to a .pdf file. The secondary tile for Microsoft Edge uses a 150 x 150 pixel icon.
 
 ```xml
 <LayoutModificationTemplate Version="1" xmlns="http://schemas.microsoft.com/Start/2014/LayoutModification">
@@ -165,10 +165,10 @@ This example shows a link to a website and a link to a .pdf file.
              TileID="6153963000"
              DisplayName="cstrtqbiology.pdf"
              Arguments="-contentTile -formatVersion 0x00000003 -pinnedTimeLow 0x45b7376e -pinnedTimeHigh 0x01d2356c -securityFlags 0x00000000 -tileType 0x00000000 -url 0x0000003a https://www.ada.gov/regs2010/2010ADAStandards/Guidance_2010ADAStandards.pdf"
-             Square150x150LogoUri="ms-appx:///"                                                
+             Square150x150LogoUri="ms-appx:///Assets/MicrosoftEdgeSquare150x150.png"
              Wide310x150LogoUri="ms-appx:///" 
              ShowNameOnSquare150x150Logo="true"
-             ShowNameOnWide310x150Logo="true"
+             ShowNameOnWide310x150Logo="false"
              BackgroundColor="#ff4e4248"
              Size="4x2" 
              Row="4"
@@ -181,8 +181,6 @@ This example shows a link to a website and a link to a .pdf file.
 ```
 
 >[!NOTE]
->Microsoft Edge tile logos won't appear on secondary tiles because they aren't stored in Surface Hub.
->
 >The default value for `ForegroundText` is light; you don't need to include `ForegroundText` in your XML unless you're changing the value to dark.
 
 ## More information

devices/surface-hub/surface-hub-update-history.md

@@ -2,8 +2,6 @@
 title: Surface Hub update history
 description: Surface Hub update history
 ms.assetid: d66a9392-2b14-4cb2-95c3-92db0ae2de34
-ms.reviewer:
-manager:
 keywords:
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/surfacehub-miracast-not-supported-europe-japan-israel.md

@@ -2,8 +2,6 @@
 title: Surface Hub Miracast channels 149-165 not supported in Europe, Japan, Israel
 description: Surface Hub Miracast channels 149-165 not supported in Europe, Japan, Israel
 ms.assetid: 8af3a832-0537-403b-823b-12eaa7a1af1f
-ms.reviewer: 
-manager: 
 keywords:
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/use-cloud-recovery-for-bitlocker-on-surfacehub.md

@@ -2,8 +2,6 @@
 title: How to use cloud recovery for BitLocker on a Surface Hub
 description: How to use cloud recovery for BitLocker on a Surface Hub
 ms.assetid: c0bde23a-49de-40f3-a675-701e3576d44d
-ms.reviewer: 
-manager: 
 keywords: Accessibility settings, Settings app, Ease of Access
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface-hub/use-surface-hub-diagnostic-test-device-account.md

@@ -2,8 +2,6 @@
 title: Using the Surface Hub Hardware Diagnostic Tool to test a device account
 description: Using the Surface Hub Hardware Diagnostic Tool to test a device account
 ms.assetid: a87b7d41-d0a7-4acc-bfa6-b9070f99bc9c
-ms.reviewer: 
-manager: 
 keywords: Accessibility settings, Settings app, Ease of Access
 ms.prod: surface-hub
 ms.sitesec: library

devices/surface/TOC.md

@@ -30,15 +30,16 @@
 ### [Surface System SKU reference](surface-system-sku-reference.md)
 
 ## Manage
+### [Optimizing wireless connectivity for Surface devices](surface-wireless-connect.md)
 ### [Best practice power settings for Surface devices](maintain-optimal-power-settings-on-Surface-devices.md)
 ### [Battery Limit setting](battery-limit.md)
 ### [Surface Brightness Control](microsoft-surface-brightness-control.md)
 ### [Surface Asset Tag](assettag.md)
 ### [Surface firmware and driver updates](update.md)
-### [Download the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)
+### [Deploy the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)
 ### [Manage Surface driver and firmware updates](manage-surface-pro-3-firmware-updates.md)
 ### [Surface Dock Updater](surface-dock-updater.md)
-### [Use System Center Configuration Manager to manage devices with SEMM](use-system-center-configuration-manager-to-manage-devices-with-semm.md)
+
 
 ## Secure
 ### [Manage Surface UEFI settings](manage-surface-uefi-settings.md)
@@ -46,12 +47,13 @@
 ### [Surface Enterprise Management Mode](surface-enterprise-management-mode.md)
 ### [Enroll and configure Surface devices with SEMM](enroll-and-configure-surface-devices-with-semm.md)
 ### [Unenroll Surface devices from SEMM](unenroll-surface-devices-from-semm.md)
+### [Use System Center Configuration Manager to manage devices with SEMM](use-system-center-configuration-manager-to-manage-devices-with-semm.md)
 
-## Support
+## Troubleshoot
 ### [Fix common Surface problems using the Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-for-business-intro.md)
-### [Deploy Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md)
+#### [Deploy Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md)
-### [Use Surface Diagnostic Toolkit for Business in desktop mode](surface-diagnostic-toolkit-desktop-mode.md)
+#### [Use Surface Diagnostic Toolkit for Business in desktop mode](surface-diagnostic-toolkit-desktop-mode.md)
-### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md)
+#### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md)
 ### [Surface Data Eraser](microsoft-surface-data-eraser.md)
 ### [Top support solutions for Surface devices](support-solutions-surface.md)
 ### [Change history for Surface documentation](change-history-for-surface.md)

devices/surface/change-history-for-surface.md

@@ -15,6 +15,14 @@ ms.topic: article
 
 This topic lists new and updated topics in the Surface documentation library.
 
+## August 2019
+
+| **New or changed topic** | **Description** |
+| ------------------------ | --------------- |
+| [Optimizing wireless connectivity for Surface devices](surface-wireless-connect.md)             | New document highlights key wireless connectivity considerations for Surface devices in mobile scenarios. |
+| [Deploy the latest firmware and drivers for Surface devices](deploy-the-latest-firmware-and-drivers-for-surface-devices.md)              | Updated to reflect minor changes in the file naming convention for Surface MSI files. |
+
+
 ## July 2019
 
 | **New or changed topic** | **Description** |

devices/surface/deploy-the-latest-firmware-and-drivers-for-surface-devices.md

@@ -1,5 +1,5 @@
 ---
-title: Download the latest firmware and drivers for Surface devices (Surface)
+title: Deploy the latest firmware and drivers for Surface devices (Surface)
 description: This article provides a list of the available downloads for Surface devices and links to download the drivers and firmware for your device.
 ms.assetid: 7662BF68-8BF7-43F7-81F5-3580A770294A
 ms.reviewer: 
@@ -11,27 +11,43 @@ ms.mktglfcycl: deploy
 ms.pagetype: surface, devices
 ms.sitesec: library
 author: dansimp
-ms.date: 11/15/2018
+ms.date: 08/13/2018
 ms.author: dansimp
 ms.topic: article
 ---
 
-# Deploying the latest firmware and drivers for Surface devices
+# Deploy the latest firmware and drivers for Surface devices
 Although Surface devices are typically automatically updated with the latest device drivers and firmware via Windows Update, sometimes it's necessary to download and install updates manually, such as during a Windows deployment. 
 
-## Downloading MSI files
+## Download MSI files
 To download MSI files, refer to the following Microsoft Support page:
  
 - [Download drivers and firmware for Surface](https://support.microsoft.com/help/4023482/surface-download-drivers-and-firmware-for-surface)<br>
 Installation files for administrative tools, drivers for accessories, and updates for Windows are also available for some devices.
 
 ## Deploying MSI files
-Driver and firmware updates for Surface devices containing all required cumulative updates are packaged in separate MSI files for specific versions of Windows 10. 
+Driver and firmware updates for Surface devices consisting of all required cumulative updates are packaged in separate MSI files for specific versions of Windows 10.
-In the name of each of these files you will find a Windows build number, this number indicates the minimum supported build required to install the drivers and firmware contained within. Refer to [Windows 10 release information](https://docs.microsoft.com/windows/windows-10/release-information) for a list of the build numbers for each version. For example, to install the drivers contained in SurfacePro6_Win10_16299_1900307_0.msi file you must have Windows 10 Fall Creators Update version 1709, or newer installed on your Surface Pro 6.
 
+The MSI file names contain useful information including the minimum supported Windows build number required to install the drivers and firmware. For example, to install the drivers contained in SurfaceBook_Win10_17763_19.080.2031.0.msi requires Windows 10 Fall Creators Update version 1709 or later installed on your Surface Book.
+
+To view build numbers for each version, refer to [Windows 10 release information](https://docs.microsoft.com/windows/windows-10/release-information).
 
 ### Surface MSI naming convention
-Each .MSI file is named in accordance with a formula that begins with the product and Windows release information, followed by the Windows build  number and version number, and ending with the revision of version number.  SurfacePro6_Win10_16299_1900307_0.msi is classified as follows:
+Beginning in August 2019, MSI files use the following naming formula:
+
+- Product > Windows release > Windows build number > Version number >  Revision of version number (typically zero).
+
+**Example:**
+SurfacePro6_Win10_18362_19.073.44195_0.msi :
+
+| Product     | Windows release | Build | Version |  Revision of version |
+| --- | --- | --- | --- | --- |
+| SurfacePro6 | Win10  | 18362  | 19.073.44195 | 0  |
+|       |      |       | Indicates key date and sequence information.  | Indicates release history of the update.   |
+|      |        |     | **19:** Signifies the year (2019).<br>**073**: Signifies the month (July) and week of the release (3).  <br>**44195**: Signifies the minute of the month that the MSI file was created. |**0:**  Signifies it's the first release of version 1907344195 and has not been re-released for any reason. |
+
+### Legacy Surface MSI naming convention
+Legacy MSI files prior to August 2019 followed the same overall naming formula but used a different method to derive the version number.  
 
 **Example:**
 SurfacePro6_Win10_16299_1900307_0.msi :
@@ -39,8 +55,8 @@ SurfacePro6_Win10_16299_1900307_0.msi :
 | Product     | Windows release | Build | Version |  Revision of version |
 | --- | --- | --- | --- | --- |
 | SurfacePro6 | Win10  | 16299  | 1900307 | 0  |
-|       |      |       | Indicates key date and sequence information  | Indicates release history of the MSI file   |
+|       |      |       | Indicates key date and sequence information.  | Indicates release history of the MSI file.   |
-|      |        |     | **19:** Signifies the year (2019)<br>**003**: Signifies that it’s the third release of 2019<br>**07**: Signifies the product version number. (Surface Pro 6 is officially the seventh version of Surface Pro.) | **0:** Signifies it's the first release of version 1900307 and has not been re-released for any reason. |
+|      |        |     | **19:** Signifies the year (2019)<br>**003**: Signifies that it’s the third release of 2019.<br>**07**: Signifies the product version number. (Surface Pro 6 is officially the seventh version of Surface Pro.) | **0:** Signifies it's the first release of version 1900307 and has not been re-released for any reason. |
 
 Look to the **version** number to determine the latest files that contain the most recent security updates.  For example, you might need to install the newest file from the following list:
 
@@ -60,9 +76,9 @@ There are no downloadable firmware or driver updates available for Surface devic
 
 For more information about deploying Surface drivers and firmware, refer to:
 
-- [Manage Surface driver and firmware updates](https://docs.microsoft.com/surface/manage-surface-pro-3-firmware-updates).
+- [Manage Surface driver and firmware updates](https://docs.microsoft.com/surface/manage-surface-pro-3-firmware-updates)
 
-- [Microsoft Surface support for business](https://www.microsoft.com/surface/support/business).
+- [Microsoft Surface support for business](https://www.microsoft.com/surface/support/business)
 
 
  

devices/surface/support-solutions-surface.md

@@ -25,7 +25,7 @@ These are the top Microsoft Support solutions for common issues experienced when
 
 ## Screen cracked or scratched issues
 
-- [Cracked screen and physical damage](https://www.microsoft.com/surface/support/warranty-service-and-recovery/surface-is-damaged)
+- [Contact Microsoft Support](https://support.microsoft.com/en-us/supportforbusiness/productselection) 
 
 
 ## Device cover or keyboard issues

devices/surface/surface-diagnostic-toolkit-for-business-intro.md

@@ -29,10 +29,9 @@ Before you run the diagnostic tool, make sure you have the latest Windows update
 **To run the Surface Diagnostic Toolkit for Business:**
 
 1. Download the [Surface Diagnostic Toolkit for Business](https://aka.ms/SDT4B).
-2. Select Run and follow the on-screen instructions.
+2. Select Run and follow the on-screen instructions. For full details, refer to [Deploy Surface Diagnostic Toolkit for Business](https://docs.microsoft.com/surface/surface-diagnostic-toolkit-business).
-
-The diagnosis and repair time averages 15 minutes but could take an hour or longer, depending on internet connection speed and the number of updates or repairs required. For more detailed information on Surface Diagnostic Toolkit for Business, refer to [Deploy Surface Diagnostic Toolkit for Business](https://docs.microsoft.com/surface/surface-diagnostic-toolkit-business).
 
+The diagnosis and repair time averages 15 minutes but could take an hour or longer, depending on internet connection speed and the number of updates or repairs required. 
 # If you still need help
 
 If the Surface Diagnostic Toolkit for Business didn’t fix the problem, you can also:

devices/surface/surface-wireless-connect.md

@@ -0,0 +1,84 @@
+---
+title: Optimizing wireless connectivity for Surface devices
+description: This topic provides guidance around recommended  wireless connectivity settings for network admins and users.
+ms.prod: w10
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: dansimp
+ms.localizationpriority: medium
+ms.author: dansimp
+ms.topic: article
+ms.date: 08/15/2019
+ms.reviewer: 
+manager: dansimp
+---
+# Optimizing wireless connectivity for Surface devices
+
+## Introduction
+
+To stay connected with all-day battery life, Surface devices implement wireless connectivity settings that balance performance and power conservation. Outside of the most demanding mobility scenarios, users can maintain sufficient wireless connectivity without modifying default network adapter or related settings. 
+
+In congested network environments, organizations can implement purpose-built wireless protocols across multiple network access points to facilitate roaming. This page highlights key wireless connectivity considerations in mobile scenarios utilizing Surface Pro 3 and later, Surface Book, Surface Laptop, and Surface Go.
+
+## Prerequisites
+
+This document assumes you have successfully deployed a wireless network that supports 802.11n (Wi-Fi 4) or later in accordance with best practice recommendations from leading equipment vendors.
+
+## Configuring access points for optimal roaming capabilities
+
+If you’re managing a wireless network that’s typically accessed by many different types of client devices, it’s recommended to enable specific protocols on access points (APs) in your WLAN, as described in [Fast Roaming with 802.11k, 802.11v, and 802.11r](https://docs.microsoft.com/en-us/windows-hardware/drivers/network/fast-roaming-with-802-11k--802-11v--and-802-11r). Surface devices can take advantage of the following wireless protocols:
+
+- **802.11r.** “**Fast BSS Transition”** accelerates connecting to new wireless access points by reducing the number of frames required before your device can access another AP as you move around with your device.
+- **802.11k.** **“Neighbor Reports”** provides devices with information on current conditions at neighboring access points. It can help your Surface device choose the best AP using criteria other than signal strength such as AP utilization.
+
+Surface Go devices can also use 802.11v “BSS Transition Management Frames,” which functions much like 802.11k in providing information on nearby candidate APs.
+
+## Managing user settings
+
+You can achieve optimal roaming capabilities through a well-designed network that supports  802.11r and 802.11k across all access points. Ensuring that your network is properly configured to provide users with the best wireless experience is the recommended approach versus attempting to manage user settings on individual devices. Moreover, in many corporate environments Surface device users won’t be able to access advanced network adapter settings without explicit permissions or local admin rights. In other lightly managed networks, users can benefit by knowing how specific settings can impact their ability to remain connected.
+
+### Recommended user settings and best practices
+
+In certain situations, modifying advanced network adapter settings built into Surface devices may facilitate a more reliable connection. Keep in mind however that an inability to connect to wireless resources is more often due to an access point issue, networking design flaw, or environmental site issue.
+
+> [!NOTE]
+> How you hold your Surface Pro or Surface Go can also affect signal strength. If you’re experiencing a loss of bandwidth, check that you’re not holding the top of the display, where the Wi-Fi radio receiver is located. Although holding the top of the display does not block wireless signals, it can trigger the device driver to initiate changes that reduce connectivity.
+
+### Keep default Auto setting for dual bandwidth capability
+On most Surface devices, you can configure client network adapter settings to only connect to wireless APs over 5 gigahertz (GHz), only connect over 2.4 GHz, or let the operating system choose the best option (default Auto setting).
+
+**To access network adapter settings go to:**
+
+- **Start** > **Control panel** > **Network and Sharing Center** > **your Wi-Fi adapter** > **Properties** > **Configure** > **Advanced**.
+
+![* wifi-band settings*](images/wifi-band.png) <br>
+
+Keep in mind that 2.4 GHz has some advantages over 5 GHz: It extends further and more easily penetrates through walls or other solid objects. Unless you have a clear use case that warrants connecting to 5 GHz, it’s recommended to leave the Band setting in the default state to avoid possible adverse consequences. For example:
+
+
+- Many hotspots found in hotels, coffee shops, and airports still only use 2.4 GHz, effectively blocking access to devices if Band is set to 5 GHz Only.
+- Since Miracast wireless display connections require the initial handshake to be completed over 2.4 GHz channels, devices won’t be able to connect at 5 GHz Only.
+
+> [!NOTE]
+> By default Surface devices will prefer connecting to 5 GHz if available. However, to preserve power  in a low battery state, Surface will first look for a 2.4 GHz connection.
+
+You can also toggle the band setting as needed to suit your environment. For example, users living in high density apartment buildings with multiple Wi-Fi hotspots  —  amid the presence of consumer devices all broadcasting via 2.4 GHz  —  will likely benefit by setting their Surface device to connect on 5 GHz only and then revert to Auto when needed.
+
+### Roaming aggressiveness settings on Surface Go
+
+Front-line workers using Surface Go may wish to select a signal strength threshold that prompts the device to search for a new access point when signal strength drops (roaming aggressiveness). By default, Surface devices attempt to roam to a new access point if the signal strength drops below **Medium** (50 percent signal strength). Note that whenever you increase roaming aggressiveness, you accelerate battery power consumption.
+
+Leave the roaming aggressiveness setting in the default state unless you’re encountering connectivity issues in specific mobile scenarios such as conducting environmental site inspections while also maintaining voice and video connectivity during a conference meeting. If you don’t notice any improvement revert to the default **Medium** state.
+
+**To enable roaming aggressiveness on Surface Go:**
+
+1. Go to **Start > Control Panel** > **Network and Internet** > **Network and Sharing Center.**
+2. Under **Connections** select **Wi-Fi** and then select **Properties.**
+3. Select **Client for Microsoft Networks** and then select **Configure**
+4. Select **Advanced** > **Roaming Aggressiveness** and choose ****your preferred value from the drop-down menu.
+
+![* Roaming aggressiveness settings *](images/wifi-roaming.png) <br>
+
+## Conclusion
+
+Surface devices are designed with default settings for optimal wireless connectivity balanced alongside the need to preserve battery life. The most effective way of enabling reliable connectivity for Surface devices is through a well-designed network that supports 802.11r and 802.11k. Users can adjust network adapter settings or roaming aggressiveness but should only do so in response to specific environmental factors and revert to default state if there’s no noticeable improvement.

education/docfx.json

@@ -28,6 +28,7 @@
       "audience": "windows-education",
       "ms.topic": "article",
       "ms.technology": "windows",
+      "manager": "laurawi",
       "audience": "ITPro",
       "breadcrumb_path": "/education/breadcrumb/toc.json",
       "ms.date": "05/09/2017",

education/get-started/get-started-with-microsoft-education.md

@@ -5,7 +5,7 @@ keywords: education, Microsoft Education, full cloud IT solution, school, deploy
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
-ms.topic: hero-article
+ms.topic: article
 ms.localizationpriority: medium
 ms.pagetype: edu
 author: levinec

education/get-started/set-up-windows-10-education-devices.md

@@ -26,6 +26,8 @@ We recommend using the latest build of Windows 10, version 1703 on your educatio
 To set up new Windows 10 devices and enroll them to your education tenant, choose from one of these options and follow the link to watch the video or follow the step-by-step guide:
 - **Option 1: [Use the Set up School PCs app](https://docs.microsoft.com/education/windows/use-set-up-school-pcs-app)** - You can use the app to create a setup file that you can use to quickly set up one or more Windows 10 devices.
 - **Option 2: [Go through Windows OOBE and join the device to Azure AD](set-up-windows-education-devices.md)** - You can go through a typical Windows 10 device setup or first-run experience to configure your device.
+- **Option 3: [Bulk enrollment for Windows devices](https://docs.microsoft.com/en-us/intune/windows-bulk-enroll)**
+- **Option 4: [Enroll Windows devices in Intune by using Windows Autopilot](https://docs.microsoft.com/en-us/intune/enrollment-autopilot)**
 
 > [!div class="step-by-step"]
 > [<< Use Intune for Education to manage groups, apps, and settings](use-intune-for-education.md)

education/get-started/use-intune-for-education.md

@@ -21,7 +21,7 @@ manager: dansimp
 > [<< Configure Microsoft Store for Education](configure-microsoft-store-for-education.md)
 > [Set up Windows 10 education devices >>](set-up-windows-10-education-devices.md)
 
-Intune for Education is a streamlined device management solution for educational institutions that can be used to quickly set up and manage Windows 10 devices for your school. It provides a new streamlined UI with the enterprise readiness and resiliency of the Intune service. You can learn more about Intune for Education by reading the <a href="https://docs.microsoft.com/intune-education" target="_blank">Intune for Education documentation</a>. 
+Intune for Education is a streamlined device management solution for educational institutions that can be used to quickly set up and manage Windows 10 and iOS devices for your school. It provides a new streamlined UI with the enterprise readiness and resiliency of the Intune service. You can learn more about Intune for Education by reading the <a href="https://docs.microsoft.com/intune-education" target="_blank">Intune for Education documentation</a>. 
 
 ## Example - Set up Intune for Education, buy apps from the Store, and install the apps
 In this walkthrough, we'll go through a sample scenario and walk you through the steps to:
@@ -221,4 +221,4 @@ You're now done assigning apps to all users in your tenant. It's time to set up
 
 
 ## Related topic
-[Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md)
+[Set up iOS device management](https://docs.microsoft.com/en-us/intune-education/setup-ios-device-management)

education/index.md

@@ -56,7 +56,7 @@ ms.prod: w10
                                                 </div>
                                                 <div class="cardText">
                                                     <h3>Deployment Guidance</h3>
-                                                    <p>Dive right into the step-by-step process for the easiest deployment path to M365 EDU. We walk you through setting up cloud infrastructure, configuring and managing devices, and migrating on-premise servers for Sharepoint and Exchange to the cloud.</p>
+                                                    <p>Learn the easiest path to deploy Microsoft 365 Education through our step-by-step process. We walk you through cloud deployment, device management,apps set up and configuration, and how to find deployment assistance.</p>
                                                 </div>
                                             </div>
                                         </div>

education/windows/set-up-school-pcs-whats-new.md

@@ -9,7 +9,7 @@ ms.pagetype: edu
 ms.localizationpriority: medium  
 author: mjcaparas
 ms.author: macapara
-ms.date: 06/03/2019 
+ms.date: 08/15/2019 
 ms.reviewer: 
 manager: dansimp
 ---  
@@ -17,6 +17,15 @@ manager: dansimp
 # What's new in Set up School PCs
 Learn what’s new with the Set up School PCs app each week. Find out about new app features and functionality, and see updated screenshots. You'll also find information about past releases.   
 
+
+## Week of June 24, 2019  
+
+### Resumed support for Windows 10, version 1903 and later   
+The previously mentioned provisioning problem was resolved, so the Set up School PCs app once again supports Windows 10, version 1903 and later. The Windows 10 settings that were removed are now back in the app. 
+
+### Device rename made optional for Azure AD joined devices  
+When you set up your Azure AD join devices in the Set up School PCs app, you no longer need to rename your devices. Set up School PCs will let you keep existing device names.  
+
 ## Week of May 23, 2019   
 
 ### Suspended support for Windows 10, version 1903 and later

mdop/agpm/step-by-step-guide-for-microsoft-advanced-group-policy-management-40.md

@@ -272,15 +272,17 @@ As an AGPM Administrator (Full Control), you designate the e-mail addresses of A
 
 **To configure e-mail notification for AGPM**
 
-1.  In the details pane, click the **Domain Delegation** tab.
+1.  In **Group Policy Management Editor** , navigate to the **Change Control** folder 
 
-2.  In the **From e-mail address** field, type the e-mail alias for AGPM from which notifications should be sent.
+2.  In the details pane, click the **Domain Delegation** tab.
 
-3.  In the **To e-mail address** field, type the e-mail address for the user account to which you intend to assign the Approver role.
+3.  In the **From e-mail address** field, type the e-mail alias for AGPM from which notifications should be sent.
 
-4.  In the **SMTP server** field, type a valid SMTP mail server.
+4.  In the **To e-mail address** field, type the e-mail address for the user account to which you intend to assign the Approver role.
 
-5.  In the **User name** and **Password** fields, type the credentials of a user who has access to the SMTP service. Click **Apply**.
+5.  In the **SMTP server** field, type a valid SMTP mail server.
+
+6.  In the **User name** and **Password** fields, type the credentials of a user who has access to the SMTP service. Click **Apply**.
 
 ### <a href="" id="bkmk-config5"></a>Step 5: Delegate access
 

mdop/appv-v5/deploying-microsoft-office-2016-by-using-app-v.md

@@ -222,7 +222,7 @@ The XML file that is included in the Office Deployment Tool specifies the produc
 
    2. With the sample configuration.xml file open and ready for editing, you can specify products, languages, and the path to which you save the Office 2016 applications. The following is a basic example of the configuration.xml file:
 
-      ``` syntax
+      ```xml
       <Configuration>
          <Add SourcePath= ”\\Server\Office2016” OfficeClientEdition="32" >
           <Product ID="O365ProPlusRetail ">
@@ -633,7 +633,7 @@ You may want to disable specific applications in your Office App-V package. For
 
 5.  Add the Office 2016 App-V Package with the new Deployment Configuration File.
 
-    ``` syntax
+    ```xml
     <Application Id="[{AppVPackageRoot}]\office16\lync.exe" Enabled="true">
       <VisualElements>
         <Name>Lync 2016</Name>

mdop/appv-v5/how-to-convert-a-package-created-in-a-previous-version-of-app-v.md

@@ -43,9 +43,7 @@ You must configure the package converter to always save the package ingredients
 Import-Module AppVPkgConverter
 ```
 
-3. 
+3. The following cmdlets are available:
-
-   The following cmdlets are available:
 
    -   Test-AppvLegacyPackage – This cmdlet is designed to check packages. It will return information about any failures with the package such as missing **.sft** files, an invalid source, **.osd** file errors, or invalid package version. This cmdlet will not parse the **.sft** file or do any in depth validation. For information about options and basic functionality for this cmdlet, using the PowerShell cmdline, type `Test-AppvLegacyPackage -?`.
 

mdop/docfx.json

@@ -27,6 +27,9 @@
       "ms.technology": "windows",
       "audience": "ITPro",
       "manager": "dansimp",
+      "ms.prod": "w10",
+      "ms.author": "dansimp",
+      "author": "dansimp",
       "ms.sitesec": "library",
       "ms.topic": "article",
       "ms.date": "04/05/2017",

mdop/medv-v1/configuring-med-v-for-remote-networks.md

@@ -53,7 +53,7 @@ When applying new settings, the service must be restarted.
 
 -   You can change the IIS authentication scheme to one of the following: BASIC, DIGEST, NTLM, or NEGOTIATE. The default is NEGOTIATE and uses the following entry:
 
-    ``` syntax
+    ```xml
     <ImageDistribution>
     <!-- The authentication used for image download. Basic and digest authentication should be used only under SSL.-->
        <!-- The line below can be one of the following: -->

mdop/medv-v1/med-v-trim-transfer-technology-medvv2.md

@@ -32,7 +32,7 @@ You can configure which folders are indexed on the host as part of the Trim Tran
 
 When applying new settings, the service must be restarted.
 
-``` syntax
+```xml
 <HostIndexingXP type="System.String[]"> 
 - <ArrayOfString>
 <string>%WINDIR%</string> 

windows/client-management/docfx.json

@@ -35,6 +35,7 @@
       "ms.technology": "windows",
       "audience": "ITPro",
       "ms.topic": "article",
+      "manager": "dansimp",
       "feedback_system": "GitHub",
       "feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
       "feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",

windows/client-management/mdm/applocker-csp.md

@@ -830,7 +830,7 @@ The following list shows the apps that may be included in the inbox.
 
 The following example disables the calendar application.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
     <SyncBody>
         <Add>
@@ -854,7 +854,7 @@ The following example disables the calendar application.
 
 The following example blocks the usage of the map application.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Add>
@@ -1394,7 +1394,7 @@ In this example, **MobileGroup0** is the node name. We recommend using a GUID fo
 ## Example for Windows 10 Holographic for Business
 The following example for Windows 10 Holographic for Business denies all apps and allows the minimum set of [inbox apps](#inboxappsandcomponents) to enable to enable a working device, as well as Settings.
 
-``` syntax
+```xml
 <RuleCollection Type="Appx" EnforcementMode="Enabled">
     <FilePublisherRule Id="96B82A15-F841-499a-B674-963DC647762F"
                      Name="Whitelist BackgroundTaskHost"

windows/client-management/mdm/azure-active-directory-integration-with-mdm.md

@@ -653,7 +653,7 @@ An alert is send to the MDM server in DM package\#1.
 
 Here's an example.
 
-``` syntax
+```xml
 <SyncBody>
  <Alert>
   <CmdID>1</CmdID>

windows/client-management/mdm/clientcertificateinstall-csp.md

@@ -372,7 +372,7 @@ Data type is string.
 
 Enroll a client certificate through SCEP.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
     <SyncBody>
         <Atomic>
@@ -571,7 +571,7 @@ Enroll a client certificate through SCEP.
 
 Add a PFX certificate. The PFX certificate password is encrypted with a custom certificate fro "My" store.
 
-``` syntax
+```xml
 <SyncML>
     <SyncBody>
             <Delete>

windows/client-management/mdm/cm-proxyentries-csp.md

@@ -90,7 +90,7 @@ Specifies the username used to connect to the proxy.
 
 To delete both a proxy and its associated connection, you must delete the proxy first, and then delete the connection. The following example shows how to delete the proxy and then the connection.
 
-``` syntax
+```xml
 <wap-provisioningdoc>
    <characteristic type="CM_ProxyEntries">
       <nocharacteristic type="GPRS_Proxy"/>

windows/client-management/mdm/defender-csp.md

@@ -215,7 +215,7 @@ Supported product status values:
 
 Example:
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.1">
   <SyncBody>
     <Get>

windows/client-management/mdm/diagnose-mdm-failures-in-windows-10.md

@@ -73,7 +73,7 @@ When the PC is already enrolled in MDM, you can remotely collect logs from the P
 
 Example: Enable the Debug channel logging
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
     <SyncBody>
         <Replace>

windows/client-management/mdm/dmacc-csp.md

@@ -262,7 +262,7 @@ Stores specifies which certificate stores the DM client will search to find the
 
 Subject specifies the certificate to search for. For example, to specify that you want a certificate with a particular Subject attribute (“CN=Tester,O=Microsoft”), use the following:
 
-``` syntax
+```xml
 <parm name="SSLCLIENTCERTSEARCHCRITERIA" 
    value="Subject=CN%3DTester,O%3DMicrosoft&amp;Stores=My%5CUser" />
 ```

windows/client-management/mdm/eap-configuration.md

@@ -56,7 +56,7 @@ Here is an easy way to get the EAP configuration from your desktop using the ras
 
 9.  Switch over to PowerShell and use the following cmdlets to retrieve the EAP configuration XML.
 
-    ``` syntax
+    ```powershell
     Get-VpnConnection -Name Test
     ```
 
@@ -80,17 +80,17 @@ Here is an easy way to get the EAP configuration from your desktop using the ras
     IdleDisconnectSeconds : 0
     ```
 
-    ``` syntax
+    ```powershell
     $a = Get-VpnConnection -Name Test
     ```
 
-    ``` syntax
+    ```powershell
     $a.EapConfigXmlStream.InnerXml
     ```
 
     Here is an example output
 
-    ``` syntax
+    ```xml
     <EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig"><EapMethod><Type xmlns="http://www.microsoft.co
     m/provisioning/EapCommon">13</Type><VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId><VendorTy
     pe xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType><AuthorId xmlns="http://www.microsoft.com/provisi
@@ -158,7 +158,7 @@ The following XML sample explains the properties for the EAP TLS XML including c
 
  
 
-``` syntax
+```xml
 <EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
  <EapMethod>
   <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">13</Type>

windows/client-management/mdm/healthattestation-csp.md

@@ -314,7 +314,7 @@ For DHA-OnPrem & DHA-EMC scenarios, send a SyncML command to the HASEndpoint nod
 
 The following example shows a sample call that instructs a managed device to communicate with an enterprise managed DHA-Service.
 
-``` syntax
+```xml
 <Replace>
     <CmdID>1</CmdID>
     <Item>
@@ -334,7 +334,7 @@ Send a SyncML call to start collection of the DHA-Data.
 
 The following example shows a sample call that triggers collection and verification of health attestation data from a managed device.
 
-``` syntax
+```xml
 <Exec>
     <CmdID>1</CmdID>
     <Item>
@@ -364,7 +364,7 @@ After the client receives the health attestation request, it sends a response. T
 
 Here is a sample alert that is issued by DHA_CSP:
 
-``` syntax
+```xml
 <Alert>
     <CmdID>1</CmdID>
     <Data>1226</Data>
@@ -389,7 +389,7 @@ Create a call to the **Nonce**, **Certificate** and **CorrelationId** nodes, and
 
 Here is an example:
 
-``` syntax
+```xml
 <Replace>
     <CmdID>1</CmdID>
     <Item>
@@ -417,7 +417,6 @@ Here is an example:
         </Target>
     </Item>
 </Get>
-
 ```
 
 ## <a href="" id="forward-data-to-has"></a>**Step 6: Forward device health attestation data to DHA-service**
@@ -1019,7 +1018,7 @@ Each of these are described in further detail in the following sections, along w
 ## DHA-Report V3 schema
 
 
-``` syntax
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns="http://schemas.microsoft.com/windows/security/healthcertificate/validation/response/v3"

windows/client-management/mdm/policy-csp-deviceinstallation.md

@@ -12,7 +12,6 @@ author: manikadhiman
 
 # Policy CSP - DeviceInstallation
 
-
 <hr/>
 
 <!--Policies-->
@@ -111,13 +110,6 @@ ADMX Info:
 
 <!--/SupportedValues-->
 <!--Example-->
-
-<!--/Example-->
-<!--Validation-->
-
-<!--/Validation-->
-<!--/Policy-->
-
 To enable this policy, use the following SyncML. This example allows Windows to install compatible devices with a device ID of USB\Composite or USB\Class_FF. To configure multiple classes, use `&#xF000;` as a delimiter. 
 
 
@@ -148,6 +140,11 @@ To verify the policy is applied, check C:\windows\INF\setupapi.dev.log and see i
 <<<  Section end 2018/11/15 12:26:41.751
 <<<  [Exit status: SUCCESS]
 ```
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
 
 <hr/>
 
@@ -222,13 +219,6 @@ ADMX Info:
 
 <!--/SupportedValues-->
 <!--Example-->
-
-<!--/Example-->
-<!--Validation-->
-
-<!--/Validation-->
-<!--/Policy-->
-
 To enable this policy, use the following SyncML. This example allows Windows to install:
 
 - Floppy Disks, ClassGUID = {4d36e980-e325-11ce-bfc1-08002be10318}
@@ -266,6 +256,11 @@ To verify the policy is applied, check C:\windows\INF\setupapi.dev.log and see i
 <<<  Section end 2018/11/15 12:26:41.751
 <<<  [Exit status: SUCCESS]
 ```
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
 
 <hr/>
 
@@ -311,8 +306,6 @@ If you enable this policy setting, Windows does not retrieve device metadata for
 
 If you disable or do not configure this policy setting, the setting in the Device Installation Settings dialog box controls whether Windows retrieves device metadata from the Internet.
 
-
-
 <!--/Description-->
 > [!TIP]
 > This is an ADMX-backed policy and requires a special SyncML format to enable or disable.  For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
@@ -340,8 +333,6 @@ ADMX Info:
 <!--/Validation-->
 <!--/Policy-->
 
-
-
 <hr/>
 
 <!--Policy-->
@@ -386,7 +377,6 @@ If you enable this policy setting, Windows is prevented from installing or updat
 
 If you disable or do not configure this policy setting, Windows is allowed to install or update the device driver for any device that is not described by the "Prevent installation of devices that match any of these device IDs," "Prevent installation of devices for these device classes," or "Prevent installation of removable devices" policy setting.
 
-
 <!--/Description-->
 > [!TIP]
 > This is an ADMX-backed policy and requires a special SyncML format to enable or disable.  For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
@@ -407,13 +397,6 @@ ADMX Info:
 
 <!--/SupportedValues-->
 <!--Example-->
-
-<!--/Example-->
-<!--Validation-->
-
-<!--/Validation-->
-<!--/Policy-->
-
 To enable this policy, use the following SyncML. This example prevents Windows from installing devices that are not specifically described by any other policy setting. 
 
 
@@ -448,7 +431,11 @@ To verify the policy is applied, check C:\windows\INF\setupapi.dev.log and see i
 You can also block installation by using a custom profile in Intune. 
 
 ![Custom profile](images/custom-profile-prevent-other-devices.png)
+<!--/Example-->
+<!--Validation-->
 
+<!--/Validation-->
+<!--/Policy-->
 
 <hr/>
 
@@ -512,9 +499,10 @@ ADMX Info:
 -   GP ADMX file name: *deviceinstallation.admx*
 
 <!--/ADMXBacked-->
-<!--/Policy-->
+<!--SupportedValues-->
-
 
+<!--/SupportedValues-->
+<!--Example-->
 <hr/>
 To enable this policy, use the following SyncML. This example prevents Windows from installing compatible devices with a device ID of USB\Composite or USB\Class_FF. To configure multiple classes, use <code>&amp;#xF000;</code> as a delimiter. To apply the policy to matching device classes that are already installed, set DeviceInstall_IDs_Deny_Retroactive to true. 
 
@@ -552,6 +540,11 @@ You can also block installation and usage of prohibited peripherals by using a c
 For example, this custom profile blocks installation and usage of USB devices with hardware IDs "USB\Composite" and "USB\Class_FF", and applies to USB devices with matching hardware IDs that are already installed.
 
 ![Custom profile](images/custom-profile-prevent-device-ids.png)
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
 
 
 <!--Policy-->
@@ -614,9 +607,10 @@ ADMX Info:
 -   GP ADMX file name: *deviceinstallation.admx*
 
 <!--/ADMXBacked-->
-<!--/Policy-->
+<!--SupportedValues-->
-<hr/>
 
+<!--/SupportedValues-->
+<!--Example-->
 To enable this policy, use the following SyncML. This example prevents Windows from installing:
 
 - Floppy Disks, ClassGUID = {4d36e980-e325-11ce-bfc1-08002be10318}
@@ -653,6 +647,12 @@ To verify the policy is applied, check C:\windows\INF\setupapi.dev.log and see i
 <<<  Section end 2018/11/15 12:26:41.751
 <<<  [Exit status: SUCCESS]
 ```
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--/Policy-->
+<hr/>
 
 Footnote:
 
@@ -664,4 +664,3 @@ Footnote:
 -   6 - Added in the next major release of Windows 10.
 
 <!--/Policies-->
-

windows/client-management/mdm/policy-csp-update.md

@@ -3874,7 +3874,7 @@ The following list shows the supported values:
 <!--Example-->
 Example
 
-``` syntax
+```xml
 <Replace>
     <CmdID>$CmdID$</CmdID>
     <Item>

windows/client-management/mdm/remotelock-csp.md

@@ -117,7 +117,7 @@ A Get operation on this node must follow an Exec operation on the /RemoteLock/Lo
 
 Initiate a remote lock of the device.
 
-``` syntax
+```xml
 <Exec>
    <CmdID>1</CmdID>
    <Item>
@@ -130,7 +130,7 @@ Initiate a remote lock of the device.
 
 Initiate a remote lock and PIN reset of the device. To successfully retrieve the new device-generated PIN, the commands must be executed together and in the proper sequence as shown below.
 
-``` syntax
+```xml
 <Sequence>
     <CmdID>1</CmdID>
     <Exec>

windows/client-management/mdm/remotering-csp.md

@@ -31,7 +31,7 @@ The supported operation is Exec.
 
 The following sample shows how to initiate a remote ring on the device.
 
-``` syntax
+```xml
 <Exec>
   <CmdID>5</CmdID>
     <Item>

windows/client-management/mdm/reporting-csp.md

@@ -81,7 +81,7 @@ Supported operations are Get and Replace.
 
 Retrieve all available Windows Information Protection (formerly known as Enterprise Data Protection) logs starting from the specified StartTime.
 
-``` syntax
+```xml
 <SyncML>
     <SyncBody>
         <Replace>
@@ -104,7 +104,7 @@ Retrieve all available Windows Information Protection (formerly known as Enterpr
 
 Retrieve a specified number of security auditing logs starting from the specified StartTime.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Replace>

windows/client-management/mdm/securitypolicy-csp.md

@@ -199,7 +199,7 @@ The following security roles are supported.
 
 Setting a security policy:
 
-``` syntax
+```xml
 <wap-provisioningdoc>
     <characteristic type="SecurityPolicy">
         <parm name="4141" value="0"/>
@@ -209,7 +209,7 @@ Setting a security policy:
 
 Querying a security policy:
 
-``` syntax
+```xml
 <wap-provisioningdoc>
     <characteristic type="SecurityPolicy">
         <parm-query name="4141"/>
@@ -222,7 +222,7 @@ Querying a security policy:
 
 Setting a security policy:
 
-``` syntax
+```xml
 <SyncML xmlns='SYNCML:SYNCML1.2'>
     <SyncHdr>
     …
@@ -245,7 +245,7 @@ Setting a security policy:
 
 Querying a security policy:
 
-``` syntax
+```xml
 <SyncML xmlns='SYNCML:SYNCML1.2'>
     <SyncHdr>
     …

windows/client-management/mdm/structure-of-oma-dm-provisioning-files.md

@@ -53,7 +53,7 @@ The following table shows the OMA DM versions that are supported.
 
 The following example shows the general structure of the XML document sent by the server using OMA DM version 1.2.1 for demonstration purposes only. The initial XML packages exchanged between client and server could contain additional XML tags. For a detailed description and samples for those packages, see the [OMA Device Management Protocol 1.2.1](https://go.microsoft.com/fwlink/p/?LinkId=526902) specification.
 
-``` syntax
+```xml
 <SyncML xmlns='SYNCML:SYNCML1.2'>
    <SyncHdr>
       <VerDTD>1.2</VerDTD>
@@ -107,7 +107,7 @@ The following example shows the header component of a DM message. In this case,
 
  
 
-``` syntax
+```xml
 <SyncHdr>
    <VerDTD>1.2</VerDTD>
    <VerProto>DM/1.2</VerProto>
@@ -130,7 +130,7 @@ SyncBody contains one or more DM commands. The SyncBody can contain multiple DM
 
 The following example shows the body component of a DM message. In this example, SyncBody contains only one command, Get. This is indicated by the &lt;Final /&gt; tag that occurs immediately after the terminating tag for the Get command.
 
-``` syntax
+```xml
 <SyncBody>
    <!-- query device OS software version -->
    <Get>
@@ -157,7 +157,7 @@ The Replace command is used to update a device setting.
 
 The following example illustrates how to use the Replace command to update a device setting.
 
-``` syntax
+```xml
 <SyncHdr>
    <VerDTD>1.2</VerDTD>
    <VerProto>DM/1.2</VerProto>

windows/client-management/mdm/supl-csp.md

@@ -481,7 +481,7 @@ Adding a SUPL and a V2 UPL account to the same device. Values in italic must be
 
 Adding a SUPL account to a device. Values in italic must be replaced with correct settings for the mobile operator network. A valid binary blob must be included for the root certificate data value.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.1">
     <SyncBody>
         <Add>

windows/client-management/mdm/surfacehub-csp.md

@@ -39,7 +39,7 @@ The following diagram shows the SurfaceHub CSP management objects in tree format
  
 <p style="margin-left: 20px">Here&#39;s a SyncML example.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
     <SyncBody>
         <Replace>

windows/client-management/mdm/tpmpolicy-csp.md

@@ -37,7 +37,7 @@ The following diagram shows the TPMPolicy configuration service provider in tree
 
 Here is an example:
 
-``` syntax
+```xml
 <Replace>
     <CmdID>101</CmdID>
     <Item>

windows/client-management/mdm/vpnv2-csp.md

@@ -598,7 +598,7 @@ Value type is bool. Supported operations include Get, Add, Replace, and Delete.
 
 Profile example
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2" xmlns:A="syncml:metinf">
   <SyncBody>
     <Atomic>
@@ -657,7 +657,7 @@ Profile example
 
 AppTriggerList
 
-``` syntax
+```xml
 <!-- Internet Explorer -->
 <Add>
   <CmdID>10013</CmdID>
@@ -691,8 +691,7 @@ AppTriggerList
 
 RouteList and ExclusionRoute
 
-``` syntax
+```xml
- 
 <Add>
   <CmdID>10008</CmdID>
   <Item>
@@ -726,13 +725,11 @@ RouteList and ExclusionRoute
     <Data>true</Data>
   </Item>
 </Add>
- 
 ```
 
 DomainNameInformationList
 
-``` syntax
+```xml
- 
 <!-- Domain Name rule with Suffix Match with DNS Servers -->
 <Add>
   <CmdID>10013</CmdID>
@@ -860,7 +857,7 @@ DomainNameInformationList
 
 AutoTrigger
 
-``` syntax
+```xml
 <Add>
   <CmdID>10010</CmdID>
   <Item>
@@ -877,7 +874,7 @@ AutoTrigger
 
 Persistent
 
-``` syntax
+```xml
 <Add>
   <CmdID>10010</CmdID>
   <Item>
@@ -894,7 +891,7 @@ Persistent
 
 TrafficFilterLIst App
 
-``` syntax
+```xml
   Desktop App
     <Add>
         <CmdID>10013</CmdID>
@@ -929,7 +926,7 @@ TrafficFilterLIst App
 
 Protocol, LocalPortRanges, RemotePortRanges, LocalAddressRanges, RemoteAddressRanges, RoutingPolicyType, EDPModeId, RememberCredentials, AlwaysOn, Lockdown, DnsSuffix, TrustedNetworkDetection
 
-``` syntax
+```xml
 Protocol
       <Add>
         <CmdID>$CmdID$</CmdID>
@@ -1077,7 +1074,7 @@ Protocol
 
 Proxy - Manual or AutoConfigUrl
 
-``` syntax
+```xml
 Manual
       <Add>
         <CmdID>$CmdID$</CmdID>
@@ -1103,7 +1100,7 @@ Manual
 
 Device Compliance - Sso
 
-``` syntax
+```xml
   Enabled
 <Add>
         <CmdID>10011</CmdID>
@@ -1143,7 +1140,7 @@ Device Compliance - Sso
 
 PluginProfile
 
-``` syntax
+```xml
 PluginPackageFamilyName
       <!-- Configure VPN Server Name or Address (PhoneNumber=) [Comma Separated]-->
       <Add>
@@ -1181,7 +1178,7 @@ PluginPackageFamilyName
 
 NativeProfile
 
-``` syntax
+```xml
 Servers
 <Add>
         <CmdID>10001</CmdID>

windows/client-management/mdm/vpnv2-profile-xsd.md

@@ -344,7 +344,7 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro
 ## Plug-in profile example
 
 
-``` syntax
+```xml
 <VPNProfile>
     <PluginProfile>
         <ServerUrlList>testserver1.contoso.com;testserver2.contoso..com</ServerUrlList>

windows/client-management/mdm/w7-application-csp.md

@@ -160,7 +160,7 @@ Stores specifies which certificate stores the DM client will search to find the
 
 Subject specifies the certificate to search for. For example, to specify that you want a certificate with a particular Subject attribute (“CN=Tester,O=Microsoft”), use the following:
 
-``` syntax
+```xml
 <parm name="SSLCLIENTCERTSEARCHCRITERIA" 
    value="Subject=CN%3DTester,O%3DMicrosoft&amp;Stores=My%5CUser" />
 ```

windows/client-management/mdm/wifi-csp.md

@@ -121,7 +121,7 @@ These XML examples show how to perform various tasks using OMA DM.
 
 The following example shows how to add PEAP-MSCHAPv2 network with SSID 'MyNetwork,' a proxy URL 'testproxy,' and port 80.
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Atomic>
@@ -160,7 +160,7 @@ The following example shows how to add PEAP-MSCHAPv2 network with SSID 'MyNetwor
 
 The following example shows how to query Wi-Fi profiles installed on an MDM server.
 
-``` syntax
+```xml
 <Get>
    <CmdID>301</CmdID>
    <Item>
@@ -173,7 +173,7 @@ The following example shows how to query Wi-Fi profiles installed on an MDM serv
 
 The following example shows the response.
 
-``` syntax
+```xml
 <Results>
    <CmdID>3</CmdID>
    <MsgRef>1</MsgRef>
@@ -190,7 +190,7 @@ The following example shows the response.
 
 The following example shows how to remove a network with SSID ‘MyNetwork’ and no proxy. Removing all network authentication types is done in this same manner.
 
-``` syntax
+```xml
 <Atomic>
   <CmdID>300</CmdID>
   <Delete>
@@ -208,7 +208,7 @@ The following example shows how to remove a network with SSID ‘MyNetwork’ an
 
 The following example shows how to add PEAP-MSCHAPv2 network with SSID ‘MyNetwork’ and root CA validation for server certificate.
 
-``` syntax
+```xml
 <Atomic>
   <CmdID>300</CmdID>
   <Add>

windows/client-management/mdm/windowsadvancedthreatprotection-csp.md

@@ -120,7 +120,7 @@ The following list describes the characteristics and parameters.
 ## Examples
 
 
-``` syntax
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Get>

windows/client-management/mdm/wmi-providers-supported-in-windows.md

@@ -27,7 +27,7 @@ The child node names of the result from a WMI query are separated by a forward s
 
 Get the list of network adapters from the device.
 
-``` syntax
+```xml
 <Get>
    <Target>
       <LocURI>./cimV2/Win32_NetworkAdapter</LocURI>
@@ -37,7 +37,7 @@ Get the list of network adapters from the device.
 
 Result
 
-``` syntax
+```xml
 <Item>
    <Source>
       <LocURI>./cimV2/Win32_NetworkAdapter</LocURI>

windows/configuration/lock-down-windows-10-to-specific-apps.md

@@ -172,18 +172,19 @@ Here are the predefined assigned access AppLocker rules for **desktop apps**:
 The following example allows Groove Music, Movies & TV, Photos, Weather, Calculator, Paint, and Notepad apps to run on the device, with Notepad configured to automatically launch and create a file called `123.text` when the user signs in.
 
 <span id="apps-sample" />
+
 ```xml
-&lt;AllAppsList&gt;
+<AllAppsList>
-        &lt;AllowedApps&gt;
+        <AllowedApps>
-          &lt;App AppUserModelId=&quot;Microsoft.ZuneMusic_8wekyb3d8bbwe!Microsoft.ZuneMusic&quot; /&gt;
+          <App AppUserModelId="Microsoft.ZuneMusic_8wekyb3d8bbwe!Microsoft.ZuneMusic" />
-          &lt;App AppUserModelId=&quot;Microsoft.ZuneVideo_8wekyb3d8bbwe!Microsoft.ZuneVideo&quot; /&gt;
+          <App AppUserModelId="Microsoft.ZuneVideo_8wekyb3d8bbwe!Microsoft.ZuneVideo" />
-          &lt;App AppUserModelId=&quot;Microsoft.Windows.Photos_8wekyb3d8bbwe!App&quot; /&gt;
+          <App AppUserModelId="Microsoft.Windows.Photos_8wekyb3d8bbwe!App" />
-          &lt;App AppUserModelId=&quot;Microsoft.BingWeather_8wekyb3d8bbwe!App&quot; /&gt;
+          <App AppUserModelId="Microsoft.BingWeather_8wekyb3d8bbwe!App" />
-          &lt;App AppUserModelId=&quot;Microsoft.WindowsCalculator_8wekyb3d8bbwe!App&quot; /&gt;
+          <App AppUserModelId="Microsoft.WindowsCalculator_8wekyb3d8bbwe!App" />
-          &lt;App DesktopAppPath=&quot;%windir%\system32\mspaint.exe&quot; /&gt;
+          <App DesktopAppPath="%windir%\system32\mspaint.exe" />
-          &lt;App DesktopAppPath=&quot;C:\Windows\System32\notepad.exe&quot; rs5:AutoLaunch=&quot;true&quot; rs5:AutoLaunchArguments=&quot;123.txt&quot;/&gt;
+          <App DesktopAppPath="C:\Windows\System32\notepad.exe" rs5:AutoLaunch="true" rs5:AutoLaunchArguments="123.txt">
-        &lt;/AllowedApps&gt;
+        </AllowedApps>
-&lt;/AllAppsList&gt;</code>
+</AllAppsList>
 ```
 
 ##### FileExplorerNamespaceRestrictions

windows/deployment/deploy-whats-new.md

@@ -10,7 +10,8 @@ ms.localizationpriority: medium
 ms.prod: w10
 ms.sitesec: library
 ms.pagetype: deploy
-audience: itpro
author: greg-lindsay
+audience: itpro
+author: greg-lindsay
 ms.topic: article
 ---
 
@@ -28,7 +29,7 @@ This topic provides an overview of new solutions and online content related to d
 
 ## Recent additions to this page
 
-[SetupDiag](#setupdiag) 1.4.1 is released.<br>
+[SetupDiag](#setupdiag) 1.6.0 is released.<br>
 The [Windows ADK for Windows 10, version 1903](https://docs.microsoft.com/windows-hardware/get-started/adk-install) is available.<br>
 New [Windows Autopilot](#windows-autopilot) content is available.<br>
 [Windows 10 Subscription Activation](#windows-10-subscription-activation) now supports Windows 10 Education.

windows/deployment/update/index.md

@@ -36,7 +36,7 @@ Windows as a service provides a new way to think about building, deploying, and
 | [Overview of Windows as a service](waas-overview.md) | Explains the differences in building, deploying, and servicing Windows 10; introduces feature updates, quality updates, and the different servicing branches; compares servicing tools. |
 | [Prepare servicing strategy for Windows 10 updates](waas-servicing-strategy-windows-10-updates.md) | Explains the decisions you need to make in your servicing strategy.  |
 | [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) | Explains how to make use of servicing branches and update deferrals to manage Windows 10 updates.  |
-| [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Explains how to assign devices to Current Branch (CB) or Current Branch for Business (CBB) for feature and quality updates, and how to enroll devices in Windows Insider. |
+| [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Explains how to assign devices to the Semi-Annual Channel for feature and quality updates, and how to enroll devices in Windows Insider. |
 | [Monitor Windows Updates with Update Compliance](update-compliance-monitor.md) | Explains how to use Windows Analytics: Update Compliance to monitor and manage Windows Updates on devices in your organization.  |
 | [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) | Explains the benefits of using Delivery Optimization or BranchCache for update distribution.  |
 | [Deploy updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile](waas-mobile-updates.md) | Explains updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile. |

windows/deployment/update/waas-branchcache.md

@@ -4,7 +4,7 @@ description: Use BranchCache to optimize network bandwidth during update deploym
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.localizationpriority: medium
 ms.author: greglin
 ms.date: 07/27/2017
@@ -65,7 +65,7 @@ In addition to these steps, there is one requirement for WSUS to be able to use
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-configure-wufb.md

@@ -7,9 +7,9 @@ ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 audience: itpro
-author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.author: greglin
+ms.author: jaimeo
 ms.topic: article
 ---
 
@@ -19,7 +19,6 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
 - Windows Server 2016
 - Windows Server 2019
 
@@ -272,7 +271,7 @@ When a device running a newer version sees an update available on Windows Update
 - [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-delivery-optimization.md

@@ -183,7 +183,7 @@ If you suspect this is the problem, try a Telnet test between two devices on the
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-deployment-rings-windows-10-updates.md

@@ -4,10 +4,9 @@ description: Deployment rings in Windows 10 are similar to the deployment groups
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.author: greglin
+ms.author: jaimeo
-ms.date: 07/11/2018
 ms.reviewer: 
 manager: laurawi
 ms.collection: M365-modern-desktop
@@ -20,10 +19,12 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
+> [!NOTE]
+> We're in the process of updating this topic with more definitive guidance. In the meantime, see [this post](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Tactical-considerations-for-creating-Windows-deployment-rings/ba-p/746979) on the Windows 10 IT Pro blog for some great suggestions for a deployment ring structure.
+
 For Windows as a service, maintenance is ongoing and iterative. Deploying previous versions of Windows required organizations to build sets of users to roll out the changes in phases. Typically, these users ranged (in order) from the most adaptable and least risky to the least adaptable or riskiest. With Windows 10, a similar methodology exists, but construction of the groups is a little different. 
 
 Deployment rings in Windows 10 are similar to the deployment groups most organizations constructed for previous major revision upgrades. They are simply a method by which to separate machines into a deployment timeline. With Windows 10, you construct deployment rings a bit differently in each servicing tool, but the concepts remain the same. Each deployment ring should reduce the risk of issues derived from the deployment of the feature updates by gradually deploying the update to entire departments. As previously mentioned, consider including a portion of each department’s employees in several deployment rings. 
@@ -37,7 +38,6 @@ Table 1 provides an example of the deployment rings you might use.
 | Deployment ring | Servicing channel | Deferral for feature updates | Deferral for quality updates | Example |
 | --- | --- | --- | --- | --- |
 | Preview | Windows Insider Program | None | None | A few machines to evaluate early builds prior to their arrival to the semi-annual channel |
-| Targeted | Semi-annual channel (Targeted) | None | None | Select devices across various teams used to evaluate the major release prior to broad deployment |
 | Broad | Semi-annual channel | 120 days | 7-14 days | Broadly deployed to most of the organization and monitored for feedback</br>Pause updates if there are critical issues |
 | Critical | Semi-annual channel | 180 days | 30 days | Devices that are critical and will only receive updates once they've been vetted for a period of time by the majority of the organization |
 
@@ -69,6 +69,6 @@ As Table 1 shows, each combination of servicing channel and deployment group is
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
 - [Manage software updates in Intune](https://docs.microsoft.com/intune/windows-update-for-business-configure)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Manage device restarts after updates](waas-restart.md)
 

windows/deployment/update/waas-integrate-wufb.md

@@ -4,7 +4,7 @@ description: Use Windows Update for Business deployments with management tools s
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.localizationpriority: medium
 ms.author: greglin
 ms.date: 07/27/2017
@@ -19,7 +19,6 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
@@ -109,7 +108,7 @@ For more information, see [Integration with Windows Update for Business in Windo
 - [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-manage-updates-configuration-manager.md

@@ -4,10 +4,9 @@ description: System Center Configuration Manager provides maximum control over q
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.author: greglin
+ms.author: jaimeo
-ms.date: 10/16/2017
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -19,14 +18,13 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
+
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
 
 >[!IMPORTANT]
->Due to [naming changes](waas-overview.md#naming-changes), older terms like CB,CBB and LTSB may still be displayed in some of our products.
+>Due to [naming changes](waas-overview.md#naming-changes), older terms like CB and CBB might still be displayed in some of our products, such as in Group Policy. If you encounter these terms, "CB" refers to the Semi-Annual Channel (Targeted)--which is no longer used--while "CBB" refers to the Semi-Annual Channel.
->
+
->In the following settings CB refers to Semi-Annual Channel (Targeted), while CBB refers to Semi-Annual Channel. 
 
 System Center Configuration Manager provides maximum control over quality and feature updates for Windows 10. Unlike other servicing tools, Configuration Manager has capabilities that extend beyond servicing, such as application deployment, antivirus management, software metering, and reporting, and provides a secondary deployment method for LTSB clients. Configuration Manager can effectively control bandwidth usage and content distribution through a combination of BranchCache and distribution points. Microsoft encourages organizations currently using Configuration Manager for Windows update management to continue doing so for Windows 10 client computers.
 
@@ -328,7 +326,7 @@ With the task sequence created, you’re ready to deploy it. If you’re using t
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Manage device restarts after updates](waas-restart.md)
 

windows/deployment/update/waas-manage-updates-wsus.md

@@ -4,7 +4,7 @@ description: WSUS allows companies to defer, selectively approve, choose when de
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.localizationpriority: medium
 ms.author: greglin
 ms.date: 10/16/2017
@@ -23,7 +23,7 @@ ms.topic: article
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
 >[!IMPORTANT]
->Due to [naming changes](waas-overview.md#naming-changes), older terms like CB,CBB and LTSB may still be displayed in some of our products.
+>Due to [naming changes](waas-overview.md#naming-changes), older terms like CB and CBB might still be displayed in some of our products, such as in Group Policy. If you encounter these terms, "CB" refers to the Semi-Annual Channel (Targeted)--which is no longer used--while "CBB" refers to the Semi-Annual Channel.
 >
 >In the following settings CB refers to Semi-Annual Channel (Targeted), while CBB refers to Semi-Annual Channel. 
 
@@ -355,6 +355,6 @@ Now that you have the All Windows 10 Upgrades view, complete the following steps
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-manage-updates-wufb.md

@@ -126,7 +126,7 @@ For more information about Update Compliance, see [Monitor Windows Updates using
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-mobile-updates.md

@@ -4,10 +4,9 @@ description: tbd
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.author: greglin
+ms.author: jaimeo
-ms.date: 07/27/2017
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -26,36 +25,22 @@ ms.topic: article
 >[!TIP]
 >If you're not familiar with the Windows 10 servicing or release channels, read [Servicing channels](waas-overview.md#servicing-channels) first.
 
-Devices running Windows 10 Mobile and Windows 10 IoT Mobile receive updates from the Semi-annual channel unless you [enroll the device in the Windows Insider Program](waas-servicing-channels-windows-10-updates.md#enroll-devices-in-the-windows-insider-program) or assign the device to Current Branch for Business (CBB). Only devices running Windows 10 Mobile Enterprise or Windows 10 IoT Mobile can be assigned to CBB.
+Devices running Windows 10 Mobile and Windows 10 IoT Mobile receive updates from the Semi-annual Channel unless you [enroll the device in the Windows Insider Program](waas-servicing-channels-windows-10-updates.md#enroll-devices-in-the-windows-insider-program).
 
 [Learn how to upgrade Windows 10 Mobile to Windows 10 Mobile Enterprise](https://technet.microsoft.com/itpro/windows/deploy/windows-10-edition-upgrades)
 
-</br>
 
->[!IMPORTANT]
->Due to [naming changes](waas-overview.md#naming-changes), older terms like CB,CBB and LTSB may still be displayed in some of our products.
->
->In the following settings CB refers to Semi-Annual Channel (Targeted), while CBB refers to Semi-Annual Channel.
 
-| Windows 10 edition | CB | CBB | Insider Program |
+| Windows 10 edition | Semi-annual Channel | Insider Program |
-| --- | --- | --- | --- | --- |
+| ---  | --- | --- | --- |
-| Mobile | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Mobile |  ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Mobile Enterprise | ![yes](images/checkmark.png) | ![yes](images/checkmark.png)  | ![yes](images/checkmark.png) |
+| Mobile Enterprise |   ![yes](images/checkmark.png)  | ![yes](images/checkmark.png) |
-| IoT Mobile | ![yes](images/checkmark.png) | ![yes](images/checkmark.png)  | ![yes](images/checkmark.png) |
+| IoT Mobile |  ![yes](images/checkmark.png)  | ![yes](images/checkmark.png) |
 
-</br>
 
-Configuration of Windows 10 Mobile and Windows 10 IoT Mobile devices is limited to the feature set pertaining to Quality Updates only. That is, Windows Mobile Feature Updates are categorized the same as Quality Updates, and can only be deferred by setting the Quality Update deferral period, for a maximum period of 30 days. You can use mobile device management (MDM) to manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile. Updates cannot be managed for Windows 10 Mobile. 
 
-## Windows 10, version 1511
+Configuration of Windows 10 Mobile and Windows 10 IoT Mobile devices is limited to the feature set pertaining to quality updates only. That is, Windows Mobile feature updates are categorized the same as quality updates, and can only be deferred by setting the quality update deferral period, for a maximum period of 30 days. You can use mobile device management (MDM) to manage updates for Windows 10 Mobile Enterprise and Windows 10 IoT Mobile. Updates cannot be managed for Windows 10 Mobile. 
 
-Only the following Windows Update for Business policies are supported for Windows 10 Mobile and Windows 10 IoT Mobile:
-
-- ../Vendor/MSFT/Policy/Config/Update/RequireDeferredUpgrade
-- ../Vendor/MSFT/Policy/Config/Update/DeferUpdatePeriod
-- ../Vendor/MSFT/Policy/Config/Update/PauseDeferrals
-
-To defer the update period or pause deferrals, the device must be configured for CBB servicing branch by applying the **RequireDeferredUpgrade** policy.
 
 ## Windows 10, version 1607
 
@@ -65,9 +50,8 @@ Only the following Windows Update for Business policies are supported for Window
 - ../Vendor/MSFT/Policy/Config/Update/DeferQualityUpdatesInDays  
 - ../Vendor/MSFT/Policy/Config/Update/PauseQualityUpdates
 
-In version 1607, you can defer and pause updates for devices on both the CB and CBB servicing branches.
 
-If a device running Windows 10 Mobile Enterprise or Windows 10 IoT Mobile, version 1511, has Windows Update for Business policies applied and is then updated to version 1607, version 1511 policies continue to apply until version 1607 policies are applied. 
+
 
 
 
@@ -85,7 +69,7 @@ If a device running Windows 10 Mobile Enterprise or Windows 10 IoT Mobile, versi
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-optimize-windows-10-updates.md

@@ -4,9 +4,9 @@ description: Two methods of peer-to-peer content distribution are available in W
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.author: greg-lindsay
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -107,5 +107,5 @@ At this point, the download is complete and the update is ready to be installed.
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-overview.md

@@ -5,12 +5,9 @@ keywords: updates, servicing, current, deployment, semi-annual channel, feature,
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
+author: jaimeo
-author: greg-lindsay
 ms.localizationpriority: medium
-ms.audience: itpro
+ms.author: jaimeo
-author: greg-lindsay
-ms.date: 09/24/2018
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -22,18 +19,12 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
 - Windows 10 IoT Mobile
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
 The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers. These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time. 
 
-Click the following Microsoft Mechanics video for an overview of the release model, particularly the Semi-Annual Channel.
-
-
-[![YouTube video of Michael Niehouse explaining how the Semi-Annual Channel works](images/SAC_vid_crop.jpg)](https://youtu.be/qSAsiM01GOU) 
-
 ## Building
 
 Prior to Windows 10, Microsoft released new versions of Windows every few years. This traditional deployment schedule imposed a training burden on users because the feature revisions were often significant. That schedule also meant waiting long periods without new features — a scenario that doesn’t work in today’s rapidly changing world, a world in which new security, management, and deployment capabilities are necessary to address challenges. Windows as a service will deliver smaller feature updates two times per year, around March and September, to help address these issues.
@@ -74,12 +65,13 @@ To align with this new update delivery model, Windows 10 has three servicing cha
 
 ### Naming changes
 
-As part of the alignment with Windows 10 and Office 365 ProPlus, we are adopting common terminology to make it as easy as possible to understand the servicing process. Going forward, these are the new terms we will be using:
+There are currently two release channels for Windows 10:
-* Semi-Annual Channel - We will be referring to Current Branch (CB) as "Semi-Annual Channel (Targeted)", while Current Branch for Business (CBB) will simply be referred to as "Semi-Annual Channel". 
+
-* Long-Term Servicing Channel -  The Long-Term Servicing Branch (LTSB) will be referred to as Long-Term Servicing Channel (LTSC).
+- The **Semi-Annual Channel** receives feature updates twice per year. 
+- The **Long Term Servicing Channel**, which is designed to be used only for specialized devices (which typically don't run Office) such as those that control medical equipment or ATM machines, receives new feature releases every two to three years.
 
 >[!IMPORTANT]
->With each Semi-Annual Channel release, we recommend beginning deployment right away to devices selected for early adoption (targeted validation) and ramp up to full deployment at your discretion, regardless of the "Targeted" designation. This will enable you to gain access to new features, experiences, and integrated security as soon as possible. For more information, see the blog post [Windows 10 and the "disappearing" SAC-T](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Windows-10-and-the-disappearing-SAC-T/ba-p/199747).
+>With each Semi-Annual Channel release, we recommend beginning deployment right away to devices selected for early adoption (targeted validation) and ramp up to full deployment at your discretion. This will enable you to gain access to new features, experiences, and integrated security as soon as possible. The "Semi-Annual Channel (Targeted)" designation is no longer used. For more information, see the blog post [Windows 10 and the "disappearing" SAC-T](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Windows-10-and-the-disappearing-SAC-T/ba-p/199747).
 
 > [!NOTE]
 >For additional information, see the section about [Servicing Channels](#servicing-channels). 
@@ -87,20 +79,18 @@ As part of the alignment with Windows 10 and Office 365 ProPlus, we are adopting
 >You can also read the blog post [Waas simplified and aligned](https://blogs.technet.microsoft.com/windowsitpro/2017/07/27/waas-simplified-and-aligned/), with details on this change. 
 
 >[!IMPORTANT]
-> Devices on the Semi-Annual Channel (formerly called Current Branch for Business) must have their diagnostic data set to **1 (Basic)** or higher, in order to ensure that the service is performing at the expected quality. If diagnostic data is set to **0**, the device will be treated as if it were in the Semi-Annual Channel (Targeted)(formerly called Current Branch or CB) branch. For instructions to set the diagnostic data level, see [Configure the operating system diagnostic data level](https://docs.microsoft.com/windows/configuration/configure-windows-diagnostic-data-in-your-organization#diagnostic-data-levels).
+>Devices on the Semi-Annual Channel must have their diagnostic data set to **1 (Basic)** or higher, in order to ensure that the service is performing at the expected quality. For instructions to set the diagnostic data level, see [Configure the operating system diagnostic data level](https://docs.microsoft.com/windows/configuration/configure-windows-diagnostic-data-in-your-organization#diagnostic-data-levels).
 
 ### Feature updates
 
 With Windows 10, Microsoft will package new features into feature updates that can be deployed using existing management tools. Because feature updates are delivered more frequently than with previous Windows releases — twice per year, around March and September, rather than every 3–5 years — changes will be in bite-sized chunks rather than all at once and end user readiness time much shorter. 
 
->[!TIP]
-> The feature update cadence has been aligned with Office 365 ProPlus updates. Starting with this falls' update, both Windows and Office will deliver their major updates semi-annually, around March and September. See [upcoming changes to Office 365 ProPlus update management](https://support.office.com/article/Overview-of-the-upcoming-changes-to-Office-365-ProPlus-update-management-78b33779-9356-4cdf-9d2c-08350ef05cca) for more information about changes to Office update management.
 
 ### Quality updates
 
 Monthly updates in previous Windows versions were often overwhelming because of the sheer number of updates available each month. Many organizations selectively chose which updates they wanted to install and which they didn’t, and this created countless scenarios in which organizations deployed essential security updates but picked only a subset of non-security fixes.
 
-In Windows 10, rather than receiving several updates each month and trying to figure out which the organization needs, which ultimately causes platform fragmentation, administrators will see one cumulative monthly update that supersedes the previous month’s update, containing both security and non-security fixes. This approach makes patching simpler and ensures that customers’ devices are more closely aligned with the testing done at Microsoft, reducing unexpected issues resulting from patching. The left side of Figure 1 provides an example of Windows 7 devices in an enterprise and what their current patch level might look like. On the right is what Microsoft’s test environment PCs contain. This drastic difference is the basis for many compatibility issues and system anomalies related to Windows updates.
+In Windows 10, rather than receiving several updates each month and trying to figure out which the organization needs, which ultimately causes platform fragmentation, administrators will see one cumulative monthly update that supersedes the previous month’s update, containing both security and non-security fixes. This approach makes patching simpler and ensures that customers’ devices are more closely aligned with the testing done at Microsoft, reducing unexpected issues resulting from patching. The left side of Figure 1 provides an example of Windows 7 devices in an enterprise and what their current patch level might look like. On the right is what Microsoft’s test environment devicess contain. This drastic difference is the basis for many compatibility issues and system anomalies related to Windows updates.
 
 **Figure 1**
 
@@ -112,7 +102,7 @@ In Windows 10, rather than receiving several updates each month and trying to fi
 
 To align with the new method of delivering feature updates and quality updates in Windows 10, Microsoft introduced the concept of servicing channels to allow customers to designate how frequently their individual devices are updated. For example, an organization may have test devices that the IT department can update with new features as soon as possible, and then specialized devices that require a longer feature update cycle to ensure continuity. 
 
-With that in mind, Windows 10 offers 3 servicing channels. The [Windows Insider Program](#windows-insider) provides organizations with the opportunity to test and provide feedback on features that will be shipped in the next feature update. The [Semi-Annual Channel](#semi-annual-channel) provides new functionality with twice-per-year feature update releases. Organizations can choose when to deploy updates from the Semi-Annual Channel. The [Long Term Servicing Channel](#long-term-servicing-channel), which is designed to be used only for specialized devices (which typically don't run Office) such as those that control medical equipment or ATM machines, receives new feature releases every two to three years. For details about the versions in each servicing channel, see [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx).
+With that in mind, Windows 10 offers three servicing channels. The [Windows Insider Program](#windows-insider) provides organizations with the opportunity to test and provide feedback on features that will be shipped in the next feature update. The [Semi-Annual Channel](#semi-annual-channel) provides new functionality with twice-per-year feature update releases. Organizations can choose when to deploy updates from the Semi-Annual Channel. The [Long Term Servicing Channel](#long-term-servicing-channel), which is designed to be used only for specialized devices (which typically don't run Office) such as those that control medical equipment or ATM machines, receives new feature releases every two to three years. For details about the versions in each servicing channel, see [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx).
 
 The concept of servicing channels is new, but organizations can use the same management tools they used to manage updates and upgrades in previous versions of Windows. For more information about the servicing tool options for Windows 10 and their capabilities, see [Servicing tools](#servicing-tools).
 
@@ -121,15 +111,15 @@ The concept of servicing channels is new, but organizations can use the same man
 
 ### Semi-Annual Channel
 
-In the Semi-Annual servicing channel, feature updates are available as soon as Microsoft releases them. Windows 10, version 1511, had few servicing tool options to delay feature updates, limiting the use of the Semi-Annual servicing channel. Windows 10, version 1607 and onward, includes more servicing tools that can delay feature updates for up to 365 days. This servicing model is ideal for pilot deployments and testing of Windows 10 feature updates and for users such as developers who need to work with the latest features immediately. Once the latest release has gone through pilot deployment and testing, you will be able to choose the timing at which it goes into broad deployment.
+In the Semi-Annual servicing channel, feature updates are available as soon as Microsoft releases them. Windows 10, version 1511, had few servicing tool options to delay feature updates, limiting the use of the Semi-Annual servicing channel. Starting with Windows 10, version 1607, more servicing tools that can delay feature updates for up to 365 days are available. This servicing model is ideal for pilot deployments and testing of Windows 10 feature updates and for users such as developers who need to work with the latest features immediately. Once the latest release has gone through pilot deployment and testing, you will be able to choose the timing at which it goes into broad deployment.
 
-When Microsoft officially releases a feature update for Windows 10, it is made available to any PC not configured to defer feature updates so that those devices can immediately install it. Organizations that use Windows Server Update Services (WSUS), Microsoft System Center Configuration Manager, or Windows Update for Business, however, can defer feature updates to selective devices by withholding their approval and deployment. In this scenario, the content available for the Semi-Annual Channel will be available but not necessarily immediately mandatory, depending on the policy of the management system. For more details about Windows 10 servicing tools, see [Servicing tools](#servicing-tools).
+When Microsoft officially releases a feature update for Windows 10, it is made available to any device not configured to defer feature updates so that those devices can immediately install it. Organizations that use Windows Server Update Services (WSUS), Microsoft System Center Configuration Manager, or Windows Update for Business, however, can defer feature updates to selective devices by withholding their approval and deployment. In this scenario, the content available for the Semi-Annual Channel will be available but not necessarily immediately mandatory, depending on the policy of the management system. For more details about Windows 10 servicing tools, see [Servicing tools](#servicing-tools).
 
 
 Organizations are expected to initiate targeted deployment on Semi-Annual Channel releases.  All customers, independent software vendors (ISVs), and partners should use this time for testing and piloting within their environments. After 2-4 months, we will transition to broad deployment and encourage customers and partners to expand and accelerate the deployment of the release. For customers using Windows Update for Business, the Semi-Annual Channel provides three months of additional total deployment time before being required to update to the next release.
 
 > [!NOTE]
-> All releases of Windows 10 have 18 months of servicing for all editions--these updates provide security and feature updates for the release. Customers running Enterprise and Education editions have an additional 12 months of servicing for specific Windows 10 releases, for a total of 30 months from initial release. These versions include Enterprise and Education editions for Windows 10, versions 1607, 1703, 1709 and 1803. Starting in October 2018, all Semi-Annual Channel releases in the September/October timeframe will also have the additional 12 months of servicing for a total of 30 months from the initial release. The Semi-Annual Channel versions released in March/April timeframe will continue to have an 18 month lifecycle.
+> All releases of Windows 10 have 18 months of servicing for all editions--these updates provide security and feature updates for the release. Customers running Enterprise and Education editions have an additional 12 months of servicing for specific Windows 10 releases, for a total of 30 months from initial release. These versions include Enterprise and Education editions for Windows 10, versions 1607 and later. Starting in October 2018, all Semi-Annual Channel releases in the September/October timeframe will also have the additional 12 months of servicing for a total of 30 months from the initial release. The Semi-Annual Channel versions released in March/April timeframe will continue to have an 18-month lifecycle.
 > 
 > 
 > [!NOTE]
@@ -137,12 +127,12 @@ Organizations are expected to initiate targeted deployment on Semi-Annual Channe
 
 ### Long-term Servicing Channel
 
-Specialized systems—such as PCs that control medical equipment, point-of-sale systems, and ATMs—often require a longer servicing option because of their purpose. These devices typically perform a single important task and don’t need feature updates as frequently as other devices in the organization. It’s more important that these devices be kept as stable and secure as possible than up to date with user interface changes. The LTSC servicing model prevents Windows 10 Enterprise LTSB devices from receiving the usual feature updates and provides only quality updates to ensure that device security stays up to date. With this in mind, quality updates are still immediately available to Windows 10 Enterprise LTSB clients, but customers can choose to defer them by using one of the servicing tools mentioned in the section Servicing tools.
+Specialized systems—such as devices that control medical equipment, point-of-sale systems, and ATMs—often require a longer servicing option because of their purpose. These devices typically perform a single important task and don’t need feature updates as frequently as other devices in the organization. It’s more important that these devices be kept as stable and secure as possible than up to date with user interface changes. The LTSC servicing model prevents Windows 10 Enterprise LTSB devices from receiving the usual feature updates and provides only quality updates to ensure that device security stays up to date. With this in mind, quality updates are still immediately available to Windows 10 Enterprise LTSB clients, but customers can choose to defer them by using one of the servicing tools mentioned in the section Servicing tools.
 
 > [!NOTE]
 > Windows 10 Enterprise LTSB is a separate Long Term Servicing Channel version.
 >
-> Long-term Servicing channel is not intended for deployment on most or all the PCs in an organization; it should be used only for special-purpose devices.  As a general guideline, a PC with Microsoft Office installed is a general-purpose device, typically used by an information worker, and therefore it is better suited for the Semi-Annual servicing channel.
+>Long-term Servicing channel is not intended for deployment on most or all the devicess in an organization; it should be used only for special-purpose devices. As a general guideline, a device with Microsoft Office installed is a general-purpose device, typically used by an information worker, and therefore it is better suited for the Semi-Annual servicing channel.
 
 Microsoft never publishes feature updates through Windows Update on devices that run Windows 10 Enterprise LTSB. Instead, it typically offers new LTSC releases every 2–3 years, and organizations can choose to install them as in-place upgrades or even skip releases over a 10-year life cycle.
 
@@ -158,10 +148,10 @@ The Long-term Servicing Channel is available only in the Windows 10 Enterprise L
 
 For many IT pros, gaining visibility into feature updates early—before they’re available to the Semi-Annual Channel — can be both intriguing and valuable for future end user communications as well as provide the means to test for any issues on the next Semi-Annual Channel release. With Windows 10, feature flighting enables Windows Insiders to consume and deploy preproduction code to their test machines, gaining early visibility into the next build. Testing the early builds of Windows 10 helps both Microsoft and its customers because they have the opportunity to discover possible issues before the update is ever publicly available and can report it to Microsoft.
 
-Microsoft recommends that all organizations have at least a few PCs enrolled in the Windows Insider Program and provide feedback on any issues they encounter. For information about the Windows Insider Program for Business, go to [Windows Insider Program for Business](waas-windows-insider-for-business.md).
+Microsoft recommends that all organizations have at least a few devices enrolled in the Windows Insider Program and provide feedback on any issues they encounter. For information about the Windows Insider Program for Business, go to [Windows Insider Program for Business](waas-windows-insider-for-business.md).
 
 >[!NOTE]
-> Microsoft recommends that all organizations have at least a few PCs enrolled in the Windows Insider Program, to include the Windows Insider Program in their deployment plans and to provide feedback on any issues they encounter to Microsoft via our Feedback Hub app. 
+>Microsoft recommends that all organizations have at least a few devices enrolled in the Windows Insider Program, to include the Windows Insider Program in their deployment plans and to provide feedback on any issues they encounter to Microsoft via our Feedback Hub app. 
 >
 > The Windows Insider Program isn’t intended to replace Semi-Annual Channel deployments in an organization. Rather, it provides IT pros and other interested parties with pre-release Windows builds that they can test and ultimately provide feedback on to Microsoft. 
 
@@ -171,7 +161,7 @@ Microsoft recommends that all organizations have at least a few PCs enrolled in
 
 There are many tools with which IT pros can service Windows as a service. Each option has its pros and cons, ranging from capabilities and control to simplicity and low administrative requirements. The following are examples of the servicing tools available to manage Windows as a service updates:
 
-- **Windows Update (stand-alone)** provides limited control over feature updates, with IT pros manually configuring the device to be in the Semi-Annual Channel. Organizations can target which devices defer updates by selecting the Defer upgrades check box in Start\Settings\Update & Security\Advanced Options on a Windows 10 client.
+- **Windows Update (stand-alone)** provides limited control over feature updates, with IT pros manually configuring the device to be in the Semi-Annual Channel. Organizations can target which devices defer updates by selecting the Defer upgrades check box in Start\Settings\Update & Security\Advanced Options on a Windows 10 device.
 - **Windows Update for Business** is the second option for servicing Windows as a service. This servicing tool includes control over update deferment and provides centralized management using Group Policy. Windows Update for Business can be used to defer updates by up to 365 days, depending on the version. These deployment options are available to clients in the Semi-Annual Channel. In addition to being able to use Group Policy to manage Windows Update for Business, either option can be configured without requiring any on-premises infrastructure by using Intune.
 - **Windows Server Update Services (WSUS)** provides extensive control over Windows 10 updates and is natively available in the Windows Server operating system. In addition to the ability to defer updates, organizations can add an approval layer for updates and choose to deploy them to specific computers or groups of computers whenever ready. 
 - **System Center Configuration Manager** provides the greatest control over servicing Windows as a service. IT pros can defer updates, approve them, and have multiple options for targeting deployments and managing bandwidth usage and deployment times. 
@@ -188,7 +178,7 @@ With all these options, which an organization chooses depends on the resources,
 | Configuration Manager | Yes | Yes | BranchCache, Client Peer Cache | Distribution points, multiple deployment options |
 
 >[!NOTE]
-> Due to [naming changes](#naming-changes), older terms like CB,CBB and LTSB may still be displayed in some of our products.
+>Due to [naming changes](#naming-changes), older terms like CB and CBB might still be displayed in some of our products, such as in Group Policy. If you encounter these terms, "CB" refers to the Semi-Annual Channel (Targeted)--which is no longer used--while "CBB" refers to the Semi-Annual Channel.
 
 </br>
 
@@ -215,6 +205,6 @@ With all these options, which an organization chooses depends on the resources,
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Manage device restarts after updates](waas-restart.md)
  

windows/deployment/update/waas-quick-start.md

@@ -5,10 +5,9 @@ keywords: updates, servicing, current, deployment, semi-annual channel, feature,
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.author: jaimeo
-ms.date: 10/17/2018
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -20,7 +19,6 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
 - Windows 10 IoT Mobile
 
 Windows as a service is a new concept, introduced with the release of Windows 10. While [an extensive set of documentation](index.md) is available explaining all the specifics and nuances, here is a quick guide to the most important concepts.
@@ -62,12 +60,7 @@ Additional technologies such as BranchCache and Delivery Optimization, both peer
 
 See [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) and [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) for more information.
 
-## Video: An overview of Windows as a service
 
-Click the following Microsoft Mechanics video for an overview of the updated release model, particularly the Semi-Annual Channel.
-
-
-[![YouTube video of Michael Niehouse explaining how the Semi-Annual Channel works](images/SAC_vid_crop.jpg)](https://youtu.be/qSAsiM01GOU) 
  
 ## Learn more
 
@@ -83,7 +76,7 @@ Click the following Microsoft Mechanics video for an overview of the updated rel
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Manage device restarts after updates](waas-restart.md)
 
 

windows/deployment/update/waas-restart.md

@@ -4,9 +4,9 @@ description: tbd
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.author: greg-lindsay
 ms.date: 07/27/2017
 ms.reviewer: 
 manager: laurawi
@@ -19,7 +19,7 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
+
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
 
@@ -205,4 +205,4 @@ There are 3 different registry combinations for controlling restart behavior:
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)

windows/deployment/update/waas-servicing-channels-windows-10-updates.md

@@ -4,10 +4,9 @@ description: tbd
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.author: jaimeo
-ms.date: 10/13/2017
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -19,75 +18,63 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
+
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
 >[!TIP]
 >If you're not familiar with the Windows 10 servicing or release channels, read [Servicing Channels](waas-overview.md#servicing-channels) first.
 >
->Due to [naming changes](waas-overview.md#naming-changes), older terms like CB, CBB and LTSB may still be displayed in some of our products.
+>Due to [naming changes](waas-overview.md#naming-changes), older terms like CB and CBB might still be displayed in some of our products, such as in Group Policy. If you encounter these terms, "CB" refers to the Semi-Annual Channel (Targeted)--which is no longer used--while "CBB" refers to the Semi-Annual Channel.
 
-Semi-Annual Channel is the default servicing channel for all Windows 10 devices except those with the LTSB edition installed. The following table shows the servicing channels available to each Windows 10 edition. 
+The Semi-Annual Channel is the default servicing channel for all Windows 10 devices except those with the LTSB edition installed. The following table shows the servicing channels available to each Windows 10 edition. 
 
-| Windows 10 edition | Semi-Annual Channel (Targeted) | Semi-Annual Channel | Long-Term Servicing Channel | Insider Program |
+| Windows 10 edition | Semi-Annual Channel | Long-Term Servicing Channel | Insider Program |
-| --- | --- | --- | --- | --- |
+| --- | --- | --- | --- |
-| Home | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Home | ![no](images/crossmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Pro | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Pro | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Enterprise | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Enterprise  | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Enterprise LTSB | ![no](images/crossmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) | ![no](images/crossmark.png) |
+| Enterprise LTSB  | ![no](images/crossmark.png) | ![yes](images/checkmark.png) | ![no](images/crossmark.png) |
-| Pro Education | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Pro Education | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Education | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Education  | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Mobile | ![yes](images/checkmark.png) | ![no](images/crossmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Mobile | ![no](images/crossmark.png) | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
-| Mobile Enterprise | ![yes](images/checkmark.png) | ![yes](images/checkmark.png)  | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
+| Mobile Enterprise  | ![yes](images/checkmark.png)  | ![no](images/crossmark.png) | ![yes](images/checkmark.png) |
 
 
 
 >[!NOTE]
 >The LTSB edition of Windows 10 is only available through the [Microsoft Volume Licensing Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx).
 
->[!NOTE]
+
->Semi-Annual Channel (Targeted) should be used only by the customers that are using [Windows Update for Business](https://docs.microsoft.com/windows/deployment/update/waas-manage-updates-wufb). For those who don't use Windows Update for Business, Semi-Annual Channel (Targeted) would be the same as Semi-Annual Channel.
 
 ## Assign devices to Semi-Annual Channel
 
 >[!IMPORTANT]
->Due to [naming changes](waas-overview.md#naming-changes), older terms like CB, CBB and LTSB may still be displayed in some of our products.
+>Due to [naming changes](waas-overview.md#naming-changes), older terms like CB and CBB might still be displayed in some of our products, such as in Group Policy. If you encounter these terms, "CB" refers to the Semi-Annual Channel (Targeted)--which is no longer used--while "CBB" refers to the Semi-Annual Channel.
->
->In the following settings CB refers to Semi-Annual Channel (Targeted), while CBB refers to Semi-Annual Channel.
 
-**To assign a single PC locally to CBB**
+**To assign a single devices locally to the Semi-Annual Channel**
 
 1. Go to **Settings** > **Update & security** > **Windows Update** > **Advanced options**.
 2. Select **Defer feature updates**.
 
-**To assign PCs to CBB using Group Policy**
+**To assign devicess to the Semi-Annual Channel by using Group Policy**
 
-- In Windows 10, version 1511:
 
-    Computer Configuration > Administrative Templates > Windows Components > Windows Update > **Defer Upgrades and Updates**
+- In Windows 10, version 1607 and later releases:
 
-- In Windows 10, version 1607:
+    Computer Configuration > Administrative Templates > Windows Components > Windows Update > Defer Windows Updates > **Select when Feature Updates are received** - enable policy and set branch readiness level to the Semi-Annual Channel
     
-    Computer Configuration > Administrative Templates > Windows Components > Windows Update > Defer Windows Updates > **Select when Feature Updates are received** - enable policy and set branch readiness level to CBB
+**To assign devicess to to the Semi-Annual Channel by using MDM**
 
-**To assign PCs to CBB using MDM**
 
-- In Windows 10, version 1511:
+- In Windows 10, version 1607 and later releases:
-
-    ../Vendor/MSFT/Policy/Config/Update/**RequireDeferUpgrade**
-
-- In Windows 10, version 1607:
 
     ../Vendor/MSFT/Policy/Config/Update/**BranchReadinessLevel**
     
-**To assign Windows 10 Mobile Enterprise to CBB using MDM**
+**To assign Windows 10 Mobile Enterprise devices to the Semi-Annual Channel by using MDM**
 
-- In Windows 10 Mobile Enterprise, version 1511:
 
-    ../Vendor/MSFT/Policy/Config/Update/RequireDeferUpgrade
+- In Windows 10 Mobile Enterprise, version 1607 and later releases:
-
-- In Windows 10 Mobile Enterprise, version 1607:
 
     ../Vendor/MSFT/Policy/Config/Update/BranchReadinessLevel
 
@@ -125,7 +112,7 @@ To prevent devices in your enterprise from being enrolled in the Insider Program
 
 ## Switching channels
 
-During the life of a device, it may be necessary or desirable to switch between the available channels. Depending on the channel you are using, the exact mechanism for doing this can be different; some will be simple, others more involved.
+During the life of a device, it might be necessary or desirable to switch between the available channels. Depending on the channel you are using, the exact mechanism for doing this can be different; some will be simple, others more involved.
 
 <table>
 <colgroup>
@@ -143,38 +130,21 @@ During the life of a device, it may be necessary or desirable to switch between
 <tbody>
 <tr class="odd">
 <td align="left" rowspan="3">Windows Insider Program</td>
-<td align="left">Semi-Annual Channel (Targeted)</td>
-<td align="left">Wait for the final Semi-Annual Channel release.</td>
 </tr>
 <tr class="even">
 <td align="left">Semi-Annual Channel</td>
-<td align="left">Not directly possible, because Windows Insider Program devices are automatically upgraded to the Semi-Annual Channel (Targeted) release at the end of the development cycle.</td>
+<td align="left">Not directly possible</td>
 </tr>
 <tr class="odd">
 <td align="left">Long-Term Servicing Channel</td>
 <td align="left">Not directly possible (requires wipe-and-load).</td>
 </tr>
-<tr class="even">
-<td align="left" rowspan="3">Semi-Annual Channel (Targeted)</td>
-<td align="left">Insider</td>
-<td align="left">Use the Settings app to enroll the device in the Windows Insider Program.</td>
-</tr>
-<tr class="odd">
-<td align="left">Semi-Annual Channel</td>
-<td align="left">Select the <strong>Defer upgrade</strong> setting, or move the PC to a target group or flight that will not receive the next upgrade until it is business ready. Note that this change will not have any immediate impact; it only prevents the installation of the next Semi-Annual Channel release.</td>
-</tr>
-<tr class="even">
-<td align="left">Long-Term Servicing Channel</td>
-<td align="left">Not directly possible (requires wipe-and-load).</td>
-</tr>
 <tr class="odd">
 <td align="left" rowspan="3">Semi-Annual Channel</td>
 <td align="left">Insider</td>
 <td align="left">Use the Settings app to enroll the device in the Windows Insider Program.</td>
 </tr>
 <tr class="even">
-<td align="left">Semi-Annual Channel (Targeted)</td>
-<td align="left">Disable the <strong>Defer upgrade</strong> setting, or move the device to a target group or flight that will receive the latest Current Semi-Annual Channel release.</td>
 </tr>
 <tr class="odd">
 <td align="left">Long-Term Servicing Channel</td>
@@ -184,11 +154,6 @@ During the life of a device, it may be necessary or desirable to switch between
 <td align="left" rowspan="3">Long-Term Servicing Channel</td>
 <td align="left">Insider</td>
 <td align="left">Use media to upgrade to the latest Windows Insider Program build.</td>
-</tr>
-<tr class="odd">
-<td align="left">Semi-Annual Channel (Targeted)</td>
-<td align="left">Use media to upgrade. Note that the Semi-Annual Channel build must be a later build.</td>
-</tr>
 <tr class="even">
 <td align="left">Semi-Annual Channel</td>
 <td align="left">Use media to upgrade. Note that the Semi-Annual Channel build must be a later build.</td>
@@ -224,5 +189,5 @@ By enabling the Group Policy setting under **Computer Configuration\Administrati
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-servicing-strategy-windows-10-updates.md

@@ -4,10 +4,9 @@ description: A strong Windows 10 deployment strategy begins with establishing a
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.author: jaimeo
-ms.date: 11/02/2018
 ms.reviewer: 
 manager: laurawi
 ms.topic: article
@@ -19,7 +18,7 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
+
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
@@ -70,5 +69,5 @@ Each time Microsoft releases a Windows 10 feature update, the IT department shou
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
 - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-wu-settings.md

@@ -5,11 +5,10 @@ ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 audience: itpro
-author: greg-lindsay
+author: jaimeo
 ms.localizationpriority: medium
 ms.audience: itpro
-author: greg-lindsay
+author: jaimeo
-ms.date: 07/27/2017
 ms.reviewer:
 manager: laurawi
 ms.topic: article
@@ -21,14 +20,14 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile 
+
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
 
 You can use Group Policy settings or mobile device management (MDM) to configure the behavior of Windows Update (WU) on your Windows 10 devices. You can configure the update detection frequency, select when updates are received, specify the update service location and more.
 
 >[!IMPORTANT]
->In Windows 10, any Group Policy user configuration settings for Windows Update were deprecated and are no longer supported on this platform.
+>In Windows 10, any Group Policy user configuration settings for Windows Update are no longer supported on this platform.
 
 ## Summary of Windows Update settings
 

windows/deployment/update/waas-wufb-group-policy.md

@@ -4,9 +4,9 @@ description: Configure Windows Update for Business settings using Group Policy.
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.author: greg-lindsay
 ms.date: 07/27/2017
 ms.reviewer: 
 manager: laurawi
@@ -138,7 +138,7 @@ We recommend that you set up a ring to receive preview builds by joining the Win
 - [Deploy updates using Windows Update for Business](waas-manage-updates-wufb.md)
 - [Configure Windows Update for Business](waas-configure-wufb.md)
 - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md)
-- [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md)
+- [Walkthrough: use Intune to configure Windows Update for Business](https://docs.microsoft.com/intune/windows-update-for-business-configure)
 - [Deploy Windows 10 updates using Windows Server Update Services](waas-manage-updates-wsus.md)
 - [Deploy Windows 10 updates using System Center Configuration Manager](waas-manage-updates-configuration-manager.md)
 - [Manage device restarts after updates](waas-restart.md)

windows/deployment/update/waas-wufb-intune.md

@@ -4,9 +4,11 @@ description: Configure Windows Update for Business settings using Microsoft Intu
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
-audience: itpro
author: greg-lindsay
+audience: itpro
+author: greg-lindsay
 ms.localizationpriority: medium
-ms.audience: itpro
author: greg-lindsay
+ms.audience: itpro
+author: greg-lindsay
 ms.date: 07/27/2017
 ms.reviewer: 
 manager: laurawi
@@ -19,7 +21,7 @@ ms.topic: article
 **Applies to**
 
 - Windows 10
-- Windows 10 Mobile
+
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 

windows/deployment/upgrade/setupdiag.md

@@ -28,7 +28,8 @@ ms.topic: article
 
 ## About SetupDiag
 
-<I>Current version of SetupDiag: 1.5.0.0</I>
+<I>Current version of SetupDiag: 1.6.0.0</I>
+>Always be sure to run the most recent version of SetupDiag, so that can access new functionality and fixes to known issues.
 
 SetupDiag is a standalone diagnostic tool that can be used to obtain details about why a Windows 10 upgrade was unsuccessful. 
 
@@ -147,7 +148,6 @@ SetupDiag.exe /Output:C:\SetupDiag\Dumpdebug.log /LogsPath:D:\Dump
 ## Known issues
 
 1. Some rules can take a long time to process if the log files involved are large.
-2. If the failing computer is opted into the Insider program and getting regular pre-release updates, or an update is already pending on the computer when SetupDiag is run, it can encounter problems trying to open these log files. This will likely cause a failure to determine a root cause.  In this case, try gathering the log files and running SetupDiag in offline mode.
 
 
 ## Sample output
@@ -157,7 +157,7 @@ The following is an example where SetupDiag is run in offline mode.
 ```
 D:\SetupDiag>SetupDiag.exe /output:c:\setupdiag\result.xml /logspath:D:\Tests\Logs\f55be736-beed-4b9b-aedf-c133536c946e /format:xml
 
-SetupDiag v1.5.0.0
+SetupDiag v1.6.0.0
 Copyright (c) Microsoft Corporation. All rights reserved.
 
 Searching for setup logs...
@@ -318,6 +318,19 @@ Each rule name and its associated unique rule identifier are listed with a descr
 
 ## Release notes
 
+08/08/2019 - SetupDiag v1.6.0.0 is released with 60 rules, as a standalone tool available from the Download Center.
+ - Log detection performance is improved.  What used to take up to a minute should take around 10 seconds or less.
+ - Added Setup Operation and Setup Phase information to both the results log and the registry information.
+     - This is the last Operation and Phase that Setup was in when the failure occurred.
+ - Added detailed Setup Operation and Setup Phase information (and timing) to output log when /verbose is specified.
+     - Note, if the issue found is a compat block, no Setup Operation or Phase info exists yet and therefore won’t be available.
+ - Added more info to the Registry output. 
+     - Detailed ‘FailureData’ info where available.  Example: “AppName = MyBlockedApplication” or “DiskSpace = 6603” (in MB)
+         - “Key = Value” data specific to the failure found.
+     - Added ‘UpgradeStartTime’, ‘UpgradeEndTime’ and ‘UpgradeElapsedTime’
+     - Added ‘SetupDiagVersion’, ‘DateTime’ (to indicate when SetupDiag was executed on the system), ‘TargetOSVersion’, ‘HostOSVersion’ and more…
+
+
 06/19/2019 - SetupDiag v1.5.0.0 is released with 60 rules, as a standalone tool available from the Download Center.
    - All date and time outputs are updated to localized format per user request.
    - Added setup Operation and Phase information to /verbose log.
@@ -335,7 +348,7 @@ Each rule name and its associated unique rule identifier are listed with a descr
        - For an example, see [Sample registry key](#sample-registry-key).
 
 05/17/2019 - SetupDiag v1.4.1.0 is released with 53 rules, as a standalone tool available from the Download Center.
-   - This release adds the ability to find and diagnose reset and recovery failures (Push Button Reset).  
+   - This release dds the ability to find and diagnose reset and recovery failures (Push Button Reset).  
 
 12/18/2018 - SetupDiag v1.4.0.0 is released with 53 rules, as a standalone tool available from the Download Center.
    - This release includes major improvements in rule processing performance: ~3x faster rule processing performance!
@@ -408,7 +421,7 @@ Refer to https://docs.microsoft.com/windows/deployment/upgrade/upgrade-error-cod
 ```xml
 <?xml version="1.0" encoding="utf-16"?>
 <SetupDiag xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://docs.microsoft.com/windows/deployment/upgrade/setupdiag">
-  <Version>1.5.0.0</Version>
+  <Version>1.6.0.0</Version>
   <ProfileName>FindSPFatalError</ProfileName>
   <ProfileGuid>A4028172-1B09-48F8-AD3B-86CDD7D55852</ProfileGuid>
   <SystemInfo>
@@ -459,7 +472,7 @@ Refer to "https://docs.microsoft.com/windows/desktop/Debug/system-error-codes" f
 
 ```
 {
-    "Version":"1.5.0.0",
+    "Version":"1.6.0.0",
     "ProfileName":"FindSPFatalError",
     "ProfileGuid":"A4028172-1B09-48F8-AD3B-86CDD7D55852",
     "SystemInfo":{

windows/deployment/upgrade/upgrade-readiness-additional-insights.md

@@ -5,7 +5,8 @@ manager: laurawi
 ms.author: greglin
 description: Explains additional features of Upgrade Readiness.
 ms.prod: w10
-audience: itpro
author: greg-lindsay
+audience: itpro
+author: greg-lindsay
 ms.topic: article
 ms.collection: M365-analytics
 ---
@@ -14,44 +15,9 @@ ms.collection: M365-analytics
 
 This topic provides information on additional features that are available in Upgrade Readiness to provide insights into your environment. These include:
 
-- [Spectre and Meltdown protections](#spectre-and-meltdown-protection-status): Status of devices with respect to their anti-virus, security update, and firmware updates related to protection from the "Spectre" and "Meltdown" vulnerabilities.
 - [Site discovery](#site-discovery): An inventory of web sites that are accessed by client computers running Windows 7, Windows 8.1, or Windows 10 using Internet Explorer.
 - [Office add-ins](#office-add-ins): A list of the Microsoft Office add-ins that are installed on client computers.
 
-## Spectre and Meltdown protection status
-Microsoft has published guidance for IT Pros that outlines the steps you can take to improve protection against the hardware vulnerabilities known as "Spectre" and "Meltdown." See [Windows Client Guidance for IT Pros to protect against speculative execution side-channel vulnerabilities](https://go.microsoft.com/fwlink/?linkid=867468) for details about the vulnerabilities and steps you can take.
- 
-Microsoft recommends three steps to help protect against the Spectre and Meltdown vulnerabilities:
-- Verify that you are running a supported antivirus application.
-- Apply all available Windows operating system updates, including the January 2018 and later Windows security updates.
-- Apply any applicable processor firmware (microcode) updates provided by your device manufacturer(s).
- 
-Upgrade Readiness reports on status of your devices in these three areas.
-
-![Spectre-Meltdown protection blades](../images/spectre-meltdown-prod-closeup.png)
-
->[!IMPORTANT]
->To provide these blades with data, ensure that your devices can reach the endpoint **http://adl.windows.com**. (See [Enrolling devices in Windows Analytics](https://docs.microsoft.com/windows/deployment/update/windows-analytics-get-started) for more about necessary endpoints and how to whitelist them.)
-
-### Anti-virus status blade
-This blade helps you determine if your devices' anti-virus solution is compatible with the latest Windows operating system updates. It shows the number of devices that have an anti-virus solution with no known issues, issues reported, or an unknown status for a particular Windows security update. In the following example, an anti-virus solution that has no known issues with the January 3, 2018 Windows update is installed on about 2,800 devices.
-
-![Spectre-Meltdown antivirus blade](../images/AV-status-by-computer.png)
-
-### Security update status blade
-This blade indicates whether a Windows security update that includes Spectre- or Meltdown-related fixes (January 3, 2018 or later) has been installed, as well as whether specific fixes have been disabled. Though protections are enabled by default on devices running Windows (but not Windows Server) operating systems, some IT administrators might choose to disable specific protections. In the following example, about 4,300 devices have a Windows security update that includes Spectre or Meltdown protections installed, and those protections are enabled.
-
-![Spectre-Meltdown antivirus blade](../images/win-security-update-status-by-computer.png)
-
->[!IMPORTANT]
->If you are seeing computers with statuses of either “Unknown – action may be required” or “Installed, but mitigation status unknown,” it is likely that you need to whitelist the **http://adl.windows.com** endpoint.
-
-### Firmware update status blade
-This blade reports the number of devices that have installed a firmware update that includes Spectre or Meltdown protections. The blade might report a large number of blank, “unknown”, or “to be determined” statuses at first. As CPU information is provided by partners, the blade will automatically update with no further action required on your part.
-
-
-
-
 ## Site discovery
 
 The IE site discovery feature in Upgrade Readiness provides an inventory of web sites that are accessed by client computers using Internet Explorer on Windows 7, Windows 8.1, and Windows 10. Site discovery does not include sites that are accessed using other Web browsers, such as Microsoft Edge. Site inventory information is provided as optional data related to upgrading to Windows 10 and Internet Explorer 11, and is meant to help prioritize compatibility testing for web applications. You can make more informed decisions about testing based on usage data.

windows/deployment/upgrade/use-upgrade-readiness-to-manage-windows-upgrades.md

@@ -6,8 +6,9 @@ description: Describes how to use Upgrade Readiness to manage Windows upgrades.
 keywords: windows analytics, oms, operations management suite, prerequisites, requirements, upgrades, log analytics, 
 ms.localizationpriority: medium
 ms.prod: w10
-audience: itpro
author: greg-lindsay
+audience: itpro
-ms.author: greglin
+author: jaimeo
+ms.author: jaimeo
 ms.topic: article
 ---
 
@@ -25,9 +26,8 @@ When you are ready to begin the upgrade process, a workflow is provided to guide
 
 <A HREF="../images/ua-cg-15.png">![Series of blades showing Upgrade Overview, Step 1: Identify Important Apps, Prioritize Applications, Step 2: Resolve issues, and Review applications with known issues](../images/ua-cg-15.png)</A>
 
-Each step in the workflow is enumerated using blue tiles. Helpful data is provided on white tiles to help you get started, to monitor your progress, and to complete each step.
+Blue tiles enumerate each step in the workflow. White tiles show data to help you get started, to monitor your progress, and to complete each step.
-
+>**Important**: You can use the [Target version](#target-version) setting to evaluate computers that are running a specified version of Windows before starting the Upgrade Readiness workflow. By default, the Target version is configured to the released version of Windows 10 for the Semi-Annual Channel.
->**Important**: You can use the [Target version](#target-version) setting to evaluate computers that are running a specified version of Windows before starting the Upgrade Readiness workflow. By default, the Target version is configured to the released version of Windows 10 for the Current Branch for Business (CBB).
 
 The following information and workflow is provided:
 
@@ -46,11 +46,11 @@ The target version setting is used to evaluate the number of computers that are
 
 ![Upgrade overview showing target version](../images/ur-target-version.png)
 
-The default target version in Upgrade Readiness is set to the released version of the Current Branch for Business (CBB). CBB can be determined by reviewing [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx). The target version setting is used to evaluate the number of computers that are already running this version of Windows, or a later version. 
+The default target version in Upgrade Readiness is set to the released version of the Semi-Annual Channel. Check [Windows 10 release information](https://technet.microsoft.com/windows/release-info.aspx) to learn the current version in the Semi-Annual Channel. The target version setting is used to evaluate the number of computers that are already running this version of Windows, or a later version. 
 
 The number displayed under **Computers upgraded** in the Upgrade Overview blade is the total number of computers that are already running the same or a later version of Windows compared to the target version. It also is used in the evaluation of apps and drivers: Known issues and guidance for the apps and drivers in Upgrade Readiness is based on the target operating system version.
 
-You now have the ability to change the Windows 10 version you wish to target. The available options currently are: Windows 10 version 1507, Windows 10 version 1511, Windows 10 version 1607, Windows 10 version 1703, Windows 10 version 1709 and Windows 10 version 1803.
+You can change the Windows 10 version you want to target. All currently supported versions of Windows 10 are available options.
 
 To change the target version setting, click on **Solutions Settings**, which appears at the top when you open you Upgrade Readiness solution:
 

windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md

@@ -9,7 +9,7 @@ ms.mktglfcycl: deploy
 ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
-audience: itpro
author: greg-lindsay
+author: greg-lindsay
 ms.author: greglin
 ms.collection: M365-modern-desktop
 ms.topic: article

windows/deployment/windows-autopilot/windows-autopilot-requirements.md

@@ -9,7 +9,8 @@ ms.mktglfcycl: deploy
 ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
-audience: itpro
author: greg-lindsay
+audience: itpro
+author: greg-lindsay
 ms.author: greglin
 ms.collection: M365-modern-desktop
 ms.topic: article
@@ -73,9 +74,9 @@ If the WNS services are not available, the Autopilot process will still continue
 
 If the Microsoft Store is not accessible, the AutoPilot process will still continue without Microsoft Store apps.
 
-<tr><td><b>Office 365<b><td>As part of the Intune device configuration, installation of Office 365 ProPlus may be required. For more information, see <a href="https://support.office.com/en-us/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2">Office 365 URLs and IP address ranges</a> (includes all Office services, DNS names, IP addresses; includes Azure AD and other services that may overlap with those listed above).
+<tr><td><b>Office 365<b><td>As part of the Intune device configuration, installation of Office 365 ProPlus may be required. For more information, see <a href="https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2">Office 365 URLs and IP address ranges</a> (includes all Office services, DNS names, IP addresses; includes Azure AD and other services that may overlap with those listed above).
-<tr><td><b>Certificate revocation lists (CRLs)<b><td>Some of these services will also need to check certificate revocation lists (CRLs) for certificates used in the services.  A full list of these is documented at <a href="https://support.office.com/en-us/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2#bkmk_crl">Office 365 URLs and IP address ranges</a> and <a href="https://aka.ms/o365chains">Office 365 Certificate Chains</a>.
+<tr><td><b>Certificate revocation lists (CRLs)<b><td>Some of these services will also need to check certificate revocation lists (CRLs) for certificates used in the services.  A full list of these is documented at <a href="https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2#bkmk_crl">Office 365 URLs and IP address ranges</a> and <a href="https://aka.ms/o365chains">Office 365 Certificate Chains</a>.
-<tr><td><b>Hybrid AAD join<b><td>Hybrid AAD can be join, the machine should be on corporate network for hybrid AAD join to work. See details at <a href="https://docs.microsoft.com/windows/deployment/windows-autopilot/user-driven-hybrid">Windows Autopilot user-driven mode</a>
+<tr><td><b>Hybrid AAD join<b><td>The device can be hybrid AAD joined. The computer should be on corporate network for hybrid AAD join to work. See details at <a href="https://docs.microsoft.com/windows/deployment/windows-autopilot/user-driven-hybrid">Windows Autopilot user-driven mode</a>
 </table>
 
 ## Licensing requirements