diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd183c2b97..75cb7255c8 100644
--- a/CONTRIBUTING.md
+++ b/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**.
@@ -30,12 +30,12 @@ We've tried to make editing an existing, public file as simple as possible.
-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.
@@ -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**.
-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:
diff --git a/browsers/edge/includes/configure-kiosk-mode-supported-values-include.md b/browsers/edge/includes/configure-kiosk-mode-supported-values-include.md
index 2d6285a59d..e5a7ff9155 100644
--- a/browsers/edge/includes/configure-kiosk-mode-supported-values-include.md
+++ b/browsers/edge/includes/configure-kiosk-mode-supported-values-include.md
@@ -11,7 +11,7 @@ ms.topic: include
| | |
|----------|------|
-|**Single-app**
Displays a specific site in full-screen mode, running Microsoft Edge InPrivate protecting user data.
**Digital signage** does not require user interaction.
***Example.*** Use digital signage for things like a rotating advertisement or menu.
**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.
***Example.*** Use interactive signage for things like a building business directory or restaurant order/pay station.
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.
The single-app public browsing mode is the only kiosk mode that has an End session button. Microsoft Edge also resets the session after a specified time of user inactivity. Both restart Microsoft Edge and clear the user’s session.
Example. A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps.
Runs a full-version of Microsoft Edge with all browsing features and preserves the user data and state between sessions.
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.
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.
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.
Example. A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps.
Displays a specific site in full-screen mode, running Microsoft Edge InPrivate protecting user data.
**Digital signage** does not require user interaction.
***Example.*** Use digital signage for things like a rotating advertisement or menu.
**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.
***Example.*** Use interactive signage for things like a building business directory or restaurant order/pay station.
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.
The single-app public browsing mode is the only kiosk mode that has an End session button. Microsoft Edge also resets the session after a specified time of user inactivity. Both restart Microsoft Edge and clear the user’s session.
Example. A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps.
Runs a full-version of Microsoft Edge with all browsing features and preserves the user data and state between sessions.
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.
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.
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.
Example. A public library or hotel concierge desk are two examples of public browsing that provides access to Microsoft Edge and other apps.
Policy setting = Enabled (1) |
---
diff --git a/browsers/enterprise-mode/collect-data-using-enterprise-site-discovery.md b/browsers/enterprise-mode/collect-data-using-enterprise-site-discovery.md
index 15858b4039..c90d6b1c59 100644
--- a/browsers/enterprise-mode/collect-data-using-enterprise-site-discovery.md
+++ b/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).
diff --git a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md b/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md
index d634c34fd0..3a2826187a 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/collect-data-using-enterprise-site-discovery.md
+++ b/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).
diff --git a/browsers/internet-explorer/ie11-deploy-guide/intranet-problems-and-ie11.md b/browsers/internet-explorer/ie11-deploy-guide/intranet-problems-and-ie11.md
index 91517251f0..77eb2fa5b1 100644
--- a/browsers/internet-explorer/ie11-deploy-guide/intranet-problems-and-ie11.md
+++ b/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**
diff --git a/browsers/internet-explorer/ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md b/browsers/internet-explorer/ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md
index 7e475887ce..ca25c64f0e 100644
--- a/browsers/internet-explorer/ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md
+++ b/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**.
-2. Click Edit, and then modify the **TEMP** and **TMP** environmental variables to a non-user profile directory.
+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.
## Unicode characters are not supported in IEAK 11 path names
diff --git a/devices/hololens/hololens-cortana.md b/devices/hololens/hololens-cortana.md
index 8c74b3b97e..dfe9539b1b 100644
--- a/devices/hololens/hololens-cortana.md
+++ b/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 .
-- Move here (gaze at the spot you want the app to move to).
+- Launch ``.
+- Move `` 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 . (Requires Skype.)
+- Call ``. (Requires Skype.)
- What time is it?
- Show me the latest NBA scores.
- How much battery do I have left?
diff --git a/devices/hololens/hololens-encryption.md b/devices/hololens/hololens-encryption.md
index 25bf786333..8cbeaf26eb 100644
--- a/devices/hololens/hololens-encryption.md
+++ b/devices/hololens/hololens-encryption.md
@@ -45,7 +45,7 @@ Provisioning packages are files created by the Windows Configuration Designer to
-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).
diff --git a/devices/hololens/hololens-setup.md b/devices/hololens/hololens-setup.md
index c7007d172e..77bb29070f 100644
--- a/devices/hololens/hololens-setup.md
+++ b/devices/hololens/hololens-setup.md
@@ -1,46 +1,75 @@
---
-title: Set up HoloLens (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.
+title: Set up a new HoloLens
+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
-ms.author: dansimp
-ms.topic: article
+author: scooley
+ms.author: scooley
+ms.topic: quickstart
ms.localizationpriority: medium
-ms.date: 07/27/2017
-ms.reviewer:
-manager: dansimp
+ms.date: 07/14/2019
---
-# 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.
-- The Wi-Fi network cannot require certificates to connect.
-- The Wi-Fi network does not need to provide access to enterprise resources or intranet sites.
+- Internet access.
+ - 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.
+ - 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.
-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.
-3. Next, you'll be guided through connecting to a Wi-Fi network.
-4. After HoloLens connects to the Wi-Fi network, you select between **My work or school owns it** and **I own it**.
+1. Be sure your HoloLens is [charged](https://support.microsoft.com/help/12627)
+1. [Adjust fit](https://support.microsoft.com/help/12632) for a comfortable fit.
+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.
+
+## 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.
- 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.
-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. 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.
+1. The device sets your time zone based on information obtained from the Wi-Fi network.
+1. Follow the first-start guides to learn how to interact with holograms, control the HoloLens with your voice, and access the start menu.
+Congratulations! Setup is complete and you can begin using HoloLens.
+## 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)
\ No newline at end of file
diff --git a/devices/hololens/hololens-upgrade-enterprise.md b/devices/hololens/hololens-upgrade-enterprise.md
index bfafb1d925..57bf3d0e04 100644
--- a/devices/hololens/hololens-upgrade-enterprise.md
+++ b/devices/hololens/hololens-upgrade-enterprise.md
@@ -47,7 +47,7 @@ Provisioning packages are files created by the Windows Configuration Designer to
-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).
diff --git a/devices/hololens/images/hololens2-side-render.png b/devices/hololens/images/hololens2-side-render.png
new file mode 100644
index 0000000000..143fb8fc50
Binary files /dev/null and b/devices/hololens/images/hololens2-side-render.png differ
diff --git a/devices/hololens/index.md b/devices/hololens/index.md
index e3790fbfb5..3320efb458 100644
--- a/devices/hololens/index.md
+++ b/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
-ms.author: jdecker
+author: scooley
+ms.author: scooley
ms.topic: article
ms.localizationpriority: medium
-ms.date: 07/27/2018
+ms.date: 07/14/2019
---
# Microsoft HoloLens
-
-
Microsoft HoloLens is the first fully self-contained holographic computer running Windows 10.
Microsoft HoloLens is available in the Development Edition, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the Commercial Suite, which runs Windows Holographic for Business when you apply the Enterprise license file to the device.
+
+
Microsoft HoloLens is the first fully self-contained holographic computer running Windows 10.
+
+
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.
+
+
-## 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. |
-| [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. |
+| [What's new in Microsoft HoloLens](hololens-whats-new.md) | Discover new features in the latest updates. |
| [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 |
-| [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 |
-| [Change history for Microsoft HoloLens documentation](change-history-hololens.md) | See new and updated topics in the HoloLens documentation library. |
+| [HoloLens MDM support](hololens-enroll-mdm.md) | Manage multiple HoloLens devices simultaneously using Mobile Device Management (MDM) solutions like Microsoft Intune. |
+| [HoloLens update management](hololens-updates.md) | Use mobile device management (MDM) policies to configure settings for updates. |
+| [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)
-
-- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes)
+* [Documentation for Holographic app development](https://developer.microsoft.com/windows/mixed-reality/development)
+* [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)
diff --git a/devices/surface-hub/TOC.md b/devices/surface-hub/TOC.md
index 7eac6565e2..d9bdb48c3a 100644
--- a/devices/surface-hub/TOC.md
+++ b/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
diff --git a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
index 27ebc7924e..00620b9f7c 100644
--- a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
+++ b/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
diff --git a/devices/surface-hub/device-reset-surface-hub.md b/devices/surface-hub/device-reset-surface-hub.md
index 09c4b1ea60..2075507bd4 100644
--- a/devices/surface-hub/device-reset-surface-hub.md
+++ b/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**.
-2. Click **Update & Security**.
+2. Click **Update & Security**.
-3. Click **Recovery**, and then, under **Reset device**, click **Get started**.
+3. Click **Recovery**, and then, under **Reset device**, click **Get started**.
diff --git a/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md b/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
index cf30261837..73a50f66c9 100644
--- a/devices/surface-hub/differences-between-surface-hub-and-windows-10-enterprise.md
+++ b/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:* Surface Hub doesn't support installing Win32 agents required by most traditional PC management and monitoring tools, such as System Center Operations Manager.
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
index 857f59487f..5f16f8d171 100644
--- a/devices/surface-hub/docfx.json
+++ b/devices/surface-hub/docfx.json
@@ -14,7 +14,9 @@
"resource": [
{
"files": [
- "**/images/**"
+ "**/images/**",
+ "**/*.pptx",
+ "**/*.pdf"
],
"exclude": [
"**/obj/**"
diff --git a/devices/surface-hub/install-apps-on-surface-hub.md b/devices/surface-hub/install-apps-on-surface-hub.md
index 917cd53509..50bb8314a4 100644
--- a/devices/surface-hub/install-apps-on-surface-hub.md
+++ b/devices/surface-hub/install-apps-on-surface-hub.md
@@ -21,7 +21,7 @@ You can install additional apps on your Surface Hub to fit your team or organiza
A few things to know about apps on Surface Hub:
- Surface Hub only runs [Universal Windows Platform (UWP) apps](https://msdn.microsoft.com/windows/uwp/get-started/whats-a-uwp). Apps created using the [Desktop App Converter](https://docs.microsoft.com/windows/uwp/porting/desktop-to-uwp-run-desktop-app-converter) will not run on Surface Hub.
- Apps must be targeted for the [Universal device family](https://msdn.microsoft.com/library/windows/apps/dn894631) or Windows Team device family.
-- Surface Hub only supports [offline-licensed apps](https://docs.microsoft.com/microsoft-store/distribute-offline-apps) from Microsoft Store for Business.
+- Surface Hub only supports [offline-licensed apps](https://docs.microsoft.com/microsoft-store/distribute-offline-apps) from [Microsoft Store for Business](https://businessstore.microsoft.com/store).
- By default, apps must be Store-signed to be installed. During testing and development, you can also choose to run developer-signed UWP apps by placing the device in developer mode.
- When submitting an app to the Microsoft Store, developers need to set Device family availability and Organizational licensing options to make sure an app will be available to run on Surface Hub.
- You need admin credentials to install apps on your Surface Hub. Since the device is designed to be used in communal spaces like meeting rooms, people can't access the Microsoft Store to download and install apps.
@@ -39,10 +39,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**.
-2. Type the device admin credentials when prompted.
-3. Navigate to **Update & security** > **For developers**.
-4. Select **Developer mode** and accept the warning prompt.
+1. From your Surface Hub, start **Settings**.
+2. Type the device admin credentials when prompted.
+3. Navigate to **Update & security** > **For developers**.
+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 +101,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**.
-2. Type the device admin credentials when prompted.
-3. Navigate to **This device** > **Apps & features**.
-4. Select **Open Store**.
+1. From your Surface Hub, start **Settings**.
+2. Type the device admin credentials when prompted.
+3. Navigate to **This device** > **Apps & features**.
+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.
diff --git a/devices/surface-hub/monitor-surface-hub.md b/devices/surface-hub/monitor-surface-hub.md
index f030a801e9..e90e7d8f95 100644
--- a/devices/surface-hub/monitor-surface-hub.md
+++ b/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**. Indicates impact to core functionality (such as Skype, projection, touch, and internet connectivity). **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. **Components that affect Skype**: - Speaker driver - Microphone driver - Camera driver **Components that affect wired and wireless projection**: - Wired touchback driver - Wired ingest driver - Wireless adapter driver - Wi-Fi Direct error **Other components**: - Touch digitizer driver - Network adapter error (not reported to OMS)|
**To set up an alert**
-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.
-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.
+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.
+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.
## Enroll your Surface Hub
diff --git a/devices/surface-hub/skype-hybrid-voice.md b/devices/surface-hub/skype-hybrid-voice.md
index a6fa631e1b..c60e7826dc 100644
--- a/devices/surface-hub/skype-hybrid-voice.md
+++ b/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
diff --git a/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md b/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md
index 502df5cbb0..8251f94a15 100644
--- a/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md
+++ b/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md
@@ -20,7 +20,7 @@ You can install additional apps to fit your team or organization's needs.
- Surface Hub only runs [Universal Windows Platform (UWP) apps](https://msdn.microsoft.com/windows/uwp/get-started/whats-a-uwp). Apps created using the [Desktop App Converter](https://docs.microsoft.com/windows/uwp/porting/desktop-to-uwp-run-desktop-app-converter) will not run on Surface Hub.
- Apps must be targeted for the [Universal device family](https://msdn.microsoft.com/library/windows/apps/dn894631) or Windows Team device family.
-- Surface Hub only supports [offline-licensed apps](https://docs.microsoft.com/microsoft-store/distribute-offline-apps) from Microsoft Store for Business.
+- Surface Hub only supports [offline-licensed apps](https://docs.microsoft.com/microsoft-store/distribute-offline-apps) from [Microsoft Store for Business](https://businessstore.microsoft.com/store).
- By default, apps must be Store-signed to be installed. During testing and development, you can also choose to run developer-signed UWP apps by placing the device in developer mode.
- When developing and submitting apps to the Microsoft Store, set Device family availability and Organizational licensing options to ensure that apps are available to run on Surface Hub.
- You need admin credentials to install apps on Surface Hub. Designed for use in meeting rooms and other shared spaces, Surface Hub prevents regular users from accessing the Microsoft Store to download and install apps.
diff --git a/devices/surface-hub/surface-hub-2s-phone-authenticate.md b/devices/surface-hub/surface-hub-2s-phone-authenticate.md
index ecf42be99d..924b5483ab 100644
--- a/devices/surface-hub/surface-hub-2s-phone-authenticate.md
+++ b/devices/surface-hub/surface-hub-2s-phone-authenticate.md
@@ -39,4 +39,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).
diff --git a/devices/surface-hub/surface-hub-2s-prepare-environment.md b/devices/surface-hub/surface-hub-2s-prepare-environment.md
index 905baa519f..40ae6aeb82 100644
--- a/devices/surface-hub/surface-hub-2s-prepare-environment.md
+++ b/devices/surface-hub/surface-hub-2s-prepare-environment.md
@@ -44,6 +44,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.
diff --git a/devices/surface-hub/surface-hub-2s-setup.md b/devices/surface-hub/surface-hub-2s-setup.md
index 610cdcc697..3ba8fce268 100644
--- a/devices/surface-hub/surface-hub-2s-setup.md
+++ b/devices/surface-hub/surface-hub-2s-setup.md
@@ -43,7 +43,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,7 +91,7 @@ If you insert a USB thumb drive with a provisioning package into one of the USB
-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).
diff --git a/devices/surface-hub/whiteboard-collaboration.md b/devices/surface-hub/whiteboard-collaboration.md
index 525c84acb2..2c8a3793a6 100644
--- a/devices/surface-hub/whiteboard-collaboration.md
+++ b/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.
-2. Sign in with your organization ID.
-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.
+1. In the Whiteboard app, tap the **Sign in** button.
+2. Sign in with your organization ID.
+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.
-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.
diff --git a/devices/surface/deploy-surface-app-with-windows-store-for-business.md b/devices/surface/deploy-surface-app-with-windows-store-for-business.md
index 9448059c5b..5c4cc7c4a3 100644
--- a/devices/surface/deploy-surface-app-with-windows-store-for-business.md
+++ b/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
*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.
-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.
+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.
>[!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.
-2. Begin an elevated PowerShell session.
+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.
>[!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 \ Microsoft.SurfaceHub_10.0.342.0_neutral_~_8wekyb3d8bbwe.AppxBundle –LicensePath \ 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.
-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.
+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**.
+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.
-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.
+1. Open the properties of the Surface app in the MDT Deployment Workbench.
+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.
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.
-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**.
+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.
+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).
diff --git a/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md b/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md
index e749f22972..ea5592fb85 100644
--- a/devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md
+++ b/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**.
-11. Repeat Steps 6 through 10 for the Surface app.
-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.
+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.
+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.
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.
-16. On the **Properties** tab of the **Inject Drivers** step (as shown in Figure 23), configure the following options:
+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:
* 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
diff --git a/devices/surface/enroll-and-configure-surface-devices-with-semm.md b/devices/surface/enroll-and-configure-surface-devices-with-semm.md
index 3d04792b01..7eb53c4ec9 100644
--- a/devices/surface/enroll-and-configure-surface-devices-with-semm.md
+++ b/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**.
-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.
+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.
*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**.
-14. When the package is created and saved, the **Successful** page is displayed.
+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.
>[!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.
diff --git a/devices/surface/surface-diagnostic-toolkit-business.md b/devices/surface/surface-diagnostic-toolkit-business.md
index 8b78717d6c..cd0812b2d9 100644
--- a/devices/surface/surface-diagnostic-toolkit-business.md
+++ b/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.
-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**.
+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.
+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.
-6. Under Setup Type, select **Advanced**.
+5. On the Install Options screen, change the default install location if desired.
+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.
-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 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**.
-2. When the tool opens, click **Create Custom Package**, as shown in figure 3.
+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.
diff --git a/devices/surface/surface-diagnostic-toolkit-desktop-mode.md b/devices/surface/surface-diagnostic-toolkit-desktop-mode.md
index abce43dabc..9022fb4770 100644
--- a/devices/surface/surface-diagnostic-toolkit-desktop-mode.md
+++ b/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.
@@ -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**.
-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.
+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**.
+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
diff --git a/devices/surface/surface-enterprise-management-mode.md b/devices/surface/surface-enterprise-management-mode.md
index 9244515eb1..df65b6c73d 100644
--- a/devices/surface/surface-enterprise-management-mode.md
+++ b/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
diff --git a/devices/surface/unenroll-surface-devices-from-semm.md b/devices/surface/unenroll-surface-devices-from-semm.md
index 6531857a06..edcfcdf120 100644
--- a/devices/surface/unenroll-surface-devices-from-semm.md
+++ b/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.
-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**.
+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**.
+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**.
@@ -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.
@@ -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.
-18. Click or press **Restart now** on the **SEMM reset successful** page to complete the unenrollment from SEMM, as shown in Figure 14.
+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.
*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.
diff --git a/devices/surface/using-the-sda-deployment-share.md b/devices/surface/using-the-sda-deployment-share.md
index de79c73b49..52e96859b3 100644
--- a/devices/surface/using-the-sda-deployment-share.md
+++ b/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.
*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
diff --git a/education/trial-in-a-box/educator-tib-get-started.md b/education/trial-in-a-box/educator-tib-get-started.md
index b842f7b7e8..50a37cacde 100644
--- a/education/trial-in-a-box/educator-tib-get-started.md
+++ b/education/trial-in-a-box/educator-tib-get-started.md
@@ -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.
diff --git a/education/windows/deploy-windows-10-in-a-school-district.md b/education/windows/deploy-windows-10-in-a-school-district.md
index b35e105266..274b626f3e 100644
--- a/education/windows/deploy-windows-10-in-a-school-district.md
+++ b/education/windows/deploy-windows-10-in-a-school-district.md
@@ -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.
diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md
index 5ddc9d7456..cb30050aa8 100644
--- a/education/windows/edu-deployment-recommendations.md
+++ b/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**)
-2. Select a related problem (**Deleting an account**)
-3. Click **Next**.
-4. Select a contact method to get answers to your questions.
+1. Select a help topic (**Account and Password**)
+2. Select a related problem (**Deleting an account**)
+3. Click **Next**.
+4. Select a contact method to get answers to your questions.
#### Xbox
diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md
index 3432624379..838aa85226 100644
--- a/education/windows/teacher-get-minecraft.md
+++ b/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.
-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**
+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)
+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.
diff --git a/mdop/appv-v4/delete-package.md b/mdop/appv-v4/delete-package.md
index b5f9062d59..925e63a5c9 100644
--- a/mdop/appv-v4/delete-package.md
+++ b/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]`
diff --git a/mdop/appv-v4/sfttray-command-reference.md b/mdop/appv-v4/sfttray-command-reference.md
index 0b72c8c94c..38b1c28072 100644
--- a/mdop/appv-v4/sfttray-command-reference.md
+++ b/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 /LAUNCH app [args]`
+`Sfttray.exe [/HIDE | /SHOW] [/QUIET] /LAUNCHRESULT /LAUNCH app [args]`
-` Sfttray.exe /EXIT`
+`Sfttray.exe /EXIT`
### Command-Line Switches
diff --git a/mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer.md b/mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer.md
index d9862868d2..ee45693fca 100644
--- a/mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer.md
+++ b/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: http://publishingserver:pubport. If the server is running correctly information similar to the following will be displayed:
- ``
-
- ` `
-
- ` `
-
- ` `
-
- ` `
-
- ` `
-
- ` `
-
- ``
+ ```xml
+
+
+
+
+
+
+
+
+ ```
**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).
diff --git a/mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer51.md b/mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer51.md
index b304366dd1..c9ed253251 100644
--- a/mdop/appv-v5/how-to-install-the-publishing-server-on-a-remote-computer51.md
+++ b/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: http://publishingserver:pubport. If the server is running correctly information similar to the following will be displayed:
- ``
-
- ` `
-
- ` `
-
- ` `
-
- ` `
-
- ` `
-
- ` `
-
- ``
+ ```xml
+
+
+
+
+
+
+
+
+ ```
**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).
diff --git a/mdop/mbam-v1/how-to-move-mbam-10-features-to-another-computer.md b/mdop/mbam-v1/how-to-move-mbam-10-features-to-another-computer.md
index b300c0341b..e0dec01036 100644
--- a/mdop/mbam-v1/how-to-move-mbam-10-features-to-another-computer.md
+++ b/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:
diff --git a/mdop/mbam-v2/how-to-move-mbam-20-features-to-another-computer-mbam-2.md b/mdop/mbam-v2/how-to-move-mbam-20-features-to-another-computer-mbam-2.md
index 46aeb38af7..7888f34d72 100644
--- a/mdop/mbam-v2/how-to-move-mbam-20-features-to-another-computer-mbam-2.md
+++ b/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:
diff --git a/mdop/uev-v2/application-template-schema-reference-for-ue-v-2x-both-uevv2.md b/mdop/uev-v2/application-template-schema-reference-for-ue-v-2x-both-uevv2.md
index cf5d567d3a..fd3074b66a 100644
--- a/mdop/uev-v2/application-template-schema-reference-for-ue-v-2x-both-uevv2.md
+++ b/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
`, for example:
-``` syntax
-
- 4
+ 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 3 Jan 01, 2013 Added font settings support - Mark@Contoso.com
+ Version 4 Jan 31, 2013 Added support for plugin settings - Tony@Contoso.com
+ -->
+4
```
**Important**
@@ -1216,25 +1215,25 @@ Author identifies the creator of the settings location template. Two optional ch
Processes contains at least one `` 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
-
- MyApplication.exe
- Win64
- MyApplication
- MyApplication.exe
-
-
-
-
-
-
-
-
-
-
-
-
-
+```xml
+
+ MyApplication.exe
+ Win64
+ MyApplication
+ MyApplication.exe
+
+
+
+
+
+
+
+
+
+
+
+
+
```
### 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
-
- MyApplication.exe
- My Application 6.x by Contoso.com
-
-
-
-
+```xml
+
+ MyApplication.exe
+ My Application 6.x by Contoso.com
+
+
+
+
```
### 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
-
-
- MyApplication.exe
- My Application Main Engine
-
-
-
-
-
- MyApplicationHelper.exe
- My Application Background Process Executable
-
-
-
-
+
+ MyApplication.exe
+ My Application Main Engine
+
+
+
+
+
+ MyApplicationHelper.exe
+ My Application Background Process Executable
+
+
+
+
```
@@ -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
+
+
+
+
```
**Example 2:**
File version: 5.0.2.1000 specified in the UE-V Generator produces the following XML:
-``` syntax
-
-
-
-
-
-
+```xml
+
+
+
+
+
+
```
**Incorrect Example 1 – incomplete range:**
Only the Minimum attribute is present. Maximum must be included in a range as well.
-``` syntax
-
-
-
+```xml
+
+
+
```
**Incorrect Example 2 – Minor specified without Major element:**
Only the Minor element is present. Major must be included as well.
-``` syntax
-
-
-
+```xml
+
+
+
```
### 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
-
- MSACCESS.EXE
- Win32
-
-
-
-
-
-
-
-
-
+```xml
+
+ MSACCESS.EXE
+ Win32
+
+
+
+
+
+
+
+
+
```
### Application Element
diff --git a/store-for-business/acquire-apps-microsoft-store-for-business.md b/store-for-business/acquire-apps-microsoft-store-for-business.md
index 3b6a6ab7cf..cfbb3dcb99 100644
--- a/store-for-business/acquire-apps-microsoft-store-for-business.md
+++ b/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
-2. Select **Shop for my group**, or use Search to find an app.
-3. Select the app you want to purchase.
-4. On the product description page, choose your license type - either online or offline.
+1. Sign in to http://businessstore.microsoft.com
+2. Select **Shop for my group**, or use Search to find an app.
+3. Select the app you want to purchase.
+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.
-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**.
+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**.
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).
diff --git a/store-for-business/app-inventory-management-microsoft-store-for-business.md b/store-for-business/app-inventory-management-microsoft-store-for-business.md
index c7b0c2dce6..17369a8148 100644
--- a/store-for-business/app-inventory-management-microsoft-store-for-business.md
+++ b/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).
-2. Click **Manage**, and then choose **Inventory**.
-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**.
+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**.
+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**.
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.
-2. Click the private store tab.
-3. Click the app you want to install, and then click **Install**.
+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.
+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.
diff --git a/store-for-business/distribute-apps-from-your-private-store.md b/store-for-business/distribute-apps-from-your-private-store.md
index 50f43122c5..d45e508ac3 100644
--- a/store-for-business/distribute-apps-from-your-private-store.md
+++ b/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
-3. Use **Refine results** to search for online-licensed apps under **License type**.
-4. From the list of online-licensed apps, click the ellipses for the app you want, and then choose **Add to private store**.
+3. Click on the application to open the application settings, then select **Private store availability**.
+4. Select **Everyone** to make application available for all people in your organization.
-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).
diff --git a/store-for-business/manage-orders-microsoft-store-for-business.md b/store-for-business/manage-orders-microsoft-store-for-business.md
index 6a2f39e62d..115dd3fa5b 100644
--- a/store-for-business/manage-orders-microsoft-store-for-business.md
+++ b/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**.
-3. Find the app you want to refund, click the ellipses under **Actions**, and then choose **View license details**.
+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**.
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**.
diff --git a/store-for-business/update-microsoft-store-for-business-account-settings.md b/store-for-business/update-microsoft-store-for-business-account-settings.md
index 495b200df1..1cb95fa906 100644
--- a/store-for-business/update-microsoft-store-for-business-account-settings.md
+++ b/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:
diff --git a/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md b/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
index 90350a2913..f4075f53b1 100644
--- a/windows/application-management/app-v/appv-install-the-appv-databases-and-convert-the-associated-security-identifiers-with-powershell.md
+++ b/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)
diff --git a/windows/application-management/svchost-service-refactoring.md b/windows/application-management/svchost-service-refactoring.md
index dddf40f87f..58e0e60b57 100644
--- a/windows/application-management/svchost-service-refactoring.md
+++ b/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.
-> 2. To see separated processes, set the RAM to 3486 MB or greater. 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.
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.
diff --git a/windows/client-management/mdm/activesync-csp.md b/windows/client-management/mdm/activesync-csp.md
index f8b87748fa..9761cd0e66 100644
--- a/windows/client-management/mdm/activesync-csp.md
+++ b/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
```
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
./Vendor/MSFT/ActiveSync/Accounts/%7BC556E16F-56C4-4EDB-9C64-D9469EE1FBE0%7D
diff --git a/windows/client-management/mdm/assignedaccess-csp.md b/windows/client-management/mdm/assignedaccess-csp.md
index ed052860e4..d1e42bc7aa 100644
--- a/windows/client-management/mdm/assignedaccess-csp.md
+++ b/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.
**./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
+
+
+
@@ -270,6 +278,7 @@ KioskModeApp Replace
+
@@ -286,6 +295,10 @@ KioskModeApp Replace
+
+
+
+
@@ -304,7 +317,13 @@ KioskModeApp Replace
+
+
+
+
+
+
@@ -322,7 +341,8 @@ KioskModeApp Replace
-
+
+
@@ -340,6 +360,7 @@ KioskModeApp Replace
+
@@ -365,6 +386,22 @@ KioskModeApp Replace
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -385,7 +422,94 @@ KioskModeApp Replace
+```
+Here is the schema for new features introduced in Windows 10 1809 release
+```xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+Schema for Windows 10 prerelease
+```xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+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
+
+
+
+
+
+
```
## Example AssignedAccessConfiguration XML
@@ -796,7 +920,7 @@ StatusConfiguration Get
StatusConfiguration Replace On
-```syntax
+```xml
@@ -1219,7 +1343,7 @@ ShellLauncherConfiguration Get
## AssignedAccessAlert XSD
-```syntax
+```xml
1
@@ -379,7 +379,7 @@ Add a root certificate to the MDM server.
Get all installed client certificates.
-``` syntax
+```xml
1
@@ -394,7 +394,7 @@ Get all installed client certificates.
Delete a root certificate.
-``` syntax
+```xml
1
@@ -409,7 +409,7 @@ Delete a root certificate.
Configure the device to enroll a client certificate through SCEP.
-``` syntax
+```xml
100
@@ -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
1
diff --git a/windows/client-management/mdm/cm-cellularentries-csp.md b/windows/client-management/mdm/cm-cellularentries-csp.md
index 6ef3f48d8b..567dfd207e 100644
--- a/windows/client-management/mdm/cm-cellularentries-csp.md
+++ b/windows/client-management/mdm/cm-cellularentries-csp.md
@@ -198,7 +198,7 @@ The following diagram shows the CM\_CellularEntries configuration service provid
To delete a connection, you must first delete any associated proxies and then delete the connection. The following example shows how to delete the proxy and then the connection.
-``` syntax
+```xml
@@ -214,7 +214,7 @@ To delete a connection, you must first delete any associated proxies and then de
Configuring a GPRS connection:
-``` syntax
+```xml
@@ -231,7 +231,7 @@ Configuring a GPRS connection:
Configuring an LTE connection:
-``` syntax
+```xml
@@ -250,7 +250,7 @@ Configuring an LTE connection:
Configuring a CDMA connection:
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/cmpolicy-csp.md b/windows/client-management/mdm/cmpolicy-csp.md
index e9c0f37c15..1dfca8abb1 100644
--- a/windows/client-management/mdm/cmpolicy-csp.md
+++ b/windows/client-management/mdm/cmpolicy-csp.md
@@ -240,7 +240,7 @@ Specifies the type of connection being referenced. The following list describes
Adding an application-based mapping policy. In this example, the ConnectionId for type CMST\_CONNECTION\_NAME is set to the name of the connection (“GPRSConn1”) that is configured with the CM\_CellularEntries configuration service provider.
-``` syntax
+```xml
@@ -285,7 +285,7 @@ Adding an application-based mapping policy. In this example, the ConnectionId fo
Adding a host-based mapping policy. In this example, the ConnectionId for type CMST\_CONNECTION\_NAME is set to the name of the connection (“GPRSConn1”) that is configured with the CM\_CellularEntries configuration service provider.
-``` syntax
+```xml
@@ -334,7 +334,7 @@ Adding a host-based mapping policy. In this example, the ConnectionId for type C
Adding an application-based mapping policy:
-``` syntax
+```xml
@@ -401,7 +401,7 @@ Adding an application-based mapping policy:
Adding a host-based mapping policy:
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/cmpolicyenterprise-csp.md b/windows/client-management/mdm/cmpolicyenterprise-csp.md
index f601f858de..08d0040594 100644
--- a/windows/client-management/mdm/cmpolicyenterprise-csp.md
+++ b/windows/client-management/mdm/cmpolicyenterprise-csp.md
@@ -240,7 +240,7 @@ Specifies the type of connection being referenced. The following list describes
Adding an application-based mapping policy. In this example, the ConnectionId for type CMST\_CONNECTION\_NAME is set to the name of the connection (“GPRSConn1”) that is configured with the CM\_CellularEntries configuration service provider.
-``` syntax
+```xml
@@ -285,7 +285,7 @@ Adding an application-based mapping policy. In this example, the ConnectionId fo
Adding a host-based mapping policy. In this example, the ConnectionId for type CMST\_CONNECTION\_NAME is set to the name of the connection (“GPRSConn1”) that is configured with the CM\_CellularEntries configuration service provider.
-``` syntax
+```xml
@@ -334,7 +334,7 @@ Adding a host-based mapping policy. In this example, the ConnectionId for type C
Adding an application-based mapping policy:
-``` syntax
+```xml
@@ -401,7 +401,7 @@ Adding an application-based mapping policy:
Adding a host-based mapping policy:
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/customdeviceui-csp.md b/windows/client-management/mdm/customdeviceui-csp.md
index 6e5b89a1b1..05add93e6a 100644
--- a/windows/client-management/mdm/customdeviceui-csp.md
+++ b/windows/client-management/mdm/customdeviceui-csp.md
@@ -38,7 +38,7 @@ Package Full Name of the App that needs be launched in the background. This can
**Set StartupAppID**
-``` syntax
+```xml
@@ -60,7 +60,7 @@ Package Full Name of the App that needs be launched in the background. This can
**Get all background tasks**
-``` syntax
+```xml
@@ -78,7 +78,7 @@ Package Full Name of the App that needs be launched in the background. This can
**Add background task**
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/device-update-management.md b/windows/client-management/mdm/device-update-management.md
index 0888128b87..13a78b2032 100644
--- a/windows/client-management/mdm/device-update-management.md
+++ b/windows/client-management/mdm/device-update-management.md
@@ -648,7 +648,7 @@ If a machine has Microsoft Update enabled, any Microsoft Updates in these catego
Example
-``` syntax
+```xml
$CmdID$
@@ -919,7 +919,7 @@ The following screenshots of the administrator console shows the list of update
Set auto update to notify and defer.
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/deviceinstanceservice-csp.md b/windows/client-management/mdm/deviceinstanceservice-csp.md
index 40379541ed..09d6af05e4 100644
--- a/windows/client-management/mdm/deviceinstanceservice-csp.md
+++ b/windows/client-management/mdm/deviceinstanceservice-csp.md
@@ -70,7 +70,7 @@ The parent node to group SIM2 specific information in case of dual SIM mode.
The following sample shows how to query roaming status and phone number on the device.
-``` syntax
+```xml
2
@@ -88,7 +88,7 @@ The following sample shows how to query roaming status and phone number on the d
Response from the phone.
-``` syntax
+```xml
31
diff --git a/windows/client-management/mdm/devicelock-csp.md b/windows/client-management/mdm/devicelock-csp.md
index b2cf37371d..246408076e 100644
--- a/windows/client-management/mdm/devicelock-csp.md
+++ b/windows/client-management/mdm/devicelock-csp.md
@@ -126,7 +126,7 @@ Required. This node has the same set of policy nodes as the **ProviderID** node.
Set device lock policies:
-``` syntax
+```xml
13
diff --git a/windows/client-management/mdm/diagnosticlog-csp.md b/windows/client-management/mdm/diagnosticlog-csp.md
index 98c675ebf6..44c558fde0 100644
--- a/windows/client-management/mdm/diagnosticlog-csp.md
+++ b/windows/client-management/mdm/diagnosticlog-csp.md
@@ -420,7 +420,7 @@ Default value is 0 meaning no keyword.
Get provider **Keywords**
-``` syntax
+```xml
@@ -440,7 +440,7 @@ Get provider **Keywords**
Set provider **Keywords**
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
index 6c7e0be2f3..3cb1682333 100644
--- a/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
+++ b/windows/client-management/mdm/disconnecting-from-mdm-unenrollment.md
@@ -105,7 +105,7 @@ After the previous package is sent, the unenrollment process begins.
When the server initiates disconnection, all undergoing sessions for the enrollment ID are aborted immediately to avoid deadlocks. The server will not get a response for the unenrollment, instead a generic alert notification is sent with messageid=1.
-``` syntax
+```xml
4
1226
diff --git a/windows/client-management/mdm/dmclient-csp.md b/windows/client-management/mdm/dmclient-csp.md
index 4dd6ad8b3d..7946edba39 100644
--- a/windows/client-management/mdm/dmclient-csp.md
+++ b/windows/client-management/mdm/dmclient-csp.md
@@ -70,7 +70,7 @@ Supported operation is Get.
The following is a Get command example.
-``` syntax
+```xml
12
@@ -173,7 +173,7 @@ To work around the timeout, you can use this setting to keep the session alive b
Here is an example of DM message sent by the device when it is in pending state:
-``` syntax
+```xml
1.2
@@ -229,7 +229,7 @@ Added in Windows 10, version 1607. The list of management server URLs in the fo
-``` syntax
+```xml
101
@@ -770,7 +770,7 @@ Note that <LocURI>./Vendor/MSFT/DMClient/Unenroll</LocURI> is suppor
The following SyncML shows how to remotely unenroll the device. Note that this command should be inserted in the general DM packages sent from the server to the device.
-``` syntax
+```xml
2
diff --git a/windows/client-management/mdm/dynamicmanagement-csp.md b/windows/client-management/mdm/dynamicmanagement-csp.md
index d8747df10d..e7d55aedc0 100644
--- a/windows/client-management/mdm/dynamicmanagement-csp.md
+++ b/windows/client-management/mdm/dynamicmanagement-csp.md
@@ -29,7 +29,7 @@ The following diagram shows the DynamicManagement configuration service provider
Default value is False. Supported operations are Get and Replace.
Example to turn on NotificationsEnabled:
-``` syntax
+```xml
100
@@ -84,7 +84,7 @@ The following diagram shows the DynamicManagement configuration service provider
Disable Cortana based on Geo location and time, From 9am-5pm, when in the 100 meters radius of the specified latitude/longitude
-``` syntax
+```xml
200
@@ -138,7 +138,7 @@ Disable Cortana based on Geo location and time, From 9am-5pm, when in the 100 me
Disable camera using network trigger with time trigger, from 9-5, when ip4 gateway is 192.168.0.1
-``` syntax
+```xml
300
@@ -193,7 +193,7 @@ Disable camera using network trigger with time trigger, from 9-5, when ip4 gatew
Delete a context
-``` syntax
+```xml
400
@@ -206,7 +206,7 @@ Delete a context
Get ContextStatus and SignalDefinition from a specific context
-``` syntax
+```xml
400
diff --git a/windows/client-management/mdm/eap-configuration.md b/windows/client-management/mdm/eap-configuration.md
index 0080b3d273..49635be46f 100644
--- a/windows/client-management/mdm/eap-configuration.md
+++ b/windows/client-management/mdm/eap-configuration.md
@@ -142,11 +142,11 @@ The following list describes the prerequisites for a certificate to be used with
- The certificate must have at least one of the following EKU (Extended Key Usage) properties:
- Client Authentication
- - As defined by RFC 5280, this is a well-defined OID with Value 1.3.6.1.5.5.7.3.2
+ - As defined by RFC 5280, this is a well-defined OID with Value 1.3.6.1.5.5.7.3.2
- Any Purpose
- - An EKU Defined and published by Microsoft, is a well-defined OID with value 1.3.6.1.4.1.311.10.12.1. The inclusion of this OID implies that the certificate can be used for any purpose. The advantage of this EKU over the All Purpose EKU is that additional non-critical or custom EKUs can still be added to the certificate for effective filtering.
+ - An EKU Defined and published by Microsoft, is a well-defined OID with value 1.3.6.1.4.1.311.10.12.1. The inclusion of this OID implies that the certificate can be used for any purpose. The advantage of this EKU over the All Purpose EKU is that additional non-critical or custom EKUs can still be added to the certificate for effective filtering.
- All Purpose
- - As defined by RFC 5280, If a CA includes extended key usages to satisfy some application needs, but does not want to restrict usage of the key, the CA can add an Extended Key Usage Value of 0. A certificate with such an EKU can be used for all purposes.
+ - As defined by RFC 5280, If a CA includes extended key usages to satisfy some application needs, but does not want to restrict usage of the key, the CA can add an Extended Key Usage Value of 0. A certificate with such an EKU can be used for all purposes.
- The user or the computer certificate on the client chains to a trusted root CA
- The user or the computer certificate does not fail any one of the checks that are performed by the CryptoAPI certificate store, and the certificate passes requirements in the remote access policy.
- The user or the computer certificate does not fail any one of the certificate object identifier checks that are specified in the Internet Authentication Service (IAS)/Radius Server.
diff --git a/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md b/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md
index 8e61116fdd..f97a70c2f7 100644
--- a/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md
+++ b/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md
@@ -64,7 +64,7 @@ See [Support Tip: Ingesting Office ADMX-backed policies using Microsoft Intune](
> [!NOTE]
> The \ payload must be XML encoded. To avoid encoding, you can use CData if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect). If you are using Intune, select String as the data type.
-``` syntax
+```xml
@@ -114,7 +114,7 @@ See [Support Tip: Ingesting Office ADMX-backed policies using Microsoft Intune](
Here is the snippet from appv.admx:
- ``` syntax
+ ```xml
@@ -226,7 +226,7 @@ See [Support Tip: Ingesting Office ADMX-backed policies using Microsoft Intune](
> [!NOTE]
> The \ payload must be XML encoded. To avoid encoding, you can use CData if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect). If you are using Intune, select String as the data type.
- ``` syntax
+ ```xml
@@ -264,7 +264,7 @@ See [Support Tip: Ingesting Office ADMX-backed policies using Microsoft Intune](
The \ payload is \. Here is an example to disable AppVirtualization/PublishingAllowServer2.
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
index 645484d8fa..e05ab31e6f 100644
--- a/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
+++ b/windows/client-management/mdm/enable-offline-updates-for-windows-embedded-8-1-handheld-devices-to-windows-10.md
@@ -275,7 +275,7 @@ After the installation of updates is completed, the IT Admin can use the DURepor
## Example PowerShell script
-``` syntax
+```powershell
param (
# [Parameter (Mandatory=$true, HelpMessage="Input File")]
[String]$inputFile,
diff --git a/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md b/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
index 1d7810f0e3..f374eaec31 100644
--- a/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
+++ b/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy.md
@@ -50,7 +50,7 @@ Requirements:
- Enterprise has MDM service already configured
- Enterprise AD must be registered with Azure AD
-1. Run GPEdit.msc
+1. Run GPEdit.msc
Click Start, then in the text box type gpedit.
@@ -62,11 +62,11 @@ Requirements:
-4. Double-click **Auto MDM Enrollment with AAD Token**.
+4. Double-click **Auto MDM Enrollment with AAD Token**.
-5. Click **Enable**, then click **OK**.
+5. Click **Enable**, then click **OK**.
A task is created and scheduled to run every 5 minutes for the duration of 1 day. The task is called " Schedule created by enrollment client for automatically enrolling in MDM from AAD."
@@ -76,9 +76,9 @@ Requirements:
-6. To verify successful enrollment to MDM , click **Start > Settings > Accounts > Access work or school**, then select your domain account.
+6. To verify successful enrollment to MDM , click **Start > Settings > Accounts > Access work or school**, then select your domain account.
-7. Click **Info** to see the MDM enrollment information.
+7. Click **Info** to see the MDM enrollment information.
@@ -91,9 +91,9 @@ Requirements:
-2. Under **Best match**, click **Task Scheduler** to launch it.
+2. Under **Best match**, click **Task Scheduler** to launch it.
-3. In **Task Scheduler Library**, open **Microsoft > Windows** , then click **EnterpriseMgmt**.
+3. In **Task Scheduler Library**, open **Microsoft > Windows** , then click **EnterpriseMgmt**.
@@ -122,11 +122,11 @@ Requirements:
> 5. Restart the Primary Domain Controller for the policy to be available.
> This procedure will work for any future version as well.
-1. Create a Group Policy Object (GPO) and enable the Group Policy **Computer Configuration** > **Policies** > **Administrative Templates** > **Windows Components** > **MDM** > **Enable automatic MDM enrollment using default Azure AD credentials**.
-2. Create a Security Group for the PCs.
-3. Link the GPO.
-4. Filter using Security Groups.
-5. Enforce a GPO link.
+1. Create a Group Policy Object (GPO) and enable the Group Policy **Computer Configuration** > **Policies** > **Administrative Templates** > **Windows Components** > **MDM** > **Enable automatic MDM enrollment using default Azure AD credentials**.
+2. Create a Security Group for the PCs.
+3. Link the GPO.
+4. Filter using Security Groups.
+5. Enforce a GPO link.
> [!NOTE]
> Version 1903 (March 2019) is actually on the Insider program and doesn't yet contain a downloadable version of Templates (version 1903).
diff --git a/windows/client-management/mdm/enterprise-app-management.md b/windows/client-management/mdm/enterprise-app-management.md
index 2502635341..b809041a65 100644
--- a/windows/client-management/mdm/enterprise-app-management.md
+++ b/windows/client-management/mdm/enterprise-app-management.md
@@ -78,7 +78,7 @@ Note that performing a full inventory of a device can be resource intensive on t
Here is an example of a query for all apps on the device.
-``` syntax
+```xml
1
@@ -92,7 +92,7 @@ Here is an example of a query for all apps on the device.
Here is an example of a query for a specific app for a user.
-``` syntax
+```xml
1
@@ -121,7 +121,7 @@ For detailed descriptions of each node, see [EnterpriseModernAppManagement CSP](
Here is an example of a query for all app licenses on a device.
-``` syntax
+```xml
1
@@ -135,7 +135,7 @@ Here is an example of a query for all app licenses on a device.
Here is an example of a query for all app licenses for a user.
-``` syntax
+```xml
1
@@ -161,7 +161,7 @@ For more information about the AllowAllTrustedApps policy, see [Policy CSP](poli
Here are some examples.
-``` syntax
+```xml
1
@@ -199,7 +199,7 @@ For more information about the AllowDeveloperUnlock policy, see [Policy CSP](pol
Here is an example.
-``` syntax
+```xml
1
@@ -244,7 +244,7 @@ Here are the requirements for this scenario:
Here are some examples.
-``` syntax
+```xml
1
@@ -281,7 +281,7 @@ In the SyncML, you need to specify the following information in the Exec command
Here is an example of an offline license installation.
-``` syntax
+```xml
1
@@ -315,7 +315,7 @@ The Add command for the package family name is required to ensure proper removal
Here is an example of a line-of-business app installation.
-``` syntax
+```xml
0
@@ -342,7 +342,7 @@ Here is an example of a line-of-business app installation.
Here is an example of an app installation with dependencies.
-``` syntax
+```xml
0
@@ -376,7 +376,7 @@ Here is an example of an app installation with dependencies.
Here is an example of an app installation with dependencies and optional packages.
-``` syntax
+```xml
0
@@ -438,7 +438,7 @@ Here is an example of app installation.
> **Note** This is only supported in Windows 10 for desktop editions.
-``` syntax
+```xml
0
@@ -475,7 +475,7 @@ Here is an example of app installation with dependencies.
> **Note** This is only supported in Windows 10 for desktop editions.
-``` syntax
+```xml
0
@@ -526,7 +526,7 @@ When an app is installed successfully, the node is cleaned up and no longer pres
Here is an example of a query for a specific app installation.
-``` syntax
+```xml
2
@@ -540,7 +540,7 @@ Here is an example of a query for a specific app installation.
Here is an example of a query for all app installations.
-``` syntax
+```xml
2
@@ -558,7 +558,7 @@ Application installations can take some time to complete, hence they are done as
Here is an example of an alert.
-``` syntax
+```xml
4
1226
@@ -594,7 +594,7 @@ To uninstall an app, you delete it under the origin node, package family name, a
Here is an example for uninstalling all versions of an app for a user.
-``` syntax
+```xml
1
@@ -608,7 +608,7 @@ Here is an example for uninstalling all versions of an app for a user.
Here is an example for uninstalling a specific version of the app for a user.
-``` syntax
+```xml
1
@@ -631,7 +631,7 @@ Removing provisioned app occurs in the device context.
Here is an example for removing a provisioned app from a device.
-``` syntax
+```xml
1
@@ -645,7 +645,7 @@ Here is an example for removing a provisioned app from a device.
Here is an example for removing a specific version of a provisioned app from a device:
-``` syntax
+```xml
1
@@ -663,7 +663,7 @@ You can remove app licenses from a device per app based on the content ID.
Here is an example for removing an app license for a user.
-``` syntax
+```xml
1
@@ -677,7 +677,7 @@ Here is an example for removing an app license for a user.
Here is an example for removing an app license for a provisioned package (device context).
-``` syntax
+```xml
1
@@ -697,7 +697,7 @@ For user-based uninstallation, use ./User in the LocURI, and for provisioning, u
Here is an example. There is only one uninstall for hosted and store apps.
-``` syntax
+```xml
1226
@@ -723,7 +723,7 @@ To update an app from Microsoft Store, the device requires contact with the stor
Here is an example of an update scan.
-``` syntax
+```xml
1
@@ -737,7 +737,7 @@ Here is an example of an update scan.
Here is an example of a status check.
-``` syntax
+```xml
1
@@ -766,7 +766,7 @@ Turning off updates only applies to updates from the Microsoft Store at the devi
Here is an example.
-``` syntax
+```xml
1
@@ -795,7 +795,7 @@ You can install app on non-system volumes, such as a secondary partition or remo
Here is an example.
-``` syntax
+```xml
1
@@ -832,7 +832,7 @@ The RestrictAppDataToSystemVolume policy in [Policy CSP](policy-configuration-se
Here is an example.
-``` syntax
+```xml
1
@@ -873,7 +873,7 @@ The valid values are 0 (off, default value) and 1 (on).
Here is an example.
-``` syntax
+```xml
1
diff --git a/windows/client-management/mdm/enterpriseapn-csp.md b/windows/client-management/mdm/enterpriseapn-csp.md
index 2b091686b2..d2b3bddc1d 100644
--- a/windows/client-management/mdm/enterpriseapn-csp.md
+++ b/windows/client-management/mdm/enterpriseapn-csp.md
@@ -132,7 +132,7 @@ The following image shows the EnterpriseAPN configuration service provider in tr
## Examples
-``` syntax
+```xml
diff --git a/windows/client-management/mdm/enterpriseappmanagement-csp.md b/windows/client-management/mdm/enterpriseappmanagement-csp.md
index e5e5177782..486334505b 100644
--- a/windows/client-management/mdm/enterpriseappmanagement-csp.md
+++ b/windows/client-management/mdm/enterpriseappmanagement-csp.md
@@ -209,7 +209,7 @@ The Microsoft Store application has a GUID of d5dc1ebb-a7f1-df11-9264-00237de2db
Use the following SyncML format to query to see if the application is installed on a managed device:
-``` syntax
+```xml
1
@@ -222,7 +222,7 @@ Use the following SyncML format to query to see if the application is installed
Response from the device (it contains list of subnodes if this app is installed in the device).
-``` syntax
+```xml
31
@@ -266,7 +266,7 @@ The value actually applied to the device can be queried via the nodes under the
Enroll enterprise ID “4000000001” for the first time:
-``` syntax
+```xml
2
@@ -293,7 +293,7 @@ Enroll enterprise ID “4000000001” for the first time:
Update the enrollment token (for example, to update an expired application enrollment token):
-``` syntax
+```xml
2
@@ -310,7 +310,7 @@ Update the enrollment token (for example, to update an expired application enrol
Query all installed applications that belong to enterprise id “4000000001”:
-``` syntax
+```xml
2
@@ -325,7 +325,7 @@ Query all installed applications that belong to enterprise id “4000000001”:
Response from the device (that contains two installed applications):
-``` syntax
+```xml
31
@@ -444,7 +444,7 @@ To perform an XAP update, create the Name, URL, Version, and DownloadInstall nod
-``` syntax
+```xml
2` node among with other `` nodes, it shares most grammar with the Application Node, **folderId** is mandatory, **folderName** is optional, which is the folder name displayed on Start. **folderId** is a unique unsigned integer for each folder.
Folder example:
-``` syntax
+```xml
Large
@@ -123,7 +123,7 @@ Folder example:
```
An application that belongs in the folder would add an optional attribute **ParentFolderId**, which maps to **folderId** of the folder. In this case, the location of this application will be located inside the folder.
-``` syntax
+```xml
Medium
@@ -252,7 +252,7 @@ For example, in place of SettingPageDisplay, you would use ms-settings:display.
Here is an example for Windows 10, version 1703.
-``` syntax
+```xml
@@ -327,14 +327,14 @@ Starting in Windows 10, version 1703, Quick action settings no longer require an
In this example, all settings pages and quick action settings are allowed. An empty \ node indicates that none of the settings are blocked.
-``` syntax
+```xml
```
In this example for Windows 10, version 1511, all System setting pages are enabled. Note that the System page group is added as well as all of the System subpage names.
-``` syntax
+```xml
@@ -350,7 +350,7 @@ In this example for Windows 10, version 1511, all System setting pages are ena
```
Here is an example for Windows 10, version 1703.
-``` syntax
+```xml
@@ -382,7 +382,7 @@ Buttons | The following list identifies the hardware buttons on the device that
> Custom buttons are hardware buttons that can be added to devices by OEMs.
Buttons example:
-``` syntax
+```xml
@@ -407,7 +407,7 @@ The Search and custom buttons can be remapped or configured to open a s
To remap a button in lockdown XML, you supply the button name, the button event (typically "press"), and the product ID for the application the button will open.
-``` syntax
+```xml
