Merge pull request #815 from MicrosoftDocs/master

updating v-jowirt with Master

.openpublishing.redirection.json

@@ -14156,6 +14156,116 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/client-management/mdm/create-a-custom-configuration-service-provider.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/client-management/mdm/design-a-custom-windows-csp.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/iconfigserviceprovider2.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/iconfigserviceprovider2getnode.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnode.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodeadd.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodeclear.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodecopy.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodedeletechild.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodedeleteproperty.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodeexecute.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodegetchildnodenames.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodegetproperty.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodegetpropertyidentifiers.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodegetvalue.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodemove.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodesetproperty.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodesetvalue.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspnodetransactioning.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/icspvalidate.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/client-management/mdm/samples-for-writing-a-custom-configuration-service-provider.md",
+"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference",
+"redirect_document_id": false
+},
+{
 "source_path": "windows/keep-secure/collect-wip-audit-event-logs.md",
 "redirect_url": "/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs",
 "redirect_document_id": true

CONTRIBUTING.md

@@ -18,7 +18,7 @@ We've tried to make editing an existing, public file as simple as possible.
 
 **To edit a topic**
 
-1.	Go to the page on docs.microsoft.com that you want to update, and then click **Edit**.
+1. Go to the page on docs.microsoft.com that you want to update, and then click **Edit**.
 
     ![GitHub Web, showing the Edit link](images/contribute-link.png)
 
@@ -30,12 +30,12 @@ We've tried to make editing an existing, public file as simple as possible.
 
     ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png)
 
-4.	Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see:
+4. Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see:
     - **If you're linked to the Microsoft organization in GitHub:** [Windows authoring guide](https://aka.ms/WindowsAuthoring)
     
     - **If you're external to Microsoft:** [Mastering Markdown](https://guides.github.com/features/mastering-markdown/) 
 
-5.	Make your suggested change, and then click **Preview Changes** to make sure it looks correct.
+5. Make your suggested change, and then click **Preview Changes** to make sure it looks correct.
 
     ![GitHub Web, showing the Preview Changes tab](images/preview-changes.png)
 
@@ -45,19 +45,19 @@ We've tried to make editing an existing, public file as simple as possible.
 
     The **Comparing changes** screen appears to see what the changes are between your fork and the original content.
 
-7.	On the **Comparing changes** screen, you’ll see if there are any problems with the file you’re checking in.
+7. On the **Comparing changes** screen, you’ll see if there are any problems with the file you’re checking in.
 
     If there are no problems, you’ll see the message, **Able to merge**.
     
     ![GitHub Web, showing the Comparing changes screen](images/compare-changes.png)
 
-8.	Click **Create pull request**.
+8. Click **Create pull request**.
 
-9.	Enter a title and description to give the approver the appropriate context about what’s in the request.
+9. Enter a title and description to give the approver the appropriate context about what’s in the request.
 
-10.	Scroll to the bottom of the page, making sure that only your changed files are in this pull request. Otherwise, you could overwrite changes from other people.
+10. Scroll to the bottom of the page, making sure that only your changed files are in this pull request. Otherwise, you could overwrite changes from other people.
 
-11.	Click **Create pull request** again to actually submit the pull request.
+11. Click **Create pull request** again to actually submit the pull request.
 
     The pull request is sent to the writer of the topic and your edits are reviewed. If your request is accepted, updates are published to one of the following places:
 

browsers/edge/includes/configure-kiosk-mode-supported-values-include.md

@@ -11,7 +11,7 @@ ms.topic: include
 
 | | |
 |----------|------|
-|**Single-app**<p><a href="/images/Picture1.png" alt="Full-sized view single-app digital/interactive signage" target="_blank">![thumbnail](../images/Picture1-sm.png)</a><p>**Digital/interactive signage**<p>Displays a specific site in full-screen mode, running Microsoft Edge InPrivate protecting user data.<ul><li>**Digital signage** does not require user interaction.<p>***Example.*** Use digital signage for things like a rotating advertisement or menu.<p></li><li>**Interactive signage**, on the other hand, requires user interaction within the page but doesn’t allow for any other uses, such as browsing the internet.<p>***Example.*** Use interactive signage for things like a building business directory or restaurant order/pay station.</li></ul><p>**Policy setting** = Not configured (0 default)<p>                                      |                                                                                                                    <p>&nbsp;<p><a href="/images/Picture2.png" alt="Full-sized view single-app public browsing" target="_blank">![thumbnail](../images/Picture2-sm.png)</a> <p><strong>Public browsing</strong><p>Runs a limited multi-tab version of Microsoft Edge, protecting user data. Microsoft Edge is the only app users can use on the device, preventing them from customizing Microsoft Edge.  Users can only browse publically or end their browsing session.<p>The single-app public browsing mode is the only kiosk mode that has an <strong>End session</strong> button. Microsoft Edge also resets the session after a specified time of user inactivity. Both restart Microsoft Edge and clear the user’s session.<p><em><strong>Example.</strong></em> A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps. <p><strong>Policy setting</strong> = Enabled (1)                                                                                                                     |
+|**Single-app**<p><a href="../images/Picture1.png" alt="Full-sized view single-app digital/interactive signage" target="_blank">![thumbnail](../images/Picture1-sm.png)</a><p>**Digital/interactive signage**<p>Displays a specific site in full-screen mode, running Microsoft Edge InPrivate protecting user data.<ul><li>**Digital signage** does not require user interaction.<p>***Example.*** Use digital signage for things like a rotating advertisement or menu.<p></li><li>**Interactive signage**, on the other hand, requires user interaction within the page but doesn’t allow for any other uses, such as browsing the internet.<p>***Example.*** Use interactive signage for things like a building business directory or restaurant order/pay station.</li></ul><p>**Policy setting** = Not configured (0 default)<p>                                      |                                                                                                                    <p>&nbsp;<p><a href="../images/Picture2.png" alt="Full-sized view single-app public browsing" target="_blank">![thumbnail](../images/Picture2-sm.png)</a> <p><strong>Public browsing</strong><p>Runs a limited multi-tab version of Microsoft Edge, protecting user data. Microsoft Edge is the only app users can use on the device, preventing them from customizing Microsoft Edge.  Users can only browse publically or end their browsing session.<p>The single-app public browsing mode is the only kiosk mode that has an <strong>End session</strong> button. Microsoft Edge also resets the session after a specified time of user inactivity. Both restart Microsoft Edge and clear the user’s session.<p><em><strong>Example.</strong></em> A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps. <p><strong>Policy setting</strong> = Enabled (1)                                                                                                                     |
-| **Multi-app**<p><a href="/images/Picture5.png" alt="Full-sized view multi-app normal browsing" target="_blank">![thumbnail](../images/Picture5-sm.png)</a><p>**Normal browsing**<p>Runs a full-version of Microsoft Edge with all browsing features and preserves the user data and state between sessions.<p>Some features may not work depending on what other apps you have configured in assigned access. For example, installing extensions or books from the Microsoft store are not allowed if the store is not available. Also, if Internet Explorer 11 is set up in assigned access, you can enable [EnterpriseModeSiteList](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-browser#browser-enterprisemodesitelist) to automatically switch users to Internet Explorer 11 for sites that need backward compatibility support.<p>**Policy setting** = Not configured (0 default) | <p>&nbsp;<p><a href="/images/Picture6.png" alt="Full-sized view multi-app public browsing" target="_blank">![thumbnail](../images/Picture6-sm.png)</a><p><strong>Public browsing</strong><p>Runs a multi-tab version of Microsoft Edge InPrivate with a tailored experience for kiosks that runs in full-screen mode. Users can open and close Microsoft Edge and launch other apps if allowed by assigned access. Instead of an End session button to clear their browsing session, the user closes Microsoft Edge normally.<p>In this configuration, Microsoft Edge can interact with other applications. For example, if Internet Explorer 11 is set up in multi-app assigned access, you can enable [EnterpriseModeSiteList](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-browser#browser-enterprisemodesitelist) to automatically switch users to Internet Explorer 11 for sites that need backward compatibility support. <p><em><strong>Example.</strong></em> A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps.<p><strong>Policy setting</strong> = Enabled (1) |
+| **Multi-app**<p><a href="../images/Picture5.png" alt="Full-sized view multi-app normal browsing" target="_blank">![thumbnail](../images/Picture5-sm.png)</a><p>**Normal browsing**<p>Runs a full-version of Microsoft Edge with all browsing features and preserves the user data and state between sessions.<p>Some features may not work depending on what other apps you have configured in assigned access. For example, installing extensions or books from the Microsoft store are not allowed if the store is not available. Also, if Internet Explorer 11 is set up in assigned access, you can enable [EnterpriseModeSiteList](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-browser#browser-enterprisemodesitelist) to automatically switch users to Internet Explorer 11 for sites that need backward compatibility support.<p>**Policy setting** = Not configured (0 default) | <p>&nbsp;<p><a href="../images/Picture6.png" alt="Full-sized view multi-app public browsing" target="_blank">![thumbnail](../images/Picture6-sm.png)</a><p><strong>Public browsing</strong><p>Runs a multi-tab version of Microsoft Edge InPrivate with a tailored experience for kiosks that runs in full-screen mode. Users can open and close Microsoft Edge and launch other apps if allowed by assigned access. Instead of an End session button to clear their browsing session, the user closes Microsoft Edge normally.<p>In this configuration, Microsoft Edge can interact with other applications. For example, if Internet Explorer 11 is set up in multi-app assigned access, you can enable [EnterpriseModeSiteList](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-browser#browser-enterprisemodesitelist) to automatically switch users to Internet Explorer 11 for sites that need backward compatibility support. <p><em><strong>Example.</strong></em> A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps.<p><strong>Policy setting</strong> = Enabled (1) |
 
 ---

browsers/edge/includes/prevent-turning-off-required-extensions-include.md

@@ -20,7 +20,7 @@ ms.topic: include
 |                Group Policy                 |                                                                                                                                                                                                                                                                                                                                                                                                      Description                                                                                                                                                                                                                                                                                                                                                                                                       |
 |---------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Disabled or not configured<br>**(default)** |                                                                                                                                                                                                                                                                                                                      Allowed. Users can uninstall extensions. If you previously enabled this policy and you decide to disable it, the list of extension PFNs defined in this policy get ignored.                                                                                                                                                                                                                                                                                                                       |
-|                   Enabled                   | Provide a semi-colon delimited list of extension PFNs. For example, adding the following OneNote Web Clipper and Office Online extension prevents users from turning it off:<p><p>*Microsoft.OneNoteWebClipper8wekyb3d8bbwe;Microsoft.OfficeOnline8wekyb3d8bbwe* <p>After defining the list of extensions, you deploy them through any available enterprise deployment channel, such as Microsoft Intune.<p>Removing extensions from the list does not uninstall the extension from the user’s computer automatically. To uninstall the extension, use any available enterprise deployment channel. If you enable the [Allow Developer Tools](../group-policies/developer-settings-gp.md#allow-developer-tools) policy, then this policy does not prevent users from debugging and altering the logic on an extension. |
+|                   Enabled                   | Provide a semi-colon delimited list of extension PFNs. For example, adding the following OneNote Web Clipper and Office extension prevents users from turning it off:<p><p>*Microsoft.OneNoteWebClipper8wekyb3d8bbwe;Microsoft.OfficeOnline8wekyb3d8bbwe* <p>After defining the list of extensions, you deploy them through any available enterprise deployment channel, such as Microsoft Intune.<p>Removing extensions from the list does not uninstall the extension from the user’s computer automatically. To uninstall the extension, use any available enterprise deployment channel. If you enable the [Allow Developer Tools](../group-policies/developer-settings-gp.md#allow-developer-tools) policy, then this policy does not prevent users from debugging and altering the logic on an extension. |
 
 ---
 

browsers/enterprise-mode/collect-data-using-enterprise-site-discovery.md

@@ -154,11 +154,11 @@ If you choose to use WMI as your data output, you need to make sure that your WM
 
 **To set up your firewall**
 
-1.	In **Control Panel**, click **System and Security**, and then click **Windows Firewall**.
+1. In **Control Panel**, click **System and Security**, and then click **Windows Firewall**.
 
-2.	In the left pane, click **Allow an app or feature through Windows Firewall** and scroll down to check the box for **Windows Management Instrumentation (WMI)**.
+2. In the left pane, click **Allow an app or feature through Windows Firewall** and scroll down to check the box for **Windows Management Instrumentation (WMI)**.
 
-3.	Restart your computer to start collecting your WMI data.
+3. Restart your computer to start collecting your WMI data.
 
 ## Use PowerShell to finish setting up Enterprise Site Discovery
 You can determine which zones or domains are used for data collection, using PowerShell. If you don’t want to use PowerShell, you can do this using Group Policy. For more info, see [Use Group Policy to finish setting up Enterprise Site Discovery](#use-group-policy-to-finish-setting-up-enterprise-site-discovery).

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

@@ -154,11 +154,11 @@ If you choose to use WMI as your data output, you need to make sure that your WM
 
 **To set up your firewall**
 
-1.	In **Control Panel**, click **System and Security**, and then click **Windows Firewall**.
+1. In **Control Panel**, click **System and Security**, and then click **Windows Firewall**.
 
-2.	In the left pane, click **Allow an app or feature through Windows Firewall** and scroll down to check the box for **Windows Management Instrumentation (WMI)**.
+2. In the left pane, click **Allow an app or feature through Windows Firewall** and scroll down to check the box for **Windows Management Instrumentation (WMI)**.
 
-3.	Restart your computer to start collecting your WMI data.
+3. Restart your computer to start collecting your WMI data.
 
 ## Use PowerShell to finish setting up Enterprise Site Discovery
 You can determine which zones or domains are used for data collection, using PowerShell. If you don’t want to use PowerShell, you can do this using Group Policy. For more info, see [Use Group Policy to finish setting up Enterprise Site Discovery](#use-group-policy-to-finish-setting-up-enterprise-site-discovery).

browsers/internet-explorer/ie11-deploy-guide/intranet-problems-and-ie11.md

@@ -24,7 +24,7 @@ IE11 works differently with search, based on whether your organization is domain
 
 -   **Non-domain-joined computers.** A single word entry is treated as an intranet site. However, if the term doesn't resolve to a site, IE11 then treats the entry as a search term and opens your default search provider.
 
-To explicitly go to an intranet site, regardless of the environment, users can type either a trailing slash like ` contoso/` or the `https://` prefix. Either of these will cause IE11 to treat the entry as an intranet search. You can also change the default behavior so that IE11 treats your single word entry in the address bar as an intranet site, regardless of your environment.
+To explicitly go to an intranet site, regardless of the environment, users can type either a trailing slash like `contoso/` or the `https://` prefix. Either of these will cause IE11 to treat the entry as an intranet search. You can also change the default behavior so that IE11 treats your single word entry in the address bar as an intranet site, regardless of your environment.
 
  **To enable single-word intranet search**
 

browsers/internet-explorer/ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md

@@ -75,8 +75,8 @@ If you cannot uninstall IE using **Uninstall or change a program** in the Contro
 ## The Internet Explorer Customization Wizard 11 does not work with user names that user double-byte character sets
 The customization wizard does not work with user names that use double-byte character sets, such as Chinese or Japanese. To fix this, set the **TEMP** and **TMP** environmental variables to a path that does not use these characters (for example, C:\temp).
 
-1.	Open **System Properties**, click the **Advanced** tab, and then click **Environmental Variables**.
+1. Open **System Properties**, click the **Advanced** tab, and then click **Environmental Variables**.
-2.	Click Edit, and then modify the **TEMP** and **TMP** environmental variables to a non-user profile directory.
+2. Click Edit, and then modify the **TEMP** and **TMP** environmental variables to a non-user profile directory.
 
  
 ## Unicode characters are not supported in IEAK 11 path names

devices/hololens/hololens-cortana.md

@@ -31,13 +31,13 @@ Here are some things you can try saying (remember to say "Hey Cortana" first):
 - Restart.
 - Go to sleep.
 - Mute.
-- Launch <app name>.
+- Launch `<app name>`.
-- Move <app name> here (gaze at the spot you want the app to move to).
+- Move `<app name>` here (gaze at the spot you want the app to move to).
 - Go to Start.
 - Take a picture.
 - Start recording. (Starts recording a video.)
 - Stop recording. (Stops recording a video.)
-- Call <contact>. (Requires Skype.)
+- Call `<contact>`. (Requires Skype.)
 - What time is it?
 - Show me the latest NBA scores. 
 - How much battery do I have left?

devices/hololens/hololens-encryption.md

@@ -45,7 +45,7 @@ Provisioning packages are files created by the Windows Configuration Designer to
 
     ![Require device encryption setting configured to yes](images/device-encryption.png)
 
-2.	Browse to and select the XML license file that was provided when you purchased the Commercial Suite.
+2. Browse to and select the XML license file that was provided when you purchased the Commercial Suite.
 
     >[!NOTE]
     >You can configure [additional settings in the provisioning package](hololens-provisioning.md).

devices/hololens/hololens-setup.md

@@ -1,46 +1,75 @@
 ---
-title: Set up HoloLens (HoloLens)
+title: Set up a new HoloLens
-description: The first time you set up HoloLens, you'll need a Wi-Fi network and either a Microsoft or Azure Active Directory account.
+description: This guide walks through first time set up.  You'll need a Wi-Fi network and either a Microsoft (MSA) or Azure Active Directory (AAD) account.
 ms.prod: hololens
 ms.sitesec: library
-author: dansimp
+author: scooley
-ms.author: dansimp
+ms.author: scooley
-ms.topic: article
+ms.topic: quickstart
 ms.localizationpriority: medium
-ms.date: 07/27/2017
+ms.date: 07/14/2019
-ms.reviewer: 
-manager: dansimp
 ---
 
-# Set up HoloLens
+# Set up HoloLens for the first time
 
-Before you get started setting up your HoloLens, make sure you have a Wi-Fi network and a Microsoft account or an Azure Active Directory (Azure AD) account. 
+Follow along to set up a HoloLens for the first time.  At the end of this quickstart, you'll be able to use HoloLens and navigate HoloLens settings on-device.
 
-## Network connectivity requirements
+This is a high level unboxing guide to become familiar with HoloLens.  
+See [Set up HoloLens in the enterprise](hololens-requirements.md) to configure HoloLens for scale enterprise deployment and ongoing device management.
 
-The first time you use your HoloLens, you'll be guided through connecting to a Wi-Fi network. You need to connect HoloLens to a Wi-Fi network with Internet connectivity so that the user account can be authenticated.
+## Prerequisites
 
-- It can be an open Wi-Fi or password-protected Wi-Fi network.
+- Internet access.
-- The Wi-Fi network cannot require certificates to connect.
+  - Wi-Fi is the easiest way to do first set up on both HoloLens and HoloLens 2.  It can be an open Wi-Fi or password-protected Wi-Fi network; the Wi-Fi network does not need to provide access to enterprise resources or intranet sites.
-- The Wi-Fi network does not need to provide access to enterprise resources or intranet sites. 
+  - HoloLens 2 can connect to the internet via ethernet and a USB-C adapter.
+- a user account - Microsoft (MSA) or Azure Active Directory (AAD)
 
-## HoloLens setup
+## Prepare for first-boot
 
-The HoloLens setup process combines a quick tutorial on using HoloLens with the steps needed to connect to the network and add an account.
+Become familiar with the HoloLens hardware and prepare to turn your HoloLens on for the first time.
 
-1. Be sure your HoloLens is [charged](https://support.microsoft.com/help/12627), then [adjust it](https://support.microsoft.com/help/12632) for a comfortable fit.
+1. Be sure your HoloLens is [charged](https://support.microsoft.com/help/12627)
-2. [Turn on HoloLens](https://support.microsoft.com/help/12642). You will be guided through a calibration procedure and how to perform [the gestures](https://support.microsoft.com/help/12644/hololens-use-gestures) that you will use to operate HoloLens.
+1. [Adjust fit](https://support.microsoft.com/help/12632) for a comfortable fit.
-3. Next, you'll be guided through connecting to a Wi-Fi network. 
+1. [Turn on HoloLens](https://support.microsoft.com/help/12642). You will be guided through a calibration procedure and how to perform [the gestures](https://support.microsoft.com/help/12644/hololens-use-gestures) that you will use to operate HoloLens.
-4. After HoloLens connects to the Wi-Fi network, you select between **My work or school owns it** and **I own it**. 
+
+## Set up your HoloLens
+
+Set up your HoloLens and your user account.
+
+1. Connect to the internet (select Wi-Fi).
+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 with 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. 
+        1. Enter your organizational account.
         2. Accept privacy statement.
         3. Sign in using your Azure AD credentials. This may redirect to your organization's sign-in page.
         4. Continue with device setup.
     - When you choose **I own it**, you sign in with 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. 
+        1. Enter your Microsoft account.
-        2. 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. 
+        2. 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.
-5. The device sets your time zone based on information obtained from the Wi-Fi network. 
+1. The device sets your time zone based on information obtained from the Wi-Fi network.
-6. Next, you learn how to perform the bloom gesture and how to select and place the Start screen. After you place the Start screen, setup is complete and you can begin using HoloLens.
+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.
 
+## Explore HoloLens
+
+### Check out on-device settings and desktop
+
+HoloLens doesn't have an on-device command line.  With that in mind, the settings section in HoloLens plays an important role in diagnosing problems on-device.  Understanding the information available to HoloLens users will pay dividends when troubleshooting or configuring the device.
+
+Open settings by opening the start menu and clicking on the **Settings** in the top bar.  You can also ask Cortana to open settings.
+
+Follow [this guide](https://docs.microsoft.com/windows/mixed-reality/navigating-the-windows-mixed-reality-home) to navigate around the HoloLens home.
+
+### Connect bluetooth devices
+
+Connecting a bluetooth keyboard makes typing on HoloLens as efficient as a Windows PC.
+
+[Connect a bluetooth keyboard or clicker](https://support.microsoft.com/en-us/help/12636).
+
+## Next steps
+
+Start planning for HoloLens at scale with HoloLens' enterprise management features.
+
+> [!div class="nextstepaction"]
+> [HoloLens in the enterprise](hololens-requirements.md)

devices/hololens/hololens-upgrade-enterprise.md

@@ -47,7 +47,7 @@ Provisioning packages are files created by the Windows Configuration Designer to
 
     ![Upgrade edition with license setting selected](images/icd1.png)
 
-2.	Browse to and select the XML license file that was provided when you purchased the Commercial Suite.
+2. Browse to and select the XML license file that was provided when you purchased the Commercial Suite.
 
     >[!NOTE]
     >You can configure [additional settings in the provisioning package](hololens-provisioning.md).

devices/hololens/index.md

@@ -1,46 +1,51 @@
 ---
 title: Microsoft HoloLens (HoloLens)
-description: HoloLens provides extra features designed for business in the Commercial Suite.
+description: Landing page for HoloLens commercial and enterprise management.
 ms.prod: hololens
 ms.sitesec: library
-author: jdeckerms
+author: scooley
-ms.author: jdecker
+ms.author: scooley
 ms.topic: article
 ms.localizationpriority: medium
-ms.date: 07/27/2018
+ms.date: 07/14/2019
 ---
 
 # Microsoft HoloLens
 
-
 <table><tbody>
-<tr><td style="border: 0px;width: 75%;valign= top"><p>Microsoft HoloLens is the first fully self-contained holographic computer running Windows 10.</p><p> Microsoft HoloLens is available in the <strong>Development Edition</strong>, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the <strong>Commercial Suite</strong>, which runs Windows Holographic for Business when you apply the Enterprise license file to the device.</p></td><td align="left" style="border: 0px"><img src="images/hololens.png" alt="Hololens"/></td></tr>
+<tr><td style="border: 0px;width: 75%;valign= top">
+<p>Microsoft HoloLens is the first fully self-contained holographic computer running Windows 10.</p>
+
+<p>Now, with the introduction of HoloLens 2, every device provides commercial ready management enhanced by the reliability, security, and scalability of cloud and AI services from Microsoft.</p>
+
+</td><td align="left" style="border: 0px"><img alt="HoloLens 2 side view" src="./images/hololens2-side-render.png"/></td></tr>
 </tbody></table>
 
-## In this section
+## Guides in this section
+
+| Guide | Description |
+| --- | --- |
+| [Get started with HoloLens](hololens-setup.md) | Set up HoloLens for the first time.  |
+| [Set up HoloLens in the enterprise](hololens-requirements.md) | Configure HoloLens for scale enterprise deployment and ongoing device management.  |
+| [Install and manage applications on HoloLens](hololens-install-apps.md) |Install and manage important applications on HoloLens at scale.  |
+| [Recover and troubleshoot HoloLens issues](https://support.microsoft.com/products/hololens) |  Learn how to gather logs from HoloLens, recover a misbehaving device, or reset HoloLens when necessary.  |
+| [Get support](https://support.microsoft.com/products/hololens) |Connect with Microsoft support resources for HoloLens in enterprise.  |
+
+## Quick reference by topic
 
 | Topic | Description |
 | --- | --- |
-| [What's new in Microsoft HoloLens](hololens-whats-new.md) | Discover the new features in the latest update. |
+| [What's new in Microsoft HoloLens](hololens-whats-new.md) | Discover new features in the latest updates. |
-| [HoloLens in the enterprise: requirements](hololens-requirements.md) | Lists requirements for general use, Wi-Fi, and device management |
-| [Set up HoloLens](hololens-setup.md) | How to set up HoloLens for the first time  |
-[Install localized version of HoloLens](hololens-install-localized.md) | Install the Chinese or Japanese version of HoloLens
-| [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md)  | How to upgrade your Development Edition HoloLens to Windows Holographic for Business |
-| [Enroll HoloLens in MDM](hololens-enroll-mdm.md) | Manage multiple HoloLens devices simultaneously using solutions like Microsoft Intune |
-| [Manage updates to HoloLens](hololens-updates.md) | Use mobile device management (MDM) policies to configure settings for updates. |
-| [Set up HoloLens in kiosk mode](hololens-kiosk.md) | Enable kiosk mode for HoloLens, which limits the user's ability to launch new apps or change the running app  |
-[Share HoloLens with multiple people](hololens-multiple-users.md) | Multiple users can shared a HoloLens device by using their Azure Active Directory accounts. |
 | [Configure HoloLens using a provisioning package](hololens-provisioning.md) | Provisioning packages make it easy for IT administrators to configure HoloLens devices without imaging |
-| [Install apps on HoloLens](hololens-install-apps.md) | Use Microsoft Store for Business, mobile device management (MDM), or the Windows Device Portal to install apps on HoloLens |
+| [HoloLens MDM support](hololens-enroll-mdm.md) | Manage multiple HoloLens devices simultaneously using Mobile Device Management (MDM) solutions like Microsoft Intune. |
-| [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md) | Learn how to use Bitlocker device encryption to protect files and information stored on the HoloLens |
+| [HoloLens update management](hololens-updates.md) | Use mobile device management (MDM) policies to configure settings for updates. |
-| [Change history for Microsoft HoloLens documentation](change-history-hololens.md) | See new and updated topics in the HoloLens documentation library. |
+| [HoloLens user management](hololens-multiple-users.md) | Multiple users can shared a HoloLens device by using their Azure Active Directory accounts. |
+| [HoloLens application access management](hololens-kiosk.md) | Manage application access for different user groups.  |
+| [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md) | Learn how to use Bitlocker device encryption to protect files and information stored on the HoloLens. |
+| [Install localized version of HoloLens](hololens-install-localized.md) | Configure HoloLens for different locale.  |
 
 ## Related resources
 
-- [Help for using HoloLens](https://support.microsoft.com/products/hololens)
+* [Documentation for Holographic app development](https://developer.microsoft.com/windows/mixed-reality/development)
-
+* [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial)
-- [Documentation for Holographic app development](https://developer.microsoft.com/windows/mixed-reality/development)
+* [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes)
-
-- [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial)
-
-- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes)

devices/surface-hub/TOC.md

@@ -5,7 +5,7 @@
 ## Overview
 ### [What's new in Surface Hub 2S for IT admins](surface-hub-2s-whats-new.md)
 ### [Surface Hub 2S tech specs](surface-hub-2s-techspecs.md) 
-### [Operating system essentials (Surface Hub) ](differences-between-surface-hub-and-windows-10-enterprise.md)
+### [Operating system essentials (Surface Hub)](differences-between-surface-hub-and-windows-10-enterprise.md)
 ### [Adjust Surface Hub 2S brightness, volume, and input](surface-hub-2s-onscreen-display.md)
 
 ## Plan
@@ -21,9 +21,10 @@
 ### [Configure Easy Authentication for Surface Hub 2S](surface-hub-2s-phone-authenticate.md)
 
 ## Deploy
-### [Surface Hub 2S adoption toolkit](surface-hub-2s-adoption-kit.md)
 ### [First time setup for Surface Hub 2S](surface-hub-2s-setup.md)
+### [Connect devices to Surface Hub 2S](surface-hub-2s-connect.md)
 ### [Surface Hub 2S deployment checklist](surface-hub-2s-deploy-checklist.md)
+### [Surface Hub 2S adoption toolkit](surface-hub-2s-adoption-kit.md)
 ### [Create Surface Hub 2S device account](surface-hub-2s-account.md)
 ### [Create provisioning packages for Surface Hub 2S](surface-hub-2s-deploy.md)
 ### [Deploy apps to Surface Hub 2S using Intune](surface-hub-2s-deploy-apps-intune.md)

devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md

@@ -534,7 +534,7 @@ if ($status.Count -gt 0)
         elseif ($v[0] -eq "F")
         {
             $color = "red"
-            $v += " Go to http://aka.ms/shubtshoot"
+            $v += " Go to https://aka.ms/shubtshoot"
         }
 
         Write-Host -NoNewline $k -ForegroundColor $color
@@ -978,7 +978,7 @@ if ($status.Count -gt 0)
         elseif ($v[0] -eq "F")
         {
             $color = "red"
-            $v += " Go to http://aka.ms/shubtshoot for help"
+            $v += " Go to https://aka.ms/shubtshoot for help"
         }
 
         Write-Host -NoNewline $k -ForegroundColor $color

devices/surface-hub/create-a-device-account-using-office-365.md

@@ -4,7 +4,7 @@ description: If you prefer to use a graphical user interface, you can create a d
 ms.assetid: D11BCDC4-DABA-4B9A-9ECB-58E02CC8218C
 ms.reviewer: 
 manager: dansimp
-keywords: create device account, Office 365 UI, Exchange Admin center, Office 365 admin center, Skype for Business, mobile device mailbox policy
+keywords: create device account, Office 365 UI, Exchange Admin center, Microsoft 365 admin center, Skype for Business, mobile device mailbox policy
 ms.prod: surface-hub
 ms.sitesec: library
 author: dansimp
@@ -22,22 +22,22 @@ If you prefer to use a graphical user interface, you can create a device account
 ## <a href="" id="create-device-acct-o365"></a>Create a device account using Office 365
 
 
-1.  [Create the account in the Office 365 Admin Center](#create-device-acct-o365-admin-ctr).
+1.  [Create the account in the Microsoft 365 Admin Center](#create-device-acct-o365-admin-ctr).
 2.  [Create a mobile device mailbox (ActiveSync) policy from the Microsoft Exchange Admin Center](#create-device-acct-o365-mbx-policy).
 3.  [Use PowerShell to complete device account creation](#create-device-acct-o365-complete-acct).
 4.  [Use PowerShell to configure Exchange properties of the account](#create-device-acct-o365-configure-exch-prop).
 5.  [Enable the account with Skype for Business](#create-device-acct-o365-skype-for-business).
 
-### <a href="" id="create-device-acct-o365-admin-ctr"></a>Create the account in the Office 365 Admin Center
+### <a href="" id="create-device-acct-o365-admin-ctr"></a>Create the account in the admin center
 
 1.  Sign in to Office 365 by visiting http://portal.office.com
-2.  Provide the admin credentials for your Office 365 tenant. This will take you to your Office 365 Admin Center.
+2.  Provide the admin credentials for your Office 365 tenant. This will take you to your Microsoft 365 Admin Center.
 
-    ![Office 365 admin center.](images/setupdeviceaccto365-02.png)
+    ![Microsoft 365 admin center.](images/setupdeviceaccto365-02.png)
 
-3. In the Office 365 Admin Center, navigate to **Resources** in the left panel, and then click **Rooms & equipment**.
+3. In the admin center, navigate to **Resources** in the left panel, and then click **Rooms & equipment**.
 
-    ![Rooms & equipment option in Office 365 admin center](images/room-equipment.png)
+    ![Rooms & equipment option in admin center](images/room-equipment.png)
 
 4. Click **Add** to create a new Room account. Enter a display name and email address for the account, and then click **Add**.
 
@@ -49,9 +49,9 @@ If you prefer to use a graphical user interface, you can create a device account
 
 ### <a href="" id="create-device-acct-o365-mbx-policy"></a>Create a mobile device mailbox (ActiveSync) policy from the Exchange Admin Center
 
-1.  In the Office 365 Admin Center’s left panel, click **ADMIN**, and then click **Exchange**.
+1.  In the admin center’s left panel, click **ADMIN**, and then click **Exchange**.
 
-    ![Office 365 admin center, showing exchange active users.](images/setupdeviceaccto365-08.png)
+    ![admin center, showing exchange active users.](images/setupdeviceaccto365-08.png)
 
 2.  This will open another tab on your browser to take you to the Exchange Admin Center, where you can create and set the Mailbox Setting for Surface Hub.
 

devices/surface-hub/device-reset-surface-hub.md

@@ -44,15 +44,15 @@ If you see a blank screen for long periods of time during the **Reset device** p
 ## Reset a Surface Hub from Settings
 
 **To reset a Surface Hub**
-1.	On your Surface Hub, open **Settings**.
+1. On your Surface Hub, open **Settings**.
 
     ![Image showing Settings app for Surface Hub.](images/sh-settings.png)
 
-2.	Click **Update & Security**.
+2. Click **Update & Security**.
 
     ![Image showing Update & Security group in Settings app for Surface Hub.](images/sh-settings-update-security.png)
 
-3.	Click **Recovery**, and then, under **Reset device**, click **Get started**.
+3. Click **Recovery**, and then, under **Reset device**, click **Get started**.
 
     ![Image showing Reset device option in Settings app for Surface Hub.](images/sh-settings-reset-device.png)
 

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

@@ -127,7 +127,7 @@ The administrative features in Windows 10 Enterprise, such as the Microsoft Mana
 
 ### Remote management and monitoring
 
-Surface Hub supports remote management through mobile device management (MDM) solutions such as [Microsoft Intune](https://docs.microsoft.com/en-us/intune/) and monitoring through [Azure Monitor](https://azure.microsoft.com/services/monitor/). 
+Surface Hub supports remote management through mobile device management (MDM) solutions such as [Microsoft Intune](https://docs.microsoft.com/intune/) and monitoring through [Azure Monitor](https://azure.microsoft.com/services/monitor/). 
 
 *Organization policies that this may affect:* <br> Surface Hub doesn't support installing Win32 agents required by most traditional PC management and monitoring tools, such as System Center Operations Manager.
 

devices/surface-hub/docfx.json

@@ -14,7 +14,9 @@
     "resource": [
       {
         "files": [
-          "**/images/**"
+          "**/images/**",
+          "**/*.pptx",
+          "**/*.pdf"
         ],
         "exclude": [
           "**/obj/**"

devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md

@@ -59,7 +59,7 @@ Use this procedure if you use Exchange on-premises.
     >
     >msExchRecipientTypeDetails = 8589934592
     
-3.  After you've created the account, run a directory synchronization. When it's complete, go to the users page in your Office 365 admin center and verify that the account created in the previous steps has merged to online.
+3.  After you've created the account, run a directory synchronization. When it's complete, go to the users page in your Microsoft 365 admin center and verify that the account created in the previous steps has merged to online.
     
 4.  Connect to Microsoft Exchange Online and set some properties for the account in Office 365.
 

devices/surface-hub/install-apps-on-surface-hub.md

@@ -12,6 +12,7 @@ ms.author: dansimp
 ms.topic: article
 ms.date: 10/23/2018
 ms.localizationpriority: medium
+audience: ITPro
 ---
 
 # Install apps on your Microsoft Surface Hub
@@ -39,10 +40,10 @@ By enabling developer mode, you can also install developer-signed UWP apps.
 > After developer mode has been enabled, you will need to reset the Surface Hub to disable it. Resetting the device removes all local user files and configurations and then reinstalls Windows.
 
 **To turn on developer mode** 
-1.	From your Surface Hub, start **Settings**.
+1. From your Surface Hub, start **Settings**.
-2.	Type the device admin credentials when prompted.
+2. Type the device admin credentials when prompted.
-3.	Navigate to **Update & security** > **For developers**.
+3. Navigate to **Update & security** > **For developers**.
-4.	Select **Developer mode** and accept the warning prompt.
+4. Select **Developer mode** and accept the warning prompt.
 
 ### Visual Studio
 During development, the easiest way to test your app on a Surface Hub is using Visual Studio. Visual Studio's remote debugging feature helps you discover issues in your app before deploying it broadly. For more information, see [Test Surface Hub apps using Visual Studio](https://msdn.microsoft.com/windows/uwp/debug-test-perf/test-surface-hub-apps-using-visual-studio).
@@ -101,10 +102,10 @@ To evaluate apps released on the Microsoft Store, use the Microsoft Store app on
 > - To install apps, you will need to manually sign in to the Microsoft Store app on each Surface Hub you own.
 
 **To browse the Microsoft Store on Surface Hub** 
-1.	From your Surface Hub, start **Settings**.
+1. From your Surface Hub, start **Settings**.
-2.	Type the device admin credentials when prompted.
+2. Type the device admin credentials when prompted.
-3.	Navigate to **This device** > **Apps & features**.
+3. Navigate to **This device** > **Apps & features**.
-4.	Select **Open Store**.
+4. Select **Open Store**.
 
 ### Download app packages from Microsoft Store for Business
 To download the app package you need to install apps on your Surface Hub, visit the [Microsoft Store for Business](https://www.microsoft.com/business-store). The Store for Business is where you can find, acquire, and manage apps for the Windows 10 devices in your organization, including Surface Hub.

devices/surface-hub/monitor-surface-hub.md

@@ -95,10 +95,10 @@ This table describes the sample queries in the Surface Hub solution:
 | Hardware   | Error | **Contact Microsoft support**. <br> Indicates impact to core functionality (such as Skype, projection, touch, and internet connectivity). <br> **Note** Some events, including heartbeat, include the device’s serial number that you can use when contacting support.| Triggers when there is an error with any of the following hardware components. <br> **Components that affect Skype**: <br> - Speaker driver <br> - Microphone driver <br> - Camera driver <br> **Components that affect wired and wireless projection**: <br> - Wired touchback driver <br> - Wired ingest driver <br> - Wireless adapter driver <br> - Wi-Fi Direct error <br> **Other components**: <br> - Touch digitizer driver <br> - Network adapter error (not reported to OMS)|
 
 **To set up an alert**
-1.	From the Surface Hub solution, select one of the sample queries.
+1. From the Surface Hub solution, select one of the sample queries.
-2.	Modify the query as desired. See Log Analytics search reference to learn more.
+2. Modify the query as desired. See Log Analytics search reference to learn more.
-3.	Click **Alert** at the top of the page to open the **Add Alert Rule** screen. See [Alerts in Log Analytics](https://azure.microsoft.com/documentation/articles/log-analytics-alerts/) for details on the options to configure the alert.
+3. Click **Alert** at the top of the page to open the **Add Alert Rule** screen. See [Alerts in Log Analytics](https://azure.microsoft.com/documentation/articles/log-analytics-alerts/) for details on the options to configure the alert.
-4.	Click **Save** to complete the alert rule. It will start running immediately.
+4. Click **Save** to complete the alert rule. It will start running immediately.
 
 ## Enroll your Surface Hub
 

devices/surface-hub/skype-hybrid-voice.md

@@ -80,14 +80,14 @@ If you deployed Skype for Business Cloud PBX with one of the hybrid voice option
    Set-Mailbox surfacehub2@adatum.com -RoomMailboxPassword $credNewAccount.Password -EnableRoomMailboxAccount $true
    ```
     
-10.	Various Exchange properties must be set on the device account to improve the meeting experience. You can see which properties can be set in [Exchange properties](exchange-properties-for-surface-hub-device-accounts.md). The following cmdlets provide an example of setting Exchange properties.
+10. Various Exchange properties must be set on the device account to improve the meeting experience. You can see which properties can be set in [Exchange properties](exchange-properties-for-surface-hub-device-accounts.md). The following cmdlets provide an example of setting Exchange properties.
 
     ```
     Set-CalendarProcessing surfacehub2@adatum.com -AutomateProcessing AutoAccept -AddOrganizerToSubject $false –AllowConflicts $false –DeleteComments $false -DeleteSubject $false -RemovePrivateProperty $false
     Set-CalendarProcessing surfacehub2@adatum.com -AddAdditionalResponse $true -AdditionalResponse "This is a Surface Hub room!"
     ```
 
-11.	Enable the mailbox as a meeting device in Skype for Business Online. Run the following cmdlet which enables the account as a meeting device. 
+11. Enable the mailbox as a meeting device in Skype for Business Online. Run the following cmdlet which enables the account as a meeting device. 
 
     ```
     Get-CsTenant | select registrarpool

devices/surface-hub/surface-hub-2s-account.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -20,9 +21,9 @@ Unlike standard Room mailboxes that remain disabled by default, you need to enab
 
 Create the account using the Microsoft 365 admin center or by using PowerShell. You can use Exchange Online PowerShell to configure specific features including: 
 
--  Calendar processing for every Surface Hub device account.
+- Calendar processing for every Surface Hub device account.
--  Custom auto replies to scheduling requests.
+- Custom auto replies to scheduling requests.
--  If the default ActiveSync mailbox policy has already been modified by someone else or another process, you will likely have to create and assign a new ActiveSync mailbox policy 
+- If the default ActiveSync mailbox policy has already been modified by someone else or another process, you will likely have to create and assign a new ActiveSync mailbox policy 
 
 ## Create account using Microsoft 365 admin center
 
@@ -52,6 +53,7 @@ Create the account using the Microsoft 365 admin center or by using PowerShell.
 Instead of using the Microsoft Admin Center portal, you can create the account using PowerShell.
 
 ### Connect to Exchange Online PowerShell
+
 ```
 $365Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.outlook.com/powershell -Credential (Get-Credential) -Authentication Basic –AllowRedirection $ImportResults = Import-PSSession $365Session
 ```

devices/surface-hub/surface-hub-2s-adoption-kit.md

@@ -6,36 +6,47 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
-ms.date: 07/08/2019
+ms.date: 07/18/2019
 ms.localizationpriority: Normal
 ---
 
- # Surface Hub 2S adoption toolkit
+# Surface Hub 2S adoption toolkit
-Microsoft has developed downloadable materials that you can make available for your users to aid in adoption of Surface Hub 2S. 
+
+Microsoft has developed downloadable materials that you can make available for your users to aid in adoption of Surface Hub 2S.
 
 ## Training guides
--  Surface Hub adoption toolkit
+
--  Training guide – end user
+- [Surface Hub adoption toolkit](downloads/SurfaceHubAdoptionToolKit.pdf)
--  Training guide – power user
+- [Training guide – end user](downloads/TrainingGuide-SurfaceHub2S-EndUser.pdf)
--  Training guide – help desk
+- [Training guide – power user](downloads/TrainingGuide-SurfaceHub2S-PowerUser.pdf)
--  Training guide – Microsoft Teams desktop
+- [Training guide – help desk](downloads/TrainingGuide-SurfaceHub2S-HelpDesk.pdf)
+- [Training guide – Microsoft Teams desktop](downloads/Guide-SurfaceHub2S-Teams.pptx)
+
+[Download all training guides](http://download.microsoft.com/download/2/2/3/2234F70E-E65A-4790-93DF-F4C373A75B8E/SurfaceHub2S-TrainerGuides-July2019.zip)
+
+[Download all training guides](http://download.microsoft.com/download/2/2/3/2234F70E-E65A-4790-93DF-F4C373A75B8E/SurfaceHub2S-TrainerGuides-July2019.zip)
 
 ## End user guides
--  Guide to Navigation on Surface Hub our
--  Guide to Office 365 on Surface Hub
--  Guide to Microsoft Whiteboard on Surface Hub
--  Guide to Microsoft Teams on Surface Hub
 
-##  Quick reference cards
+- [Guide to Navigation on Surface Hub](downloads/Guide-SurfaceHub2S-Navigation.pptx)
-- Connect your PC 
+- [Guide to Office 365 on Surface Hub](downloads/Guide-SurfaceHub2S-Office365.pptx)
-- Join a Teams Meeting
+- [Guide to Microsoft Whiteboard on Surface Hub](downloads/Guide-SurfaceHub2S-Whiteboard.pptx)
-- Manage a Teams meeting
+- [Guide to Microsoft Teams on Surface Hub](downloads/Guide-SurfaceHub2S-Teams.pptx)
-- Navigation basics
+
-- Schedule a Teams meeting
+## Quick reference cards
-- Start a new Teams meeting
+
-- Share or send a file
+- [Connect your PC](downloads/QRCConnectYourPC.pdf) 
-- Sign in to view meetings and files
+- [Join a Teams Meeting](downloads/QRCJoinTeamsMeeting.pdf)
-- Whiteboard advanced
+- [Manage a Teams meeting](downloads/QRCManageTeamsMeeting.pdf)
-- Whiteboard tools
+- [Navigation basics](downloads/QRCNavigationBasics.pdf)
+- [Schedule a Teams meeting](downloads/QRCScheduleTeamsMeeting.pdf)
+- [Start a new Teams meeting](downloads/QRCStartNewTeamsMeeting.pdf)
+- [Share or send a file](downloads/QRCShareSendFile.pdf)
+- [Sign in to view meetings and files](downloads/QRCSignInToViewMeetingsFiles.pdf)
+- [Whiteboard advanced](downloads/QRCWhiteboardAdvanced.pdf)
+- [Whiteboard tools](downloads/QRCWhiteboardTools.pdf)
+
+[Download all user guides and quick reference cards](http://download.microsoft.com/download/E/7/F/E7FC6611-BB55-43E1-AF36-7BD5CE6E0FE0/SurfaceHub2S-EndUserGuides-July2019.zip)

devices/surface-hub/surface-hub-2s-change-history.md

@@ -7,6 +7,7 @@ ms.sitesec: library
 author: robmazz
 ms.author: robmazz
 audience: Admin
+ms.manager: laurawi
 ms.topic: article
 ms.date: 06/20/2019
 ms.localizationpriority: Normal
@@ -16,6 +17,20 @@ ms.localizationpriority: Normal
 
 This topic summarizes new and updated content in the Surface Hub 2S documentation library.
 
+## August 2019
+
+Changes | Description
+|:--- |:--- 
+|Connect devices to Surface Hub 2S| Updated with guidance for connecting to a second display.
+
+## July 2019
+
+Changes | Description
+|:--- |:--- |
+| Reset and recovery for Surface Hub 2S | Added link to Surface recovery website that enables customers to download a recovery image for Surface Hub 2S |
+| Surface Hub 2S tech specs | Updated power consumption data |
+| Surface Hub 2S Adoption Kit | New |
+
 ## June 2019
 
 Changes | Description

devices/surface-hub/surface-hub-2s-connect.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -13,82 +14,113 @@ ms.localizationpriority: Normal
 ---
 
 # Connect devices to Surface Hub 2S
-
 Surface Hub 2S lets you connect external devices, mirror the display on Surface Hub 2S to another device, and connect a wide variety of third-party peripherals including video conference cameras, conference phones, and room system devices.
 
-## Connect external PCs and related devices
-
 You can display content from your devices to Surface Hub 2S. If the source device is Windows-based, that device can also provide TouchBack and InkBack, which takes video and audio from the connected device and presents them on Surface Hub 2S. If Surface Hub 2S encounters a High-Bandwidth Digital Content Protection (HDCP) signal, such as a Blu-ray DVD player, the source is displayed as a black image.
 
 > [!NOTE]
-> Surface Hub 2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect App is closed.
+> Surface Hub 2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect app is closed.
 
-## Recommended wired configurations for connecting to Surface Hub 2S
+## Recommended wired configurations 
 
 In general, it’s recommended to use native cable connections whenever possible such as USB-C to USB-C or HDMI to HDMI. Other combinations such as MiniDP to HDMI or MiniDP to USB-C will also work.
 
-|**Mode**|**Connection**|**Functionality**|**Comments**|
+| **Connection** | **Functionality** | **Description**|
-|:---- |:---------- |:------------ |:-------- |
+| --- | --- | ---|
-| Wired “Connect” Application | USB-C (via compute module) | Video, audio, TouchBack/InkBack into Surface Hub 2S.| Provides video, audio, and TouchBack/InkBack on a single cable. |
+| USB-C <br>(via compute module) | Video-in<br> Video-out<br> Audio-in<br> Audio-out <br><br>TouchBack and InkBack  | Provides video, audio, and TouchBack/InkBack on a single cable.<br><br>**NOTE:** Some configuration is required to optimize the video-out experience. Refer to the section below: [Mirroring Surface Hub 2S display on another device](#). |
-| | HDMI + USB-C | HDMI-in for Audio/Video <br> USB-C for TouchBack/InkBack | USB-C supports TouchBack/InkBack with the  HDMI A/V connection <br> <br>Use USB-C to USB-A to connect to legacy computers <br> <br> *NOTE: For best results, connect HDMI before connecting USB-C cable. If the computer you are using for HDMI is not compatible with TouchBack and InkBack, you won't need a USB-C cable.* |
+| HDMI + USB-C | HDMI-in for audio and video<br><br>USB-C for TouchBack and InkBack | USB-C supports TouchBack and InkBack with the HDMI A/V connection.<br><br>Use USB-C to USB-A to connect to legacy computers.<br><br>**NOTE:** For best results, connect HDMI before connecting a USB-C cable. If the computer you're using for HDMI is not compatible with TouchBack and InkBack, you won't need a USB-C cable. |
-| “Source” selection experience <br> (bypasses the OS, full screen requires source selection with keypad button) | USB-C (port in compute module) | Video, Audio into Surface Hub 2S | Single cable needed for A/V <br> Touchback/InkBack not supported <br> HDCP enabled |
+| USB-C <br> (via compute module) | Video-in <br>Audio-in | Single cable needed for A/V<br><br>TouchBack and InkBack not supported<br><br>HDCP enabled |
-| | HDMI (in port) | Video, Audio into Surface Hub 2S | Single cable needed for A/V <br> TouchBack/InkBack not supported <br> HDCP enabled |
+| HDMI (in port) | Video, Audio into Surface Hub 2S | Single cable needed for A/V<br><br>TouchBack and InkBack not supported<br><br>HDCP enabled |
+| MiniDP 1.2 output | Video-out such as mirroring to a larger projector. | Single cable needed for A/V |
 
-When you connect a guest computer to Surface Hub 2S via the wired connect USB-C port, several USB devices are discovered and configured. These peripheral devices are created for TouchBack and InkBack. As shown in the table below, the peripheral devices can be viewed in Device Manager, which will show duplicate names for some devices.
+When you connect a guest computer to Surface Hub 2S via the USB-C port, several USB devices are discovered and configured. These peripheral devices are created for TouchBack and InkBack. As shown in the following table, the peripheral devices can be viewed in Device Manager, which will show duplicate names for some devices.
-
+ 
-|**Peripheral**|**Listing in Device Manager**|
+| **Device Manager reference** |**Peripheral**| **Listing in Device Manager** |
-|:---------- |:------------------------- |
+| ---------------------------- |------------- | ------------------------------|
-| Human interface devices | HID-compliant consumer control device <br> HID-compliant pen <br> HID-compliant pen (duplicate item) <br> HID-compliant pen (duplicate item) <br> HID-compliant touch screen <br> USB Input Device <br> USB Input Device (duplicate item) |
+| Human interface devices | HID-compliant consumer control device<br>HID-compliant pen<br>HID-compliant pen (duplicate item)<br>HID-compliant pen (duplicate item)<br>HID-compliant touch screen<br>USB Input Device<br>USB Input Device (duplicate item) |
 | Keyboards | Standard PS/2 keyboard |
 | Mice and other pointing devices | HID-compliant mouse |
-| USB controllers | Generic USB hub <br> USB composite device |
+| USB controllers | Generic USB hub<br>USB composite device |
 
-### Connecting video-in to Surface Hub 2S
+## Connecting video-in to Surface Hub 2S
 
-Your choice of video cable will be determined by what is available from your source input. Surface Hub 2S has two choices of video input: USB-C and HDMI. See the following chart for available resolutions.
+You can input video to Surface Hub 2S using USB-C or HDMI, as indicated in the following table.  
 
-|**Signal Type**|**Resolution**|**Frame rate**|**HDMI**|**USB-C**|
+### Surface Hub 2S video-in settings
-|:----------- |:----------- |:---------- |:---- |:----- |
+
-| PC          | 640 x 480   | 59.94/60   | X    | X     |
+| **Signal Type** | **Resolution** | **Frame rate** | **HDMI** | **USB-C** |
-| PC          | 720 x 480   | 59.94/60   | X    | X     |
+| --------------- | -------------- | -------------- | -------- | --------- |
-| PC          | 1024 x 768  | 60         | X    | X     |
+| PC              | 640 x 480      | 60             | X        | X         |
-| PC          | 1920 x 1080 | 60         | X    | X     |
+| PC              | 720 x 480      | 60             | X        | X         |
-| PC          | 3840x2560   | 60         | X    | X     |
+| PC              | 1024 x 768     | 60             | X        | X         |
-| HDTV        | 720p        | 59.94/60   | X    | X     |
+| PC              | 1920 x 1080    | 60             | X        | X         |
-| HDTV        | 1080p       | 59.94/60   | X    | X     |
+| PC              | 3840x2560      | 30             | X        | X         |
-| UHD         | 3840x2560   | 60         | X    | X     |
+| HDTV            | 720p           | 60             | X        | X         |
+| HDTV            | 1080p          | 60             | X        | X         |
+| 4K UHD          | 3840x2560      | 30             | X        | X         |
+
+> [!NOTE]
+> The 4K UHD resolution (3840×2560) is only supported when connecting to ports on the compute module. It is not supported on the “guest” USB ports located on the left, top, and right sides of the device.
+
+> [!NOTE]
+> Video from a connected external PC may appear smaller when displayed on Surface Hub 2S.
 
 ## Mirroring Surface Hub 2S display on another device
 
-Surface Hub 2S includes a Video Out port for mirroring visual content from Surface Hub 2S to another display.
+You can output video to another display using either USB-C or MiniDP, as indicated in the following table.
 
-|**MODE**|**Connection**|**Functionality**|**Comments**|
+### Surface Hub 2S video-out settings
-|:---- |:---------- |:------------- |:-------- |
-| Display out | MiniDP output port | Display and audio out (support for duplicate mode only) | Requires external keyboard <br> Win+P and select Duplicate mode <br> Supports audio out (configurable via settings) |
 
-### Selecting cables
+| **Signal Type** | **Resolution** | **Frame rate** | **USB-C** | **MiniDP** |
+| --------------- | -------------- | -------------- | --------- | ---------- |
+| PC              | 640 x 480      | 60             | X         | X          |
+| PC              | 720 x 480      | 60             | X         | X          |
+| PC              | 1024 x 768     | 60             | X         | X          |
+| PC              | 1920 x 1080    | 60             | X         | X          |
+| PC              | 3840x2560      | 60             | X         | X          |
+| HDTV            | 720p           | 60             | X         | X          |
+| HDTV            | 1080p          | 60             | X         | X          |
+| 4K UHD          | 3840x2560      | 60             | X         | X          |
 
-DisplayPort cables are certified for to 3 meters in length. If a long cable is necessary, HDMI is recommended due to the wide availability of cost-effective, long-haul cables with the added benefit of installing repeaters if needed.
+ 
+Surface Hub 2S includes a MiniDP video-out port for projecting visual content from Surface Hub 2S to another display. If you plan to use Surface Hub 2S to project to another display, note the following recommendations:
+
+- **Keyboard required.** Before you begin, you’ll need to connect either a wired or Bluetooth-enabled external keyboard  to Surface Hub 2S. Note that unlike the original Surface Hub, a keyboard for Surface Hub 2S is sold separately and is not included in the shipping package.<br><br>
+- **Set duplicate mode.** Surface Hub 2S supports video-out in duplicate mode only. However, you will still need to manually configure the display mode when you connect for the first time:
+    1. Enter the **Windows logo key** + **P**, which opens the Project pane on the right side of Surface Hub 2S, and then select **Duplicate** mode.
+    2. When you’re finished with your Surface Hub 2S session, select **End Session**. This ensures that the duplicate setting is saved for the next session.<br><br>
+- **Plan for different aspect ratios.** Like other Surface devices, Surface Hub 2S uses a 3:2 display aspect ratio (the relationship between the width and the height of the display). Projecting Surface Hub 2S onto displays with different aspect ratios is supported. Note however that because Surface Hub 2S duplicates the display, the MiniDP output will also only display in a 3:2 aspect ratio, which may result in letterboxing or curtaining depending on the aspect ratio of the receiving display. 
+
+> [!NOTE]
+> if your second monitor uses a 16:9 aspect ratio (the predominant ratio for most TV monitors), black bars may appear on the left and right sides of the mirrored display. If this occurs, you may wish to inform your users that there is no need to adjust the second display.
+
+## Selecting cables
+
+Note the following recommendations:
+
+- **USB.** USB 3.1 Gen 2 cables.
+- **MiniDP.** DisplayPort cables certified for up to 3 meters in length.
+- **HDMI.** If a long cable is necessary, HDMI is recommended due to the wide availability of cost-effective, long-haul cables with the ability to install repeaters if needed.
 
 > [!NOTE]
 > Most DisplayPort sources will automatically switch to HDMI signaling if HDMI is detected.
 
 ## Wirelessly connect to Surface Hub 2S
 
-Windows 10 natively supports Miracast, which lets you wireless connect to Surface Hub 2S.
+Windows 10 natively supports Miracast, which lets you wireless connect to Surface Hub 2S.<br><br>
 
-### To connect using Miracast
+### To connect using Miracast:
 
-1. On your Windows 10 device, enter **Win** + **K**.
+1. On your Windows 10 device, enter **Windows logo key** + **K**. 
 2. In the Connect window, look for the name of your Surface Hub 2S in the list of nearby devices. You can find the name of your Surface Hub 2S in the bottom left corner of the display.
-3. If required, your system administrator may have enabled the PIN setting for Miracast connections on your Surface Hub which means that the first time you connect to that Surface Hub, a PIN number is displayed on the screen.  
+3. Enter a PIN if your system administrator has enabled the PIN setting for Miracast connections. This requires you to enter a PIN number when you connect to Surface Hub 2S for the first time.
 
 > [!NOTE]
-> If you’re a local administrator on Surface Hub 2S, you can configure PIN requirements via **Surface app > Settings.**
+>If you do not see the name of the Surface Hub 2S device as expected, it’s possible the previous session was prematurely closed. If so, sign into Surface Hub 2S directly to end the previous session and then connect from your external device.
 
 ## Connecting peripherals to Surface Hub 2S
 
-## Bluetooth accessories
+### Bluetooth accessories
 
 You can connect the following accessories to Surface Hub-2S using Bluetooth:
 
@@ -98,4 +130,4 @@ You can connect the following accessories to Surface Hub-2S using Bluetooth:
 - Speakers
 
 > [!NOTE]
-> After you connect a Bluetooth headset or speaker, you might need to change the default microphone and speaker settings. For more information, see [Local management for Surface Hub settings](local-management-surface-hub-settings.md).
+> After you connect a Bluetooth headset or speaker, you might need to change the default microphone and speaker settings. For more information, see [**Local management for Surface Hub settings**](https://docs.microsoft.com/en-us/surface-hub/local-management-surface-hub-settings).

devices/surface-hub/surface-hub-2s-custom-install.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-deploy-apps-intune.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-deploy-checklist.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-deploy.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-install-mount.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -33,4 +34,3 @@ If you’re not using licensed accessories, see [Customize wall mount of Surface
 | Get someone to help you lift and mount your Surface Hub. Make sure to hold and lift the Surface Hub from the bottom. | ![* Remove the instructional label before mounting *](images/sh2-setup-3.png) <br> |
 | 4. **Attach accessories and power on** | |
 | Install accessories and attach power cable as shown. See guides on the screen cling. Remove cling wrap from the screen. Press the power button to power on. | ![* Attach accessories and power on *](images/sh2-setup-4.png) <br> |
-

devices/surface-hub/surface-hub-2s-manage-intune.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -47,9 +48,9 @@ To ensure optimal video and audio quality on Surface Hub 2S, add the following Q
 
 |**Name**|**Description**|**OMA-URI**|**Type**|**Value**|
 |:------ |:------------- |:--------- |:------ |:------- |
-|**Audio Ports**| Audio Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/SourcePortMatchCondition | String  | 50000–50019 |
+|**Audio Ports**| Audio Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/SourcePortMatchCondition | String  | 50000-50019 |
 |**Audio DSCP**| Audio ports marking | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/DSCPAction | Integer | 46 |
-|**Video Ports**| Video Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/SourcePortMatchCondition | String  | 50020–50039 |
+|**Video Ports**| Video Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/SourcePortMatchCondition | String  | 50020-50039 |
 |**Video DSCP**| Video ports marking | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/DSCPAction | Integer | 34 |
 
 > [!NOTE]

devices/surface-hub/surface-hub-2s-manage-passwords.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-onprem-powershell.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-onscreen-display.md

@@ -6,15 +6,17 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 07/09/2019
 ms.localizationpriority: Normal
 ---
 # Adjust Surface Hub 2S brightness, volume, and input
+
 Surface Hub 2S provides an on-screen display for volume, brightness, and input control. The Source button functions as a toggle key to switch between the volume, brightness, and input control menus.
 
-**To show the on-screen display:**
+## To show the on-screen display
 
 - Press and hold the **Source** button for 4 seconds.
 
@@ -22,16 +24,16 @@ Surface Hub 2S provides an on-screen display for volume, brightness, and input c
 
  When the on-screen display is visible, use one or more buttons to reach desired settings.
  
-**To adjust volume:**
+## To adjust volume
 
 - Use the **Volume up/down** button to increase or decrease volume.
 
-**To adjust brightness:**
+## To adjust brightness
 
 1. Press the **Source** button again to switch to the brightness menu.
 2. Use the **Volume up/down** button to increase or decrease brightness.
 
-**To adjust input:**
+## To adjust input
 
 1. Press the **Source** button twice to switch to the Source menu.
 2. Use the **Volume up/down** button to switch between PC, HDMI, and USB-C inputs.

devices/surface-hub/surface-hub-2s-pack-components.md

@@ -4,8 +4,9 @@ description: "Instructions for packing Surface Hub 2S components, replacing the
 keywords: pack, replace components, camera, compute cartridge
 ms.prod: surface-hub
 ms.sitesec: library
-author: Teresa-Motiv
+author: robmazz
-ms.author: v-tea
+ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 07/1/2019

devices/surface-hub/surface-hub-2s-phone-authenticate.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -19,7 +20,7 @@ Password-less phone sign-in simplifies signing-in to your meetings and files on
 > [!NOTE]
 > Password-less phone sign-in requires that your primary email address must match your UPN.
 
-## To set up password-less phone sign-in 
+## To set up password-less phone sign-in
 
 1. Download the [Microsoft Authenticator](https://www.microsoft.com/en-us/account/authenticator) app for iPhone or Android to your phone.
 2. From your PC, go to [https://aka.ms/MFASetup](https://aka.ms/MFASetup) , sign in with your account, and select **Next.**
@@ -39,4 +40,4 @@ Password-less phone sign-in simplifies signing-in to your meetings and files on
 3. If prompted, enter the PIN or biometric ID on your phone to complete sign-in.
 
 ## Learn more
-For more information, see [Password-less phone sign-in with the Microsoft Authenticator app](https://docs.microsoft.com/en-us/azure/active-directory/authentication/howto-authentication-phone-sign-in).
+For more information, see [Password-less phone sign-in with the Microsoft Authenticator app](https://docs.microsoft.com/azure/active-directory/authentication/howto-authentication-phone-sign-in).

devices/surface-hub/surface-hub-2s-port-keypad-overview.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -40,4 +41,3 @@ The figure below shows the location of ports and physical buttons on a keypad at
 | 11 | **Power** | Power device on/off. <br> Use also to navigate display menus and select items. | n/a |
 
  ![Rear facing view of wireless, audio, & related components](images/hub2s-rear.png)
-

devices/surface-hub/surface-hub-2s-prepare-environment.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -44,6 +45,6 @@ If you affiliate Surface Hub 2S with on-premises Active Directory Domain Service
 
 ## Azure Active Directory
 
-When choosing to affiliate your Surface Hub 2S with Azure AD, any user in the Global Admins Security Group can sign in to the Settings app on Surface Hub 2S. Alternatively, you can configure the Device Administrator role to sign in to the Settings app. For more information, see [Administrator role permissions in Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/users-groups-roles/directory-assign-admin-roles#device-administrators). Currently, no other group can be delegated to sign in to the Settings app on Surface Hub 2S.
+When choosing to affiliate your Surface Hub 2S with Azure AD, any user in the Global Admins Security Group can sign in to the Settings app on Surface Hub 2S. Alternatively, you can configure the Device Administrator role to sign in to the Settings app. For more information, see [Administrator role permissions in Azure Active Directory](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-assign-admin-roles#device-administrators). Currently, no other group can be delegated to sign in to the Settings app on Surface Hub 2S.
 
 If you enabled Intune Automatic Enrollment for your organization, Surface Hub 2S will automatically enroll itself with Intune. The device’s Bitlocker key is automatically saved in Azure AD. When affiliating Surface Hub 2S with Azure AD, single sign-on and Easy Authentication will not work.

devices/surface-hub/surface-hub-2s-quick-start.md

@@ -6,13 +6,14 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
 ms.localizationpriority: Normal
 ---
 
-# Surface Hub 2S quick start 
+# Surface Hub 2S quick start
 
 ## Unpack Surface Hub 2S
 

devices/surface-hub/surface-hub-2s-recover-reset.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019
@@ -37,7 +38,7 @@ New in Surface Hub 2S, you can now reinstall the device using a recovery image.
 Surface Hub 2S lets you reinstall the device using a recovery image, which allows you to reinstall the device to factory settings if you lost the Bitlocker key or no longer have admin credentials to the Settings app.
 
 1. Begin with a USB 3.0 drive with 8 GB or 16 GB of storage, formatted as FAT32.
-2. Download recovery image from the Surface Recovery website onto the USB drive and connect it to any USB-C or USB A port on Surface Hub 2S.
+2. Download recovery image from the [Surface Recovery website](https://support.microsoft.com/en-us/surfacerecoveryimage?devicetype=surfacehub2s) onto the USB drive and connect it to any USB-C or USB A port on Surface Hub 2S.
 3. Turn off the device. While holding down the Volume down button, press the Power button. Keep holding both buttons until you see the Windows logo. Release the Power button but continue to hold the Volume until the Install UI begins.
 
 ![*Use Volume down and power buttons to initiate recovery*](images/sh2-keypad.png) <br>
@@ -54,4 +55,4 @@ On rare occasions, Surface Hub 2S may encounter an error during cleanup of user
 Reset or recover the device from Windows Recovery Environment (Windows RE). For more information, see [What is Windows RE?](https://technet.microsoft.com/library/cc765966.aspx)
 
 > [!NOTE]
-> To enter recovery mode, you need to physically unplug and replug the power cord three times. 
+> To enter recovery mode, you need to physically unplug and replug the power cord three times.

devices/surface-hub/surface-hub-2s-secure-with-uefi-semm.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-setup.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 07/03/2019
@@ -43,7 +44,7 @@ When you first start Surface Hub 2S, the device automatically enters first time
  
 ## Configuring device admin accounts
 
-You can only set up device admins during first time Setup. For more information, refer to [Surface Hub 2S device affiliation](https://docs.microsoft.com/en-us/surface-hub/surface-hub-2s-prepare-environment#device-affiliation).
+You can only set up device admins during first time Setup. For more information, refer to [Surface Hub 2S device affiliation](https://docs.microsoft.com/surface-hub/surface-hub-2s-prepare-environment#device-affiliation).
 
  In the **Setup admins for this device** window, select one of the following options: Active Directory Domain Services, Azure Active Directory, or Local admin.
 
@@ -91,10 +92,9 @@ If you insert a USB thumb drive with a provisioning package into one of the USB
 
    ![* Choose provisioning package to use*](images/sh2-run13.png) <br>
 
-3. If you created a multiple devices CSV file, you will be able to choose a device configuration. For more information, refer to [Create provisioning packages for Surface Hub 2S](https://docs.microsoft.com/en-us/surface-hub/surface-hub-2s-deploy#provisioning-multiple-devices-csv-file).
+3. If you created a multiple devices CSV file, you will be able to choose a device configuration. For more information, refer to [Create provisioning packages for Surface Hub 2S](https://docs.microsoft.com/surface-hub/surface-hub-2s-deploy#provisioning-multiple-devices-csv-file).
 
 
     ![* Select a device account and friendly name from your configuration file*](images/sh2-run14.png) <br>
 
  4. Follow the instructions to complete first time Setup.
-

devices/surface-hub/surface-hub-2s-site-planning.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-site-readiness-guide.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-techspecs.md

@@ -5,6 +5,7 @@ keywords: separate values with commas
 ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
+manager: laurawi
 ms.author: robmazz
 audience: Admin
 ms.topic: article
@@ -17,7 +18,9 @@ ms.localizationpriority: Normal
 |**Item**|**Details**|
 |:------ |:--------- |
 |**Dimensions**| 29.2" x 43.2" x 3.0” (741 mm x 1097 mm x 76 mm) |
+|**Shipping dimensions**| 47.64" x 36.89" x 9.92" (1,210 mm x 937 mm x 252 mm)|
 |**Weight**| 61.6 lbs. (28 kg) |
+|**Shipping Weight**| 81.08 lbs. (36.77 kg) |
 |**Resolution**| 3840 x 2560 |
 |**Display**| PixelSense Display, 3:2 aspect ratio, 10-bit color, 15.5 mm border, anti-glare, IPS LCD |
 |**Processor**| Quad-core 8th Generation Intel Core i5 processor, 8 GB RAM, 128 GB SSD <sup>1</sup> |
@@ -31,6 +34,11 @@ ms.localizationpriority: Normal
 |**Exterior**| Casing: Precision machined aluminum with mineral-composite resin <br> Color: Platinum <br> Physical Buttons: Power, Volume, Source |
 |**What’s in the box**| One Surface Hub 2S <br> One Surface Hub 2 Pen  <br> One Surface Hub 2 Camera <br> 2.5 m AC Power Cable <br> Quick Start Guide |
 |**Warranty**| 1-year limited hardware warranty |
+|**BTU**| 1518 BTU/hr |
+|**Input Voltage**| 50/60Hz 110/230v nominal, 90-265v max |
+|**Input power, operating**| 445 W (495 W Surge Load) |
+|**Input Current**| 5.46 A |
+|**Input Power, standby**| 5 W max  |
 
 > [!NOTE]
 > <sup>1</sup> System software uses significant storage space. Available storage is subject to change based on system software updates and apps usage. 1 GB= 1 billion bytes. See Surface.com/Storage for more details. <br> <sup>2</sup> Software license required for some features. Sold separately.<br> 

devices/surface-hub/surface-hub-2s-unpack.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/surface-hub-2s-whats-new.md

@@ -6,6 +6,7 @@ ms.prod: surface-hub
 ms.sitesec: library
 author: robmazz
 ms.author: robmazz
+manager: laurawi
 audience: Admin
 ms.topic: article
 ms.date: 06/20/2019

devices/surface-hub/whiteboard-collaboration.md

@@ -44,14 +44,14 @@ To get Whiteboard to Whiteboard collaboration up and running, you’ll need to m
 
 To start a collaboration session:
 
-1.	In the Whiteboard app, tap the **Sign in** button.
+1. In the Whiteboard app, tap the **Sign in** button.
-2.	Sign in with your organization ID.
+2. Sign in with your organization ID.
-3.	Tap the **Invite** button next to your name at the top of the app.
+3. Tap the **Invite** button next to your name at the top of the app.
-4.	Tap **Start session**. Whiteboard will generate a link that you can share.
+4. Tap **Start session**. Whiteboard will generate a link that you can share.
 
     ![screenshot of the link dialog box on whiteboard](images/wb-collab-link.png)
     
-5.	Copy and paste this link into a Skype chat with another Surface Hub
+5. Copy and paste this link into a Skype chat with another Surface Hub
 
 When the other Surface Hub receives the link, the recipient can tap on the link, sign in to Whiteboard, and then begin collaborating. You can copy and paste other content, use smart ink features like Ink to Shape, and co-author together.
 

devices/surface/deploy-surface-app-with-windows-store-for-business.md

@@ -54,7 +54,7 @@ Before users can install or deploy an app from a company’s Microsoft Store for
    ![Show offline licenses apps checkbox](images/deploysurfapp-figure1-enablingapps.png "Show offline licenses apps checkbox")<br/>
    *Figure 1. Enable apps for offline use*
 
-4.	Add Surface app to your Microsoft Store for Business account by following this procedure:
+4. Add Surface app to your Microsoft Store for Business account by following this procedure:
     * Click the **Shop** menu.
     * In the search box, type **Surface app**, and then click the search icon.
     * After the Surface app is presented in the search results, click the app’s icon.
@@ -99,21 +99,21 @@ Figure 5 shows the required frameworks for the Surface app.
 >The version numbers of the Surface app and required frameworks will change as the apps are updated. Check for the latest version of Surface app and each framework in Microsoft Store for Business. Always use the Surface app and recommended framework versions as provided by Microsoft Store for Business. Using outdated frameworks or the incorrect versions may result in errors or application crashes.
 
 To download the required frameworks for the Surface app, follow these steps:
-1.	Click the **Download** button under **Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe.Appx file to your specified folder.
+1. Click the **Download** button under **Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe.Appx file to your specified folder.
-2.	Click the **Download** button under **Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe.Appx file to your specified folder.
+2. Click the **Download** button under **Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe.Appx file to your specified folder.
 
 >[!NOTE]
 >Only the 64-bit (x64) version of each framework is required for Surface devices. Surface devices are native 64-bit UEFI devices and are not compatible with 32-bit (x86) versions of Windows that would require 32-bit frameworks. 
 
 ## Install Surface app on your computer with PowerShell
 The following procedure provisions the Surface app onto your computer and makes it available for any user accounts created on the computer afterwards.
-1.	Using the procedure described in the [How to download Surface app from a Microsoft Store for Business account](#download-surface-app-from-a-microsoft-store-for-business-account) section of this article, download the Surface app AppxBundle and license file. 
+1. Using the procedure described in the [How to download Surface app from a Microsoft Store for Business account](#download-surface-app-from-a-microsoft-store-for-business-account) section of this article, download the Surface app AppxBundle and license file. 
-2.	Begin an elevated PowerShell session.
+2. Begin an elevated PowerShell session.
 
     >[!NOTE]
     >If you don’t run PowerShell as an Administrator, the session won’t have the required permissions to install the app.
     
-3.	In the elevated PowerShell session, copy and paste the following command:
+3. In the elevated PowerShell session, copy and paste the following command:
     ```
     Add-AppxProvisionedPackage –Online –PackagePath <DownloadPath>\ Microsoft.SurfaceHub_10.0.342.0_neutral_~_8wekyb3d8bbwe.AppxBundle –LicensePath <DownloadPath>\ Microsoft.SurfaceHub_8wekyb3d8bbwe_a53ef8ab-9dbd-dec1-46c5-7b664d4dd003.xml
     ```
@@ -125,7 +125,7 @@ The following procedure provisions the Surface app onto your computer and makes
     Add-AppxProvisionedPackage –Online –PackagePath c:\Temp\ Microsoft.SurfaceHub_10.0.342.0_neutral_~_8wekyb3d8bbwe.AppxBundle –LicensePath c:\Temp\ Microsoft.SurfaceHub_8wekyb3d8bbwe_a53ef8ab-9dbd-dec1-46c5-7b664d4dd003.xml
     ```
 
-4.	The Surface app will now be available on your current Windows computer. 
+4. The Surface app will now be available on your current Windows computer. 
 
 Before the Surface app is functional on the computer where it has been provisioned, you must also provision the frameworks described earlier in this article. To provision these frameworks, use the following procedure in the elevated PowerShell session you used to provision the Surface app.
 
@@ -151,18 +151,18 @@ The following procedure uses MDT to automate installation of the Surface app at
    * Working Directory: %DEPLOYROOT%\Applications\SurfaceApp
 
 For the Surface app to function on the target computer, it will also require the frameworks described earlier in this article. Use the following procedure to import the frameworks required for the Surface app into MDT and to configure them as dependencies.
-1.	Using the procedure described earlier in this article, download the framework files. Store each framework in a separate folder.
+1. Using the procedure described earlier in this article, download the framework files. Store each framework in a separate folder.
-2.	Using the New Application Wizard in the MDT Deployment Workbench, import the downloaded files as a new **Application with source files**.
+2. Using the New Application Wizard in the MDT Deployment Workbench, import the downloaded files as a new **Application with source files**.
-3.	On the **Command Details** page, type the file name of each application you downloaded in the **Command** field and the default Working Directory.
+3. On the **Command Details** page, type the file name of each application you downloaded in the **Command** field and the default Working Directory.
 
 To configure the frameworks as dependencies of the Surface app, use this process:
-1.	Open the properties of the Surface app in the MDT Deployment Workbench.
+1. Open the properties of the Surface app in the MDT Deployment Workbench.
-2.	Click the **Dependencies** tab, and then click **Add**.
+2. Click the **Dependencies** tab, and then click **Add**.
-3.	Select the check box for each framework using the name you provided in the New Application Wizard.
+3. Select the check box for each framework using the name you provided in the New Application Wizard.
 
 After import, the Surface app will be available for selection in the **Applications** step of the Windows Deployment Wizard. You can also install the application automatically by specifying the application in the deployment task sequence by following this process:
-1.	Open your deployment task sequence in the MDT Deployment Workbench.
+1. Open your deployment task sequence in the MDT Deployment Workbench.
-2.	Add a new **Install Application** task in the **State Restore** section of deployment.
+2. Add a new **Install Application** task in the **State Restore** section of deployment.
-3.	Select **Install a single application** and specify the **Surface App** as the **Application to be installed**.
+3. Select **Install a single application** and specify the **Surface App** as the **Application to be installed**.
 
 For more information about including apps into your Windows deployments, see [Deploy Windows 10 with the Microsoft Deployment Toolkit](https://technet.microsoft.com/itpro/windows/deploy/deploy-windows-10-with-the-microsoft-deployment-toolkit).

devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md

@@ -579,10 +579,10 @@ After the task sequence is created it can be modified for increased automation,
 
 8. On the **Properties** tab of the new **Install Application** step, enter **Install Microsoft Office 2016 Click-to-Run** in the **Name** field.
 9. Click **Install a Single Application**, and then click **Browse** to view available applications that have been imported into the deployment share.
-10.	Select Office 2016 Click-to-Run from the list of applications, and then click **OK**.
+10. Select Office 2016 Click-to-Run from the list of applications, and then click **OK**.
-11.	Repeat Steps 6 through 10 for the Surface app.
+11. Repeat Steps 6 through 10 for the Surface app.
-12.	Expand the **Preinstall** folder, and then click the **Enable BitLocker (Offline)** step.
+12. Expand the **Preinstall** folder, and then click the **Enable BitLocker (Offline)** step.
-13.	Open the **Add** menu again and choose **Set Task Sequence Variable** from under the **General** menu.
+13. Open the **Add** menu again and choose **Set Task Sequence Variable** from under the **General** menu.
 14. On the **Properties** tab of the new **Set Task Sequence Variable** step (as shown in Figure 22), configure the following options:
     * **Name** – Set DriverGroup001
     * **Task Sequence Variable** – DriverGroup001
@@ -592,8 +592,8 @@ After the task sequence is created it can be modified for increased automation,
 
     *Figure 22. Configure a new Set Task Sequence Variable step in the deployment task sequence*
 
-15.	Select the **Inject Drivers** step, the next step in the task sequence.
+15. Select the **Inject Drivers** step, the next step in the task sequence.
-16.	On the **Properties** tab of the **Inject Drivers** step (as shown in Figure 23), configure the following options:
+16. On the **Properties** tab of the **Inject Drivers** step (as shown in Figure 23), configure the following options:
     * In the **Choose a selection profile** drop-down menu, select **Nothing**.
     * Click the **Install all drivers from the selection profile** button.
 
@@ -601,7 +601,7 @@ After the task sequence is created it can be modified for increased automation,
 
     *Figure 23. Configure the deployment task sequence not to choose the drivers to inject into Windows*
 
-17.	Click **OK** to apply changes to the task sequence and close the task sequence properties window.
+17. Click **OK** to apply changes to the task sequence and close the task sequence properties window.
 
 ### Configure deployment share rules
 

devices/surface/enroll-and-configure-surface-devices-with-semm.md

@@ -63,15 +63,15 @@ To create a Surface UEFI configuration package, follow these steps:
 
     *Figure 4. Disable or enable individual Surface components*
 
-11.	Click **Next**.
+11. Click **Next**.
-12.	To enable or disable advanced options in Surface UEFI or the display of Surface UEFI pages, on the **Choose the advanced settings for your devices** page, click the slider beside the desired setting to configure that option to **On** or **Off** (shown in Figure 5). In the **UEFI Front Page** section, you can use the sliders for **Security**, **Devices**, and **Boot** to control what pages are available to users who boot into Surface UEFI. (For more information about Surface UEFI settings, see [Manage Surface UEFI settings](https://technet.microsoft.com/itpro/surface/manage-surface-uefi-settings).) Click **Build** when you have finished selecting options to generate and save the package.
+12. To enable or disable advanced options in Surface UEFI or the display of Surface UEFI pages, on the **Choose the advanced settings for your devices** page, click the slider beside the desired setting to configure that option to **On** or **Off** (shown in Figure 5). In the **UEFI Front Page** section, you can use the sliders for **Security**, **Devices**, and **Boot** to control what pages are available to users who boot into Surface UEFI. (For more information about Surface UEFI settings, see [Manage Surface UEFI settings](https://technet.microsoft.com/itpro/surface/manage-surface-uefi-settings).) Click **Build** when you have finished selecting options to generate and save the package.
 
     ![Control advanced Surface UEFI settings and Surface UEFI pages](images/surface-ent-mgmt-fig4-advancedsettings.png "Control advanced Surface UEFI settings and Surface UEFI pages")
 
     *Figure 5. Control advanced Surface UEFI settings and Surface UEFI pages with SEMM*
 
-13.	In the **Save As** dialog box, specify a name for the Surface UEFI configuration package, browse to the location where you would like to save the file, and then click **Save**.
+13. In the **Save As** dialog box, specify a name for the Surface UEFI configuration package, browse to the location where you would like to save the file, and then click **Save**.
-14.	When the package is created and saved, the **Successful** page is displayed.
+14. When the package is created and saved, the **Successful** page is displayed.
 
 >[!NOTE]
 >Record the certificate thumbprint characters that are displayed on this page, as shown in Figure 6. You will need these characters to confirm enrollment of new Surface devices in SEMM. Click **End** to complete package creation and close Microsoft Surface UEFI Configurator.

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

@@ -59,9 +59,9 @@ SDT for Business is supported on Surface 3 and later devices, including:
 
 To create an SDT package that you can distribute to users in your organization:
 
-1.	Sign in to your Surface device using the Administrator account.
+1. Sign in to your Surface device using the Administrator account.
-2.	Download SDT Windows Installer Package (.msi) from the [Surface Tools for IT download page](https://www.microsoft.com/download/details.aspx?id=46703) and copy it to a preferred location on your Surface device, such as Desktop.
+2. Download SDT Windows Installer Package (.msi) from the [Surface Tools for IT download page](https://www.microsoft.com/download/details.aspx?id=46703) and copy it to a preferred location on your Surface device, such as Desktop.
-3.	The SDT setup wizard appears, as shown in figure 1. Click **Next**. 
+3. The SDT setup wizard appears, as shown in figure 1. Click **Next**. 
 
     >[!NOTE]
     >If the setup wizard does not appear, ensure that you are signed into the Administrator account on your computer. 
@@ -72,15 +72,15 @@ To create an SDT package that you can distribute to users in your organization:
 
 4. When the SDT setup wizard appears, click **Next**, accept the End User License Agreement (EULA)
 
-5.	On the Install Options screen, change the default install location if desired. 
+5. On the Install Options screen, change the default install location if desired. 
-6.	Under Setup Type, select **Advanced**. 
+6. Under Setup Type, select **Advanced**. 
 
     >[!NOTE]
     >The standard option allows users to run the diagnostic tool directly on their Surface device provided they are signed into their device using an Administrator account. 
     
      ![Install Options: Advanced](images/sdt-install.png)
 
-7.	Click **Next** and then click **Install**. 
+7. Click **Next** and then click **Install**. 
 
 ## Installing using the command line
 If desired, you can install SDT at a command prompt and set a custom flag to install the tool in admin mode. SDT contains the following install option flags:
@@ -90,7 +90,7 @@ If desired, you can install SDT at a command prompt and set a custom flag to ins
 
 ### To install SDT from the command line:
 
-1.	Open a command prompt and enter:
+1. Open a command prompt and enter:
 
     ```
     msiexec.exe /i <the path of installer> ADMINMODE=1. 
@@ -116,8 +116,8 @@ In addition to the .exe file, SDT installs a JSON file and an admin.dll file (mo
 
 Creating a custom package allows you to target the tool to specific known issues.
 
-1.	Click **Start > Run**, enter **Surface** and then click **Surface Diagnostic Toolkit for Business**. 
+1. Click **Start > Run**, enter **Surface** and then click **Surface Diagnostic Toolkit for Business**. 
-2.	When the tool opens, click **Create Custom Package**, as shown in figure 3.
+2. When the tool opens, click **Create Custom Package**, as shown in figure 3.
 
     ![Create custom package option](images/sdt-3.png)
 

devices/surface/surface-diagnostic-toolkit-desktop-mode.md

@@ -16,9 +16,9 @@ manager: dansimp
 
 This topic explains how to use the Surface Diagnostic Toolkit (SDT) to help users in your organization run the tool to identify and diagnose issues with the Surface device. Successfully running SDT can quickly determine if a reported issue is caused by failed hardware or user error.
 
-1.	Direct the user to install [the SDT package](surface-diagnostic-toolkit-business.md#create-custom-sdt) from a software distribution point or network share. After it is installed, you’re ready to guide the user through a series of tests. 
+1. Direct the user to install [the SDT package](surface-diagnostic-toolkit-business.md#create-custom-sdt) from a software distribution point or network share. After it is installed, you’re ready to guide the user through a series of tests. 
 
-2.	Begin at the home page, which allows users to enter a description of the issue, and click **Continue**, as shown in figure 1.
+2. Begin at the home page, which allows users to enter a description of the issue, and click **Continue**, as shown in figure 1.
 
     ![Start SDT in desktop mode](images/sdt-desk-1.png)
 
@@ -63,9 +63,9 @@ For each test, if functionality does not work as expected and the user clicks **
 
 *Figure 4. Running hardware diagnostics*
 
-1.	If the brightness successfully adjusts from 0-100 percent as expected, direct the user to click **Yes** and then click **Continue**. 
+1. If the brightness successfully adjusts from 0-100 percent as expected, direct the user to click **Yes** and then click **Continue**. 
-2.	If the brightness fails to adjust from 0-100 percent as expected, direct the user to click **No** and then click **Continue**. 
+2. If the brightness fails to adjust from 0-100 percent as expected, direct the user to click **No** and then click **Continue**. 
-3.	Guide users through remaining tests as appropriate. When finished, SDT automatically provides a high-level summary of the report, including the possible causes of any hardware issues along with guidance for resolution.
+3. Guide users through remaining tests as appropriate. When finished, SDT automatically provides a high-level summary of the report, including the possible causes of any hardware issues along with guidance for resolution.
 
 
 ### Repairing applications

devices/surface/surface-enterprise-management-mode.md

@@ -226,8 +226,16 @@ create a reset package using PowerShell to reset SEMM.
 
 ## Version History
 
+
+
+### Version 2.43.136.0
+* Support to enable/disable simulatenous multithreating 
+* Separate options for WiFi and Bluetooth for some devices 
+* Battery Limit removed for Surface Studio 
+
 ### Version 2.26.136.0
 * Add support to Surface Studio 2
+* Battery Limit feature
 
 ### Version 2.21.136.0
 * Add support to Surface Pro 6

devices/surface/unenroll-surface-devices-from-semm.md

@@ -118,9 +118,9 @@ To initiate a Recovery Request, follow these steps:
 
     *Figure 10. Click Recovery Request to begin the process to approve a Recovery Request*
 
-11.	Click **Certificate Protection** to authenticate the Recovery Request with the SEMM certificate.
+11. Click **Certificate Protection** to authenticate the Recovery Request with the SEMM certificate.
-12.	Browse to and select your SEMM certificate file, and then click **OK**.
+12. Browse to and select your SEMM certificate file, and then click **OK**.
-13.	When you are prompted to enter the certificate password as shown in Figure 11, type and confirm the password for the certificate file, and then click **OK**.
+13. When you are prompted to enter the certificate password as shown in Figure 11, type and confirm the password for the certificate file, and then click **OK**.
 
     ![Type password for SEMM certificate](images/surface-semm-unenroll-fig11.png "Type password for SEMM certificate")
 
@@ -137,7 +137,7 @@ To initiate a Recovery Request, follow these steps:
     * If you displayed the Recovery Request (Reset Request) as a QR Code and then used a messaging or email application to send the code to the computer with Microsoft Surface UEFI Configurator, copy and paste the code into the provided field.
     * If you saved the Recovery Request (Reset Request) as a file to a USB drive, click the **Import** button, browse to and select the Recovery Request (Reset Request) file, and then click **OK**.
 
-16.	The reset verification code is displayed in Microsoft Surface UEFI Configurator, as shown in Figure 13.
+16. The reset verification code is displayed in Microsoft Surface UEFI Configurator, as shown in Figure 13.
 
     ![Display of the reset verification code](images/surface-semm-unenroll-fig13.png "Display of the reset verification code")
 
@@ -145,13 +145,13 @@ To initiate a Recovery Request, follow these steps:
 
     * Click the **Share** button to send the reset verification code by email.
 
-17.	Enter the reset verification code in the provided field on the Surface device (shown in Figure 8), and then click or press **Verify** to reset the device and unenroll the device from SEMM.
+17. Enter the reset verification code in the provided field on the Surface device (shown in Figure 8), and then click or press **Verify** to reset the device and unenroll the device from SEMM.
-18.	Click or press **Restart now** on the **SEMM reset successful** page to complete the unenrollment from SEMM, as shown in Figure 14.
+18. Click or press **Restart now** on the **SEMM reset successful** page to complete the unenrollment from SEMM, as shown in Figure 14.
 
     ![Example display of successful unenrollment from SEMM](images/surface-semm-unenroll-fig14.png "Example display of successful unenrollment from SEMM")
 
     *Figure 14. Successful unenrollment from SEMM*
 
-19.	Click **End** in Microsoft Surface UEFI Configurator to complete the Recovery Request (Reset Request) process and close Microsoft Surface UEFI Configurator.
+19. Click **End** in Microsoft Surface UEFI Configurator to complete the Recovery Request (Reset Request) process and close Microsoft Surface UEFI Configurator.
 
 

devices/surface/using-the-sda-deployment-share.md

@@ -141,23 +141,23 @@ In the previous example for including drivers for a POS system, you would also n
 
 9. Click the **Task Sequence** tab to view the steps that are included in the new task sequence.
 
-10.	Select the **Windows Update (Pre-Application Installation)** step, and then click **Add**.
+10. Select the **Windows Update (Pre-Application Installation)** step, and then click **Add**.
 
-11.	Hover the mouse over **General** under the **Add** menu, and then click **Install Application**. This will add a new step after the selected step for the installation of a specific application as shown in Figure 3.
+11. Hover the mouse over **General** under the **Add** menu, and then click **Install Application**. This will add a new step after the selected step for the installation of a specific application as shown in Figure 3.
 
     ![A new Install Application step for Sample POS App](images/using-sda-newinstall-fig3.png "A new Install Application step for Sample POS App")
   
     *Figure 3. A new Install Application step for Sample POS App*
 
-12.	On the **Properties** tab of the new **Install Application** step, enter **Install - Sample POS App** in the **Name** field, where *Sample POS App* is the name of your app.
+12. On the **Properties** tab of the new **Install Application** step, enter **Install - Sample POS App** in the **Name** field, where *Sample POS App* is the name of your app.
 
-13.	Click **Install a Single Application**, and then click **Browse** to view available applications that have been imported into the deployment share.
+13. Click **Install a Single Application**, and then click **Browse** to view available applications that have been imported into the deployment share.
 
-14.	Select your app from the list of applications, and then click **OK**.
+14. Select your app from the list of applications, and then click **OK**.
 
-15.	Click **OK** to close the task sequence properties.
+15. Click **OK** to close the task sequence properties.
 
-16.	Close the Deployment Workbench.
+16. Close the Deployment Workbench.
 
 ## Work with existing deployment shares
 

education/get-started/enable-microsoft-teams.md

@@ -19,12 +19,12 @@ manager: dansimp
 
 Microsoft Teams is a digital hub that brings conversations, content, and apps together in one place. Because it's built on Office 365, schools benefit from integration with their familiar Office apps and services. Your institution can use Microsoft Teams to create collaborative classrooms, connect in professional learning communities, and communicate with school staff all from a single experience in Office 365 for Education. 
 
-To get started, IT administrators need to use the Office 365 Admin Center to enable Microsoft Teams for your school. 
+To get started, IT administrators need to use the Microsoft 365 Admin Center to enable Microsoft Teams for your school. 
 
 ## Enable Microsoft Teams for your school
 
 1. Sign in to <a href="https://portal.office.com" target="_blank">Office 365</a> with your work or school account.
-2. Click **Admin** to go to the Office 365 admin center.
+2. Click **Admin** to go to the admin center.
 3. Go to **Settings > Services & add-ins**.
 4. On the **Services & add-ins** page, select **Microsoft Teams**.
 

education/get-started/finish-setup-and-other-tasks.md

@@ -109,7 +109,7 @@ When a device is owned by the school, you may need to have a single person addin
 
 Follow the steps in this section to enable a single person to add many devices to your cloud infrastructure.
 
-1. Sign in to the <a href="https://portal.office.com" target="_blank">Office 365 admin center</a>.
+1. Sign in to the <a href="https://portal.office.com" target="_blank">admin center</a>.
 2. Configure the device settings for the school's Active Directory. To do this, go to the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>.
 3. Select **Azure Active Directory > Users and groups > Device settings**.
 
@@ -125,7 +125,7 @@ When students move from using one device to another, they may need to have their
 
 Follow the steps in this section to ensure that settings for the each user follow them when they move from one device to another.
 
-1. Sign in to the <a href="https://portal.office.com" target="_blank">Office 365 admin center</a>.
+1. Sign in to the <a href="https://portal.office.com" target="_blank">admin center</a>.
 2. Go to the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>.
 3. Select **Azure Active Directory > Users and groups > Device settings**.
 4. Find the setting **Users may sync settings and enterprise app data** and change the value to **All**.
@@ -142,12 +142,12 @@ Now that your basic cloud infrastructure is up and running, it's time to complet
 ## Enable Microsoft Teams for your school
 Microsoft Teams is a digital hub that brings conversations, content, and apps together in one place. Because it's built on Office 365, schools benefit from integration with their familiar Office apps and services. Your institution can use Microsoft Teams to create collaborative classrooms, connect in professional learning communities, and communicate with school staff all from a single experience in Office 365 for Education. 
 
-To get started, IT administrators need to use the Office 365 Admin Center to enable Microsoft Teams for your school. 
+To get started, IT administrators need to use the Microsoft 365 Admin Center to enable Microsoft Teams for your school. 
 
 **To enable Microsoft Teams for your school**
 
 1. Sign in to <a href="https://portal.office.com" target="_blank">Office 365</a> with your work or school account.
-2. Click **Admin** to go to the Office 365 admin center.
+2. Click **Admin** to go to the admin center.
 3. Go to **Settings > Services & add-ins**.
 4. On the **Services & add-ins** page, select **Microsoft Teams**.
 

education/get-started/inclusive-classroom-it-admin.md

@@ -29,12 +29,12 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea
 
 |             Reading features              |                                                                                                              Available in which apps                                                                                                               |                                                                                Office 2016 MSI                                                                                 |                                                                   Office 2019                                                                   |                                  Office 365 ProPlus Monthly (C2R)                                  |                                Office 365 ProPlus Semi Annual (C2R)                                |                                         Office 365 ProPlus Annual (C2R)                                          |
 |-------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------|
-| Read aloud with simultaneous highlighting | <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul> | <p style="text-align: center;">X</p> <p style="text-align: center;"><p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p> |                                <p style="text-align: center;">X</p>                                |    <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Outlook PC)</p>    | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps or Outlook PC)</p> |
+| Read aloud with simultaneous highlighting | <ul><li>OneNote 2016 (add-in), OneNote in a browser, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word in a browser, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul> | <p style="text-align: center;">X</p> <p style="text-align: center;"><p style="text-align: center;">(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)</p> |                                <p style="text-align: center;">X</p>                                |    <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Outlook PC)</p>    | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps or Outlook PC)</p> |
-|   Adjustable text spacing and font size   |       <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word Online, Word Mac, Word for iPad</li><li>Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>        | <p style="text-align: center;">X</p> <p style="text-align: center;"><p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)</p> |                                <p style="text-align: center;">X</p>                                |                                <p style="text-align: center;">X</p>                                |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
+|   Adjustable text spacing and font size   |       <ul><li>OneNote 2016 (add-in), OneNote in a browser, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word in a browser, Word Mac, Word for iPad</li><li>Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>        | <p style="text-align: center;">X</p> <p style="text-align: center;"><p style="text-align: center;">(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)</p> |                                <p style="text-align: center;">X</p>                                |                                <p style="text-align: center;">X</p>                                |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
-|              Syllabification              |                                           <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word Online</li><li>Outlook Web Access</li></ul>                                            |                                                                                                                                                                                |         <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word Online, Outlook Web Access)</p>         |     <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word iOS)</p>     |     <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word iOS)</p>     |  <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps or Word iOS)</p>  |
+|              Syllabification              |                                           <ul><li>OneNote 2016 (add-in), OneNote in a browser, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word in a browser</li><li>Outlook Web Access</li></ul>                                            |                                                                                                                                                                                |         <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word for iOS, Word in a browser, Outlook Web Access)</p>         |     <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word iOS)</p>     |     <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word iOS)</p>     |  <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps or Word iOS)</p>  |
-|      Parts of speech identification       | <ul><li>OneNote 2016 (add-in), OneNote Online, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul> |                               <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>                                |                <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>                | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
+|      Parts of speech identification       | <ul><li>OneNote 2016 (add-in), OneNote in a browser, OneNote for Windows 10, OneNote for iPad, OneNote Mac</li><li>Word 2016, Word in a browser, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul> |                               <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word in a browser, Outlook Web Access)</p>                                |                <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word in a browser, Outlook Web Access)</p>                | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
-|              Line focus mode              |                                                   <ul><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>                                                    |                                                                                                                                                                                |                <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>                | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
+|              Line focus mode              |                                                   <ul><li>Word 2016, Word in a browser, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>                                                    |                                                                                                                                                                                |                <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word in a browser, Outlook Web Access)</p>                | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
-|            Picture Dictionary             |                                                   <ul><li>Word 2016, Word Online, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>                                                    |                                                                                                                                                                                |                <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word Online, Outlook Web Access)</p>                | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
+|            Picture Dictionary             |                                                   <ul><li>Word 2016, Word in a browser, Word Mac, Word for iOS</li><li>Outlook 2016, Outlook Web Access</li><li>Office Lens on iOS, Android</li></ul>                                                    |                                                                                                                                                                                |                <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for Word in a browser, Outlook Web Access)</p>                | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> | <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p> |        <p style="text-align: center;">X</p> <p style="text-align: center;">(N/A for any OneNote apps)</p>        |
 
 </br>
 
@@ -42,11 +42,11 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea
 |                 Writing and proofing features                  |                                                Available in which apps                                                |           Office 2016 MSI            |             Office 2019              |   Office 365 ProPlus Monthly (C2R)   | Office 365 ProPlus Semi Annual (C2R) | Office 365 ProPlus Annual (C2R) |
 |----------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|--------------------------------------|--------------------------------------|--------------------------------------|--------------------------------------|---------------------------------|
 |                           Dictation                            | <ul><li>OneNote 2016, OneNote for Windows 10</li><li>Word 2016</li><li>Outlook 2016</li><li>PowerPoint 2016</li></ul> |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                      |                                 |
-|         Spelling suggestions for phonetic misspellings         |                      <ul><li>Word 2016, Word Online, Word for Mac</li><li>Outlook 2016</li></ul>                      |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                 |
+|         Spelling suggestions for phonetic misspellings         |                      <ul><li>Word 2016, Word in a browser, Word for Mac</li><li>Outlook 2016</li></ul>                      |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                 |
 | Synonyms alongside spelling suggestions that can be read aloud |                                   <ul><li>Word 2016</li><li>Outlook 2016</li></ul>                                    |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                 |
-|                         Grammar checks                         |                      <ul><li>Word 2016, Word Online, Word for Mac</li><li>Outlook 2016</li></ul>                      |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                      |                                 |
+|                         Grammar checks                         |                      <ul><li>Word 2016, Word in a browser, Word for Mac</li><li>Outlook 2016</li></ul>                      |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                      |                                 |
 |                 Customizable writing critiques                 |                            <ul><li>Word 2016, Word for Mac</li><li>Outlook 2016</li></ul>                             | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                      |                                 |
-|                  Tell me what you want to do                   |            <ul><li>Office 2016</li><li>Office Online</li><li>Office on iOS, Android, Windows 10</li></ul>             | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                 |
+|                  Tell me what you want to do                   |            <ul><li>Office 2016</li><li>Office in a browser</li><li>Office on iOS, Android, Windows 10</li></ul>             | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                 |
 |                             Editor                             |                                              <ul><li>Word 2016</li></ul>                                              |                                      | <p style="text-align: center;">X</p> | <p style="text-align: center;">X</p> |                                      |                                 |
 
 </br>

education/index.md

@@ -32,7 +32,7 @@ ms.prod: w10
                                             <div class="card">
                                                 <div class="cardImageOuter">
                                                     <div class="cardImage bgdAccent1"> 
-                                                        <img src="https://docs.microsoft.com/media/hubs/microsoft365/M365-education.svg" alt="" />
+                                                        <img src="images/MSC17_cloud_012_merged.png" alt="" />
                                                     </div>
                                                 </div>
                                                 <div class="cardText">
@@ -51,7 +51,7 @@ ms.prod: w10
                                             <div class="card">
                                                 <div class="cardImageOuter">
                                                     <div class="cardImage bgdAccent1"> 
-                                                        <img src="https://docs.microsoft.com/media/hubs/education/education-pro-get-started.svg" alt="" />
+                                                        <img src="images/MSC17_cloud_005.png" alt="" />
                                                     </div>
                                                 </div>
                                                 <div class="cardText">
@@ -63,65 +63,6 @@ ms.prod: w10
                                     </div>
                                 </a>
                             </li>
-                            <li>
-                            </li>
-                            <li>
-                                <a href="/microsoft-365/education/index?branch=m365-integration#pivot=itpro&amp;panel=itpro-scd" target="_blank">
-                                    <div class="cardSize">
-                                        <div class="cardPadding">
-                                            <div class="card">
-                                                <div class="cardImageOuter">
-                                                    <div class="cardImage bgdAccent1"> 
-                                                        <img src="https://docs.microsoft.com/media/hubs/education/education-pro-office365.svg" alt="" />
-                                                    </div>
-                                                </div>
-                                                <div class="cardText">
-                                                    <h3>1. M365 EDU deployment</h3>
-                                                    <p>Get started by creating your Office 365 tenant, setting up a cloud infrastructure for your school, and creating, managing, and syncing user accounts.</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="/microsoft-365/education/index?branch=m365-integration#pivot=itpro&amp;panel=itpro-sdm" target="_blank">
-                                    <div class="cardSize">
-                                        <div class="cardPadding">
-                                            <div class="card">
-                                                <div class="cardImageOuter">
-                                                    <div class="cardImage bgdAccent1"> 
-                                                        <img src="https://docs.microsoft.com/media/hubs/education/education-pro-usb.svg" alt="" />
-                                                    </div>
-                                                </div>
-                                                <div class="cardText">
-                                                    <h3>2. Device Management</h3>
-                                                    <p>Improve student learning outcomes through connected classrooms and engaging new technologies with streamlined device management.</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="/microsoft-365/education/deploy/post-deployment-next-steps" target="_blank">
-                                    <div class="cardSize">
-                                        <div class="cardPadding">
-                                            <div class="card">
-                                                <div class="cardImageOuter">
-                                                    <div class="cardImage bgdAccent1"> 
-                                                        <img src="https://docs.microsoft.com/media/hubs/education/education-ms-teams.svg" alt="" />
-                                                    </div>
-                                                </div>
-                                                <div class="cardText">
-                                                    <h3>3. Post Deployment Next Steps</h3>
-                                                    <p>Migrate to Sharepoint Server Hybrid or Sharepoint Online, and Exchange Server Hybrid or Exchange Online. Configure settings in your Admin portals.</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            </li>
                         </ul>
                     </li>
                 </ul>

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

@@ -78,7 +78,7 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse
 
 4. Select the **Immersive Reader** button.
 
-   ![Word Online's Immersive Reader](images/word_online_immersive_reader.png)
+   ![Word's Immersive Reader](images/word_online_immersive_reader.png)
 
 5. Press the **Play** button to hear text read aloud.
 
@@ -86,7 +86,7 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse
 
    | Text to Speech | Text Preferences | Grammar Options | Line Focus |
    | :------------: | :--------------: | :-------------: | :--------: |
-   | ![Word Online Text to Speech](images/wordonline_tts.png) | ![Word Online Text Preferences](images/wordonline_text_preferences.png) | ![Word Online Grammar Options](images/wordonline_grammar_options.png) | ![Word Online Line Focus](images/wordonline_line_focus.png) |
+   | ![Word Text to Speech](images/wordonline_tts.png) | ![Word Text Preferences](images/wordonline_text_preferences.png) | ![Word Grammar Options](images/wordonline_grammar_options.png) | ![Word Line Focus](images/wordonline_line_focus.png) |
 
 </br>
 </br>
@@ -182,9 +182,9 @@ Use video to create a project summary.
 
 9. Select the first card in the Storyboard (the video of the project materials) and select **Text**, type a title in, a text style, a layout, and select **Done**.
 
-10.	Select the third card in the Storyboard (the video of the children assembling the maze) and select **Trim**.  Drag the trim handle on the left to shorten the duration of the clip and select **Done**.
+10. Select the third card in the Storyboard (the video of the children assembling the maze) and select **Trim**.  Drag the trim handle on the left to shorten the duration of the clip and select **Done**.
 
-11.	Select the last card on the Storyboard and select **3D effects**.
+11. Select the last card on the Storyboard and select **3D effects**.
     1. Position the playback indicator to be roughly 1 second into the video clip, or when the boy moves down to examine the laser.
     2. Find the **lightning bolt** effect and click or drag to add it to the scene.  Rotate, scale, and position the effect so it looks like the lightning is coming out of the laser beam and hitting the black back of the mirror.
     3. Position the blue anchor over the end of the laser pointer in the video and toggle on **Attach to a point** for the lightning bolt effect to anchor the effect in the scene.

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

@@ -257,7 +257,7 @@ Follow these instructions to confirm if you configured your tenant correctly and
     3. If you added **Office 365 for Windows 10 S (Education Preview)** to the package and provisioned **Device B** with it, you need to click on one of the Office apps in the **Start** menu to complete app registration. 
 
 * [Verify the device is Azure AD joined](https://docs.microsoft.com/education/get-started/finish-setup-and-other-tasks#verify-the-device-is-azure-ad-joined) - Confirm that your devices are being managed in Intune for Education.
-* [Add more users](https://docs.microsoft.com/education/get-started/finish-setup-and-other-tasks#add-more-users) - Go to the Office 365 admin center to add more users.
+* [Add more users](https://docs.microsoft.com/education/get-started/finish-setup-and-other-tasks#add-more-users) - Go to the Microsoft 365 admin center to add more users.
 * Get app updates (including updates for Office 365 for Windows 10 S)
     1. Open the **Start** menu and go to the **Microsoft Store**.
     2. From the **Microsoft Store**, click **...** (See more) and select **Downloads and updates**.

education/trial-in-a-box/support-options.md

@@ -31,7 +31,7 @@ For more information about checking for updates, and how to optionally turn on a
 
 ## 2. Confirm your admin contact information is current
 
-1. Go to the <a href="https://portal.office.com/adminportal/home" target="_blank">Office 365 admin center</a> and sign in with your Office 365 admin credentials.
+1. Go to the <a href="https://portal.office.com/adminportal/home" target="_blank">admin center</a> and sign in with your Office 365 admin credentials.
 2. In the admin center dashboard, select your profile on the upper righthand corner and select **My account** from the options.
 3. Select **Personal info** and then edit **Contact details** to update  your phone, primary email address, and alternate email address. 
 

education/windows/deploy-windows-10-in-a-school-district.md

@@ -615,7 +615,7 @@ Now that you have created your new Office 365 Education subscription, add the do
 
 #### To add additional domains and subdomains
 
-1. In the Office 365 admin center, in the list view, click **DOMAINS**.
+1. In the admin center, in the list view, click **DOMAINS**.
 
 2. In the details pane, above the list of domains, on the menu bar, click **Add domain**.
 
@@ -867,7 +867,7 @@ Now that you have created your new Office 365 Education subscription, you need t
 
 >**Note**  If your institution has AD DS, don’t create security accounts in Office 365. Instead, create the security groups in AD DS, and then use Azure AD integration to synchronize the security groups with your Office 365 tenant.
 
-You can use the Office 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users).
+You can use the Microsoft 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users).
 
 The bulk-add process assigns the same Office 365 Education license plan to all users on the list. Therefore, you must create a separate list for each license plan you recorded in Table 9. Depending on the number of faculty members who need to use the classroom, you may want to add the faculty Office 365 accounts manually; however, use the bulk-add process to add student accounts.
 
@@ -1247,7 +1247,7 @@ You can use Windows Deployment Services in conjunction with System Center Config
 
     To support PXE boot requests, you install the PXE service point site system role. Then, you must configure one or more distribution points to respond to PXE boot request.
     For more information about how to perform this step, see [Install site system roles for System Center Configuration Manager](https://technet.microsoft.com/library/mt704036.aspx), [Use PXE to deploy Windows over the network with System Center Configuration Manager](https://technet.microsoft.com/library/mt627940.aspx), and [Configuring distribution points to accept PXE requests](https://technet.microsoft.com/library/mt627944.aspx#BKMK_PXEDistributionPoint).
-3.	Configure the appropriate boot images (Windows PE images) to deploy from the PXE-enabled distribution point.
+3. Configure the appropriate boot images (Windows PE images) to deploy from the PXE-enabled distribution point.
 
     Before a device can start a boot image from a PXE-enabled distribution point, you must change the properties of the boot image to enable PXE booting. Typically, you create this boot image when you created your MDT task sequence in the Configuration Manager console.
 
@@ -1808,7 +1808,7 @@ For more information about how to:
 For more information about how to:
 <ul>
 <li>Create or modify security groups, see <a href="https://support.office.com/en-us/article/Create-an-Office-365-Group-in-the-admin-center-74a1ef8b-3844-4d08-9980-9f8f7a36000f?ui=en-US&amp;rs=en-001&amp;ad=US" data-raw-source="[Create an Office 365 Group in the admin center](https://support.office.com/en-us/article/Create-an-Office-365-Group-in-the-admin-center-74a1ef8b-3844-4d08-9980-9f8f7a36000f?ui=en-US&amp;rs=en-001&amp;ad=US)">Create an Office 365 Group in the admin center</a>.</li>
-<li>Manage group membership, see <a href="https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a" data-raw-source="[Manage Group membership in the Office 365 admin center](https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a)">Manage Group membership in the Office 365 admin center</a>.</li>
+<li>Manage group membership, see <a href="https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a" data-raw-source="[Manage Group membership in the admin center](https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a)">Manage Group membership in the admin center</a>.</li>
 </ul>
 </td>
 <td></td>

education/windows/deploy-windows-10-in-a-school.md

@@ -249,7 +249,7 @@ Now that you have created your new Office 365 Education subscription, add the do
 
 #### To add additional domains and subdomains
 
-1. In the Office 365 admin center, in the list view, click **DOMAINS**.
+1. In the admin center, in the list view, click **DOMAINS**.
 2. In the details pane, above the list of domains, on the menu bar, click **Add domain**.
 3. In the Add a New Domain in Office 365 Wizard, on the **Verify domain wizard** page, click **Let’s get started**.
 4. On the **Verify domain** wizard page, in the **Enter a domain you already own** box, type your domain name, and then click **Next**.
@@ -490,7 +490,7 @@ You can bulk-import user and group accounts directly into Office 365, reducing t
 
 Now that you have created your new Office 365 Education subscription, you need to create user accounts. You can add user accounts for the teachers, other faculty, and students who will use the classroom.
 
-You can use the Office 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users).
+You can use the Microsoft 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users).
 
 The bulk-add process assigns the same Office 365 Education license plan to all users on the list. Therefore, you must create a separate list for each license plan you recorded in Table 2. Depending on the number of faculty members who need to use the classroom, you may want to add the faculty Office 365 accounts manually; however, use the bulk-add process to add student accounts.
 
@@ -1239,8 +1239,8 @@ For more information about how to:
 <td>Create or modify security groups and manage group membership in Office 365.<br/><br/>
 For more information about how to:
 <ul>
-<li>Create or modify security groups, see <a href="https://support.office.com/en-us/article/View-create-and-delete-groups-in-the-Office-365-admin-center-a6360120-2fc4-46af-b105-6a04dc5461c7" data-raw-source="[View, create, and delete Groups in the Office 365 admin center](https://support.office.com/en-us/article/View-create-and-delete-groups-in-the-Office-365-admin-center-a6360120-2fc4-46af-b105-6a04dc5461c7)">View, create, and delete Groups in the Office 365 admin center</a>.</li>
+<li>Create or modify security groups, see <a href="https://support.office.com/en-us/article/View-create-and-delete-groups-in-the-Office-365-admin-center-a6360120-2fc4-46af-b105-6a04dc5461c7" data-raw-source="[View, create, and delete Groups in the admin center](https://support.office.com/en-us/article/View-create-and-delete-groups-in-the-Office-365-admin-center-a6360120-2fc4-46af-b105-6a04dc5461c7)">View, create, and delete Groups in the admin center</a>.</li>
-<li>Manage group membership, see <a href="https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a" data-raw-source="[Manage Group membership in the Office 365 admin center](https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a)">Manage Group membership in the Office 365 admin center</a>.</li>
+<li>Manage group membership, see <a href="https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a" data-raw-source="[Manage Group membership in the admin center](https://support.office.com/en-us/article/Manage-Group-membership-in-the-Office-365-admin-center-e186d224-a324-4afa-8300-0e4fc0c3000a)">Manage Group membership in the admin center</a>.</li>
 </ul>
 
 </td>

education/windows/edu-deployment-recommendations.md

@@ -123,10 +123,10 @@ If you want to delete either (or both) the Skype and the Xbox accounts, here’s
 To delete a Skype account, you can follow the instructions here: [How do I close my Skype account?](https://go.microsoft.com/fwlink/?LinkId=816515)
 
 If you need help deleting the account, you can contact Skype customer service by going to the [Skype support request page](https://go.microsoft.com/fwlink/?LinkId=816519). You may need to sign in and specify a Skype account. Once you’ve signed in, you can:
-1.	Select a help topic (**Account and Password**)
+1. Select a help topic (**Account and Password**)
-2.	Select a related problem (**Deleting an account**)
+2. Select a related problem (**Deleting an account**)
-3.	Click **Next**.
+3. Click **Next**.
-4.	Select a contact method to get answers to your questions.
+4. Select a contact method to get answers to your questions.
 
 
 #### Xbox

education/windows/teacher-get-minecraft.md

@@ -49,9 +49,9 @@ You can purchase individual Minecraft: Education Edition subscriptions for you a
 
 To purchase individual Minecraft: Education Edition subscriptions (i.e. direct purchase):
 
-1.	Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com/) with your Office 365 account.
+1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com/) with your Office 365 account.
-2.	Click on [Minecraft: Education Edition](https://educationstore.microsoft.com/en-us/store/details/minecraft-education-edition/9nblggh4r2r6) (or use Search the Store to find it)
+2. Click on [Minecraft: Education Edition](https://educationstore.microsoft.com/en-us/store/details/minecraft-education-edition/9nblggh4r2r6) (or use Search the Store to find it)
-3.	Click **Buy**
+3. Click **Buy**
 
 >[!Note]
 >Administrators can restrict the ability for teachers to purchase applications in the Microsoft Store for Education. If you do not have the ability to Buy, contact your school administration or IT administrator.

it-client

@@ -1 +0,0 @@
-Subproject commit 61e0a21977430f3c0eef1c32e398999dc090c332

mdop/appv-v4/delete-package.md

@@ -19,7 +19,7 @@ ms.date: 06/16/2016
 
 Removes a package record and the applications associated with it.
 
-` SFTMIME DELETE PACKAGE:package-name                 [/LOG log-pathname | /CONSOLE | /GUI]`
+`SFTMIME DELETE PACKAGE:package-name                 [/LOG log-pathname | /CONSOLE | /GUI]`
 
 <table>
 <colgroup>

mdop/appv-v4/sfttray-command-reference.md

@@ -31,23 +31,23 @@ There is only one Application Virtualization Client Tray instance for each user
 
 
 
-`     Sfttray.exe /?`
+`Sfttray.exe /?`
 
 ### Command Usage
 
-`     Sfttray.exe [/HIDE | /SHOW]`
+`Sfttray.exe [/HIDE | /SHOW]`
 
-`     Sfttray.exe [/HIDE | /SHOW] [/QUIET] [/EXE alternate-exe] /LAUNCH app [args]`
+`Sfttray.exe [/HIDE | /SHOW] [/QUIET] [/EXE alternate-exe] /LAUNCH app [args]`
 
-`     Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LOAD app [/SFTFILE sft]`
+`Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LOAD app [/SFTFILE sft]`
 
-`     Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LOADALL`
+`Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LOADALL`
 
-`     Sfttray.exe [/HIDE | /SHOW] [/QUIET] /REFRESHALL`
+`Sfttray.exe [/HIDE | /SHOW] [/QUIET] /REFRESHALL`
 
-`     Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LAUNCHRESULT <UNIQUE ID>  /LAUNCH app [args]`
+`Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LAUNCHRESULT <UNIQUE ID>  /LAUNCH app [args]`
 
-`     Sfttray.exe /EXIT`
+`Sfttray.exe /EXIT`
 
 ### Command-Line Switches
 

mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer.md

@@ -51,21 +51,16 @@ Use the following procedure to install the publishing server on a separate compu
 
 9. To verify if the publishing server is running correctly, you should import a package to the management server, entitle the package to an AD group, and publish the package. Using an internet browser, open the following URL: <strong>http://publishingserver:pubport</strong>. If the server is running correctly information similar to the following will be displayed:
 
-   `<Publishing Protocol="1.0">`
+   ```xml
-
+   <Publishing Protocol="1.0">
-   `  <Packages>`
+     <Packages>
-
+       <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" VersionId="5d03c08f-51dc-4026-8cf9-15ebe3d65a72" PackageUrl="\\server\share\file.appv" />
-   `  <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" VersionId="5d03c08f-51dc-4026-8cf9-15ebe3d65a72" PackageUrl="\\server\share\file.appv" />`
+     </Packages>
-
+     <NoGroup>
-   `  </Packages>`
+       <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" />
-
+     </NoGroup>
-   `  <NoGroup>`
+   </Publishing>
-
+   ```
-   `  <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" />`
-
-   `  </NoGroup>`
-
-   `</Publishing>`
 
    **Got a suggestion for App-V**? Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). **Got an App-V issue?** Use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/home?forum=mdopappv).
 

mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer51.md

@@ -51,21 +51,16 @@ Use the following procedure to install the publishing server on a separate compu
 
 9. To verify if the publishing server is running correctly, you should import a package to the management server, entitle the package to an AD group, and publish the package. Using an internet browser, open the following URL: <strong>http://publishingserver:pubport</strong>. If the server is running correctly information similar to the following will be displayed:
 
-   `<Publishing Protocol="1.0">`
+   ```xml
-
+   <Publishing Protocol="1.0">
-   `  <Packages>`
+     <Packages>
-
+       <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" VersionId="5d03c08f-51dc-4026-8cf9-15ebe3d65a72" PackageUrl="\\server\share\file.appv" />
-   `  <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" VersionId="5d03c08f-51dc-4026-8cf9-15ebe3d65a72" PackageUrl="\\server\share\file.appv" />`
+     </Packages>
-
+     <NoGroup>
-   `  </Packages>`
+       <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" />
-
+     </NoGroup>
-   `  <NoGroup>`
+   </Publishing>
-
+   ```
-   `  <Package PackageId="28115343-06e2-44dc-a327-3a0b9b868bda" />`
-
-   `  </NoGroup>`
-
-   `</Publishing>`
 
    **Got a suggestion for App-V**? Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). **Got an App-V issue?** Use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/home?forum=mdopappv).
 

mdop/mbam-v1/how-to-move-mbam-10-features-to-another-computer.md

@@ -88,49 +88,55 @@ You can use the following procedure to move the MBAM Recovery and Hardware Datab
 
     Modify the MBAM Recovery and Hardware Database to use the full recovery mode.
 
-    `USE master;`
+    ```sql
+    USE master;
 
-    `GO`
+    GO
 
-    `ALTER DATABASE "MBAM Recovery and Hardware"`
+    ALTER DATABASE "MBAM Recovery and Hardware"
 
-    `   SET RECOVERY FULL;`
+       SET RECOVERY FULL;
 
-    `GO`
+    GO
+    ```
 
     Create MBAM Recovery and Hardware Database Data and MBAM Recovery logical backup devices.
 
-    `USE master`
+    ```sql
+    USE master
 
-    `GO`
+    GO
 
-    `EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device',`
+    EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device',
 
-    `'Z:\MBAM Recovery and Hardware Database Data.bak';`
+    'Z:\MBAM Recovery and Hardware Database Data.bak';
 
-    `GO`
+    GO
+    ```
 
     Back up the full MBAM Recovery and Hardware database.
 
-    `BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device];`
+    ```sql
+    BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device];
 
-    `GO`
+    GO
 
-    `BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate]`
+    BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate]
 
-    `TO FILE = 'Z:\SQLServerInstanceCertificateFile'`
+    TO FILE = 'Z:\SQLServerInstanceCertificateFile'
 
-    `WITH PRIVATE KEY`
+    WITH PRIVATE KEY
 
-    `(`
+    (
 
-    `    FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',`
+        FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',
 
-    `    ENCRYPTION BY PASSWORD = '$PASSWORD$'`
+        ENCRYPTION BY PASSWORD = '$PASSWORD$'
 
-    `);`
+    );
 
-    `GO`
+    GO
+    ```
 
     **Note**  
     Replace the values from the preceding example with those that match your environment:
@@ -181,43 +187,51 @@ You can use the following procedure to move the MBAM Recovery and Hardware Datab
 
 4.  To automate this procedure, create a SQL file (.sql) that contains the following SQL script:
 
-    `-- Restore MBAM Recovery and Hardware Database. `
+    ```sql
+    -- Restore MBAM Recovery and Hardware Database. 
 
-    `USE master`
+    USE master
 
-    `GO`
+    GO
+    ```
 
     Drop the certificate created by MBAM Setup.
 
-    `DROP CERTIFICATE [MBAM Recovery Encryption Certificate]`
+    ```sql
+    DROP CERTIFICATE [MBAM Recovery Encryption Certificate]
 
-    `GO`
+    GO
+    ```
 
     Add certificate
 
-    `CREATE CERTIFICATE [MBAM Recovery Encryption Certificate]`
+    ```sql
+    CREATE CERTIFICATE [MBAM Recovery Encryption Certificate]
 
-    `FROM FILE = 'Z: \SQLServerInstanceCertificateFile'`
+    FROM FILE = 'Z: \SQLServerInstanceCertificateFile'
 
-    `WITH PRIVATE KEY`
+    WITH PRIVATE KEY
 
-    `(`
+    (
 
-    `    FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',`
+        FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',
 
-    `    DECRYPTION BY PASSWORD = '$PASSWORD$'`
+        DECRYPTION BY PASSWORD = '$PASSWORD$'
 
-    `);`
+    );
 
-    `GO`
+    GO
+    ```
 
     Restore the MBAM Recovery and Hardware database data and the log files.
 
-    `RESTORE DATABASE [MBAM Recovery and Hardware]`
+    ```sql
+    RESTORE DATABASE [MBAM Recovery and Hardware]
 
-    `   FROM DISK = 'Z:\MBAM Recovery and Hardware Database Data.bak'`
+       FROM DISK = 'Z:\MBAM Recovery and Hardware Database Data.bak'
 
-    `   WITH REPLACE`
+       WITH REPLACE
+    ```
 
     **Note**  
     Replace the values from the preceding example with those that match your environment:
@@ -354,35 +368,37 @@ If you choose to move the MBAM Compliance Status Database feature from one compu
 
 2.  To automate this procedure, create a SQL file (.sql) that contains the following-SQL script:
 
-    `-- Modify the MBAM Compliance Status Database to use the full recovery model.`
+    ```sql
+    -- Modify the MBAM Compliance Status Database to use the full recovery model.
 
-    `USE master;`
+    USE master;
 
-    `GO`
+    GO
 
-    `ALTER DATABASE "MBAM Compliance Status"`
+    ALTER DATABASE "MBAM Compliance Status"
 
-    `   SET RECOVERY FULL;`
+       SET RECOVERY FULL;
 
-    `GO`
+    GO
 
-    `-- Create MBAM Compliance Status Data logical backup devices.`
+    -- Create MBAM Compliance Status Data logical backup devices.
 
-    `USE master`
+    USE master
 
-    `GO`
+    GO
 
-    `EXEC sp_addumpdevice 'disk', 'MBAM Compliance Status Database Data Device',`
+    EXEC sp_addumpdevice 'disk', 'MBAM Compliance Status Database Data Device',
 
-    `'Z: \MBAM Compliance Status Database Data.bak';`
+    'Z: \MBAM Compliance Status Database Data.bak';
 
-    `GO`
+    GO
 
     -- Back up the full MBAM Recovery and Hardware database.
 
-    `BACKUP DATABASE [MBAM Compliance Status] TO [MBAM Compliance Status Database Data Device];`
+    BACKUP DATABASE [MBAM Compliance Status] TO [MBAM Compliance Status Database Data Device];
 
-    `GO`
+    GO
+    ```
 
 3.  Run the SQL file with a command that is similar to the following one, by using the SQL Server PowerShell:
 
@@ -422,19 +438,21 @@ If you choose to move the MBAM Compliance Status Database feature from one compu
 
 3.  To automate this procedure, create a SQL file (.sql) that contains the following-SQL script:
 
-    `-- Create MBAM Compliance Status Database Data logical backup devices. `
+    ```sql
+    -- Create MBAM Compliance Status Database Data logical backup devices. 
 
-    `Use master`
+    Use master
 
-    `GO`
+    GO
 
     -- Restore the MBAM Compliance Status database data files.
 
-    `RESTORE DATABASE [MBAM Compliance Status Database]`
+    RESTORE DATABASE [MBAM Compliance Status Database]
 
-    `   FROM DISK = 'C:\test\MBAM Compliance Status Database Data.bak'`
+       FROM DISK = 'C:\test\MBAM Compliance Status Database Data.bak'
 
-    `   WITH REPLACE`
+       WITH REPLACE
+    ```
 
 4.  Run the SQL File with a command that is similar to the following one, by using the SQL Server PowerShell:
 

mdop/mbam-v2/how-to-move-mbam-20-features-to-another-computer-mbam-2.md

@@ -88,49 +88,51 @@ To move the Recovery Database from one computer to another (for example, from Se
 
     Modify the MBAM Recovery Database to use the full recovery mode.
 
-    `USE master;`
+    ```sql
+    USE master;
 
-    `GO`
+    GO
 
-    `ALTER DATABASE "MBAM Recovery and Hardware"`
+    ALTER DATABASE "MBAM Recovery and Hardware"
 
-    `   SET RECOVERY FULL;`
+       SET RECOVERY FULL;
 
-    `GO`
+    GO
 
     -- Create MBAM Recovery Database Data and MBAM Recovery logical backup devices.
 
-    `USE master`
+    USE master
 
-    `GO`
+    GO
 
-    `EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device',`
+    EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device',
 
-    `'Z:\MBAM Recovery Database Data.bak';`
+    'Z:\MBAM Recovery Database Data.bak';
 
-    `GO`
+    GO
 
     -- Back up the full MBAM Recovery Database.
 
-    `BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device];`
+    BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device];
 
-    `GO`
+    GO
 
-    `BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate]`
+    BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate]
 
-    `TO FILE = 'Z:\SQLServerInstanceCertificateFile'`
+    TO FILE = 'Z:\SQLServerInstanceCertificateFile'
 
-    `WITH PRIVATE KEY`
+    WITH PRIVATE KEY
 
-    `(`
+    (
 
-    `    FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',`
+        FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',
 
-    `    ENCRYPTION BY PASSWORD = '$PASSWORD$'`
+        ENCRYPTION BY PASSWORD = '$PASSWORD$'
 
-    `);`
+    );
 
-    `GO`
+    GO
+    ```
 
     **Note**  
     Replace the following values in the example above with those that match your environment:
@@ -183,43 +185,45 @@ To move the Recovery Database from one computer to another (for example, from Se
 
 4.  To automate this procedure, create a SQL file (.sql) that contains the following-SQL script:
 
-    `-- Restore MBAM Recovery Database. `
+    ```sql
+    -- Restore MBAM Recovery Database. 
 
-    `USE master`
+    USE master
 
-    `GO`
+    GO
 
     -- Drop certificate created by MBAM Setup.
 
-    `DROP CERTIFICATE [MBAM Recovery Encryption Certificate]`
+    DROP CERTIFICATE [MBAM Recovery Encryption Certificate]
 
-    `GO`
+    GO
 
     --Add certificate
 
-    `CREATE CERTIFICATE [MBAM Recovery Encryption Certificate]`
+    CREATE CERTIFICATE [MBAM Recovery Encryption Certificate]
 
-    `FROM FILE = 'Z: \SQLServerInstanceCertificateFile'`
+    FROM FILE = 'Z: \SQLServerInstanceCertificateFile'
 
-    `WITH PRIVATE KEY`
+    WITH PRIVATE KEY
 
-    `(`
+    (
 
-    `    FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',`
+        FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey',
 
-    `    DECRYPTION BY PASSWORD = '$PASSWORD$'`
+        DECRYPTION BY PASSWORD = '$PASSWORD$'
 
-    `);`
+    );
 
-    `GO`
+    GO
 
     -- Restore the MBAM Recovery Database data and log files.
 
-    `RESTORE DATABASE [MBAM Recovery and Hardware]`
+    RESTORE DATABASE [MBAM Recovery and Hardware]
 
-    `   FROM DISK = 'Z:\MBAM Recovery Database Data.bak'`
+       FROM DISK = 'Z:\MBAM Recovery Database Data.bak'
 
-    `   WITH REPLACE`
+       WITH REPLACE
+    ```
 
     **Note**  
     Replace the following values in the example above with those that match your environment:
@@ -362,35 +366,37 @@ If you want to move the MBAM Compliance and Audit Database from one computer to
 
 2.  To automate this procedure, create a SQL file (.sql) that contains the following-SQL script:
 
-    `-- Modify the MBAM Compliance Status Database to use the full recovery model.`
+    ```sql
+    -- Modify the MBAM Compliance Status Database to use the full recovery model.
 
-    `USE master;`
+    USE master;
 
-    `GO`
+    GO
 
-    `ALTER DATABASE "MBAM Compliance Status"`
+    ALTER DATABASE "MBAM Compliance Status"
 
-    `   SET RECOVERY FULL;`
+       SET RECOVERY FULL;
 
-    `GO`
+    GO
 
-    `-- Create MBAM Compliance Status Data logical backup devices.`
+    -- Create MBAM Compliance Status Data logical backup devices.
 
-    `USE master`
+    USE master
 
-    `GO`
+    GO
 
-    `EXEC sp_addumpdevice 'disk', 'MBAM Compliance Status Database Data Device',`
+    EXEC sp_addumpdevice 'disk', 'MBAM Compliance Status Database Data Device',
 
-    `'Z: \MBAM Compliance Status Database Data.bak';`
+    'Z: \MBAM Compliance Status Database Data.bak';
 
-    `GO`
+    GO
 
     -- Back up the full MBAM Recovery database.
 
-    `BACKUP DATABASE [MBAM Compliance Status] TO [MBAM Compliance Status Database Data Device];`
+    BACKUP DATABASE [MBAM Compliance Status] TO [MBAM Compliance Status Database Data Device];
 
-    `GO`
+    GO
+    ```
 
 3.  Run the SQL file by using a Windows PowerShell command line that is similar to the following:
 
@@ -430,19 +436,21 @@ If you want to move the MBAM Compliance and Audit Database from one computer to
 
 3.  To automate this procedure, create a SQL file (.sql) that contains the following-SQL script:
 
-    `-- Create MBAM Compliance Status Database Data logical backup devices. `
+    ```sql
+    -- Create MBAM Compliance Status Database Data logical backup devices. 
 
-    `Use master`
+    Use master
 
-    `GO`
+    GO
 
     -- Restore the MBAM Compliance Status database data files.
 
-    `RESTORE DATABASE [MBAM Compliance Status]`
+    RESTORE DATABASE [MBAM Compliance Status]
 
-    `   FROM DISK = 'C:\test\MBAM Compliance Status Database Data.bak'`
+       FROM DISK = 'C:\test\MBAM Compliance Status Database Data.bak'
 
-    `   WITH REPLACE`
+       WITH REPLACE
+    ```
 
 4.  Run the SQL File by using a Windows PowerShell command line that is similar to the following:
 

mdop/mbam-v25/TOC.md

@@ -83,6 +83,7 @@
 #### [Monitoring Web Service Request Performance Counters](monitoring-web-service-request-performance-counters.md)
 ### [Using Windows PowerShell to Administer MBAM 2.5](using-windows-powershell-to-administer-mbam-25.md)
 ## [Troubleshooting MBAM 2.5](troubleshooting-mbam-25.md)
+## [Applying hotfixes on MBAM 2.5 SP1](apply-hotfix-for-mbam-25-sp1.md)
 ## [Technical Reference for MBAM 2.5](technical-reference-for-mbam-25.md)
 ### [Client Event Logs](client-event-logs.md)
 ### [Server Event Logs](server-event-logs.md)

mdop/uev-v2/application-template-schema-reference-for-ue-v-2x-both-uevv2.md

@@ -240,7 +240,7 @@ Version identifies the version of the settings location template for administrat
 
 **Hint:** You can save notes about version changes using XML comment tags `<!-- -->`, for example:
 
-``` syntax
+```xml
   <!--
      Version History
 
@@ -279,25 +279,25 @@ Author identifies the creator of the settings location template. Two optional ch
 
 Processes contains at least one `<Process>` element, which in turn contains the following child elements: **Filename**, **Architecture**, **ProductName**, **FileDescription**, **ProductVersion**, and **FileVersion**. The Filename child element is mandatory and the others are optional. A fully populated element contains tags similar to this example:
 
-``` syntax
+```xml
-    <Process>
+<Process>
-      <Filename>MyApplication.exe</Filename>
+  <Filename>MyApplication.exe</Filename>
-      <Architecture>Win64</Architecture>
+  <Architecture>Win64</Architecture>
-      <ProductName> MyApplication </ProductName>
+  <ProductName> MyApplication </ProductName>
-      <FileDescription>MyApplication.exe</FileDescription>
+  <FileDescription>MyApplication.exe</FileDescription>
-      <ProductVersion>
+  <ProductVersion>
-        <Major Minimum="2" Maximum="2" />
+    <Major Minimum="2" Maximum="2" />
-        <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        <Build Minimum="0" Maximum="0" />
+    <Build Minimum="0" Maximum="0" />
-        <Patch Minimum="5" Maximum="5" />
+    <Patch Minimum="5" Maximum="5" />
-      </ProductVersion>
+  </ProductVersion>
-      <FileVersion>
+  <FileVersion>
-        <Major Minimum="2" Maximum="2" />
+    <Major Minimum="2" Maximum="2" />
-        <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        <Build Minimum="0" Maximum="0" />
+    <Build Minimum="0" Maximum="0" />
-        <Patch Minimum="5" Maximum="5" />
+    <Patch Minimum="5" Maximum="5" />
-      </FileVersion>
+  </FileVersion>
-    </Process>
+</Process>
 ```
 
 ### Filename
@@ -354,14 +354,14 @@ UE-V does not support ARM processors in this version.
 
 ProductName is an optional element used to identify a product for administrative purposes or reporting. ProductName differs from Filename in that there are no regular expression restrictions on its value. This allows for more easily understood descriptions of a process where the executable name may not be obvious. For example:
 
-``` syntax
+```xml
-    <Process>
+<Process>
-      <Filename>MyApplication.exe</Filename>
+  <Filename>MyApplication.exe</Filename>
-      <ProductName>My Application 6.x by Contoso.com</ProductName>
+  <ProductName>My Application 6.x by Contoso.com</ProductName>
-      <ProductVersion>
+  <ProductVersion>
-        <Major Minimum="6" Maximum="6" />
+    <Major Minimum="6" Maximum="6" />
-      </ProductVersion>
+  </ProductVersion>
-    </Process>
+</Process>
 ```
 
 ### FileDescription
@@ -374,23 +374,22 @@ FileDescription is an optional tag that allows for an administrative description
 
 For example, in a suited application, it might be useful to provide reminders about the function of two executables (MyApplication.exe and MyApplicationHelper.exe), as shown here:
 
-``` syntax
+```xml
 <Processes>
-
+  <Process>
-   <Process>
+    <Filename>MyApplication.exe</Filename>
-      <Filename>MyApplication.exe</Filename>
+    <FileDescription>My Application Main Engine</ FileDescription>
-      <FileDescription>My Application Main Engine</ FileDescription>
+    <ProductVersion>
-      <ProductVersion>
+      <Major Minimum="6" Maximum="6" />
-        <Major Minimum="6" Maximum="6" />
+    </ProductVersion>
-      </ProductVersion>
+  </Process>
-    </Process>
+  <Process>
-    <Process>
+    <Filename>MyApplicationHelper.exe</Filename>
-      <Filename>MyApplicationHelper.exe</Filename>
+    <FileDescription>My Application Background Process Executable</FileDescription>
-      <FileDescription>My Application Background Process Executable</FileDescription>
+    <ProductVersion>
-      <ProductVersion>
+      <Major Minimum="6" Maximum="6" />
-        <Major Minimum="6" Maximum="6" />
+    </ProductVersion>
-      </ProductVersion>
+  </Process>
-    </Process>
 </Processes>
 ```
 
@@ -408,44 +407,44 @@ The product and file version elements may be left unspecified. Doing so makes th
 
 Product version: 1.0 specified in the UE-V Generator produces the following XML:
 
-``` syntax
+```xml
-      <ProductVersion>
+<ProductVersion>
-        <Major Minimum="1" Maximum="1" />
+  <Major Minimum="1" Maximum="1" />
-        <Minor Minimum="0" Maximum="0" />
+  <Minor Minimum="0" Maximum="0" />
-      </ProductVersion>
+</ProductVersion>
 ```
 
 **Example 2:**
 
 File version: 5.0.2.1000 specified in the UE-V Generator produces the following XML:
 
-``` syntax
+```xml
-      <FileVersion>
+<FileVersion>
-        <Major Minimum="5" Maximum="5" />
+  <Major Minimum="5" Maximum="5" />
-        <Minor Minimum="0" Maximum="0" />
+  <Minor Minimum="0" Maximum="0" />
-        <Build Minimum="2" Maximum="2" />
+  <Build Minimum="2" Maximum="2" />
-        <Patch Minimum="1000" Maximum="1000" />
+  <Patch Minimum="1000" Maximum="1000" />
-      </FileVersion>
+</FileVersion>
 ```
 
 **Incorrect Example 1 – incomplete range:**
 
 Only the Minimum attribute is present. Maximum must be included in a range as well.
 
-``` syntax
+```xml
-      <ProductVersion>
+<ProductVersion>
-        <Major Minimum="2" />
+  <Major Minimum="2" />
-      </ProductVersion>
+</ProductVersion>
 ```
 
 **Incorrect Example 2 – Minor specified without Major element:**
 
 Only the Minor element is present. Major must be included as well.
 
-``` syntax
+```xml
-      <ProductVersion>
+<ProductVersion>
-        <Minor Minimum="0" Maximum="0" />
+  <Minor Minimum="0" Maximum="0" />
-      </ProductVersion>
+</ProductVersion>
 ```
 
 ### FileVersion
@@ -462,19 +461,19 @@ Including a FileVersion element for an application allows for more granular fine
 
 The child elements and syntax rules for FileVersion are identical to those of ProductVersion.
 
-``` syntax
+```xml
-      <Process>
+<Process>
-        <Filename>MSACCESS.EXE</Filename>
+  <Filename>MSACCESS.EXE</Filename>
-        <Architecture>Win32</Architecture>
+  <Architecture>Win32</Architecture>
-        <ProductVersion>
+  <ProductVersion>
-          <Major Minimum="14" Maximum="14" />
+    <Major Minimum="14" Maximum="14" />
-          <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        </ProductVersion>
+  </ProductVersion>
-        <FileVersion>
+  <FileVersion>
-          <Major Minimum="14" Maximum="14" />
+    <Major Minimum="14" Maximum="14" />
-          <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        </FileVersion>
+  </FileVersion>
-      </Process>
+</Process>
 ```
 
 ### <a href="" id="application21"></a>Application Element
@@ -1177,16 +1176,16 @@ Version identifies the version of the settings location template for administrat
 
 **Hint:** You can save notes about version changes using XML comment tags `<!-- -->`, for example:
 
-``` syntax
+```xml
-  <!--
+<!--
-     Version History
+    Version History
 
-     Version 1 Jul 05, 2012 Initial template created by Generator - Denise@Contoso.com
+    Version 1 Jul 05, 2012 Initial template created by Generator - Denise@Contoso.com
-     Version 2 Jul 31, 2012 Added support for app.exe v2.1.3 - Mark@Contoso.com
+    Version 2 Jul 31, 2012 Added support for app.exe v2.1.3 - Mark@Contoso.com
-     Version 3 Jan 01, 2013 Added font settings support - Mark@Contoso.com
+    Version 3 Jan 01, 2013 Added font settings support - Mark@Contoso.com
-     Version 4 Jan 31, 2013 Added support for plugin settings - Tony@Contoso.com
+    Version 4 Jan 31, 2013 Added support for plugin settings - Tony@Contoso.com
-   -->
+  -->
-  <Version>4</Version>
+<Version>4</Version>
 ```
 
 **Important**  
@@ -1216,25 +1215,25 @@ Author identifies the creator of the settings location template. Two optional ch
 
 Processes contains at least one `<Process>` element, which in turn contains the following child elements: **Filename**, **Architecture**, **ProductName**, **FileDescription**, **ProductVersion**, and **FileVersion**. The Filename child element is mandatory and the others are optional. A fully populated element contains tags similar to this example:
 
-``` syntax
+```xml
-    <Process>
+<Process>
-      <Filename>MyApplication.exe</Filename>
+  <Filename>MyApplication.exe</Filename>
-      <Architecture>Win64</Architecture>
+  <Architecture>Win64</Architecture>
-      <ProductName> MyApplication </ProductName>
+  <ProductName> MyApplication </ProductName>
-      <FileDescription>MyApplication.exe</FileDescription>
+  <FileDescription>MyApplication.exe</FileDescription>
-      <ProductVersion>
+  <ProductVersion>
-        <Major Minimum="2" Maximum="2" />
+    <Major Minimum="2" Maximum="2" />
-        <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        <Build Minimum="0" Maximum="0" />
+    <Build Minimum="0" Maximum="0" />
-        <Patch Minimum="5" Maximum="5" />
+    <Patch Minimum="5" Maximum="5" />
-      </ProductVersion>
+  </ProductVersion>
-      <FileVersion>
+  <FileVersion>
-        <Major Minimum="2" Maximum="2" />
+    <Major Minimum="2" Maximum="2" />
-        <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        <Build Minimum="0" Maximum="0" />
+    <Build Minimum="0" Maximum="0" />
-        <Patch Minimum="5" Maximum="5" />
+    <Patch Minimum="5" Maximum="5" />
-      </FileVersion>
+  </FileVersion>
-    </Process>
+</Process>
 ```
 
 ### Filename
@@ -1291,14 +1290,14 @@ UE-V does not support ARM processors in this version.
 
 ProductName is an optional element used to identify a product for administrative purposes or reporting. ProductName differs from Filename in that there are no regular expression restrictions on its value. This allows for more easily understood descriptions of a process where the executable name may not be obvious. For example:
 
-``` syntax
+```xml
-    <Process>
+<Process>
-      <Filename>MyApplication.exe</Filename>
+  <Filename>MyApplication.exe</Filename>
-      <ProductName>My Application 6.x by Contoso.com</ProductName>
+  <ProductName>My Application 6.x by Contoso.com</ProductName>
-      <ProductVersion>
+  <ProductVersion>
-        <Major Minimum="6" Maximum="6" />
+    <Major Minimum="6" Maximum="6" />
-      </ProductVersion>
+  </ProductVersion>
-    </Process>
+</Process>
 ```
 
 ### FileDescription
@@ -1311,23 +1310,22 @@ FileDescription is an optional tag that allows for an administrative description
 
 For example, in a suited application, it might be useful to provide reminders about the function of two executables (MyApplication.exe and MyApplicationHelper.exe), as shown here:
 
-``` syntax
+```xml
 <Processes>
-
+  <Process>
-   <Process>
+    <Filename>MyApplication.exe</Filename>
-      <Filename>MyApplication.exe</Filename>
+    <FileDescription>My Application Main Engine</ FileDescription>
-      <FileDescription>My Application Main Engine</ FileDescription>
+    <ProductVersion>
-      <ProductVersion>
+      <Major Minimum="6" Maximum="6" />
-        <Major Minimum="6" Maximum="6" />
+    </ProductVersion>
-      </ProductVersion>
+  </Process>
-    </Process>
+  <Process>
-    <Process>
+    <Filename>MyApplicationHelper.exe</Filename>
-      <Filename>MyApplicationHelper.exe</Filename>
+    <FileDescription>My Application Background Process Executable</FileDescription>
-      <FileDescription>My Application Background Process Executable</FileDescription>
+    <ProductVersion>
-      <ProductVersion>
+      <Major Minimum="6" Maximum="6" />
-        <Major Minimum="6" Maximum="6" />
+    </ProductVersion>
-      </ProductVersion>
+  </Process>
-    </Process>
 </Processes>
 ```
 
@@ -1345,44 +1343,44 @@ The product and file version elements may be left unspecified. Doing so makes th
 
 Product version: 1.0 specified in the UE-V Generator produces the following XML:
 
-``` syntax
+```xml
-      <ProductVersion>
+<ProductVersion>
-        <Major Minimum="1" Maximum="1" />
+  <Major Minimum="1" Maximum="1" />
-        <Minor Minimum="0" Maximum="0" />
+  <Minor Minimum="0" Maximum="0" />
-      </ProductVersion>
+</ProductVersion>
 ```
 
 **Example 2:**
 
 File version: 5.0.2.1000 specified in the UE-V Generator produces the following XML:
 
-``` syntax
+```xml
-      <FileVersion>
+<FileVersion>
-        <Major Minimum="5" Maximum="5" />
+  <Major Minimum="5" Maximum="5" />
-        <Minor Minimum="0" Maximum="0" />
+  <Minor Minimum="0" Maximum="0" />
-        <Build Minimum="2" Maximum="2" />
+  <Build Minimum="2" Maximum="2" />
-        <Patch Minimum="1000" Maximum="1000" />
+  <Patch Minimum="1000" Maximum="1000" />
-      </FileVersion>
+</FileVersion>
 ```
 
 **Incorrect Example 1 – incomplete range:**
 
 Only the Minimum attribute is present. Maximum must be included in a range as well.
 
-``` syntax
+```xml
-      <ProductVersion>
+<ProductVersion>
-        <Major Minimum="2" />
+  <Major Minimum="2" />
-      </ProductVersion>
+</ProductVersion>
 ```
 
 **Incorrect Example 2 – Minor specified without Major element:**
 
 Only the Minor element is present. Major must be included as well.
 
-``` syntax
+```xml
-      <ProductVersion>
+<ProductVersion>
-        <Minor Minimum="0" Maximum="0" />
+  <Minor Minimum="0" Maximum="0" />
-      </ProductVersion>
+</ProductVersion>
 ```
 
 ### FileVersion
@@ -1399,19 +1397,19 @@ Including a FileVersion element for an application allows for more granular fine
 
 The child elements and syntax rules for FileVersion are identical to those of ProductVersion.
 
-``` syntax
+```xml
-      <Process>
+<Process>
-        <Filename>MSACCESS.EXE</Filename>
+  <Filename>MSACCESS.EXE</Filename>
-        <Architecture>Win32</Architecture>
+  <Architecture>Win32</Architecture>
-        <ProductVersion>
+  <ProductVersion>
-          <Major Minimum="14" Maximum="14" />
+    <Major Minimum="14" Maximum="14" />
-          <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        </ProductVersion>
+  </ProductVersion>
-        <FileVersion>
+  <FileVersion>
-          <Major Minimum="14" Maximum="14" />
+    <Major Minimum="14" Maximum="14" />
-          <Minor Minimum="0" Maximum="0" />
+    <Minor Minimum="0" Maximum="0" />
-        </FileVersion>
+  </FileVersion>
-      </Process>
+</Process>
 ```
 
 ### <a href="" id="application"></a>Application Element

smb/cloud-mode-business-setup.md

@@ -40,7 +40,7 @@ Go to the <a href="https://business.microsoft.com" target="_blank">Microsoft Bus
 Here's a few things to keep in mind before you get started:
 - You'll need a registered domain to successfully go through the walkthrough.
   - If you already own a domain, you can add this during the Office 365 setup.
-  - If you don't already own a domain, you'll have the option to purchase a domain from the Office 365 admin center. We'll show how to do this as part of the walkthrough.
+  - If you don't already own a domain, you'll have the option to purchase a domain from the Microsoft 365 admin center. We'll show how to do this as part of the walkthrough.
 - You'll need an email address to create your Office 365 tenant.
 - We recommend that you use Internet Explorer for the entire walkthrough. Right click on Internet Explorer and then choose **Start InPrivate Browsing**.
 
@@ -79,22 +79,22 @@ If this is the first time you're setting this up, and you'd like to see how it's
    ![Office 365 portal](images/office365_portal.png)
 
 
-6. Select the **Admin** tile to go to the Office 365 admin center.
+6. Select the **Admin** tile to go to the admin center.
 7. In the admin center, click **Next** to see the highlights and welcome info for the admin center. When you're done, click **Go to setup** to complete the Office 365 setup.
 
    This may take up to a half hour to complete.
   
-   **Figure 3** - Office 365 admin center
+   **Figure 3** - Admin center
 
-   ![Office 365 admin center](images/office365_admin_portal.png)
+   ![Microsoft 365 admin center](images/office365_admin_portal.png)
 
 
-8. Go back to the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">Office 365 admin center</a> to add or buy a domain.
+8. Go back to the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">admin center</a> to add or buy a domain.
    1. Select the **Domains** option.
 
       **Figure 4** - Option to add or buy a domain
 
-      ![Add or buy a domain in Office 365 admin center](images/office365_buy_domain.png)
+      ![Add or buy a domain in admin center](images/office365_buy_domain.png)
     
 
    2. In the **Home > Domains** page, you will see the Microsoft-provided domain, such as *fabrikamdesign.onmicrosoft.com*.
@@ -110,16 +110,16 @@ If this is the first time you're setting this up, and you'd like to see how it's
 
       **Figure 6** - Domains
 
-      ![Verify your domains in Office 365 admin center](images/office365_additional_domain.png)
+      ![Verify your domains in the admin center](images/office365_additional_domain.png)
 
 ### 1.2 Add users and assign product licenses
-Once you've set up Office and added your domain, it's time to add users so they have access to Office 365. People in your organization need an account before they can sign in and access Office 365. The easiest way to add users is to add them one at a time in the Office 365 admin center.
+Once you've set up Office and added your domain, it's time to add users so they have access to Office 365. People in your organization need an account before they can sign in and access Office 365. The easiest way to add users is to add them one at a time in the Microsoft 365 admin center.
 
 When adding users, you can also assign admin privileges to certain users in your team. You'll also want to assign **Product licenses** to each user so that subscriptions can be assigned to the person.
 
 **To add users and assign product licenses**
 
-1. In the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">Office 365 admin center</a>, select **Users > Active users**.
+1. In the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">admin center</a>, select **Users > Active users**.
 
    **Figure 7** - Add users
 
@@ -128,7 +128,7 @@ When adding users, you can also assign admin privileges to certain users in your
 2. In the **Home > Active users** page, add users individually or in bulk.
    - To add users one at a time, select **+ Add a user**.
 
-     If you select this option, you'll see the **New user** screen and you can add details about the new user including their name, user name, role, and so on. You also have the opportunity to assign **Product licenses**. For detailed step-by-step info on adding a user account, see *Add a user account in the Office 365 admin center* in <a href="https://support.office.com/en-us/article/Add-users-individually-or-in-bulk-to-Office-365-Admin-Help-1970f7d6-03b5-442f-b385-5880b9c256ec" target="_blank">Add users individually or in bulk to Office 365 - Admin Help</a>.
+     If you select this option, you'll see the **New user** screen and you can add details about the new user including their name, user name, role, and so on. You also have the opportunity to assign **Product licenses**. For detailed step-by-step info on adding a user account, see *Add a user account in the admin center* in <a href="https://support.office.com/en-us/article/Add-users-individually-or-in-bulk-to-Office-365-Admin-Help-1970f7d6-03b5-442f-b385-5880b9c256ec" target="_blank">Add users individually or in bulk to Office 365 - Admin Help</a>.
 
      **Figure 8** - Add an individual user
 
@@ -153,7 +153,7 @@ Microsoft Intune provides mobile device management, app management, and PC manag
 
 **To add Microsoft Intune to your tenant**
 
-1. In the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">Office 365 admin center</a>, select **Billing > Purchase services**.
+1. In the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">admin center</a>, select **Billing > Purchase services**.
 2. In the **Home > Purchase services** screen, search for **Microsoft Intune**. Hover over **Microsoft Intune** to see the options to start a free 30-day trial or to buy now.
 3. Confirm your order to enable access to Microsoft Intune.
 4. In the admin center, the Intune licenses will show as available and ready to be assigned to users. Select **Users > Active users** and then edit the product licenses assigned to the users to turn on **Intune A Direct**.
@@ -176,7 +176,7 @@ Microsoft Azure is an open and flexible cloud platform that enables you to quick
 
 **To add Azure AD to your domain**
 
-1. In the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">Office 365 admin center</a>, select **Admin centers > Azure AD**.
+1. In the <a href="https://portal.office.com/adminportal/home#/homepage" target="_blank">admin center</a>, select **Admin centers > Azure AD**.
 
    > [!NOTE]
    > You will need Azure AD Premium to configure automatic MDM enrollment with Intune.

store-for-business/acquire-apps-microsoft-store-for-business.md

@@ -61,13 +61,13 @@ People in your org can request license for apps that they need, or that others n
 
 ## Acquire apps
 **To acquire an app**  
-1.	Sign in to http://businessstore.microsoft.com
+1. Sign in to http://businessstore.microsoft.com
-2.	Select **Shop for my group**, or use Search to find an app. 
+2. Select **Shop for my group**, or use Search to find an app. 
-3.	Select the app you want to purchase. 
+3. Select the app you want to purchase. 
-4.	On the product description page, choose your license type - either online or offline. 
+4. On the product description page, choose your license type - either online or offline. 
 5.  Free apps will be added to **Products & services**. For apps with a price, you can set the quantity you want to buy. Type the quantity and select **Next**.
-6.	If you don’t have a payment method saved in **Billing & payments**, we will prompt you for one.
+6. If you don’t have a payment method saved in **Billing & payments**, we will prompt you for one.
-7.	Add your credit card or debit card info, and select **Next**. Your card info is saved as a payment option on **Billing & payments - Payment methods**.
+7. Add your credit card or debit card info, and select **Next**. Your card info is saved as a payment option on **Billing & payments - Payment methods**.
 
 You’ll also need to have your business address saved on **My organization - Profile**. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://docs.microsoft.com/microsoft-store/update-microsoft-store-for-business-account-settings#organization-tax-information). 
 

store-for-business/app-inventory-management-microsoft-store-for-business.md

@@ -75,10 +75,10 @@ For online-licensed apps, you can assign apps directly to people in your organiz
 
 **To assign an app to an employee**
 
-1.	Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://businessstore.microsoft.com).
+1. Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://businessstore.microsoft.com).
-2.	Click **Manage**, and then choose **Inventory**.
+2. Click **Manage**, and then choose **Inventory**.
-3.	Find an app, click the ellipses, and then choose **Assign to people**.
+3. Find an app, click the ellipses, and then choose **Assign to people**.
-4.	Type the email address for the employee that you're assigning the app to, and click **Confirm**.
+4. Type the email address for the employee that you're assigning the app to, and click **Confirm**.
 
 Employees will receive an email with a link that will install the app on their device. Click the link to start the Microsoft Store app, and then click **Install**. Also, in the Microsoft Store app, they can find the app under **My Library**.
 
@@ -103,9 +103,9 @@ Employees can claim apps that admins added to the private store by doing the fol
 ### Get and remove private store apps
 **To claim an app from the private store**
 
-1.	Sign in to your computer with your Azure Active Directory (AD) credentials, and start the Microsoft Store app.
+1. Sign in to your computer with your Azure Active Directory (AD) credentials, and start the Microsoft Store app.
-2.	Click the private store tab.
+2. Click the private store tab.
-3.	Click the app you want to install, and then click **Install**.
+3. Click the app you want to install, and then click **Install**.
 
 Another way to distribute apps is by assigning them to people in your organization.
 

store-for-business/distribute-apps-from-your-private-store.md

@@ -43,13 +43,11 @@ Microsoft Store adds the app to **Products and services**. Click **Manage**, **A
 
     <!--- ![Image showing Manage menu in Microsoft Store for Business.](images/wsfb-manageinventory.png) -->
 
-3.  Use **Refine results** to search for online-licensed apps under **License type**.
+3.  Click on the application to open the application settings, then select **Private store availability**.
-4.  From the list of online-licensed apps, click the ellipses for the app you want, and then choose **Add to private store**.
+4.  Select **Everyone** to make application available for all people in your organization.
 
     <!--- ![Image showing options from Action for each app in Inventory.](images/wsfb-inventoryaddprivatestore.png) -->
 
-The value under **Private store** for the app will change to pending. It will take approximately thirty-six hours before the app is available in the private store.
-
 >[!Note]
  > If you are working with a new Line-of-Business (LOB) app, you have to wait for the app to be available in **Products & services** before adding it to your private store. For more information, see [Working with line-of-business apps](working-with-line-of-business-apps.md). 
 

store-for-business/distribute-offline-apps.md

@@ -66,8 +66,8 @@ There are several items to download or create for offline-licensed apps. The app
 
 1.  Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com/) or [Microsoft Store for Education](https://educationstore.microsoft.com).
 2.  Click **Manage**.
-3.  Under **Shopping Experience**, set **Show offline apps** to **On**.
+3.  Click **Settings**.
-4.  Click **Shop for my group**. Search for the required inbox-app, select it, change the License type to **Offline**, and click  **Get the app**, which will add the app to your inventory.
+4.  Click **Shop**. Search for the **Shopping experience** section, change the License type to **Offline**, and click  **Get the app**, which will add the app to your inventory.
 5.  Click **Manage**. You now have access to download the appx bundle package metadata and license file.
 6.  Go to **Products & services**, and select **Apps & software**. (The list may be empty, but it will auto-populate after some time.)
 

store-for-business/manage-orders-microsoft-store-for-business.md

@@ -55,10 +55,10 @@ Refunds work a little differently for free apps, and apps that have a price. In
 
 Reclaim licenses, and then request a refund. If you haven't assigned licenses, start on step 5.
 1.  Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com).
-2.	Click **Manage**, and then choose **Apps & software**.
+2. Click **Manage**, and then choose **Apps & software**.
-3.	Find the app you want to refund, click the ellipses under **Actions**, and then choose **View license details**.
+3. Find the app you want to refund, click the ellipses under **Actions**, and then choose **View license details**.
 4.  Select the people who you want to reclaim license from, click the ellipses under **Actions**, and then choose **Reclaim licenses**.
-5.	Click **Order history**, click the order you want to refund, and click **Refund order**.
+5. Click **Order history**, click the order you want to refund, and click **Refund order**.
 
 For free apps, the app will be removed from your inventory in **Apps & software**.
 

store-for-business/microsoft-store-for-business-overview.md

@@ -60,7 +60,7 @@ Microsoft Azure Active Directory (AD) accounts for your employees:
 - Employees need Azure AD account when they access Store for Business content from Windows devices.
 - If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account
 - For offline-licensed apps, Azure AD accounts are not required for employees.
-- Admins can add or remove user accounts in the Office 365 admin center, even if you don’t have an Office 365 subscription. You can access the Office 365 admin portal directly from the Store for Business and Education. 
+- Admins can add or remove user accounts in the Microsoft 365 admin center, even if you don’t have an Office 365 subscription. You can access the Office 365 admin portal directly from the Store for Business and Education. 
 
 For more information on Azure AD, see [About Office 365 and Azure Active Directory](https://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](https://go.microsoft.com/fwlink/p/?LinkId=708611).
 

store-for-business/update-microsoft-store-for-business-account-settings.md

@@ -94,7 +94,7 @@ If you qualify for tax-exempt status in your market, start a service request to
 
 **To start a service request**
 1.  Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com).
-2.	Select **Manage**, click **Support**, and then under **Store settings & configuration** select **Create technical support ticket**.
+2. Select **Manage**, click **Support**, and then under **Store settings & configuration** select **Create technical support ticket**.
 
 You’ll need this documentation:
 

windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md

@@ -42,7 +42,7 @@ Before attempting this procedure, you should read and understand the information
 
 2.  To open a Windows PowerShell console, click **Start** and type **PowerShell**. Right-click **Windows PowerShell** and select **Run as Administrator**.
 
-    ``` syntax
+    ```powershell
     <#
     .SYNOPSIS
     This Windows PowerShell script will take an array of account names and try to convert each of them to the corresponding SID in standard and hexadecimal formats.
@@ -59,9 +59,6 @@ Before attempting this procedure, you should read and understand the information
     .\ConvertToSID.ps1 $accountsArray | Write-Output -FilePath .\SIDs.txt -Width 200
     #>
 
-    []()  
-
-    []()  
     function ConvertSIDToHexFormat
     {
        param([System.Security.Principal.SecurityIdentifier]$sidToConvert)

windows/application-management/svchost-service-refactoring.md

@@ -40,8 +40,8 @@ Benefits of this design change include:
 >**Try This**
 >
 > To see the refactoring behavior, create a Windows 10 version 1703 VM and configure the memory settings as follows:
-> 1.	To see grouped processes, set the RAM to 3484 MB or less. Restart the VM and then open Task Manager.
+> 1. To see grouped processes, set the RAM to 3484 MB or less. Restart the VM and then open Task Manager.
-> 2.	To see separated processes, set the RAM to 3486 MB or greater. Restart the VM and then open Task Manager.
+> 2. To see separated processes, set the RAM to 3486 MB or greater. Restart the VM and then open Task Manager.
 
 
 Refactoring also makes it easier to view running processes in Task Manager. You can look at Task Manager and know exactly which service is using what resources, without having to expand many separate host groups.

windows/client-management/mdm/TOC.md

@@ -55,6 +55,8 @@
 ### [AllJoynManagement CSP](alljoynmanagement-csp.md)
 #### [AllJoynManagement DDF](alljoynmanagement-ddf.md)
 ### [APPLICATION CSP](application-csp.md)
+### [ApplicationControl CSP](applicationcontrol-csp.md)
+#### [ApplicationControl DDF file](applicationcontrol-csp-ddf.md)
 ### [AppLocker CSP](applocker-csp.md)
 #### [AppLocker DDF file](applocker-ddf-file.md)
 #### [AppLocker XSD](applocker-xsd.md)

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

@@ -60,13 +60,13 @@ When managing over OMA DM, make sure to always use a unique GUID. Provisioning w
 
 Braces { } are required around the GUID. In OMA Client Provisioning, you can type the braces. For example:
 
-``` syntax
+```xml
 <characteristic type="{C556E16F-56C4-4EDB-9C64-D9469EE1FBE0}"/>
 ```
 
 For OMA DM, you must use the ASCII values of %7B and %7D for the opening and closing braces, respectively. For example, if the GUID is "C556E16F-56C4-4EDB-9C64-D9469EE1FBE0", type:
 
-``` syntax
+```xml
 <Target>
    <LocURI>
       ./Vendor/MSFT/ActiveSync/Accounts/%7BC556E16F-56C4-4EDB-9C64-D9469EE1FBE0%7D

windows/client-management/mdm/applicationcontrol-csp-ddf.md

@@ -0,0 +1,274 @@
+---
+title: ApplicationControl CSP
+description: ApplicationControl CSP
+ms.author: dansimp@microsoft.com
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: ManikaDhiman
+ms.date: 07/10/2019
+---
+
+# ApplicationControl CSP DDF
+
+
+This topic shows the OMA DM device description framework (DDF) for the **ApplicationControl** configuration service provider. DDF files are used only with OMA DM provisioning XML.
+
+Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download).
+
+### ApplicationControl CSP
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE MgmtTree PUBLIC " -//OMA//DTD-DM-DDF 1.2//EN"
+  "http://www.openmobilealliance.org/tech/DTD/DM_DDF-V1_2.dtd"
+  [<?oma-dm-ddf-ver supported-versions="1.2"?>]>
+<MgmtTree xmlns:MSFT="http://schemas.microsoft.com/MobileDevice/DM">
+  <VerDTD>1.2</VerDTD>
+      <Node>
+        <NodeName>ApplicationControl</NodeName>
+        <Path>./Vendor/MSFT</Path>
+        <DFProperties>
+          <AccessType>
+            <Get />
+          </AccessType>
+          <Description>Root Node of the ApplicationControl CSP</Description>
+          <DFFormat>
+            <node />
+          </DFFormat>
+          <Occurrence>
+            <One />
+          </Occurrence>
+          <Scope>
+            <Permanent />
+          </Scope>
+          <DFType>
+            <DDFName></DDFName>
+          </DFType>
+        </DFProperties>
+        <Node>
+          <NodeName>Policies</NodeName>
+          <DFProperties>
+            <AccessType>
+              <Get />
+            </AccessType>
+            <Description>Beginning of a Subtree that contains all policies.</Description>
+            <DFFormat>
+              <node />
+            </DFFormat>
+            <Occurrence>
+              <One />
+            </Occurrence>
+            <Scope>
+              <Permanent />
+            </Scope>
+            <DFTitle>Policies</DFTitle>
+            <DFType>
+              <DDFName></DDFName>
+            </DFType>
+          </DFProperties>
+          <Node>
+            <NodeName></NodeName>
+            <DFProperties>
+              <AccessType>
+                <Get />
+              </AccessType>
+              <Description>The GUID of the Policy</Description>
+              <DFFormat>
+                <node />
+              </DFFormat>
+              <Occurrence>
+                <ZeroOrMore />
+              </Occurrence>
+              <Scope>
+                <Dynamic />
+              </Scope>
+              <DFTitle>Policy GUID</DFTitle>
+              <DFType>
+                <DDFName></DDFName>
+              </DFType>
+            </DFProperties>
+            <Node>
+              <NodeName>Policy</NodeName>
+              <DFProperties>
+                <AccessType>
+                  <Get />
+                  <Add />
+                  <Delete />
+                  <Replace />
+                </AccessType>
+                <Description>The policy binary encoded as base64</Description>
+                <DFFormat>
+                  <b64 />
+                </DFFormat>
+                <Occurrence>
+                  <One />
+                </Occurrence>
+                <Scope>
+                  <Dynamic />
+                </Scope>
+                <DFTitle>Policy</DFTitle>
+                <DFType>
+                  <DDFName></DDFName>
+                </DFType>
+              </DFProperties>
+            </Node>
+            <Node>
+              <NodeName>PolicyInfo</NodeName>
+              <DFProperties>
+                <AccessType>
+                  <Get />
+                </AccessType>
+                <Description>Information Describing the Policy indicated by the GUID</Description>
+                <DFFormat>
+                  <node />
+                </DFFormat>
+                <Occurrence>
+                  <One />
+                </Occurrence>
+                <Scope>
+                  <Dynamic />
+                </Scope>
+                <DFTitle>PolicyInfo</DFTitle>
+                <DFType>
+                  <DDFName></DDFName>
+                </DFType>
+              </DFProperties>
+              <Node>
+                <NodeName>Version</NodeName>
+                <DFProperties>
+                  <AccessType>
+                    <Get />
+                  </AccessType>
+                  <Description>Version of the Policy indicated by the GUID, as a string. When parsing use a uint64 as the containing data type</Description>
+                  <DFFormat>
+                    <chr />
+                  </DFFormat>
+                  <Occurrence>
+                    <One />
+                  </Occurrence>
+                  <Scope>
+                    <Dynamic />
+                  </Scope>
+                  <DFTitle>Version</DFTitle>
+                  <DFType>
+                    <MIME>text/plain</MIME>
+                  </DFType>
+                </DFProperties>
+              </Node>
+              <Node>
+                <NodeName>IsEffective</NodeName>
+                <DFProperties>
+                  <AccessType>
+                    <Get />
+                  </AccessType>
+                  <Description>Whether the Policy indicated by the GUID is Effective on the system (loaded by the enforcement engine and in effect)</Description>
+                  <DFFormat>
+                    <bool />
+                  </DFFormat>
+                  <Occurrence>
+                    <One />
+                  </Occurrence>
+                  <Scope>
+                    <Dynamic />
+                  </Scope>
+                  <DFTitle>IsEffective</DFTitle>
+                  <DFType>
+                    <MIME>text/plain</MIME>
+                  </DFType>
+                </DFProperties>
+              </Node>
+              <Node>
+                <NodeName>IsDeployed</NodeName>
+                <DFProperties>
+                  <AccessType>
+                    <Get />
+                  </AccessType>
+                  <Description>Whether the Policy indicated by the GUID is deployed on the system (on the physical machine)</Description>
+                  <DFFormat>
+                    <bool />
+                  </DFFormat>
+                  <Occurrence>
+                    <One />
+                  </Occurrence>
+                  <Scope>
+                    <Dynamic />
+                  </Scope>
+                  <DFTitle>IsDeployed</DFTitle>
+                  <DFType>
+                    <MIME>text/plain</MIME>
+                  </DFType>
+                </DFProperties>
+              </Node>
+              <Node>
+                <NodeName>IsAuthorized</NodeName>
+                <DFProperties>
+                  <AccessType>
+                    <Get />
+                  </AccessType>
+                  <Description>Whether the Policy indicated by the GUID is authorized to be loaded by the enforcement engine on the system </Description>
+                  <DFFormat>
+                    <bool />
+                  </DFFormat>
+                  <Occurrence>
+                    <One />
+                  </Occurrence>
+                  <Scope>
+                    <Dynamic />
+                  </Scope>
+                  <DFTitle>IsAuthorized</DFTitle>
+                  <DFType>
+                    <MIME>text/plain</MIME>
+                  </DFType>
+                </DFProperties>
+              </Node>
+              <Node>
+                <NodeName>Status</NodeName>
+                <DFProperties>
+                  <AccessType>
+                    <Get />
+                  </AccessType>
+                  <Description>The Current Status of the Policy Indicated by the Policy GUID</Description>
+                  <DFFormat>
+                    <int />
+                  </DFFormat>
+                  <Occurrence>
+                    <One />
+                  </Occurrence>
+                  <Scope>
+                    <Dynamic />
+                  </Scope>
+                  <DFTitle>Status</DFTitle>
+                  <DFType>
+                    <MIME>text/plain</MIME>
+                  </DFType>
+                </DFProperties>
+              </Node>
+              <Node>
+                <NodeName>FriendlyName</NodeName>
+                <DFProperties>
+                  <AccessType>
+                    <Get />
+                  </AccessType>
+                  <Description>The FriendlyName of the Policy Indicated by the Policy GUID</Description>
+                  <DFFormat>
+                    <chr />
+                  </DFFormat>
+                  <Occurrence>
+                    <One />
+                  </Occurrence>
+                  <Scope>
+                    <Dynamic />
+                  </Scope>
+                  <DFTitle>FriendlyName</DFTitle>
+                  <DFType>
+                    <MIME>text/plain</MIME>
+                  </DFType>
+                </DFProperties>
+              </Node>
+            </Node>
+          </Node>
+        </Node>
+      </Node>
+</MgmtTree>
+```

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

@@ -0,0 +1,236 @@
+---
+title: ApplicationControl CSP
+description: ApplicationControl CSP
+ms.author: dansimp@microsoft.com
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: ManikaDhiman
+ms.date: 05/21/2019
+---
+
+# ApplicationControl CSP
+
+Windows Defender Application Control (WDAC) policies can be managed from an MDM server through ApplicationControl configuration service provider (CSP). This CSP provides expanded diagnostic capabilities and support for [multiple policies](https://docs.microsoft.com/en-us/windows/security/threat-protection/windows-defender-application-control/deploy-multiple-windows-defender-application-control-policies) (introduced in Windows 10, version 1903). It also provides support for rebootless policy deployment (introduced in Windows 10, version 1709). Unlike [AppLocker CSP](applocker-csp.md), ApplicationControl CSP correctly detects the presence of no-reboot option and consequently does not schedule a reboot.
+Existing WDAC policies deployed using AppLocker CSP’s CodeIntegrity node can now be deployed using ApplicationControl CSP URI. Although WDAC policy deployment via AppLocker CSP will continue to be supported, all new feature work will be done in ApplicationControl CSP only.
+
+ApplicationControl CSP was added in Windows 10, version 1903.
+
+The following diagram shows ApplicationControl CSP in tree format.
+
+![tree diagram for applicationcontrol csp](images/provisioning-csp-applicationcontrol.png)
+
+<a href="" id="vendor-msft-applicationcontrol"></a>**./Vendor/MSFT/ApplicationControl**  
+Defines the root node for ApplicationControl CSP.
+
+Scope is permanent. Supported operation is Get.
+
+<a href="" id="applicationcontrol-policies"></a>**ApplicationControl/Policies**  
+An interior node that contains all the policies, each identified by their globally unique identifier (GUID).
+
+Scope is permanent. Supported operation is Get.
+
+<a href="" id="applicationcontrol-policies-policyguid"></a>**ApplicationControl/Policies/_Policy GUID_**  
+ApplicationControl CSP enforces that the “ID” segment of a given policy URI is the same GUID as the policy ID in the policy blob. Each *Policy GUID* node contains a Policy node and a corresponding PolicyInfo node.
+
+Scope is dynamic. Supported operation is Get.
+
+<a href="" id="applicationcontrol-policies-policyguid-policy"></a>**ApplicationControl/Policies/_Policy GUID_/Policy**  
+This node is the policy binary itself, which is encoded as base64.
+
+Scope is dynamic. Supported operations are Get, Add, Delete, and Replace.
+
+Value type is b64. Supported value is any well-formed WDAC policy, i.e. the base64-encoded content output by the ConvertFrom-CIPolicy cmdlet.
+
+Default value is empty.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo**  
+An interior node that contains the nodes that describe the policy indicated by the GUID.
+
+Scope is dynamic. Supported operation is Get.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo-version"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Version**  
+This node provides the version of the policy indicated by the GUID. Stored as a string, but when parsing use a uint64 as the containing data type.
+
+Scope is dynamic. Supported operation is Get.
+
+Value type is char.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo-iseffective"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsEffective**  
+This node specifies whether a policy is actually loaded by the enforcement engine and is in effect on a system.
+
+Scope is dynamic. Supported operation is Get.
+
+Value type is bool. Supported values are as follows:  
+- True — Indicates that the policy is actually loaded by the enforcement engine and is in effect on a system.
+- False — Indicates that the policy is not loaded by the enforcement engine and is not in effect on a system. This is the default.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo-isdeployed"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsDeployed**  
+This node specifies whether a policy is deployed on the system and is present on the physical machine.
+
+Scope is dynamic. Supported operation is Get.
+
+Value type is bool. Supported values are as follows:  
+- True — Indicates that the policy is deployed on the system and is present on the physical machine.
+- False — Indicates that the policy is not deployed on the system and is not present on the physical machine. This is the default.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo-isauthorized"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsAuthorized**  
+This node specifies whether the policy is authorized to be loaded by the enforcement engine on the system. If not authorized, a policy cannot take effect on the system.
+
+Scope is dynamic. Supported operation is Get.
+
+Value type is bool. Supported values are as follows:  
+- True — Indicates that the policy is authorized to be loaded by the enforcement engine on the system.
+- False — Indicates that the policy is not authorized to be loaded by the enforcement engine on the system. This is the default.
+
+The following table provides the result of this policy based on different values of IsAuthorized, IsDeployed, and IsEffective nodes:
+
+|IsAuthorized | IsDeployed | IsEffective | Resultant |
+|------------ | ---------- | ----------- | --------- |
+|True|True|True|Policy is currently running and in effect.|
+|True|True|False|Policy requires a reboot to take effect.|
+|True|False|True|Policy requires a reboot to unload from CI.|
+|False|True|True|Not Reachable.|
+|True|False|False|*Not Reachable.|
+|False|True|False|*Not Reachable.|
+|False|False|True|Not Reachable.|
+|False|False|False|*Not Reachable.|
+
+`*` denotes a valid intermediary state; however, if an MDM transaction results in this state configuration, the END_COMMAND_PROCESSING will result in a fail.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo-status"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Status**  
+This node specifies whether the deployment of the policy indicated by the GUID was successful.
+
+Scope is dynamic. Supported operation is Get.
+
+Value type is integer. Default value is 0 == OK.
+
+<a href="" id="applicationcontrol-policies-policyguid-policyinfo-friendlyname"></a>**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/FriendlyName**  
+This node provides the friendly name of the policy indicated by the policy GUID.
+
+Scope is dynamic. Supported operation is Get.
+
+Value type is char.
+
+## Usage guidance  
+
+To use ApplicationControl CSP, you must:
+- Know a generated policy’s GUID, which can be found in the policy xml as `<PolicyTypeID>`.
+- Convert the policies to binary format using the ConvertFrom-CIPolicy cmdlet in order to be deployed. The binary policy may be signed or unsigned.
+- Create a policy node (a Base64-encoded blob of the binary policy representation) using the [certutil -encode](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc732443(v=ws.11)#BKMK_encode) command line tool.
+
+Here is a sample certutil invocation:
+```
+certutil -encode WinSiPolicy.p7b WinSiPolicy.cer 
+```
+An alternative to using certutil would be to use the following PowerShell invocation:
+```
+[Convert]::ToBase64String($(Get-Content -Encoding Byte -ReadCount 0 -Path <bin file>))
+```
+If you are using hybrid MDM management with System Center Configuration Manager or using Intune, ensure that you are using Base64 as the Data type when using Custom OMA-URI
+functionality to apply the Code Integrity policy.
+
+### Deploy policies
+To deploy a new base policy using the CSP, perform an ADD on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy** using the Base64-encoded policy node as {Data}. Refer to the the Format section in the Example 1 below.
+
+To deploy base policy and supplemental policies:
+- Perform an ADD on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy** using the Base64-encoded policy node as {Data} with the GUID and policy data for the base policy.
+- Repeat for each base or supplemental policy (with its own GUID and data).
+
+The following example shows the deployment of two base policies and a supplemental policy (which already specifies the base policy it supplements and does not need that reflected in the ADD).
+
+**Example 1: Add first base policy**
+```xml
+<Add>
+    <CmdID>1</CmdID>
+    <Item>
+        <Target>
+            <LocURI>./Vendor/MSFT/ApplicationControl/Policies/{Base1GUID}/Policy</LocURI>
+        </Target>
+        <Meta>
+             <Format xmlns="syncml:metinf">b64</Format>
+        </Meta>
+        <Data> {Base1Data} </Data>
+    </Item>
+</Add>
+```
+**Example 2: Add second base policy**
+```xml
+<Add>
+    <CmdID>1</CmdID>
+    <Item>
+        <Target>
+            <LocURI>./Vendor/MSFT/ApplicationControl/Policies/{Base2GUID}/Policy</LocURI>
+        </Target>
+        <Meta>
+            <Format xmlns="syncml:metinf">b64</Format>
+        </Meta>
+        <Data> {Base2Data} </Data>
+    </Item>
+</Add>
+```
+**Example 3: Add supplemental policy**
+```xml
+<Add>
+    <CmdID>1</CmdID>
+    <Item>
+        <Target>
+            <LocURI>./Vendor/MSFT/ApplicationControl/Policies/{Supplemental1GUID}/Policy</LocURI>
+        </Target>
+        <Meta>
+            <Format xmlns="syncml:metinf">b64</Format>
+        </Meta>
+        <Data> {Supplemental1Data} </Data>
+    </Item>
+</Add>
+```
+### Get policies
+
+Perform a GET using a deployed policy’s GUID to interrogate/inspect the policy itself or information about it.
+
+The following table displays the result of Get operation on different nodes:
+
+|Nodes | Get Results|
+|------------- | ------|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy|raw p7b|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Version|Policy version|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsEffective|Is the policy in effect|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsDeployed|Is the policy on the system|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsAuthorized|Is the policy authorized on the system|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Status|Was the deployment successful|
+|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/FriendlyName|Friendly name per the policy|
+
+The following is an example of Get command:  
+```xml
+ <Get>
+    <CmdID>1</CmdID>
+        <Item>
+            <Target>
+                <LocURI>./Vendor/MSFT/ApplicationControl/Policies/{PolicyGUID}/Policy</LocURI>
+            </Target>
+        </Item>
+ </Get>
+```
+
+### Delete policies
+To delete an unsigned policy, perform a DELETE on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy**.
+
+> [!Note]
+>  Only signed things should be able to update signed policies. Hence, performing a DELETE on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy** is not sufficient to delete a signed policy.
+    
+To delete a signed policy:
+1. Replace it with a signed update allowing unsigned policy.
+2. Deploy another update with unsigned policy.
+3. Perform delete.
+    
+The following is an example of Delete command:
+```xml
+   <Delete>
+     <CmdID>1</CmdID>
+        <Item>
+            <Target>
+                  <LocURI>./Vendor/MSFT/ApplicationControl/Policies/{PolicyGUID}/Policy</LocURI>
+            </Target>
+        </Item>
+   </Delete>
+```

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

@@ -14,6 +14,7 @@ ms.date: 09/18/2018
 
 # AssignedAccess CSP
 
+**Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.**
 
 The AssignedAccess configuration service provider (CSP) is used to set the device to run in kiosk mode. Once the CSP has been executed, then the next user login that is associated with the kiosk mode puts the device into the kiosk mode running the application specified in the CSP configuration.
 
@@ -134,7 +135,7 @@ Additionally, the Status payload includes the following fields:
 Supported operation is Get.
 
 <a href="" id="assignedaccess-shelllauncher"></a>**./Device/Vendor/MSFT/AssignedAccess/ShellLauncher**
-Added in Windows 10,version 1803. This node accepts a ShellLauncherConfiguration xml as input. Click [link](#shelllauncherconfiguration-xsd) to see the schema. Shell Launcher V2 is introduced in Windows 10, version 1903 to support both UWP and Win32 apps as the custom shell. For more information, see [Shell Launcher](https://docs.microsoft.com/en-us/windows/configuration/kiosk-shelllauncher).
+Added in Windows 10,version 1803. This node accepts a ShellLauncherConfiguration xml as input. Click [link](#shelllauncherconfiguration-xsd) to see the schema. Shell Launcher V2 is introduced in Windows 10, version 1903 to support both UWP and Win32 apps as the custom shell. For more information, see [Shell Launcher](https://docs.microsoft.com/windows/configuration/kiosk-shelllauncher).
 
 > [!Note]
 > You cannot set both ShellLauncher and KioskModeApp at the same time on the device.
@@ -246,6 +247,8 @@ KioskModeApp Replace
 
 ## AssignedAccessConfiguration XSD
 
+Below schema is for AssignedAccess Configuration up to Windows 10 1803 release.
+
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema
@@ -253,9 +256,14 @@ KioskModeApp Replace
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns="http://schemas.microsoft.com/AssignedAccess/2017/config"
     xmlns:default="http://schemas.microsoft.com/AssignedAccess/2017/config"
+    xmlns:rs5="http://schemas.microsoft.com/AssignedAccess/201810/config"
+    xmlns:v3="http://schemas.microsoft.com/AssignedAccess/2020/config"
     targetNamespace="http://schemas.microsoft.com/AssignedAccess/2017/config"
     >
 
+    <xs:import namespace="http://schemas.microsoft.com/AssignedAccess/201810/config"/>
+    <xs:import namespace="http://schemas.microsoft.com/AssignedAccess/2020/config"/>
+
     <xs:complexType name="profile_list_t">
         <xs:sequence minOccurs="1" >
             <xs:element name="Profile" type="profile_t" minOccurs="1" maxOccurs="unbounded"/>
@@ -270,6 +278,7 @@ KioskModeApp Replace
         <xs:choice>
             <xs:sequence minOccurs="1" maxOccurs="1">
                 <xs:element name="AllAppsList" type="allappslist_t" minOccurs="1" maxOccurs="1"/>
+                <xs:element ref="rs5:FileExplorerNamespaceRestrictions" minOccurs="0" maxOccurs="1"/>
                 <xs:element name="StartLayout" type="xs:string" minOccurs="1" maxOccurs="1"/>
                 <xs:element name="Taskbar" type="taskbar_t" minOccurs="1" maxOccurs="1"/>
             </xs:sequence>
@@ -286,6 +295,10 @@ KioskModeApp Replace
                     <xs:selector xpath="default:App"/>
                     <xs:field xpath="@AppUserModelId|@DesktopAppPath"/>
                 </xs:unique>
+                <xs:unique name="OnlyOneAppCanHaveAutoLaunch">
+                    <xs:selector xpath="default:App"/>
+                    <xs:field xpath="@rs5:AutoLaunch"/>
+                </xs:unique>
             </xs:element>
         </xs:sequence>
     </xs:complexType>
@@ -304,7 +317,13 @@ KioskModeApp Replace
     <xs:complexType name="app_t">
         <xs:attribute name="AppUserModelId" type="xs:string"/>
         <xs:attribute name="DesktopAppPath" type="xs:string"/>
+        <xs:attributeGroup ref="autoLaunch_attributeGroup"/>
     </xs:complexType>
+    
+    <xs:attributeGroup name="autoLaunch_attributeGroup">
+        <xs:attribute ref="rs5:AutoLaunch"/>
+        <xs:attribute ref="rs5:AutoLaunchArguments" use="optional"/>
+    </xs:attributeGroup>
 
     <xs:complexType name="taskbar_t">
         <xs:attribute name="ShowTaskbar" type="xs:boolean" use="required"/>
@@ -322,7 +341,8 @@ KioskModeApp Replace
 
     <xs:complexType name="config_list_t">
         <xs:sequence minOccurs="1" >
-            <xs:element name="Config" type="config_t" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element ref="v3:GlobalProfile" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="Config" type="config_t" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -340,6 +360,7 @@ KioskModeApp Replace
 
     <xs:complexType name="autologon_account_t">
         <xs:attribute name="HiddenId" type="guid_t" fixed="{74331115-F68A-4DF9-8D2C-52BA2CE2ADB1}"/>
+        <xs:attribute ref="rs5:DisplayName" use="optional" />
     </xs:complexType>
 
     <xs:complexType name="group_t">
@@ -365,6 +386,22 @@ KioskModeApp Replace
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:complexType name="fileExplorerNamespaceRestrictions_t">
+        <xs:sequence minOccurs="1">
+            <xs:element name="AllowedNamespace" type="allowedFileExplorerNamespace_t"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="allowedFileExplorerNamespace_t">
+        <xs:attribute name="Name" type="allowedFileExplorerNamespaceValues_t"/>
+    </xs:complexType>
+
+    <xs:simpleType name="allowedFileExplorerNamespaceValues_t">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Downloads"/>
+        </xs:restriction>
+    </xs:simpleType>
+
     <!--below is the definition of the config xml content-->
     <xs:element name="AssignedAccessConfiguration">
         <xs:complexType>
@@ -385,7 +422,94 @@ KioskModeApp Replace
         </xs:complexType>
     </xs:element>
 </xs:schema>
+```
 
+Here is the schema for new features introduced in Windows 10 1809 release
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema
+    elementFormDefault="qualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://schemas.microsoft.com/AssignedAccess/201810/config"
+    xmlns:default="http://schemas.microsoft.com/AssignedAccess/201810/config"
+    xmlns:v3="http://schemas.microsoft.com/AssignedAccess/2020/config"
+    targetNamespace="http://schemas.microsoft.com/AssignedAccess/201810/config"
+    >
+
+    <xs:import namespace="http://schemas.microsoft.com/AssignedAccess/2020/config"/>
+
+    <xs:complexType name="fileExplorerNamespaceRestrictions_t">
+        <xs:choice>
+            <xs:sequence minOccurs="0">
+                <xs:element name="AllowedNamespace" type="allowedFileExplorerNamespace_t" minOccurs="0"/>
+                <xs:element ref="v3:AllowRemovableDrives" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+            <xs:element ref="v3:NoRestriction" minOccurs="0" maxOccurs="1" />
+        </xs:choice>
+    </xs:complexType>
+
+    <xs:complexType name="allowedFileExplorerNamespace_t">
+        <xs:attribute name="Name" type="allowedFileExplorerNamespaceValues_t" use="required"/>
+    </xs:complexType>
+
+    <xs:simpleType name="allowedFileExplorerNamespaceValues_t">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Downloads"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:element name="FileExplorerNamespaceRestrictions" type="fileExplorerNamespaceRestrictions_t" />
+
+    <xs:attribute name="AutoLaunch" type="xs:boolean"/>
+
+    <xs:attribute name="AutoLaunchArguments" type="xs:string"/>
+
+    <xs:attribute name="DisplayName" type="xs:string"/>
+
+</xs:schema>
+```
+
+Schema for Windows 10 prerelease
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema
+    elementFormDefault="qualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://schemas.microsoft.com/AssignedAccess/2020/config"
+    xmlns:default="http://schemas.microsoft.com/AssignedAccess/2020/config"
+    xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+    vc:minVersion="1.1"
+    targetNamespace="http://schemas.microsoft.com/AssignedAccess/2020/config"
+    >
+
+    <xs:simpleType name="guid_t">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="\{[0-9a-fA-F]{8}\-([0-9a-fA-F]{4}\-){3}[0-9a-fA-F]{12}\}"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:complexType name="globalProfile_t">
+        <xs:attribute name="Id" type="guid_t" />
+    </xs:complexType>
+  
+    <xs:element name="AllowRemovableDrives"/>
+    <xs:element name="NoRestriction" />
+    <xs:element name="GlobalProfile" type="globalProfile_t" />
+
+</xs:schema>
+```
+
+To authorize a compatible configuration XML that includes 1809 or prerelease elements and attributes, always include the namespace of these add-on schemas, and decorate the attributes and elements accordingly with the namespace alias. e.g. to configure auto-launch feature which is added in 1809 release, use below sample, notice an alias r1809 is given to the 201810 namespace for 1809 release, and the alias is tagged on AutoLaunch and AutoLaunchArguments inline.
+```xml
+<AssignedAccessConfiguration
+    xmlns="http://schemas.microsoft.com/AssignedAccess/2017/config"
+    xmlns:r1809="http://schemas.microsoft.com/AssignedAccess/201810/config"
+>
+    <Profiles>
+        <Profile Id="{9A2A490F-10F6-4764-974A-43B19E722C23}">
+            <AllAppsList>
+                <AllowedApps>
+                  <App DesktopAppPath="%SystemRoot%\system32\notepad.exe" r1809:AutoLaunch="true" r1809:AutoLaunchArguments="1.txt"/>
 ```
 
 ## Example AssignedAccessConfiguration XML
@@ -796,7 +920,7 @@ StatusConfiguration Get
 
 StatusConfiguration Replace On
 
-```syntax
+```xml
 <SyncML xmlns='SYNCML:SYNCML1.2'>
   <SyncBody>
     <Replace>
@@ -1219,7 +1343,7 @@ ShellLauncherConfiguration Get
 
 ## AssignedAccessAlert XSD
 
-```syntax
+```xml
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema
     elementFormDefault="qualified"

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

@@ -360,7 +360,7 @@ Supported operations are Add, Get, and Replace.
 
 Add a root certificate to the MDM server.
 
-``` syntax
+```xml
 <Add>
    <CmdID>1</CmdID>
    <Item>
@@ -379,7 +379,7 @@ Add a root certificate to the MDM server.
 
 Get all installed client certificates.
 
-``` syntax
+```xml
 <Get>
    <CmdID>1</CmdID>
    <Item>
@@ -394,7 +394,7 @@ Get all installed client certificates.
 
 Delete a root certificate.
 
-``` syntax
+```xml
 <Delete>
    <CmdID>1</CmdID>
    <Item>
@@ -409,7 +409,7 @@ Delete a root certificate.
 
 Configure the device to enroll a client certificate through SCEP.
 
-``` syntax
+```xml
 <Atomic>
 <CmdID>100</CmdID>
 <Add>
@@ -588,7 +588,7 @@ Configure the device to enroll a client certificate through SCEP.
 
 Configure the device to automatically renew an MDM client certificate with the specified renew period and retry interval.
 
-``` syntax
+```xml
 <Atomic>
    <CmdID>1</CmdID>
      <Replace>