diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 29a6408e38..89eeea7716 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -6497,13 +6497,13 @@ }, { "source_path": "windows/manage/app-inventory-managemement-windows-store-for-business.md", -"redirect_url": "/microsoft-store/app-inventory-management-windows-store-for-business", +"redirect_url": "/microsoft-store/app-inventory-management-windows-store-for-business#manage-apps-in-your-inventory", "redirect_document_id": true }, { "source_path": "store-for-business/app-inventory-management-windows-store-for-business.md", "redirect_url": "/microsoft-store/app-inventory-management-microsoft-store-for-business", -"redirect_document_id": true +"redirect_document_id": false }, { "source_path": "windows/manage/application-development-for-windows-as-a-service.md", @@ -14156,6 +14156,116 @@ "redirect_document_id": true }, { +"source_path": "windows/client-management/mdm/create-a-custom-configuration-service-provider.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": true +}, +{ +"source_path": "windows/client-management/mdm/design-a-custom-windows-csp.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/iconfigserviceprovider2.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/iconfigserviceprovider2configmanagernotification.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/iconfigserviceprovider2getnode.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnode.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodeadd.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodeclear.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodecopy.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodedeletechild.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodedeleteproperty.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodeexecute.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodegetchildnodenames.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodegetproperty.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodegetpropertyidentifiers.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodegetvalue.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodemove.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodesetproperty.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodesetvalue.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspnodetransactioning.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/icspvalidate.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ +"source_path": "windows/client-management/mdm/samples-for-writing-a-custom-configuration-service-provider.md", +"redirect_url": "/windows/client-management/mdm/configuration-service-provider-reference", +"redirect_document_id": false +}, +{ "source_path": "windows/keep-secure/collect-wip-audit-event-logs.md", "redirect_url": "/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs", "redirect_document_id": true 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**. ![GitHub Web, showing the Edit link](images/contribute-link.png) @@ -30,12 +30,12 @@ We've tried to make editing an existing, public file as simple as possible. ![GitHub Web, showing the Pencil icon in the red box](images/pencil-icon.png) -4. Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see: +4. Using Markdown language, make your changes to the topic. For info about how to edit content using Markdown, see: - **If you're linked to the Microsoft organization in GitHub:** [Windows authoring guide](https://aka.ms/WindowsAuthoring) - **If you're external to Microsoft:** [Mastering Markdown](https://guides.github.com/features/mastering-markdown/) -5. Make your suggested change, and then click **Preview Changes** to make sure it looks correct. +5. Make your suggested change, and then click **Preview Changes** to make sure it looks correct. ![GitHub Web, showing the Preview Changes tab](images/preview-changes.png) @@ -45,19 +45,19 @@ We've tried to make editing an existing, public file as simple as possible. The **Comparing changes** screen appears to see what the changes are between your fork and the original content. -7. On the **Comparing changes** screen, you’ll see if there are any problems with the file you’re checking in. +7. On the **Comparing changes** screen, you’ll see if there are any problems with the file you’re checking in. If there are no problems, you’ll see the message, **Able to merge**. ![GitHub Web, showing the Comparing changes screen](images/compare-changes.png) -8. Click **Create pull request**. +8. Click **Create pull request**. -9. Enter a title and description to give the approver the appropriate context about what’s in the request. +9. Enter a title and description to give the approver the appropriate context about what’s in the request. -10. Scroll to the bottom of the page, making sure that only your changed files are in this pull request. Otherwise, you could overwrite changes from other people. +10. Scroll to the bottom of the page, making sure that only your changed files are in this pull request. Otherwise, you could overwrite changes from other people. -11. Click **Create pull request** again to actually submit the pull request. +11. Click **Create pull request** again to actually submit the pull request. The pull request is sent to the writer of the topic and your edits are reviewed. If your request is accepted, updates are published to one of the following places: 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**

![thumbnail](../images/Picture1-sm.png)

**Digital/interactive signage**

Displays a specific site in full-screen mode, running Microsoft Edge InPrivate protecting user data.

**Policy setting** = Not configured (0 default)

|

 

![thumbnail](../images/Picture2-sm.png)

Public browsing

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.

Policy setting = Enabled (1) | -| **Multi-app**

![thumbnail](../images/Picture5-sm.png)

**Normal browsing**

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.

**Policy setting** = Not configured (0 default) |

 

![thumbnail](../images/Picture6-sm.png)

Public browsing

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) | +|**Single-app**

![thumbnail](../images/Picture1-sm.png)

**Digital/interactive signage**

Displays a specific site in full-screen mode, running Microsoft Edge InPrivate protecting user data.

**Policy setting** = Not configured (0 default)

|

 

![thumbnail](../images/Picture2-sm.png)

Public browsing

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.

Policy setting = Enabled (1) | +| **Multi-app**

![thumbnail](../images/Picture5-sm.png)

**Normal browsing**

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.

**Policy setting** = Not configured (0 default) |

 

![thumbnail](../images/Picture6-sm.png)

Public browsing

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/edge/includes/prevent-turning-off-required-extensions-include.md b/browsers/edge/includes/prevent-turning-off-required-extensions-include.md index 7d06a1e1d9..6257f4e2fb 100644 --- a/browsers/edge/includes/prevent-turning-off-required-extensions-include.md +++ b/browsers/edge/includes/prevent-turning-off-required-extensions-include.md @@ -20,7 +20,7 @@ ms.topic: include | Group Policy | Description | |---------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Disabled or not configured
**(default)** | Allowed. Users can uninstall extensions. If you previously enabled this policy and you decide to disable it, the list of extension PFNs defined in this policy get ignored. | -| Enabled | Provide a semi-colon delimited list of extension PFNs. For example, adding the following OneNote Web Clipper and Office Online extension prevents users from turning it off:

*Microsoft.OneNoteWebClipper8wekyb3d8bbwe;Microsoft.OfficeOnline8wekyb3d8bbwe*

After defining the list of extensions, you deploy them through any available enterprise deployment channel, such as Microsoft Intune.

Removing extensions from the list does not uninstall the extension from the user’s computer automatically. To uninstall the extension, use any available enterprise deployment channel. If you enable the [Allow Developer Tools](../group-policies/developer-settings-gp.md#allow-developer-tools) policy, then this policy does not prevent users from debugging and altering the logic on an extension. | +| Enabled | Provide a semi-colon delimited list of extension PFNs. For example, adding the following OneNote Web Clipper and Office extension prevents users from turning it off:

*Microsoft.OneNoteWebClipper8wekyb3d8bbwe;Microsoft.OfficeOnline8wekyb3d8bbwe*

After defining the list of extensions, you deploy them through any available enterprise deployment channel, such as Microsoft Intune.

Removing extensions from the list does not uninstall the extension from the user’s computer automatically. To uninstall the extension, use any available enterprise deployment channel. If you enable the [Allow Developer Tools](../group-policies/developer-settings-gp.md#allow-developer-tools) policy, then this policy does not prevent users from debugging and altering the logic on an extension. | --- 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/TOC.md b/devices/hololens/TOC.md index 5d0635344e..d50c95d74f 100644 --- a/devices/hololens/TOC.md +++ b/devices/hololens/TOC.md @@ -10,15 +10,25 @@ ## [Enroll HoloLens in MDM](hololens-enroll-mdm.md) ## [Manage updates to HoloLens](hololens-updates.md) ## [Restore HoloLens 2 using Advanced Recovery Companion](hololens-recovery.md) +## [Use the HoloLens Clicker](hololens-clicker.md) +## [Restart, reset, or recover the HoloLens](hololens-restart-recover.md) +## [Restart or recover the HoloLens clicker](hololens-clicker-restart-recover.md) # Application Management ## [Install apps on HoloLens](hololens-install-apps.md) ## [Share HoloLens with multiple people](hololens-multiple-users.md) +## [Cortana on HoloLens](hololens-cortana.md) +## [Get apps for HoloLens](hololens-get-apps.md) +## [Use apps on HoloLens](hololens-use-apps.md) +## [Use HoloLens offline](hololens-offline.md) +## [Spaces on HoloLens](hololens-spaces-on-hololens.md) # User/Access Management ## [Set up single application access](hololens-kiosk.md) ## [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md) ## [How HoloLens stores data for spaces](hololens-spaces.md) +## [Find and save files](hololens-find-and-save-files.md) # [Insider preview for Microsoft HoloLens](hololens-insider.md) -# [Change history for Microsoft HoloLens documentation](change-history-hololens.md) \ No newline at end of file +# [Change history for Microsoft HoloLens documentation](change-history-hololens.md) + diff --git a/devices/hololens/hololens-clicker-restart-recover.md b/devices/hololens/hololens-clicker-restart-recover.md new file mode 100644 index 0000000000..81c7ffc704 --- /dev/null +++ b/devices/hololens/hololens-clicker-restart-recover.md @@ -0,0 +1,47 @@ +--- +title: Restart or recover the HoloLens clicker +description: Things to try if the HoloLens clicker is unresponsive or isn’t working well. +ms.assetid: 13406eca-e2c6-4cfc-8ace-426ff8f837f4 +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Restart or recover the HoloLens clicker + +Here are some things to try if the HoloLens clicker is unresponsive or isn’t working well. + +## Restart the clicker + +Use the tip of a pen to press and hold the [pairing button](https://support.microsoft.com/en-us/help/12646). + +![Hold the pairing button](images/recover-clicker-1.png) + +At the same time, click and hold the clicker for 15 seconds. If the clicker was already paired with your HoloLens, it will stay paired after it restarts. + +![Hold the clicker](images/recover-clicker-2.png) + +If the clicker won't turn on or restart, try charging it using the HoloLens charger. If the battery is very low, it might take a few minutes for the white indicator light to turn on. + +## Re-pair the clicker + +Go to Settings > Devices and select the clicker. Select Remove, wait a few seconds, then pair the clicker again. + +## Recover the clicker + +If restarting and re-pairing the clicker don’t fix the problem, the Windows Device Recovery Tool can help you recover it. The recovery process may take some time, and the latest version of the clicker software will be installed. To use the tool, you’ll need a computer running Windows 10 or later with at least 4 GB of free storage space. + +To recover the clicker: + +1. Download and install the [Windows Device Recovery Tool](https://dev.azure.com/ContentIdea/ContentIdea/_queries/query/8a004dbe-73f8-4a32-94bc-368fc2f2a895/) on your computer. +1. Connect the clicker to your computer using the Micro USB cable that came with your HoloLens. +1. Run the Windows Device Recovery Tool and follow the instructions. + +If the clicker isn’t automatically detected, select **My device was not detected** and follow the instructions to put your device into recovery mode. diff --git a/devices/hololens/hololens-clicker.md b/devices/hololens/hololens-clicker.md new file mode 100644 index 0000000000..8ec7e8077b --- /dev/null +++ b/devices/hololens/hololens-clicker.md @@ -0,0 +1,65 @@ +--- +title: Use the HoloLens Clicker +description: +ms.assetid: 7d4a30fd-cf1d-4c9a-8eb1-1968ccecbe59 +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Use the HoloLens Clicker + +The clicker was designed specifically for HoloLens and gives you another way to interact with holograms. It comes with HoloLens, in a separate box. Use it in place of hand gestures to select, scroll, move, and resize. + +![The HoloLens Clicker](images/use-hololens-clicker-1.png) + +## Hold the clicker + +To put on the clicker, slide the loop over your ring or middle finger with the Micro USB port toward your wrist. Rest your thumb in the indentation. + +![How to hold the Clicker](images/use-hololens-clicker-2.png) + +## Clicker gestures + +Clicker gestures are small wrist rotations, not the larger movements used for HoloLens hand gestures. And HoloLens will recognize your gestures and clicks even if the clicker is outside the [gesture frame](https://support.microsoft.com/help/12644), so you can hold the clicker in the position that's most comfortable for you​. + +- **Select**. To select a hologram, button, or other element, gaze at it, then click. + +- **Click and hold**. Click and hold your thumb down on the button to do some of the same things you would with tap and hold, like move or resize a hologram. + +- **Scroll**. On the app bar, select **Scroll Tool**. Click and hold, then rotate the clicker up, down, left, or right. To scroll faster, move your hand farther from the center of the scroll tool. + +- **Zoom**. On the app bar, select **Zoom Tool**. Click and hold, then rotate the clicker up to zoom in, or down to zoom out. + +>[!TIP] +>In Microsoft Edge, gaze at a page and double-click to zoom in or out. + +## Pair and charge the clicker + +To pair the clicker with your HoloLens, see [Pair Bluetooth devices](https://support.microsoft.com/help/12636). + +When the clicker battery is low, the battery indicator will blink amber. Plug the Micro USB cable into a USB power supply to charge the device. + +## Indicator lights + +Here's what the lights on the clicker mean. + +- **Blinking white**. The clicker is in pairing mode. + +- **Fast-blinking white**. Pairing was successful. + +- **Solid white**. The clicker is charging. + +- **Blinking amber**. The battery is low. + +- **Solid amber**. The clicker ran into an error and you'll need to restart it. While pressing the pairing button, click and hold for 15 seconds. + +>[!NOTE] +>If the clicker doesn't respond or won't start, see [Restart or recover the HoloLens clicker](https://support.microsoft.com/help/15555/hololens-restart-or-recover-the-hololens-clicker). diff --git a/devices/hololens/hololens-cortana.md b/devices/hololens/hololens-cortana.md new file mode 100644 index 0000000000..dfe9539b1b --- /dev/null +++ b/devices/hololens/hololens-cortana.md @@ -0,0 +1,50 @@ +--- +title: Cortana on HoloLens +description: Cortana can help you do all kinds of things on your HoloLens +ms.assetid: fd96fb0e-6759-4dbe-be1f-58bedad66fed +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Cortana on HoloLens + +Cortana can help you do all kinds of things on your HoloLens, from searching the web to shutting down your device. To get her attention, select Cortana on Start or say "Hey Cortana" anytime. + +![Hey Cortana!](images/cortana-on-hololens.png) + +## What do I say to Cortana + +Here are some things you can try saying (remember to say "Hey Cortana" first): + +- What can I say? +- Increase the volume. +- Decrease the brightness. +- Shut down. +- Restart. +- Go to sleep. +- Mute. +- 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.) +- What time is it? +- Show me the latest NBA scores. +- How much battery do I have left? +- Tell me a joke. + +>[!NOTE] +>- Some Cortana features you're used to from Windows on your PC or phone (for example, reminders and notifications) aren't supported in Microsoft HoloLens Development Edition. Cortana on HoloLens is English only, and the Cortana experience may vary among regions. +>- Cortana is on the first time you use HoloLens. You can turn her off in Cortana's settings. In the All apps list, select Cortana > Settings. Then turn off Cortana can give you suggestions, ideas, reminders, alerts, and more. +>- If Cortana isn't responding to "Hey Cortana," go to Cortana's settings and check to make sure she's on. +>- If you turn Cortana off, "Hey Cortana" voice commands won't be available, but you'll still be able to use other commands (like "Select" and "Place"). 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 ![Require device encryption setting configured to yes](images/device-encryption.png) -2. Browse to and select the XML license file that was provided when you purchased the Commercial Suite. +2. Browse to and select the XML license file that was provided when you purchased the Commercial Suite. >[!NOTE] >You can configure [additional settings in the provisioning package](hololens-provisioning.md). diff --git a/devices/hololens/hololens-find-and-save-files.md b/devices/hololens/hololens-find-and-save-files.md new file mode 100644 index 0000000000..ba459eff13 --- /dev/null +++ b/devices/hololens/hololens-find-and-save-files.md @@ -0,0 +1,44 @@ +--- +title: Find and save files on HoloLens +description: Use File Explorer on HoloLens to view and manage files on your device +ms.assetid: 77d2e357-f65f-43c8-b62f-6cd9bf37070a +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Find and save files on HoloLens + +Files you create on HoloLens, including Office documents, photos, and videos, are saved to your HoloLens. To view and manage them, you can use the File Explorer app on HoloLens or File Explorer on your PC. To sync photos and other files to the cloud, use the OneDrive app on HoloLens. + +## View files on HoloLens + +Use File Explorer on HoloLens to view and manage files on your device, including 3D objects, documents, and pictures. Go to Start > All apps > File Explorer on HoloLens to get started. + +>[!TIP] +>If there are no files listed in File Explorer, select **This Device** in the top left pane. + +## View HoloLens files on your PC + +To see your HoloLens files in File Explorer on your PC: + +1. Sign in to HoloLens, then plug it into the PC using the USB cable that came with the HoloLens. + +1. Select **Open Device to view files with File Explorer**, or open File Explorer on the PC and navigate to the device. + +>[!TIP] +>To see info about your HoloLens, right-click the device name in File Explorer on your PC, then select **Properties**. + +## Sync to the cloud + +To sync photos and other files from your HoloLens to the cloud, install and set up OneDrive on HoloLens. To get OneDrive, search for it in the Microsoft Store on your HoloLens. + +>[!TIP] +>HoloLens doesn't back up app files and data, so it's a good idea to save your important stuff to OneDrive. That way, if you reset your device or uninstall an app, your info will be backed up. diff --git a/devices/hololens/hololens-get-apps.md b/devices/hololens/hololens-get-apps.md new file mode 100644 index 0000000000..cd14341075 --- /dev/null +++ b/devices/hololens/hololens-get-apps.md @@ -0,0 +1,37 @@ +--- +title: Get apps for HoloLens +description: The Microsoft Store is your source for apps and games that work with HoloLens. +ms.assetid: cbe9aa3a-884f-4a92-bf54-8d4917bc3435 +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Get apps for HoloLens + +The Microsoft Store is your source for apps and games that work with HoloLens. When you go to the Store on your HoloLens, any apps you see there will run on it. + +Apps on HoloLens use either 2D view or holographic view. Apps with 2D view look like windows and can be positioned all around you. Apps that use holographic view surround you and become the only app you see. + +## Get apps + +Open the Microsoft Store from the Start menu. Then browse for apps and games (or use your voice to search​), select the microphone on the HoloLens keyboard, and start talking. + +To download apps, you'll need to be signed in with a Microsoft account. To buy them, you'll need a payment method associated with the Microsoft account you use on your HoloLens. To set up a payment method, go to [account.microsoft.com](http://account.microsoft.com/) and select **Payment & billing** > **Payment options** > **Add a payment option**. + +## Find your apps + +Once you've installed an app, you'll find it in the All apps list​ (Start > All apps ). Keep apps handy by [pinning them to Start](https://support.microsoft.com/help/12638). + +App updates are automatic, and they're free. + +>[!NOTE] +>- To purchase apps in the Store, the billing address for your payment method must match the country or region your HoloLens is set to. +>- Some apps may not be available in all countries and regions. diff --git a/devices/hololens/hololens-insider.md b/devices/hololens/hololens-insider.md index bb56182d56..5eaf9ad296 100644 --- a/devices/hololens/hololens-insider.md +++ b/devices/hololens/hololens-insider.md @@ -16,9 +16,6 @@ manager: dansimp Welcome to the latest Insider Preview builds for HoloLens! It’s simple to get started and provide valuable feedback for our next major operating system update for HoloLens. - - - ## How do I install the Insider builds? On a device running the Windows 10 April 2018 Update, go to Settings -> Update & Security -> Windows Insider Program and select Get started. Link the account you used to register as a Windows Insider. diff --git a/devices/hololens/hololens-kiosk.md b/devices/hololens/hololens-kiosk.md index 01dcda9e51..b648efe898 100644 --- a/devices/hololens/hololens-kiosk.md +++ b/devices/hololens/hololens-kiosk.md @@ -16,7 +16,7 @@ manager: dansimp -In Windows 10, version 1803, you can configure your HoloLens devices to run as multi-app or single-app kiosks. You can also configure guest access for a HoloLens kiosk device by [designating a SpecialGroup account in your XML file.](#guest) +In Windows 10, version 1803, you can configure your HoloLens devices to run as multi-app or single-app kiosks. You can also configure guest access for a HoloLens kiosk device by [designating a SpecialGroup account in your XML file.](#add-guest-access-to-the-kiosk-configuration-optional) When HoloLens is configured as a multi-app kiosk, only the allowed apps are available to the user. The benefit of a multi-app kiosk, or fixed-purpose device, is to provide an easy-to-understand experience for individuals by putting in front of them only the things they need to use, and removing from their view the things they don’t need to access. @@ -40,21 +40,19 @@ The [AssignedAccess Configuration Service Provider (CSP)](https://docs.microsoft >Be aware that voice commands are enabled for kiosk mode configured in Microsoft Intune or provisioning packages, even if the Cortana app is not selected as a kiosk app. For HoloLens devices running Windows 10, version 1803, there are three methods that you can use to configure the device as a kiosk: -- You can use [Microsoft Intune or other mobile device management (MDM) service](#intune-kiosk) to configure single-app and multi-app kiosks. -- You can [use a provisioning package](#ppkg-kiosk) to configure single-app and multi-app kiosks. -- You can [use the Windows Device Portal](#portal-kiosk) to configure single-app kiosks. This method is recommended only for demonstrations, as it requires that developer mode be enabled on the device. +- You can use [Microsoft Intune or other mobile device management (MDM) service](#set-up-kiosk-mode-using-microsoft-intune-or-mdm-windows-10-version-1803) to configure single-app and multi-app kiosks. +- You can [use a provisioning package](#setup-kiosk-mode-using-a-provisioning-package-windows-10-version-1803) to configure single-app and multi-app kiosks. +- You can [use the Windows Device Portal](#set-up-kiosk-mode-using-the-windows-device-portal-windows-10-version-1607-and-version-1803) to configure single-app kiosks. This method is recommended only for demonstrations, as it requires that developer mode be enabled on the device. -For HoloLens devices running Windows 10, version 1607, you can [use the Windows Device Portal](#portal-kiosk) to configure single-app kiosks. +For HoloLens devices running Windows 10, version 1607, you can [use the Windows Device Portal](#set-up-kiosk-mode-using-the-windows-device-portal-windows-10-version-1607-and-version-1803) to configure single-app kiosks. - -## Start layout for HoloLens +## Start layout for HoloLens -If you use [MDM, Microsoft Intune](#intune-kiosk), or a [provisioning package](#ppkg-kiosk) to configure a multi-app kiosk, the procedure requires a Start layout. Start layout customization isn't supported in Holographic for Business, so you'll need to use a placeholder Start layout. +If you use [MDM, Microsoft Intune](#set-up-kiosk-mode-using-microsoft-intune-or-mdm-windows-10-version-1803), or a [provisioning package](#setup-kiosk-mode-using-a-provisioning-package-windows-10-version-1803) to configure a multi-app kiosk, the procedure requires a Start layout. Start layout customization isn't supported in Holographic for Business, so you'll need to use a placeholder Start layout. >[!NOTE] >Because a single-app kiosk launches the kiosk app when a user signs in, there is no Start screen displayed. - ### Start layout file for MDM (Intune and others) Save the following sample as an XML file. You will select this file when you configure the kiosk in Microsoft Intune (or in another MDM service that provides a kiosk profile). @@ -80,7 +78,7 @@ Save the following sample as an XML file. You will select this file when you con ### Start layout for a provisioning package -You will [create an XML file](#ppkg-kiosk) to define the kiosk configuration to be included in a provisioning package. Use the following sample in the `StartLayout` section of your XML file. +You will [create an XML file](#setup-kiosk-mode-using-a-provisioning-package-windows-10-version-1803) to define the kiosk configuration to be included in a provisioning package. Use the following sample in the `StartLayout` section of your XML file. ```xml @@ -100,34 +98,28 @@ You will [create an XML file](#ppkg-kiosk) to define the kiosk configuration to ]]> -``` +``` - ## Set up kiosk mode using Microsoft Intune or MDM (Windows 10, version 1803) For HoloLens devices that are managed by Microsoft Intune, you [create a device profile](https://docs.microsoft.com/intune/device-profile-create) and configure the [Kiosk settings](https://docs.microsoft.com/intune/kiosk-settings). -For other MDM services, check your provider's documentation for instructions. If you need to use a custom setting and full XML configuration to set up a kiosk in your MDM service, [create an XML file that defines the kiosk configuration](#create-xml-file), and make sure to include the [Start layout](#start-layout-for-a-provisioning-package) in the XML file. +For other MDM services, check your provider's documentation for instructions. If you need to use a custom setting and full XML configuration to set up a kiosk in your MDM service, [create an XML file that defines the kiosk configuration](#create-a-kiosk-configuration-xml-file), and make sure to include the [Start layout](#start-layout-for-a-provisioning-package) in the XML file. - - - ## Setup kiosk mode using a provisioning package (Windows 10, version 1803) Process: -1. [Create an XML file that defines the kiosk configuration.](#create-xml-file) -2. [Add the XML file to a provisioning package.](#add-xml) -3. [Apply the provisioning package to HoloLens.](#apply-ppkg) +1. [Create an XML file that defines the kiosk configuration.](#create-a-kiosk-configuration-xml-file) +2. [Add the XML file to a provisioning package.](#add-the-kiosk-configuration-xml-file-to-a-provisioning-package) +3. [Apply the provisioning package to HoloLens.](#apply-the-provisioning-package-to-hololens) - ### Create a kiosk configuration XML file Follow [the instructions for creating a kiosk configuration XML file for desktop](https://docs.microsoft.com/windows/configuration/lock-down-windows-10-to-specific-apps#configure-a-kiosk-using-a-provisioning-package), with the following exceptions: - Do not include Classic Windows applications (Win32) since they aren't supported on HoloLens. -- Use the [placeholder Start XML](#start-kiosk) for HoloLens. +- Use the [placeholder Start XML](#start-layout-for-hololens) for HoloLens. - #### Add guest access to the kiosk configuration (optional) In the [Configs section of the XML file](https://docs.microsoft.com/windows/configuration/lock-down-windows-10-to-specific-apps#configs), you can configure a special group named **Visitor** to allow guests to use the kiosk. When the kiosk is configured with the **Visitor** special group, a "**Guest**" option is added to the sign-in page. The **Guest** account does not require a password, and any data associated with the account is deleted when the account signs out. @@ -143,8 +135,6 @@ Use the following snippet in your kiosk configuration XML to enable the **Guest* ``` - - ### Add the kiosk configuration XML file to a provisioning package 1. Open [Windows Configuration Designer](https://www.microsoft.com/store/apps/9nblggh4tx22). @@ -174,8 +164,6 @@ Use the following snippet in your kiosk configuration XML to enable the **Guest* 16. Click **Build** to start building the package. The provisioning package doesn't take long to build. The project information is displayed in the build page and the progress bar indicates the build status. - - ### Apply the provisioning package to HoloLens 1. Connect HoloLens via USB to a PC and start the device, but do not continue past the **Fit** page of OOBE (the first page with the blue box). @@ -191,7 +179,6 @@ Use the following snippet in your kiosk configuration XML to enable the **Guest* 7. You will see whether the package was applied successfully or not. If it failed, you can fix your package and try again. If it succeeded, proceed with OOBE. - ## Set up kiosk mode using the Windows Device Portal (Windows 10, version 1607 and version 1803) 1. [Set up the HoloLens to use the Windows Device Portal](https://developer.microsoft.com/windows/mixed-reality/using_the_windows_device_portal#setting_up_hololens_to_use_windows_device_portal). The Device Portal is a web server on your HoloLens that you can connect to from a web browser on your PC. diff --git a/devices/hololens/hololens-offline.md b/devices/hololens/hololens-offline.md new file mode 100644 index 0000000000..49190e6907 --- /dev/null +++ b/devices/hololens/hololens-offline.md @@ -0,0 +1,23 @@ +--- +title: Use HoloLens offline +description: To set up HoloLens, you'll need to connect to a Wi-Fi network +ms.assetid: b86f603c-d25f-409b-b055-4bbc6edcd301 +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Use HoloLens offline + +To set up HoloLens, you'll need to connect to a Wi-Fi network—the setup tutorial will show you how. + +## HoloLens limitations + +After your HoloLens is set up, you can use it without a Wi-Fi connection, but apps that use Internet connections may have limited capabilities when you use HoloLens offline. diff --git a/devices/hololens/hololens-restart-recover.md b/devices/hololens/hololens-restart-recover.md new file mode 100644 index 0000000000..9bf0cddb37 --- /dev/null +++ b/devices/hololens/hololens-restart-recover.md @@ -0,0 +1,55 @@ +--- +title: Restart, reset, or recover HoloLens +description: Restart, reset, or recover HoloLens +ms.assetid: 9a546416-1648-403c-9e0c-742171b8812e +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Restart, reset, or recover HoloLens + +Here are some things to try if your HoloLens is unresponsive, isn’t running well, or is experiencing software or update problems. + +## Restart your HoloLens + +If your HoloLens isn’t running well or is unresponsive, try the following things. + +First, try restarting the device: say, "Hey Cortana, restart the device." + +If you’re still having problems, press the power button for 4 seconds, until all of the battery indicators fade out. Wait 1 minute, then press the power button again to turn on the device. + +If neither of those things works, force restart the device. Hold down the power button for 10 seconds. Release it and wait 30 seconds, then press the power button again to turn on the device. + +## Reset or recover your HoloLens + +If restarting your HoloLens doesn’t help, another option is to reset it. If resetting it doesn’t fix the problem, the Windows Device Recovery Tool can help you recover your device. + +>[!IMPORTANT] +>Resetting or recovering your HoloLens will erase all of your personal data, including apps, games, photos, and settings. You won’t be able to restore a backup once the reset is complete. + +## Reset + +Resetting your HoloLens keeps the version of the Windows Holographic software that’s installed on it and returns everything else to factory settings. + +To reset your HoloLens, go to **Settings** > **Update** > **Reset** and select **Reset device**. The battery will need to have at least a 40 percent charge remaining to reset. + +## Recover using the Windows Device Recovery Tool + +Before you use this tool, determine if restarting or resetting your HoloLens fixes the problem. The recovery process may take some time, and the latest version of the Windows Holographic software approved for your HoloLens will be installed. + +To use the tool, you’ll need a computer running Windows 10 or later, with at least 4 GB of free storage space. Please note that you can’t run this tool on a virtual machine. +To recover your HoloLens + +1. Download and install the [Windows Device Recovery Tool](https://dev.azure.com/ContentIdea/ContentIdea/_queries/query/8a004dbe-73f8-4a32-94bc-368fc2f2a895/) on your computer. +1. Connect the clicker to your computer using the Micro USB cable that came with your HoloLens. +1. Run the Windows Device Recovery Tool and follow the instructions. + +If the clicker isn’t automatically detected, select **My device was not detected** and follow the instructions to put your device into recovery mode. 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-spaces-on-hololens.md b/devices/hololens/hololens-spaces-on-hololens.md new file mode 100644 index 0000000000..5c04bb7c3e --- /dev/null +++ b/devices/hololens/hololens-spaces-on-hololens.md @@ -0,0 +1,40 @@ +--- +title: Spaces on HoloLens +description: HoloLens blends holograms with your world +ms.assetid: bd55ecd1-697a-4b09-8274-48d1499fcb0b +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Spaces on HoloLens + +HoloLens blends holograms with your world, mapping your surroundings to remember where you place your apps and content. + +>[!NOTE] +>For your HoloLens to work properly, HoloLens Wi-Fi needs to be turned on, though it doesn't have to be connected to a network. + +## Tips for setting up your space + +HoloLens works best in certain kinds of environments. Choose a room with adequate light and plenty of space. Avoid dark spaces and rooms with a lot of dark, shiny, or translucent surfaces (for instance, mirrors or gauzy curtains). + +>[!NOTE] +>HoloLens is optimized for indoor use. Use it in a safe place with no tripping hazards. [More on safety](https://support.microsoft.com/help/4023454/safety-information). + +## Mapping your space + +When HoloLens starts mapping your surroundings, you'll see a mesh graphic spreading over the space. + +To help HoloLens learn a space, walk around the space and gaze around you. Air tap in a space to light up the mesh and see what's been mapped. + +If your space changes significantly—for example, if a piece of furniture is moved—you might need to walk around the space and gaze around you so HoloLens can relearn it. + +>[!NOTE] +>If HoloLens is having trouble mapping your space or you're have difficulty placing holograms, see [HoloLens and holograms: FAQ](https://support.microsoft.com/help/13456/hololens-and-holograms-faq). 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 ![Upgrade edition with license setting selected](images/icd1.png) -2. Browse to and select the XML license file that was provided when you purchased the Commercial Suite. +2. Browse to and select the XML license file that was provided when you purchased the Commercial Suite. >[!NOTE] >You can configure [additional settings in the provisioning package](hololens-provisioning.md). diff --git a/devices/hololens/hololens-use-apps.md b/devices/hololens/hololens-use-apps.md new file mode 100644 index 0000000000..e3d0aba0a9 --- /dev/null +++ b/devices/hololens/hololens-use-apps.md @@ -0,0 +1,40 @@ +--- +title: Use apps on HoloLens +description: Apps on HoloLens use either 2D view or holographic view. +ms.assetid: 6bd124c4-731c-4bcc-86c7-23f9b67ff616 +ms.reviewer: jarrettrenshaw +ms.date: 07/01/2019 +manager: v-miegge +keywords: hololens +ms.prod: hololens +ms.sitesec: library +author: v-miegge +ms.author: v-miegge +ms.topic: article +ms.localizationpriority: medium +--- + +# Use apps on HoloLens + +Apps on HoloLens use either 2D view or holographic view. Apps with 2D view look like windows, and apps with holographic view surround you and become the only app you see. + +## Open apps + +You'll find your apps either pinned to Start or in the All apps list. To get to the All apps list, use the bloom gesture to go to Start, then select **All apps**. + +On Start or in the All apps list, select an app. It will open in a good position for viewing. + +>[!NOTE] +>- Up to three 2D app windows can be active at a time. You can open more, but only three will remain active. +>- Each open app can have one active window at a time, except Microsoft Edge, which can have up to three. +>- If you're having problems with apps, make sure there's enough light in your space, and walk around so HoloLens has a current scan. If you keep having trouble, see [HoloLens and holograms: FAQ](https://support.microsoft.com/help/13456/hololens-and-holograms-faq) for more info. + +## Move, resize, and rotate apps + +After opening an app, you can [change its position and size](https://support.microsoft.com/help/12634). + +## Close apps + +To close an app that uses 2D view, gaze at it, then select **Close**. + +To close an app that uses holographic view, use the bloom gesture to leave holographic view, then select **Close**. diff --git a/devices/hololens/images/cortana-on-hololens.png b/devices/hololens/images/cortana-on-hololens.png new file mode 100644 index 0000000000..6205d3d2fd Binary files /dev/null and b/devices/hololens/images/cortana-on-hololens.png differ 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/images/recover-clicker-1.png b/devices/hololens/images/recover-clicker-1.png new file mode 100644 index 0000000000..ad54e6ee09 Binary files /dev/null and b/devices/hololens/images/recover-clicker-1.png differ diff --git a/devices/hololens/images/recover-clicker-2.png b/devices/hololens/images/recover-clicker-2.png new file mode 100644 index 0000000000..d7a9d6fd0d Binary files /dev/null and b/devices/hololens/images/recover-clicker-2.png differ diff --git a/devices/hololens/images/use-hololens-clicker-1.png b/devices/hololens/images/use-hololens-clicker-1.png new file mode 100644 index 0000000000..ad54e6ee09 Binary files /dev/null and b/devices/hololens/images/use-hololens-clicker-1.png differ diff --git a/devices/hololens/images/use-hololens-clicker-2.png b/devices/hololens/images/use-hololens-clicker-2.png new file mode 100644 index 0000000000..d7a9d6fd0d Binary files /dev/null and b/devices/hololens/images/use-hololens-clicker-2.png differ diff --git a/devices/hololens/index.md b/devices/hololens/index.md index e3790fbfb5..abb50c076e 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.

Hololens
+

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.

+ +		HoloLens 2 side view
-## 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 e5078d0377..cc71b5adf8 100644 --- a/devices/surface-hub/TOC.md +++ b/devices/surface-hub/TOC.md @@ -5,7 +5,8 @@ ## 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 ### [Surface Hub 2S Site Readiness Guide](surface-hub-2s-site-readiness-guide.md) @@ -20,7 +21,10 @@ ### [Configure Easy Authentication for Surface Hub 2S](surface-hub-2s-phone-authenticate.md) ## Deploy +### [First time setup for Surface Hub 2S](surface-hub-2s-setup.md) +### [Connect devices to Surface Hub 2S](surface-hub-2s-connect.md) ### [Surface Hub 2S deployment checklist](surface-hub-2s-deploy-checklist.md) +### [Surface Hub 2S adoption toolkit](surface-hub-2s-adoption-kit.md) ### [Create Surface Hub 2S device account](surface-hub-2s-account.md) ### [Create provisioning packages for Surface Hub 2S](surface-hub-2s-deploy.md) ### [Deploy apps to Surface Hub 2S using Intune](surface-hub-2s-deploy-apps-intune.md) @@ -43,6 +47,7 @@ ## Support ### [Recover and reset Surface Hub 2S](surface-hub-2s-recover-reset.md) ### [Troubleshoot Miracast on Surface Hub](miracast-troubleshooting.md) +### [How to pack and ship your Surface Hub 2S for service](surface-hub-2s-pack-components.md) ### [Change history](surface-hub-2s-change-history.md) # Surface Hub @@ -74,11 +79,11 @@ ## Manage ### [Manage Microsoft Surface Hub](manage-surface-hub.md) +### [PowerShell for Surface Hub](appendix-a-powershell-scripts-for-surface-hub.md) ### [Remote Surface Hub management](remote-surface-hub-management.md) #### [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md) #### [Monitor your Surface Hub](monitor-surface-hub.md) #### [Windows updates](manage-windows-updates-for-surface-hub.md) - ### [Manage Surface Hub settings](manage-surface-hub-settings.md) #### [Local management for Surface Hub settings](local-management-surface-hub-settings.md) #### [Accessibility](accessibility-surface-hub.md) @@ -86,33 +91,37 @@ #### [Device reset](device-reset-surface-hub.md) #### [Use fully qualified domain name with Surface Hub](use-fully-qualified-domain-name-surface-hub.md) #### [Wireless network management](wireless-network-management-for-surface-hub.md) +### [Implement Quality of Service on Surface Hub](surface-hub-qos.md) ### [Install apps on your Surface Hub](install-apps-on-surface-hub.md) ### [Configure Surface Hub Start menu](surface-hub-start-menu.md) ### [Set up and use Microsoft Whiteboard](whiteboard-collaboration.md) ### [End a Surface Hub meeting with End session](i-am-done-finishing-your-surface-hub-meeting.md) -### [Sign in to Surface Hub with Microsoft Authenticator](surface-hub-authenticator-app.md) -### [Save your BitLocker key](save-bitlocker-key-surface-hub.md) ### [Connect other devices and display with Surface Hub](connect-and-display-with-surface-hub.md) ### [Miracast on existing wireless network or LAN](miracast-over-infrastructure.md) ### [Enable 802.1x wired authentication](enable-8021x-wired-authentication.md) ### [Using a room control system](use-room-control-system-with-surface-hub.md) -### [Implement Quality of Service on Surface Hub](surface-hub-qos.md) + +## Secure +### [Sign in to Surface Hub with Microsoft Authenticator](surface-hub-authenticator-app.md) +### [Save your BitLocker key](save-bitlocker-key-surface-hub.md) +### [How Surface Hub addresses Wi-Fi Direct security issues](surface-hub-wifi-direct.md) + +## Support ### [Using the Surface Hub Recovery Tool](surface-hub-recovery-tool.md) ### [Surface Hub SSD replacement](surface-hub-ssd-replacement.md) -## [PowerShell for Surface Hub](appendix-a-powershell-scripts-for-surface-hub.md) -## [How Surface Hub addresses Wi-Fi Direct security issues](surface-hub-wifi-direct.md) -## [Top support solutions for Surface Hub](support-solutions-surface-hub.md) -## [Troubleshoot Microsoft Surface Hub](troubleshoot-surface-hub.md) -## [Surface Hub Update History](surface-hub-update-history.md) -## [Known issues and additional information about Microsoft Surface Hub](known-issues-and-additional-info-about-surface-hub.md) -## [How to use cloud recovery for BitLocker on a Surface Hub](use-cloud-recovery-for-bitlocker-on-surfacehub.md) -## [Using the Surface Hub Hardware Diagnostic Tool to test a device account](use-surface-hub-diagnostic-test-device-account.md) -## [Surface Hub Miracast channels 149-165 not supported in Europe, Japan, Israel](surfacehub-miracast-not-supported-europe-japan-israel.md) -## [What to do if the Connect app in Surface Hub exits unexpectedly](connect-app-in-surface-hub-unexpectedly-exits.md) -## [Surface Hub may install updates and restart outside maintenance hours](surface-hub-installs-updates-and-restarts-outside-maintenance-hours.md) -## [General Data Privacy Regulation and Surface Hub](general-data-privacy-regulation-and-surface-hub.md) -## [Troubleshoot Miracast on Surface Hub](miracast-troubleshooting.md) -## [Useful downloads for Surface Hub administrators](surface-hub-downloads.md) -## [Technical information for 55” Microsoft Surface Hub](surface-hub-technical-55.md) -## [Technical information for 84” Microsoft Surface Hub](surface-hub-technical-84.md) -## [Change history for Surface Hub](change-history-surface-hub.md) + +### [Top support solutions for Surface Hub](support-solutions-surface-hub.md) +### [Troubleshoot Microsoft Surface Hub](troubleshoot-surface-hub.md) +### [Surface Hub Update History](surface-hub-update-history.md) +### [Known issues and additional information about Microsoft Surface Hub](known-issues-and-additional-info-about-surface-hub.md) +### [How to use cloud recovery for BitLocker on a Surface Hub](use-cloud-recovery-for-bitlocker-on-surfacehub.md) +### [Using the Surface Hub Hardware Diagnostic Tool to test a device account](use-surface-hub-diagnostic-test-device-account.md) +### [Troubleshoot Miracast on Surface Hub](miracast-troubleshooting.md) +### [Surface Hub Miracast channels 149-165 not supported in Europe, Japan, Israel](surfacehub-miracast-not-supported-europe-japan-israel.md) +### [What to do if the Connect app in Surface Hub exits unexpectedly](connect-app-in-surface-hub-unexpectedly-exits.md) +### [Surface Hub may install updates and restart outside maintenance hours](surface-hub-installs-updates-and-restarts-outside-maintenance-hours.md) +### [General Data Privacy Regulation and Surface Hub](general-data-privacy-regulation-and-surface-hub.md) +### [Useful downloads for Surface Hub administrators](surface-hub-downloads.md) +### [Technical information for 55” Microsoft Surface Hub](surface-hub-technical-55.md) +### [Technical information for 84” Microsoft Surface Hub](surface-hub-technical-84.md) +### [Change history for Surface Hub](change-history-surface-hub.md) 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/create-a-device-account-using-office-365.md b/devices/surface-hub/create-a-device-account-using-office-365.md index ff1e2014b5..20f13c7d1b 100644 --- a/devices/surface-hub/create-a-device-account-using-office-365.md +++ b/devices/surface-hub/create-a-device-account-using-office-365.md @@ -4,7 +4,7 @@ description: If you prefer to use a graphical user interface, you can create a d ms.assetid: D11BCDC4-DABA-4B9A-9ECB-58E02CC8218C ms.reviewer: manager: dansimp -keywords: create device account, Office 365 UI, Exchange Admin center, Office 365 admin center, Skype for Business, mobile device mailbox policy +keywords: create device account, Office 365 UI, Exchange Admin center, Microsoft 365 admin center, Skype for Business, mobile device mailbox policy ms.prod: surface-hub ms.sitesec: library author: dansimp @@ -22,22 +22,22 @@ If you prefer to use a graphical user interface, you can create a device account ## Create a device account using Office 365 -1. [Create the account in the Office 365 Admin Center](#create-device-acct-o365-admin-ctr). +1. [Create the account in the Microsoft 365 Admin Center](#create-device-acct-o365-admin-ctr). 2. [Create a mobile device mailbox (ActiveSync) policy from the Microsoft Exchange Admin Center](#create-device-acct-o365-mbx-policy). 3. [Use PowerShell to complete device account creation](#create-device-acct-o365-complete-acct). 4. [Use PowerShell to configure Exchange properties of the account](#create-device-acct-o365-configure-exch-prop). 5. [Enable the account with Skype for Business](#create-device-acct-o365-skype-for-business). -### Create the account in the Office 365 Admin Center +### Create the account in the admin center 1. Sign in to Office 365 by visiting http://portal.office.com -2. Provide the admin credentials for your Office 365 tenant. This will take you to your Office 365 Admin Center. +2. Provide the admin credentials for your Office 365 tenant. This will take you to your Microsoft 365 Admin Center. - ![Office 365 admin center.](images/setupdeviceaccto365-02.png) + ![Microsoft 365 admin center.](images/setupdeviceaccto365-02.png) -3. In the Office 365 Admin Center, navigate to **Resources** in the left panel, and then click **Rooms & equipment**. +3. In the admin center, navigate to **Resources** in the left panel, and then click **Rooms & equipment**. - ![Rooms & equipment option in Office 365 admin center](images/room-equipment.png) + ![Rooms & equipment option in admin center](images/room-equipment.png) 4. Click **Add** to create a new Room account. Enter a display name and email address for the account, and then click **Add**. @@ -49,9 +49,9 @@ If you prefer to use a graphical user interface, you can create a device account ### Create a mobile device mailbox (ActiveSync) policy from the Exchange Admin Center -1. In the Office 365 Admin Center’s left panel, click **ADMIN**, and then click **Exchange**. +1. In the admin center’s left panel, click **ADMIN**, and then click **Exchange**. - ![Office 365 admin center, showing exchange active users.](images/setupdeviceaccto365-08.png) + ![admin center, showing exchange active users.](images/setupdeviceaccto365-08.png) 2. This will open another tab on your browser to take you to the Exchange Admin Center, where you can create and set the Mailbox Setting for Surface Hub. diff --git a/devices/surface-hub/device-reset-surface-hub.md b/devices/surface-hub/device-reset-surface-hub.md index 09c4b1ea60..6d7d33415f 100644 --- a/devices/surface-hub/device-reset-surface-hub.md +++ b/devices/surface-hub/device-reset-surface-hub.md @@ -1,101 +1,120 @@ --- -title: Device reset (Surface Hub) -description: You may wish to reset your Microsoft Surface Hub. +title: Reset or recover a Surface Hub +description: Describes the reset and recovery processes for the Surface Hub, and provides instructions. ms.assetid: 44E82EEE-1905-464B-A758-C2A1463909FF ms.reviewer: manager: dansimp -keywords: reset Surface Hub +keywords: reset Surface Hub, recover ms.prod: surface-hub ms.sitesec: library author: dansimp ms.author: dansimp ms.topic: article -ms.date: 07/27/2017 +ms.date: 07/31/2019 ms.localizationpriority: medium --- -# Device reset (Surface Hub) +# Reset or recover a Surface Hub +This article describes how to reset or recover a Microsoft Surface Hub. -You may wish to reset your Microsoft Surface Hub. +[Resetting the Surface Hub](#reset-a-surface-hub) returns its operating system to the last cumulative Windows update, and removes all local user files and configuration information. The information that is removed includes the following: -Typical reasons for a reset include: +- The device account +- Account information for the device's local administrators +- Domain-join or Azure AD-join information +- Mobile Device Management (MDM) enrollment information +- Configuration information that was set by using MDM or the Settings app -- The device isn’t running well after installing an update. -- You’re repurposing the device for a new meeting space and want to reconfigure it. -- You want to change how you locally manage the device. +[Recovering a Surface Hub from the cloud](#recover-a-surface-hub-from-the-cloud) also removes this information. In addition, the Surface Hub downloads a new operating system image and installs it. You can specify whether the recovery process preserves other information that is stored on the Surface Hub. -Initiating a reset will return the device to the last cumulative Windows update, and remove all local user files and configuration, including: +## Reset a Surface Hub -- The device account -- MDM enrollment -- Domain join or Azure AD join information -- Local admins on the device -- Configurations from MDM or the Settings app +You may have to reset your Surface Hub for reasons such as the following: -> [!IMPORTANT] -> Performing a device reset may take up to 6 hours. Do not turn off or unplug the Surface Hub until the process has completed. Interrupting the process will render the device inoperable, requiring warranty service to return to normal functionality. +- You are re-purposing the device for a new meeting space and want to reconfigure it. +- You want to change how you locally manage the device. +- The user name or password for the device account or the Administrator account has been lost. +- After you install an update, the performance of the device decreases. -After the reset, Surface Hub restarts the [first run program](first-run-program-surface-hub.md) again. If the Surface Hub displays a Welcome screen, that indicates that the reset encountered a problem and rolled back to the previously existing OS image. +During the reset process, if you see a blank screen for long periods of time, please wait and do not take any action. -If you see a blank screen for long periods of time during the **Reset device** process, please wait and do not take any action. +> [!WARNING] +> The device reset process may take up to six hours. Do not turn off or unplug the Surface Hub until the process has finished. If you interrupt the process, the device becomes inoperable. The device requires warranty service in order to become functional again. +1. On your Surface Hub, open **Settings**. -## Reset a Surface Hub from Settings + ![Image that shows Settings app for Surface Hub.](images/sh-settings.png) -**To reset a Surface Hub** -1. On your Surface Hub, open **Settings**. +1. Select **Update & Security**. - ![Image showing Settings app for Surface Hub.](images/sh-settings.png) + ![Image that shows Update & Security group in Settings app for Surface Hub.](images/sh-settings-update-security.png) -2. Click **Update & Security**. +1. Select **Recovery**, and then, under **Reset device**, select **Get started**. - ![Image showing Update & Security group in Settings app for Surface Hub.](images/sh-settings-update-security.png) + ![Image that shows the Reset device option in Settings app for Surface Hub.](images/sh-settings-reset-device.png) -3. Click **Recovery**, and then, under **Reset device**, click **Get started**. - - ![Image showing Reset device option in Settings app for Surface Hub.](images/sh-settings-reset-device.png) + After the reset process finishes, the Surface Hub starts the [first run program](first-run-program-surface-hub.md) again. If the reset process encounters a problem, it rolls the Surface Hub back to the previously-existing operating system image and then displays the Welcome screen. + ## Recover a Surface Hub from the cloud -In the Windows Recovery Environment (Windows RE), you can recover your device by downloading a factory build from the cloud and installing it on the Surface Hub. This allows devices in an unusable state to recover without requiring assistance from Microsoft Support. +If for some reason the Surface Hub becomes unusable, you can still recover it from the cloud without assistance from Microsoft Support. The Surface Hub can download a fresh operating system image from the cloud, and use that image to reinstall its operating system. ->[!NOTE] ->The **Recover from the cloud** process requires an open internet connection (no proxy, or other authentications). An ethernet connection is recommended. +You may have to use this type of recovery process under the following circumstances: + +- [The Surface Hub or its related accounts have entered an unstable state](#recover-a-surface-hub-in-a-bad-state) +- [The Surface Hub is locked](#recover-a-locked-surface-hub) + +>[!IMPORTANT] +>The **Recover from the cloud** process requires an open internet connection (no proxy or other authentications). An ethernet connection is recommended. ### Recover a Surface Hub in a bad state -If the device account gets into an unstable state or the Admin account is running into issues, you can use cloud recovery in **Settings**. You should only use cloud recovery when [reset](#reset-a-surface-hub-from-settings) doesn't fix the problem. +If the device account gets into an unstable state or if the administrator account encounters problems, you can use the Settings app to start the cloud recovery process. You should only use the cloud recovery process when the [device reset](#reset-a-surface-hub) process doesn't fix the problem. -1. On your Surface Hub, go to **Settings** > **Update & security** > **Recovery**. +1. On your Surface Hub, select **Settings** > **Update & security** > **Recovery**. -2. Under **Recover from the cloud**, click **Restart now**. +1. Under **Recover from the cloud**, select **Restart now**. - ![recover from the cloud](images/recover-from-the-cloud.png) + ![recover from the cloud](images/recover-from-the-cloud.png) ### Recover a locked Surface Hub -On rare occasions, a Surface Hub may encounter an error while cleaning up user and app data at the end of a session. When this happens, the device will automatically reboot and try again. But if this operation fails repeatedly, the device will be automatically locked to protect user data. To unlock it, you must reset or recover the device from [Windows RE](https://technet.microsoft.com/library/cc765966.aspx). +On rare occasions, a Surface Hub may encounter an error while cleaning up user and app data at the end of a session. When this happens, the device automatically restarts and tries the operation again. But if this operation fails repeatedly, the device automatically locks to protect user data. To unlock it, you must [reset the device](#reset-a-surface-hub) or, if that doesn't work, recover it from the cloud. -1. From the welcome screen, toggle the Surface Hub's power switch 3 times. Wait a few seconds between each toggle. See the [Surface Hub Site Readiness Guide (PDF)](surface-hub-site-readiness-guide.md) for help with locating the power switch. -2. The device should automatically boot into Windows RE. -3. After the Surface Hub enters Windows RE, select **Recover from the cloud**. (Optionally, you can choose **Reset**, however **Recover from the cloud** is the recommended approach.) +1. Locate the power switch on the bottom of Surface Hub. The power switch is next to the power cord connection. For more information about the power switch, see the [Surface Hub Site Readiness Guide (PDF)](surface-hub-site-readiness-guide.md). - ![Recover from the cloud](images/recover-from-cloud.png) +1. While the Surface Hub displays the Welcome screen, use the power switch to turn off the Surface Hub. -4. Enter the Bitlocker key (if prompted). -5. When prompted, select **Reinstall**. +1. Use the power switch to turn the Surface Hub back on. The device starts and displays the Surface Hub Logo screen. When you see spinning dots under the Surface Hub Logo, use the power switch to turn the Surface Hub off again. + +1. Repeat step 3 three times, or until the Surface Hub displays the “Preparing Automatic Repair” message. After it displays this message, the Surface Hub displays the Windows RE screen. + +1. Select **Advanced Options**. + +1. Select **Recover from the cloud**. (Optionally, you can select **Reset**. However, **Recover from the cloud** is the recommended approach.) + + ![Recover from the cloud](images/recover-from-cloud.png) +1. If you are prompted to enter the Bitlocker key, do one of the following: + + - To preserve the information that Bitlocker protects on the Surface Hub, enter the Bitlocker key. + - To discard the protected information, select **Skip this drive** + +1. When you are prompted, select **Reinstall**. ![Reinstall](images/reinstall.png) -6. Select **Yes** to repartition the disk. +1. To repartition the disk, select **Yes**. - ![Repartition](images/repartition.png) + ![Repartition](images/repartition.png) -Reset will begin after the image is downloaded from the cloud. You will see progress indicators. + First, the recovery process downloads the operating system image from the cloud. -![downloading 97&](images/recover-progress.png) + ![downloading 97&](images/recover-progress.png) + + When the download finishes, the recovery process restores the Surface Hub according to the options that you selected. ## Related topics 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/downloads/Guide-SurfaceHub2S-Navigation.pptx b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Navigation.pptx new file mode 100644 index 0000000000..b06a6e8b44 Binary files /dev/null and b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Navigation.pptx differ diff --git a/devices/surface-hub/downloads/Guide-SurfaceHub2S-Office365.pptx b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Office365.pptx new file mode 100644 index 0000000000..4fa5e3abd9 Binary files /dev/null and b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Office365.pptx differ diff --git a/devices/surface-hub/downloads/Guide-SurfaceHub2S-Teams.pptx b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Teams.pptx new file mode 100644 index 0000000000..210102de52 Binary files /dev/null and b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Teams.pptx differ diff --git a/devices/surface-hub/downloads/Guide-SurfaceHub2S-Whiteboard.pptx b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Whiteboard.pptx new file mode 100644 index 0000000000..6d39d374a7 Binary files /dev/null and b/devices/surface-hub/downloads/Guide-SurfaceHub2S-Whiteboard.pptx differ diff --git a/devices/surface-hub/downloads/Outline-SurfaceHub2S-EndUser.pdf b/devices/surface-hub/downloads/Outline-SurfaceHub2S-EndUser.pdf new file mode 100644 index 0000000000..6c5b52d377 Binary files /dev/null and b/devices/surface-hub/downloads/Outline-SurfaceHub2S-EndUser.pdf differ diff --git a/devices/surface-hub/downloads/Outline-SurfaceHub2S-HelpDesk.pdf b/devices/surface-hub/downloads/Outline-SurfaceHub2S-HelpDesk.pdf new file mode 100644 index 0000000000..ae296c8c08 Binary files /dev/null and b/devices/surface-hub/downloads/Outline-SurfaceHub2S-HelpDesk.pdf differ diff --git a/devices/surface-hub/downloads/Outline-SurfaceHub2S-PowerUser.pdf b/devices/surface-hub/downloads/Outline-SurfaceHub2S-PowerUser.pdf new file mode 100644 index 0000000000..9f64a7c4f2 Binary files /dev/null and b/devices/surface-hub/downloads/Outline-SurfaceHub2S-PowerUser.pdf differ diff --git a/devices/surface-hub/downloads/QRCConnectYourPC.pdf b/devices/surface-hub/downloads/QRCConnectYourPC.pdf new file mode 100644 index 0000000000..fbdb9d9164 Binary files /dev/null and b/devices/surface-hub/downloads/QRCConnectYourPC.pdf differ diff --git a/devices/surface-hub/downloads/QRCJoinTeamsMeeting.pdf b/devices/surface-hub/downloads/QRCJoinTeamsMeeting.pdf new file mode 100644 index 0000000000..62b86d2a00 Binary files /dev/null and b/devices/surface-hub/downloads/QRCJoinTeamsMeeting.pdf differ diff --git a/devices/surface-hub/downloads/QRCManageTeamsMeeting.pdf b/devices/surface-hub/downloads/QRCManageTeamsMeeting.pdf new file mode 100644 index 0000000000..a6af26dcf9 Binary files /dev/null and b/devices/surface-hub/downloads/QRCManageTeamsMeeting.pdf differ diff --git a/devices/surface-hub/downloads/QRCNavigationBasics.pdf b/devices/surface-hub/downloads/QRCNavigationBasics.pdf new file mode 100644 index 0000000000..6d8eb75ad5 Binary files /dev/null and b/devices/surface-hub/downloads/QRCNavigationBasics.pdf differ diff --git a/devices/surface-hub/downloads/QRCScheduleTeamsMeeting.pdf b/devices/surface-hub/downloads/QRCScheduleTeamsMeeting.pdf new file mode 100644 index 0000000000..a33cf1b1e1 Binary files /dev/null and b/devices/surface-hub/downloads/QRCScheduleTeamsMeeting.pdf differ diff --git a/devices/surface-hub/downloads/QRCShareSendFile.pdf b/devices/surface-hub/downloads/QRCShareSendFile.pdf new file mode 100644 index 0000000000..56d5c9f8c2 Binary files /dev/null and b/devices/surface-hub/downloads/QRCShareSendFile.pdf differ diff --git a/devices/surface-hub/downloads/QRCSignInToViewMeetingsFiles.pdf b/devices/surface-hub/downloads/QRCSignInToViewMeetingsFiles.pdf new file mode 100644 index 0000000000..61caa64f94 Binary files /dev/null and b/devices/surface-hub/downloads/QRCSignInToViewMeetingsFiles.pdf differ diff --git a/devices/surface-hub/downloads/QRCStartNewTeamsMeeting.pdf b/devices/surface-hub/downloads/QRCStartNewTeamsMeeting.pdf new file mode 100644 index 0000000000..d7a7c89268 Binary files /dev/null and b/devices/surface-hub/downloads/QRCStartNewTeamsMeeting.pdf differ diff --git a/devices/surface-hub/downloads/QRCWhiteboardAdvanced.pdf b/devices/surface-hub/downloads/QRCWhiteboardAdvanced.pdf new file mode 100644 index 0000000000..aed2f55671 Binary files /dev/null and b/devices/surface-hub/downloads/QRCWhiteboardAdvanced.pdf differ diff --git a/devices/surface-hub/downloads/QRCWhiteboardTools.pdf b/devices/surface-hub/downloads/QRCWhiteboardTools.pdf new file mode 100644 index 0000000000..c6dfcc3523 Binary files /dev/null and b/devices/surface-hub/downloads/QRCWhiteboardTools.pdf differ diff --git a/devices/surface-hub/downloads/SurfaceHubAdoptionToolKit.pdf b/devices/surface-hub/downloads/SurfaceHubAdoptionToolKit.pdf new file mode 100644 index 0000000000..79675aaaaa Binary files /dev/null and b/devices/surface-hub/downloads/SurfaceHubAdoptionToolKit.pdf differ diff --git a/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-EndUser.pdf b/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-EndUser.pdf new file mode 100644 index 0000000000..b8b6d804a9 Binary files /dev/null and b/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-EndUser.pdf differ diff --git a/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-HelpDesk.pdf b/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-HelpDesk.pdf new file mode 100644 index 0000000000..9e3ac0aa01 Binary files /dev/null and b/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-HelpDesk.pdf differ diff --git a/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-PowerUser.pdf b/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-PowerUser.pdf new file mode 100644 index 0000000000..a40bdf33d6 Binary files /dev/null and b/devices/surface-hub/downloads/TrainingGuide-SurfaceHub2S-PowerUser.pdf differ diff --git a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md index ab66d2931a..1b001aa627 100644 --- a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md +++ b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md @@ -59,7 +59,7 @@ Use this procedure if you use Exchange on-premises. > >msExchRecipientTypeDetails = 8589934592 -3. After you've created the account, run a directory synchronization. When it's complete, go to the users page in your Office 365 admin center and verify that the account created in the previous steps has merged to online. +3. After you've created the account, run a directory synchronization. When it's complete, go to the users page in your Microsoft 365 admin center and verify that the account created in the previous steps has merged to online. 4. Connect to Microsoft Exchange Online and set some properties for the account in Office 365. diff --git a/devices/surface-hub/images/sh2-onscreen-display.png b/devices/surface-hub/images/sh2-onscreen-display.png new file mode 100644 index 0000000000..4605f50734 Binary files /dev/null and b/devices/surface-hub/images/sh2-onscreen-display.png differ diff --git a/devices/surface-hub/images/sh2-run1.png b/devices/surface-hub/images/sh2-run1.png new file mode 100644 index 0000000000..15aa540166 Binary files /dev/null and b/devices/surface-hub/images/sh2-run1.png differ diff --git a/devices/surface-hub/images/sh2-run10.png b/devices/surface-hub/images/sh2-run10.png new file mode 100644 index 0000000000..5e980fa334 Binary files /dev/null and b/devices/surface-hub/images/sh2-run10.png differ diff --git a/devices/surface-hub/images/sh2-run11.png b/devices/surface-hub/images/sh2-run11.png new file mode 100644 index 0000000000..02362bc5da Binary files /dev/null and b/devices/surface-hub/images/sh2-run11.png differ diff --git a/devices/surface-hub/images/sh2-run12.png b/devices/surface-hub/images/sh2-run12.png new file mode 100644 index 0000000000..f619ac4c42 Binary files /dev/null and b/devices/surface-hub/images/sh2-run12.png differ diff --git a/devices/surface-hub/images/sh2-run13.png b/devices/surface-hub/images/sh2-run13.png new file mode 100644 index 0000000000..77b9e3e2a6 Binary files /dev/null and b/devices/surface-hub/images/sh2-run13.png differ diff --git a/devices/surface-hub/images/sh2-run14.png b/devices/surface-hub/images/sh2-run14.png new file mode 100644 index 0000000000..d88ca872ca Binary files /dev/null and b/devices/surface-hub/images/sh2-run14.png differ diff --git a/devices/surface-hub/images/sh2-run2.png b/devices/surface-hub/images/sh2-run2.png new file mode 100644 index 0000000000..fd379b2b05 Binary files /dev/null and b/devices/surface-hub/images/sh2-run2.png differ diff --git a/devices/surface-hub/images/sh2-run3.png b/devices/surface-hub/images/sh2-run3.png new file mode 100644 index 0000000000..8171beecbf Binary files /dev/null and b/devices/surface-hub/images/sh2-run3.png differ diff --git a/devices/surface-hub/images/sh2-run4.png b/devices/surface-hub/images/sh2-run4.png new file mode 100644 index 0000000000..1a132dfebb Binary files /dev/null and b/devices/surface-hub/images/sh2-run4.png differ diff --git a/devices/surface-hub/images/sh2-run5.png b/devices/surface-hub/images/sh2-run5.png new file mode 100644 index 0000000000..ebfe53f3cb Binary files /dev/null and b/devices/surface-hub/images/sh2-run5.png differ diff --git a/devices/surface-hub/images/sh2-run6.png b/devices/surface-hub/images/sh2-run6.png new file mode 100644 index 0000000000..896531f4ec Binary files /dev/null and b/devices/surface-hub/images/sh2-run6.png differ diff --git a/devices/surface-hub/images/sh2-run7.png b/devices/surface-hub/images/sh2-run7.png new file mode 100644 index 0000000000..59e60d84de Binary files /dev/null and b/devices/surface-hub/images/sh2-run7.png differ diff --git a/devices/surface-hub/images/sh2-run8.png b/devices/surface-hub/images/sh2-run8.png new file mode 100644 index 0000000000..ec2daf8e4f Binary files /dev/null and b/devices/surface-hub/images/sh2-run8.png differ diff --git a/devices/surface-hub/images/sh2-run9.png b/devices/surface-hub/images/sh2-run9.png new file mode 100644 index 0000000000..5bd3abea88 Binary files /dev/null and b/devices/surface-hub/images/sh2-run9.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-1.png b/devices/surface-hub/images/surface-hub-2s-repack-1.png new file mode 100644 index 0000000000..cab6f33cb7 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-1.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-10.png b/devices/surface-hub/images/surface-hub-2s-repack-10.png new file mode 100644 index 0000000000..7f3c6ab51c Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-10.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-11.png b/devices/surface-hub/images/surface-hub-2s-repack-11.png new file mode 100644 index 0000000000..0e0485056a Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-11.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-12.png b/devices/surface-hub/images/surface-hub-2s-repack-12.png new file mode 100644 index 0000000000..7032cbc1b7 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-12.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-13.png b/devices/surface-hub/images/surface-hub-2s-repack-13.png new file mode 100644 index 0000000000..465ce22bee Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-13.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-2.png b/devices/surface-hub/images/surface-hub-2s-repack-2.png new file mode 100644 index 0000000000..f8fbc235b6 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-2.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-3.png b/devices/surface-hub/images/surface-hub-2s-repack-3.png new file mode 100644 index 0000000000..e270326ab9 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-3.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-4.png b/devices/surface-hub/images/surface-hub-2s-repack-4.png new file mode 100644 index 0000000000..42bc3a0389 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-4.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-5.png b/devices/surface-hub/images/surface-hub-2s-repack-5.png new file mode 100644 index 0000000000..d6457cd161 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-5.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-6.png b/devices/surface-hub/images/surface-hub-2s-repack-6.png new file mode 100644 index 0000000000..73b8a14630 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-6.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-7.png b/devices/surface-hub/images/surface-hub-2s-repack-7.png new file mode 100644 index 0000000000..54a20e2257 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-7.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-8.png b/devices/surface-hub/images/surface-hub-2s-repack-8.png new file mode 100644 index 0000000000..f2dcac60ed Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-8.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-repack-9.png b/devices/surface-hub/images/surface-hub-2s-repack-9.png new file mode 100644 index 0000000000..c067cbf1d8 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-repack-9.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-camera-1.png b/devices/surface-hub/images/surface-hub-2s-replace-camera-1.png new file mode 100644 index 0000000000..10530cba1e Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-camera-1.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-camera-2.png b/devices/surface-hub/images/surface-hub-2s-replace-camera-2.png new file mode 100644 index 0000000000..119dc21a5a Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-camera-2.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-1.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-1.png new file mode 100644 index 0000000000..ceebc3d5fd Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-1.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-10.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-10.png new file mode 100644 index 0000000000..77ab33c1d5 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-10.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-2.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-2.png new file mode 100644 index 0000000000..3cf6d0ec62 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-2.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-3.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-3.png new file mode 100644 index 0000000000..d44ad9d37c Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-3.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-4.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-4.png new file mode 100644 index 0000000000..ffbec86f57 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-4.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-5.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-5.png new file mode 100644 index 0000000000..90ddf71366 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-5.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-6.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-6.png new file mode 100644 index 0000000000..5020d16853 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-6.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-7.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-7.png new file mode 100644 index 0000000000..9ea535dff4 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-7.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-8.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-8.png new file mode 100644 index 0000000000..1a64ae0ebb Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-8.png differ diff --git a/devices/surface-hub/images/surface-hub-2s-replace-cartridge-9.png b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-9.png new file mode 100644 index 0000000000..9d9bc52c66 Binary files /dev/null and b/devices/surface-hub/images/surface-hub-2s-replace-cartridge-9.png differ diff --git a/devices/surface-hub/install-apps-on-surface-hub.md b/devices/surface-hub/install-apps-on-surface-hub.md index 748f1a9181..20c6c45925 100644 --- a/devices/surface-hub/install-apps-on-surface-hub.md +++ b/devices/surface-hub/install-apps-on-surface-hub.md @@ -12,6 +12,7 @@ ms.author: dansimp ms.topic: article ms.date: 10/23/2018 ms.localizationpriority: medium +audience: ITPro --- # Install apps on your Microsoft Surface Hub @@ -19,9 +20,9 @@ ms.localizationpriority: medium You can install additional apps on your Surface Hub to fit your team or organization's needs. There are different methods for installing apps depending on whether you are developing and testing an app, or deploying a released app. This topic describes methods for installing apps for either scenario. 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. See a [list of apps that work with Surface Hub](https://support.microsoft.com/help/4040382/surface-Apps-that-work-with-Microsoft-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 +40,10 @@ By enabling developer mode, you can also install developer-signed UWP apps. > After developer mode has been enabled, you will need to reset the Surface Hub to disable it. Resetting the device removes all local user files and configurations and then reinstalls Windows. **To turn on developer mode** -1. From your Surface Hub, start **Settings**. -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 +102,10 @@ To evaluate apps released on the Microsoft Store, use the Microsoft Store app on > - To install apps, you will need to manually sign in to the Microsoft Store app on each Surface Hub you own. **To browse the Microsoft Store on Surface Hub** -1. From your Surface Hub, start **Settings**. -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/local-management-surface-hub-settings.md b/devices/surface-hub/local-management-surface-hub-settings.md index 4d09394933..810691dfe8 100644 --- a/devices/surface-hub/local-management-surface-hub-settings.md +++ b/devices/surface-hub/local-management-surface-hub-settings.md @@ -7,7 +7,7 @@ ms.sitesec: library author: dansimp ms.author: dansimp ms.topic: article -ms.date: 06/20/2019 +ms.date: 07/08/2019 ms.reviewer: manager: dansimp ms.localizationpriority: medium @@ -29,7 +29,6 @@ Surface Hubs have many settings that are common to other Windows devices, but al | Change admin account password | Surface Hub > Accounts | Change the password for the local admin account. This is only available if you configured the device to use a local admin during first run. | | Device Management | Surface Hub > Device management | Manage policies and business applications using mobile device management (MDM). | | Provisioning packages | Surface Hub > Device management | Set or change provisioning packages installed on the Surface Hub. | -| Configure Operations Management Suite (OMS) | Surface Hub > Device management | Set up monitoring for your Surface Hub using OMS. | | Open the Microsoft Store app | Surface Hub > Apps & features | The Microsoft Store app is only available to admins through the Settings app. | | Skype for Business domain name | Surface Hub > Calling & Audio | Configure a domain name for your Skype for Business server. | | Default Speaker volume | Surface Hub > Calling & Audio | Configure the default speaker volume for the Surface Hub when it starts a session. | diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index a7c90874f6..96577828d5 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -140,7 +140,7 @@ The following tables include info on Windows 10 settings that have been validate | Setting | Details | CSP reference | Supported with
Intune? | Supported with
Configuration Manager? | Supported with
SyncML\*? | |-------------------|----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------|-------------------------------------------------|-----------------------------| | Defender policies | Use to configure various Defender settings, including a scheduled scan time. | Defender/*``*
See [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) | Yes
[Use a custom policy.](#example-intune) | Yes.
[Use a custom setting.](#example-sccm) | Yes | -| Defender status | Use to initiate a Defender scan, force a Security intelligence update, query any threats detected. | [Defender CSP](https://msdn.microsoft.com/library/windows/hardware/mt187856.aspx) | No. | No. | Yes | +| Defender status | Use to initiate a Defender scan, force a Security intelligence update, query any threats detected. | [Defender CSP](https://msdn.microsoft.com/library/windows/hardware/mt187856.aspx) | Yes | Yes | Yes | \*Settings supported with SyncML can also be configured in a Windows Configuration Designer provisioning package. 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/save-bitlocker-key-surface-hub.md b/devices/surface-hub/save-bitlocker-key-surface-hub.md index aeff0b3763..acd4207515 100644 --- a/devices/surface-hub/save-bitlocker-key-surface-hub.md +++ b/devices/surface-hub/save-bitlocker-key-surface-hub.md @@ -10,7 +10,7 @@ ms.sitesec: library author: levinec ms.author: ellevin ms.topic: article -ms.date: 06/20/2019 +ms.date: 07/08/2019 ms.localizationpriority: medium --- @@ -27,7 +27,7 @@ There are several ways to manage your BitLocker key on the Surface Hub. 2. If you’ve joined the Surface Hub to Azure Active Directory (Azure AD), the BitLocker key will be stored under the account that was used to join the device. -3. If you’re using an admin account to manage the device, you can save the BitLocker key by going to the **Settings** app and navigating to **Update & security** > **Recovery**. Insert a USB drive and select the option to save the BitLocker key. The key will be saved to a text file on the USB drive. +3. If you’re using a local admin account to manage the device, you can save the BitLocker key by going to the **Settings** app and navigating to **Update & security** > **Recovery**. Insert a USB drive and select the option to save the BitLocker key. The key will be saved to a text file on the USB drive. ## Related topics 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-account.md b/devices/surface-hub/surface-hub-2s-account.md index efbcbaf321..cb0a6f3943 100644 --- a/devices/surface-hub/surface-hub-2s-account.md +++ b/devices/surface-hub/surface-hub-2s-account.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -20,9 +21,9 @@ Unlike standard Room mailboxes that remain disabled by default, you need to enab Create the account using the Microsoft 365 admin center or by using PowerShell. You can use Exchange Online PowerShell to configure specific features including: -- Calendar processing for every Surface Hub device account. -- Custom auto replies to scheduling requests. -- If the default ActiveSync mailbox policy has already been modified by someone else or another process, you will likely have to create and assign a new ActiveSync mailbox policy +- Calendar processing for every Surface Hub device account. +- Custom auto replies to scheduling requests. +- If the default ActiveSync mailbox policy has already been modified by someone else or another process, you will likely have to create and assign a new ActiveSync mailbox policy ## Create account using Microsoft 365 admin center @@ -45,13 +46,14 @@ Create the account using the Microsoft 365 admin center or by using PowerShell. ### Finalize setup via PowerShell - **Skype for Business:** For Skype for Business only (on-premises or online), you can enable the Skype for Business object by running **Enable-CsMeetingRoom** to enable features such as Meeting room prompt for audio and Lobby hold. -- **Calling features:** Regardless of your Office 365 licensing configuration, run *Enable-CsMeetingRoom* to enable features such as **Meeting room prompt for audio** and **Lobby hold**. + - **Calendar:** Set **Calendar Auto processing** for this account. ## Create account using PowerShell Instead of using the Microsoft Admin Center portal, you can create the account using PowerShell. ### Connect to Exchange Online PowerShell + ``` $365Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.outlook.com/powershell -Credential (Get-Credential) -Authentication Basic –AllowRedirection $ImportResults = Import-PSSession $365Session ``` @@ -89,4 +91,4 @@ $SfBSession = New-CsOnlineSession -Credential (Get-Credential) Import-PSSession $SfBSession -AllowClobber Enable the Skype for Business meeting room Enable-CsMeetingRoom -Identity account@YourDomain.com -RegistrarPoo(Get-CsTenant).Registrarpool -SipAddressType EmailAddress -``` \ No newline at end of file +``` diff --git a/devices/surface-hub/surface-hub-2s-adoption-kit.md b/devices/surface-hub/surface-hub-2s-adoption-kit.md new file mode 100644 index 0000000000..d2d06415f6 --- /dev/null +++ b/devices/surface-hub/surface-hub-2s-adoption-kit.md @@ -0,0 +1,52 @@ +--- +title: "Surface Hub 2S adoption toolkit" +description: "Microsoft has developed downloadable materials that you can make available for your users to aid in adoption of Surface Hub 2S." +keywords: separate values with commas +ms.prod: surface-hub +ms.sitesec: library +author: robmazz +ms.author: robmazz +manager: laurawi +audience: Admin +ms.topic: article +ms.date: 07/18/2019 +ms.localizationpriority: Normal +--- + +# Surface Hub 2S adoption toolkit + +Microsoft has developed downloadable materials that you can make available for your users to aid in adoption of Surface Hub 2S. + +## Training guides + +- [Surface Hub adoption toolkit](downloads/SurfaceHubAdoptionToolKit.pdf) +- [Training guide – end user](downloads/TrainingGuide-SurfaceHub2S-EndUser.pdf) +- [Training guide – power user](downloads/TrainingGuide-SurfaceHub2S-PowerUser.pdf) +- [Training guide – help desk](downloads/TrainingGuide-SurfaceHub2S-HelpDesk.pdf) +- [Training guide – Microsoft Teams desktop](downloads/Guide-SurfaceHub2S-Teams.pptx) + +[Download all training guides](http://download.microsoft.com/download/2/2/3/2234F70E-E65A-4790-93DF-F4C373A75B8E/SurfaceHub2S-TrainerGuides-July2019.zip) + +[Download all training guides](http://download.microsoft.com/download/2/2/3/2234F70E-E65A-4790-93DF-F4C373A75B8E/SurfaceHub2S-TrainerGuides-July2019.zip) + +## End user guides + +- [Guide to Navigation on Surface Hub](downloads/Guide-SurfaceHub2S-Navigation.pptx) +- [Guide to Office 365 on Surface Hub](downloads/Guide-SurfaceHub2S-Office365.pptx) +- [Guide to Microsoft Whiteboard on Surface Hub](downloads/Guide-SurfaceHub2S-Whiteboard.pptx) +- [Guide to Microsoft Teams on Surface Hub](downloads/Guide-SurfaceHub2S-Teams.pptx) + +## Quick reference cards + +- [Connect your PC](downloads/QRCConnectYourPC.pdf) +- [Join a Teams Meeting](downloads/QRCJoinTeamsMeeting.pdf) +- [Manage a Teams meeting](downloads/QRCManageTeamsMeeting.pdf) +- [Navigation basics](downloads/QRCNavigationBasics.pdf) +- [Schedule a Teams meeting](downloads/QRCScheduleTeamsMeeting.pdf) +- [Start a new Teams meeting](downloads/QRCStartNewTeamsMeeting.pdf) +- [Share or send a file](downloads/QRCShareSendFile.pdf) +- [Sign in to view meetings and files](downloads/QRCSignInToViewMeetingsFiles.pdf) +- [Whiteboard advanced](downloads/QRCWhiteboardAdvanced.pdf) +- [Whiteboard tools](downloads/QRCWhiteboardTools.pdf) + +[Download all user guides and quick reference cards](http://download.microsoft.com/download/E/7/F/E7FC6611-BB55-43E1-AF36-7BD5CE6E0FE0/SurfaceHub2S-EndUserGuides-July2019.zip) diff --git a/devices/surface-hub/surface-hub-2s-change-history.md b/devices/surface-hub/surface-hub-2s-change-history.md index b5e7f65852..19151f0d9a 100644 --- a/devices/surface-hub/surface-hub-2s-change-history.md +++ b/devices/surface-hub/surface-hub-2s-change-history.md @@ -7,6 +7,7 @@ ms.sitesec: library author: robmazz ms.author: robmazz audience: Admin +ms.manager: laurawi ms.topic: article ms.date: 06/20/2019 ms.localizationpriority: Normal @@ -16,6 +17,20 @@ ms.localizationpriority: Normal This topic summarizes new and updated content in the Surface Hub 2S documentation library. +## August 2019 + +Changes | Description +|:--- |:--- +|Connect devices to Surface Hub 2S| Updated with guidance for connecting to a second display. + +## July 2019 + +Changes | Description +|:--- |:--- | +| Reset and recovery for Surface Hub 2S | Added link to Surface recovery website that enables customers to download a recovery image for Surface Hub 2S | +| Surface Hub 2S tech specs | Updated power consumption data | +| Surface Hub 2S Adoption Kit | New | + ## June 2019 Changes | Description diff --git a/devices/surface-hub/surface-hub-2s-connect.md b/devices/surface-hub/surface-hub-2s-connect.md index 3c39dc9774..9422e7facc 100644 --- a/devices/surface-hub/surface-hub-2s-connect.md +++ b/devices/surface-hub/surface-hub-2s-connect.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -13,82 +14,114 @@ ms.localizationpriority: Normal --- # Connect devices to Surface Hub 2S - Surface Hub 2S lets you connect external devices, mirror the display on Surface Hub 2S to another device, and connect a wide variety of third-party peripherals including video conference cameras, conference phones, and room system devices. -## Connect external PCs and related devices - You can display content from your devices to Surface Hub 2S. If the source device is Windows-based, that device can also provide TouchBack and InkBack, which takes video and audio from the connected device and presents them on Surface Hub 2S. If Surface Hub 2S encounters a High-Bandwidth Digital Content Protection (HDCP) signal, such as a Blu-ray DVD player, the source is displayed as a black image. > [!NOTE] -> Surface Hub 2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect App is closed. +> Surface Hub 2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect app is closed. -## Recommended wired configurations for connecting to Surface Hub 2S +## Recommended wired configurations In general, it’s recommended to use native cable connections whenever possible such as USB-C to USB-C or HDMI to HDMI. Other combinations such as MiniDP to HDMI or MiniDP to USB-C will also work. -|**Mode**|**Connection**|**Functionality**|**Comments**| -|:---- |:---------- |:------------ |:-------- | -| Wired “Connect” Application | USB-C (via compute module) | Video, audio, TouchBack/InkBack into Surface Hub 2S.| Provides video, audio, and TouchBack/InkBack on a single cable. | -| | HDMI + USB-C | HDMI-in for Audio/Video
USB-C for TouchBack/InkBack | USB-C supports TouchBack/InkBack with the HDMI A/V connection

Use USB-C to USB-A to connect to legacy computers

*NOTE: For best results, connect HDMI before connecting USB-C cable. If the computer you are using for HDMI is not compatible with TouchBack and InkBack, you won't need a USB-C cable.* | -| “Source” selection experience
(bypasses the OS, full screen requires source selection with keypad button) | USB-C (port in compute module) | Video, Audio into Surface Hub 2S | Single cable needed for A/V
Touchback/InkBack not supported
HDCP enabled | -| | HDMI (in port) | Video, Audio into Surface Hub 2S | Single cable needed for A/V
TouchBack/InkBack not supported
HDCP enabled | +| **Connection** | **Functionality** | **Description**| +| --- | --- | ---| +| USB-C
(via compute module) | Video-in
Video-out
Audio-in
Audio-out

TouchBack and InkBack | Provides video, audio, and TouchBack/InkBack on a single cable.

**NOTE:** Some configuration is required to optimize the video-out experience. Refer to the section below: [Mirroring Surface Hub 2S display on another device](#). | +| HDMI + USB-C | HDMI-in for audio and video

USB-C for TouchBack and InkBack | USB-C supports TouchBack and InkBack with the HDMI A/V connection.

Use USB-C to USB-A to connect to legacy computers.

**NOTE:** For best results, connect HDMI before connecting a USB-C cable. If the computer you're using for HDMI is not compatible with TouchBack and InkBack, you won't need a USB-C cable. | +| USB-C
(via compute module) | Video-in
Audio-in | Single cable needed for A/V

TouchBack and InkBack not supported

HDCP enabled | +| HDMI (in port) | Video, Audio into Surface Hub 2S | Single cable needed for A/V

TouchBack and InkBack not supported

HDCP enabled | +| MiniDP 1.2 output | Video-out such as mirroring to a larger projector. | Single cable needed for A/V | -When you connect a guest computer to Surface Hub 2S via the wired connect USB-C port, several USB devices are discovered and configured. These peripheral devices are created for TouchBack and InkBack. As shown in the table below, the peripheral devices can be viewed in Device Manager, which will show duplicate names for some devices. +When you connect a guest computer to Surface Hub 2S via the USB-C port, several USB devices are discovered and configured. These peripheral devices are created for TouchBack and InkBack. As shown in the following table, the peripheral devices can be viewed in Device Manager, which will show duplicate names for some devices, as shown in the following table. -|**Peripheral**|**Listing in Device Manager**| -|:---------- |:------------------------- | -| Human interface devices | HID-compliant consumer control device
HID-compliant pen
HID-compliant pen (duplicate item)
HID-compliant pen (duplicate item)
HID-compliant touch screen
USB Input Device
USB Input Device (duplicate item) | + +|**Peripheral**| **Listing in Device Manager** | +| ---------------------------- |------------- | ------------------------------| +| Human interface devices | HID-compliant consumer control device
HID-compliant pen
HID-compliant pen (duplicate item)
HID-compliant pen (duplicate item)
HID-compliant touch screen
USB Input Device
USB Input Device (duplicate item) | | Keyboards | Standard PS/2 keyboard | | Mice and other pointing devices | HID-compliant mouse | -| USB controllers | Generic USB hub
USB composite device | +| USB controllers | Generic USB hub
USB composite device | -### Connecting video-in to Surface Hub 2S +## Connecting video-in to Surface Hub 2S -Your choice of video cable will be determined by what is available from your source input. Surface Hub 2S has two choices of video input: USB-C and HDMI. See the following chart for available resolutions. +You can input video to Surface Hub 2S using USB-C or HDMI, as indicated in the following table. -|**Signal Type**|**Resolution**|**Frame rate**|**HDMI**|**USB-C**| -|:----------- |:----------- |:---------- |:---- |:----- | -| PC | 640 x 480 | 59.94/60 | X | X | -| PC | 720 x 480 | 59.94/60 | X | X | -| PC | 1024 x 768 | 60 | X | X | -| PC | 1920 x 1080 | 60 | X | X | -| PC | 3840x2560 | 60 | X | X | -| HDTV | 720p | 59.94/60 | X | X | -| HDTV | 1080p | 59.94/60 | X | X | -| UHD | 3840x2560 | 60 | X | X | +### Surface Hub 2S video-in settings + +| **Signal Type** | **Resolution** | **Frame rate** | **HDMI** | **USB-C** | +| --------------- | -------------- | -------------- | -------- | --------- | +| PC | 640 x 480 | 60 | X | X | +| PC | 720 x 480 | 60 | X | X | +| PC | 1024 x 768 | 60 | X | X | +| PC | 1920 x 1080 | 60 | X | X | +| PC | 3840x2560 | 30 | X | X | +| HDTV | 720p | 60 | X | X | +| HDTV | 1080p | 60 | X | X | +| 4K UHD | 3840x2560 | 30 | X | X | + +> [!NOTE] +> The 4K UHD resolution (3840×2560) is only supported when connecting to ports on the compute module. It is not supported on the “guest” USB ports located on the left, top, and right sides of the device. + +> [!NOTE] +> Video from a connected external PC may appear smaller when displayed on Surface Hub 2S. ## Mirroring Surface Hub 2S display on another device -Surface Hub 2S includes a Video Out port for mirroring visual content from Surface Hub 2S to another display. +You can output video to another display using either USB-C or MiniDP, as indicated in the following table. -|**MODE**|**Connection**|**Functionality**|**Comments**| -|:---- |:---------- |:------------- |:-------- | -| Display out | MiniDP output port | Display and audio out (support for duplicate mode only) | Requires external keyboard
Win+P and select Duplicate mode
Supports audio out (configurable via settings) | +### Surface Hub 2S video-out settings -### Selecting cables +| **Signal Type** | **Resolution** | **Frame rate** | **USB-C** | **MiniDP** | +| --------------- | -------------- | -------------- | --------- | ---------- | +| PC | 640 x 480 | 60 | X | X | +| PC | 720 x 480 | 60 | X | X | +| PC | 1024 x 768 | 60 | X | X | +| PC | 1920 x 1080 | 60 | X | X | +| PC | 3840x2560 | 60 | X | X | +| HDTV | 720p | 60 | X | X | +| HDTV | 1080p | 60 | X | X | +| 4K UHD | 3840x2560 | 60 | X | X | -DisplayPort cables are certified for to 3 meters in length. If a long cable is necessary, HDMI is recommended due to the wide availability of cost-effective, long-haul cables with the added benefit of installing repeaters if needed. + +Surface Hub 2S includes a MiniDP video-out port for projecting visual content from Surface Hub 2S to another display. If you plan to use Surface Hub 2S to project to another display, note the following recommendations: + +- **Keyboard required.** Before you begin, you’ll need to connect either a wired or Bluetooth-enabled external keyboard to Surface Hub 2S. Note that unlike the original Surface Hub, a keyboard for Surface Hub 2S is sold separately and is not included in the shipping package.

+- **Set duplicate mode.** Surface Hub 2S supports video-out in duplicate mode only. However, you will still need to manually configure the display mode when you connect for the first time: + 1. Enter the **Windows logo key** + **P**, which opens the Project pane on the right side of Surface Hub 2S, and then select **Duplicate** mode. + 2. When you’re finished with your Surface Hub 2S session, select **End Session**. This ensures that the duplicate setting is saved for the next session.

+- **Plan for different aspect ratios.** Like other Surface devices, Surface Hub 2S uses a 3:2 display aspect ratio (the relationship between the width and the height of the display). Projecting Surface Hub 2S onto displays with different aspect ratios is supported. Note however that because Surface Hub 2S duplicates the display, the MiniDP output will also only display in a 3:2 aspect ratio, which may result in letterboxing or curtaining depending on the aspect ratio of the receiving display. + +> [!NOTE] +> if your second monitor uses a 16:9 aspect ratio (the predominant ratio for most TV monitors), black bars may appear on the left and right sides of the mirrored display. If this occurs, you may wish to inform your users that there is no need to adjust the second display. + +## Selecting cables + +Note the following recommendations: + +- **USB.** USB 3.1 Gen 2 cables. +- **MiniDP.** DisplayPort cables certified for up to 3 meters in length. +- **HDMI.** If a long cable is necessary, HDMI is recommended due to the wide availability of cost-effective, long-haul cables with the ability to install repeaters if needed. > [!NOTE] > Most DisplayPort sources will automatically switch to HDMI signaling if HDMI is detected. ## Wirelessly connect to Surface Hub 2S -Windows 10 natively supports Miracast, which lets you wireless connect to Surface Hub 2S. +Windows 10 natively supports Miracast, which lets you wireless connect to Surface Hub 2S.

-### To connect using Miracast +### To connect using Miracast: -1. On your Windows 10 device, enter **Win** + **K**. +1. On your Windows 10 device, enter **Windows logo key** + **K**. 2. In the Connect window, look for the name of your Surface Hub 2S in the list of nearby devices. You can find the name of your Surface Hub 2S in the bottom left corner of the display. -3. If required, your system administrator may have enabled the PIN setting for Miracast connections on your Surface Hub which means that the first time you connect to that Surface Hub, a PIN number is displayed on the screen. +3. Enter a PIN if your system administrator has enabled the PIN setting for Miracast connections. This requires you to enter a PIN number when you connect to Surface Hub 2S for the first time. > [!NOTE] -> If you’re a local administrator on Surface Hub 2S, you can configure PIN requirements via **Surface app > Settings.** +>If you do not see the name of the Surface Hub 2S device as expected, it’s possible the previous session was prematurely closed. If so, sign into Surface Hub 2S directly to end the previous session and then connect from your external device. ## Connecting peripherals to Surface Hub 2S -## Bluetooth accessories +### Bluetooth accessories You can connect the following accessories to Surface Hub-2S using Bluetooth: @@ -98,4 +131,4 @@ You can connect the following accessories to Surface Hub-2S using Bluetooth: - Speakers > [!NOTE] -> After you connect a Bluetooth headset or speaker, you might need to change the default microphone and speaker settings. For more information, see [Local management for Surface Hub settings](local-management-surface-hub-settings.md). +> After you connect a Bluetooth headset or speaker, you might need to change the default microphone and speaker settings. For more information, see [**Local management for Surface Hub settings**](https://docs.microsoft.com/en-us/surface-hub/local-management-surface-hub-settings). diff --git a/devices/surface-hub/surface-hub-2s-custom-install.md b/devices/surface-hub/surface-hub-2s-custom-install.md index 13c25204aa..f42757dc00 100644 --- a/devices/surface-hub/surface-hub-2s-custom-install.md +++ b/devices/surface-hub/surface-hub-2s-custom-install.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 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 502caebb70..9aa6e13da6 100644 --- a/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md +++ b/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -18,9 +19,9 @@ You can install additional apps to fit your team or organization's needs. ## Developer guidelines -- 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. See a [list of apps that work with Surface Hub](https://support.microsoft.com/help/4040382/surface-Apps-that-work-with-Microsoft-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 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-deploy-checklist.md b/devices/surface-hub/surface-hub-2s-deploy-checklist.md index 59ab08cd88..311323fc8f 100644 --- a/devices/surface-hub/surface-hub-2s-deploy-checklist.md +++ b/devices/surface-hub/surface-hub-2s-deploy-checklist.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-deploy.md b/devices/surface-hub/surface-hub-2s-deploy.md index 52acbc78da..34bea793f6 100644 --- a/devices/surface-hub/surface-hub-2s-deploy.md +++ b/devices/surface-hub/surface-hub-2s-deploy.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-install-mount.md b/devices/surface-hub/surface-hub-2s-install-mount.md index 2c082049b6..53a75568d1 100644 --- a/devices/surface-hub/surface-hub-2s-install-mount.md +++ b/devices/surface-hub/surface-hub-2s-install-mount.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -33,4 +34,3 @@ If you’re not using licensed accessories, see [Customize wall mount of Surface | Get someone to help you lift and mount your Surface Hub. Make sure to hold and lift the Surface Hub from the bottom. | ![* Remove the instructional label before mounting *](images/sh2-setup-3.png)
| | 4. **Attach accessories and power on** | | | Install accessories and attach power cable as shown. See guides on the screen cling. Remove cling wrap from the screen. Press the power button to power on. | ![* Attach accessories and power on *](images/sh2-setup-4.png)
| - diff --git a/devices/surface-hub/surface-hub-2s-manage-intune.md b/devices/surface-hub/surface-hub-2s-manage-intune.md index 1853f3264d..d42810f20f 100644 --- a/devices/surface-hub/surface-hub-2s-manage-intune.md +++ b/devices/surface-hub/surface-hub-2s-manage-intune.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -47,9 +48,9 @@ To ensure optimal video and audio quality on Surface Hub 2S, add the following Q |**Name**|**Description**|**OMA-URI**|**Type**|**Value**| |:------ |:------------- |:--------- |:------ |:------- | -|**Audio Ports**| Audio Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/SourcePortMatchCondition | String | 50000–50019 | +|**Audio Ports**| Audio Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/SourcePortMatchCondition | String | 50000-50019 | |**Audio DSCP**| Audio ports marking | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/DSCPAction | Integer | 46 | -|**Video Ports**| Video Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/SourcePortMatchCondition | String | 50020–50039 | +|**Video Ports**| Video Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/SourcePortMatchCondition | String | 50020-50039 | |**Video DSCP**| Video ports marking | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/DSCPAction | Integer | 34 | > [!NOTE] diff --git a/devices/surface-hub/surface-hub-2s-manage-passwords.md b/devices/surface-hub/surface-hub-2s-manage-passwords.md index 98600260c3..a3bbfababd 100644 --- a/devices/surface-hub/surface-hub-2s-manage-passwords.md +++ b/devices/surface-hub/surface-hub-2s-manage-passwords.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-onprem-powershell.md b/devices/surface-hub/surface-hub-2s-onprem-powershell.md index 605fe4bdeb..7a0d250e73 100644 --- a/devices/surface-hub/surface-hub-2s-onprem-powershell.md +++ b/devices/surface-hub/surface-hub-2s-onprem-powershell.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-onscreen-display.md b/devices/surface-hub/surface-hub-2s-onscreen-display.md new file mode 100644 index 0000000000..7a2664bf01 --- /dev/null +++ b/devices/surface-hub/surface-hub-2s-onscreen-display.md @@ -0,0 +1,39 @@ +--- +title: "Adjust Surface Hub 2S brightness, volume, and input" +description: "Learn how to use the onscreen display to adjust brightness and other settings in Surface Hub 2S." +keywords: separate values with commas +ms.prod: surface-hub +ms.sitesec: library +author: robmazz +ms.author: robmazz +manager: laurawi +audience: Admin +ms.topic: article +ms.date: 07/09/2019 +ms.localizationpriority: Normal +--- +# Adjust Surface Hub 2S brightness, volume, and input + +Surface Hub 2S provides an on-screen display for volume, brightness, and input control. The Source button functions as a toggle key to switch between the volume, brightness, and input control menus. + +## To show the on-screen display + +- Press and hold the **Source** button for 4 seconds. + + ![Surface Hub 2S on-screen display](images/sh2-onscreen-display.png)
+ + When the on-screen display is visible, use one or more buttons to reach desired settings. + +## To adjust volume + +- Use the **Volume up/down** button to increase or decrease volume. + +## To adjust brightness + +1. Press the **Source** button again to switch to the brightness menu. +2. Use the **Volume up/down** button to increase or decrease brightness. + +## To adjust input + +1. Press the **Source** button twice to switch to the Source menu. +2. Use the **Volume up/down** button to switch between PC, HDMI, and USB-C inputs. diff --git a/devices/surface-hub/surface-hub-2s-pack-components.md b/devices/surface-hub/surface-hub-2s-pack-components.md new file mode 100644 index 0000000000..1ae13b7b75 --- /dev/null +++ b/devices/surface-hub/surface-hub-2s-pack-components.md @@ -0,0 +1,85 @@ +--- +title: "How to pack and ship your Surface Hub 2S for service" +description: "Instructions for packing Surface Hub 2S components, replacing the Compute cartridge, and replacing the camera" +keywords: pack, replace components, camera, compute cartridge +ms.prod: surface-hub +ms.sitesec: library +author: robmazz +ms.author: robmazz +manager: laurawi +audience: Admin +ms.topic: article +ms.date: 07/1/2019 +ms.localizationpriority: Normal +--- + +# How to pack and ship your Surface Hub 2S for service + +If you replace your Surface Hub 2S, one of its components, or a related accessory, use the instructions in this article when you pack the device for shipment. + +>[!IMPORTANT] +>When packing your device for shipment, make sure that you use the packaging in which your replacement device arrived. + +## How to pack your Surface Hub 2S 50” + +Use the following steps to pack your Surface Hub 2S 50" for shipment. + +![The Surface Hub unit and mobile stand.](images/surface-hub-2s-repack-1.png) + +![Remove the pen and the camera. Do not pack them with the unit.](images/surface-hub-2s-repack-2.png) + +![Remove the drive and the power cable. Do not pack them with the unit.](images/surface-hub-2s-repack-3.png) + +![Do not pack the Setup guide with the unit.](images/surface-hub-2s-repack-4.png) + +![Unplug all cables, slide the cover sideways, and unscrew the locking screw of the Compute Cartridge.](images/surface-hub-2s-repack-5.png) + +![Slide the Compute Cartridge out of the unit.](images/surface-hub-2s-repack-6.png) + +![You will need the Compute Cartridge and a screwdriver.](images/surface-hub-2s-repack-7.png) + +![Remove the cover screw and the cover from the Compute Cartridge, and then remove the solid state drive (SSD).](images/surface-hub-2s-repack-8.png) + +![Replace the cover and slide the Compute Cartridge back into the unit.](images/surface-hub-2s-repack-9.png) + +![Re-fasten the locking screw and slide the cover into place.](images/surface-hub-2s-repack-10.png) + +![Remove any base or mounting hardware. Using two people, place the unit in the base of the shipping container.](images/surface-hub-2s-repack-11.png) + +![Replace the cover of the shipping container, and insert the four clips.](images/surface-hub-2s-repack-12.png) + +![Close the four clips.](images/surface-hub-2s-repack-13.png) + +## How to replace and pack your Surface Hub 2S Compute Cartridge + +Use the following steps to remove the Surface Hub 2S Compute Cartridge, pack it for shipment, and install the new Compute Cartridge. + +![Image of the compute cartridge.](images/surface-hub-2s-replace-cartridge-1.png) + +![Unplug all cables, slide the cover sideways, and unscrew the locking screw of the Compute Cartridge.](images/surface-hub-2s-replace-cartridge-2.png) + +![Slide the Compute Cartridge out of the unit.](images/surface-hub-2s-replace-cartridge-3.png) + +![You will need the Compute Cartridge and a screwdriver.](images/surface-hub-2s-replace-cartridge-4.png) + +![Remove the cover screw and the cover from the Compute Cartridge, and then remove the solid state drive (SSD). When finished, replace the cover.](images/surface-hub-2s-repack-8.png) + +![You will need the packaging fixtures that were used to package your replacement Compute Cartridge.](images/surface-hub-2s-replace-cartridge-6.png) + +![Place the old Compute Cartridge in the packaging fixtures.](images/surface-hub-2s-replace-cartridge-7.png) + +![Place the old Compute Cartridge and its packaging into the box that was used for the replacement Compute Cartridge. Reseal the box.](images/surface-hub-2s-replace-cartridge-8.png) + +![Image of the replacement Compute Cartridge.](images/surface-hub-2s-replace-cartridge-1.png) + +![Slide the replacement Compute Cartridge into the unit.](images/surface-hub-2s-replace-cartridge-9.png) + +![Fasten the locking screw and slide the cover into place.](images/surface-hub-2s-replace-cartridge-10.png) + +## How to replace your Surface Hub 2S Camera + +Use the following steps to remove the Surface Hub 2S camera and install the new camera. + +![You will need the new camera and the two-millimeter allen wrench](images/surface-hub-2s-replace-camera-1.png) + +![Unplug the old camera from the unit. If needed, use the allen wrench to adjust the new camera. Plug the new camera into the unit.](images/surface-hub-2s-replace-camera-2.png) diff --git a/devices/surface-hub/surface-hub-2s-phone-authenticate.md b/devices/surface-hub/surface-hub-2s-phone-authenticate.md index ecf42be99d..9773d4a735 100644 --- a/devices/surface-hub/surface-hub-2s-phone-authenticate.md +++ b/devices/surface-hub/surface-hub-2s-phone-authenticate.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -19,7 +20,7 @@ Password-less phone sign-in simplifies signing-in to your meetings and files on > [!NOTE] > Password-less phone sign-in requires that your primary email address must match your UPN. -## To set up password-less phone sign-in +## To set up password-less phone sign-in 1. Download the [Microsoft Authenticator](https://www.microsoft.com/en-us/account/authenticator) app for iPhone or Android to your phone. 2. From your PC, go to [https://aka.ms/MFASetup](https://aka.ms/MFASetup) , sign in with your account, and select **Next.** @@ -39,4 +40,4 @@ Password-less phone sign-in simplifies signing-in to your meetings and files on 3. If prompted, enter the PIN or biometric ID on your phone to complete sign-in. ## Learn more -For more information, see [Password-less phone sign-in with the Microsoft Authenticator app](https://docs.microsoft.com/en-us/azure/active-directory/authentication/howto-authentication-phone-sign-in). +For more information, see [Password-less phone sign-in with the Microsoft Authenticator app](https://docs.microsoft.com/azure/active-directory/authentication/howto-authentication-phone-sign-in). diff --git a/devices/surface-hub/surface-hub-2s-port-keypad-overview.md b/devices/surface-hub/surface-hub-2s-port-keypad-overview.md index af0d573e27..92555790c3 100644 --- a/devices/surface-hub/surface-hub-2s-port-keypad-overview.md +++ b/devices/surface-hub/surface-hub-2s-port-keypad-overview.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -40,4 +41,3 @@ The figure below shows the location of ports and physical buttons on a keypad at | 11 | **Power** | Power device on/off.
Use also to navigate display menus and select items. | n/a | ![Rear facing view of wireless, audio, & related components](images/hub2s-rear.png) - diff --git a/devices/surface-hub/surface-hub-2s-prepare-environment.md b/devices/surface-hub/surface-hub-2s-prepare-environment.md index 905baa519f..10b5238246 100644 --- a/devices/surface-hub/surface-hub-2s-prepare-environment.md +++ b/devices/surface-hub/surface-hub-2s-prepare-environment.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -44,6 +45,6 @@ If you affiliate Surface Hub 2S with on-premises Active Directory Domain Service ## Azure Active Directory -When choosing to affiliate your Surface Hub 2S with Azure AD, any user in the Global Admins Security Group can sign in to the Settings app on Surface Hub 2S. Alternatively, you can configure the Device Administrator role to sign in to the Settings app. For more information, see [Administrator role permissions in Azure Active Directory](https://docs.microsoft.com/en-us/azure/active-directory/users-groups-roles/directory-assign-admin-roles#device-administrators). Currently, no other group can be delegated to sign in to the Settings app on Surface Hub 2S. +When choosing to affiliate your Surface Hub 2S with Azure AD, any user in the Global Admins Security Group can sign in to the Settings app on Surface Hub 2S. Alternatively, you can configure the Device Administrator role to sign in to the Settings app. For more information, see [Administrator role permissions in Azure Active Directory](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-assign-admin-roles#device-administrators). Currently, no other group can be delegated to sign in to the Settings app on Surface Hub 2S. If you enabled Intune Automatic Enrollment for your organization, Surface Hub 2S will automatically enroll itself with Intune. The device’s Bitlocker key is automatically saved in Azure AD. When affiliating Surface Hub 2S with Azure AD, single sign-on and Easy Authentication will not work. diff --git a/devices/surface-hub/surface-hub-2s-quick-start.md b/devices/surface-hub/surface-hub-2s-quick-start.md index 9d208ca609..518e43405c 100644 --- a/devices/surface-hub/surface-hub-2s-quick-start.md +++ b/devices/surface-hub/surface-hub-2s-quick-start.md @@ -6,13 +6,14 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 ms.localizationpriority: Normal --- -# Surface Hub 2S quick start +# Surface Hub 2S quick start ## Unpack Surface Hub 2S diff --git a/devices/surface-hub/surface-hub-2s-recover-reset.md b/devices/surface-hub/surface-hub-2s-recover-reset.md index 4f04c38a31..263228238b 100644 --- a/devices/surface-hub/surface-hub-2s-recover-reset.md +++ b/devices/surface-hub/surface-hub-2s-recover-reset.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 @@ -37,7 +38,7 @@ New in Surface Hub 2S, you can now reinstall the device using a recovery image. Surface Hub 2S lets you reinstall the device using a recovery image, which allows you to reinstall the device to factory settings if you lost the Bitlocker key or no longer have admin credentials to the Settings app. 1. Begin with a USB 3.0 drive with 8 GB or 16 GB of storage, formatted as FAT32. -2. Download recovery image from the Surface Recovery website onto the USB drive and connect it to any USB-C or USB A port on Surface Hub 2S. +2. Download recovery image from the [Surface Recovery website](https://support.microsoft.com/en-us/surfacerecoveryimage?devicetype=surfacehub2s) onto the USB drive and connect it to any USB-C or USB A port on Surface Hub 2S. 3. Turn off the device. While holding down the Volume down button, press the Power button. Keep holding both buttons until you see the Windows logo. Release the Power button but continue to hold the Volume until the Install UI begins. ![*Use Volume down and power buttons to initiate recovery*](images/sh2-keypad.png)
@@ -54,4 +55,4 @@ On rare occasions, Surface Hub 2S may encounter an error during cleanup of user Reset or recover the device from Windows Recovery Environment (Windows RE). For more information, see [What is Windows RE?](https://technet.microsoft.com/library/cc765966.aspx) > [!NOTE] -> To enter recovery mode, you need to physically unplug and replug the power cord three times. \ No newline at end of file +> To enter recovery mode, you need to physically unplug and replug the power cord three times. diff --git a/devices/surface-hub/surface-hub-2s-secure-with-uefi-semm.md b/devices/surface-hub/surface-hub-2s-secure-with-uefi-semm.md index 1fcb058b87..49be99e66b 100644 --- a/devices/surface-hub/surface-hub-2s-secure-with-uefi-semm.md +++ b/devices/surface-hub/surface-hub-2s-secure-with-uefi-semm.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-setup.md b/devices/surface-hub/surface-hub-2s-setup.md new file mode 100644 index 0000000000..c22b2c133a --- /dev/null +++ b/devices/surface-hub/surface-hub-2s-setup.md @@ -0,0 +1,100 @@ +--- +title: "First time Setup for Surface Hub 2S" +description: "Learn how to complete first time Setup for Surface Hub 2S." +keywords: separate values with commas +ms.prod: surface-hub +ms.sitesec: library +author: robmazz +ms.author: robmazz +manager: laurawi +audience: Admin +ms.topic: article +ms.date: 07/03/2019 +ms.localizationpriority: Normal +--- + +# First time Setup for Surface Hub 2S + +When you first start Surface Hub 2S, the device automatically enters first time Setup mode to guide you through account configuration and related settings. + +## Configuring Surface Hub 2S account + +1. **Configure your locale.** Enter region, language, keyboard layout and time zone information. Select **Next**. + + ![* Configure your locale *](images/sh2-run1.png)
+1. **Connect to a wireless network.** Choose your preferred wireless network and select **Next.** + +- This option is not shown if connected using an Ethernet cable. +- You cannot connect to a wireless network in hotspots (captive portals) that redirect sign-in requests to a provider’s website. + +3. **Enter device account info.** Use **domain\user** for on-premises and hybrid environments and **user@example.com** for online environments. Select **Next.** + + ![* Enter device account info *](images/sh2-run2.png)
+1. **Enter additional info.** If requested, provide your Exchange server address and then select **Next.** + + ![* Enter more info; for example, Exchange server name*](images/sh2-run3.png)
+ +1. **Name this device.** Enter a name for your device or use the suggested one based on your account’s display name and user principle name [UPN]. **Select Next**. + +- The **Friendly name** is visible on the bottom left corner of Surface Hub 2S and is shown when projecting to the device. + +- The **Device name** identifies the device when affiliated with Active Directory or Azure Active Directory, and when enrolling the device with Intune. + + ![* Name this device*](images/sh2-run4.png)
+ +## 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/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. + + ![* Setup admins for this device *](images/sh2-run5.png)
+ +### Active Directory Domain Services + +1. Enter the credentials of a user who has permissions to join the device to Active Directory. + + ![* Setup admins using domain join *](images/sh2-run6.png)
+ +2. Select the Active Directory Security Group containing members allowed to log on to the Settings app on Surface Hub 2S. + + ![* Enter a security group *](images/sh2-run7.png)
+1. Select **Finish**. The device will restart. + +### Azure Active Directory + +When choosing to affiliate your device with Azure Active Directory, the device will immediately restart and display the following page. Select **Next**. + +![* If your organization uses Office 365 or other business services from Microsoft, we’ll enrolll this device with your organization*](images/sh2-run8.png)
+ +1. Enter the email address or UPN of an account **with Intune Plan 1** or greater and then select **Next.** + + ![* Enter work or school account*](images/sh2-run9.png)
+ +2. If redirected, authenticate using your organization’s sign-in page and provide additional logon information if requested. The device will restart. + +## Local Administrator account + +- Enter a username and password for your local admin. The device will restart. + + ![* Set up an admin account*](images/sh2-run10.png)
+ +## Using provisioning packages + +If you insert a USB thumb drive with a provisioning package into one of the USB ports when you start Surface Hub 2S, the device displays the following page. + +1. Enter the requested settings and select **Set up**. + + ![* Enter regional settings for provisioning package*](images/sh2-run11.png)
+ + ![* Provision this device from removable media*](images/sh2-run12.png)
+2. Choose the provisioning package you’d like to use. + + ![* Choose provisioning package to use*](images/sh2-run13.png)
+ +3. If you created a multiple devices CSV file, you will be able to choose a device configuration. For more information, refer to [Create provisioning packages for Surface Hub 2S](https://docs.microsoft.com/surface-hub/surface-hub-2s-deploy#provisioning-multiple-devices-csv-file). + + + ![* Select a device account and friendly name from your configuration file*](images/sh2-run14.png)
+ + 4. Follow the instructions to complete first time Setup. diff --git a/devices/surface-hub/surface-hub-2s-site-planning.md b/devices/surface-hub/surface-hub-2s-site-planning.md index bdd4c45509..09b2344a12 100644 --- a/devices/surface-hub/surface-hub-2s-site-planning.md +++ b/devices/surface-hub/surface-hub-2s-site-planning.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-site-readiness-guide.md b/devices/surface-hub/surface-hub-2s-site-readiness-guide.md index ad0a3f3735..db16db4225 100644 --- a/devices/surface-hub/surface-hub-2s-site-readiness-guide.md +++ b/devices/surface-hub/surface-hub-2s-site-readiness-guide.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-startup.md b/devices/surface-hub/surface-hub-2s-startup.md deleted file mode 100644 index bef171d8ad..0000000000 --- a/devices/surface-hub/surface-hub-2s-startup.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: "Out-of-box startup for Surface Hub 2S" -description: "Learn about starting Surface Hub 2S for the first time." -keywords: separate values with commas -ms.prod: surface-hub -ms.sitesec: library -author: robmazz -ms.author: robmazz -audience: Admin -ms.topic: article -ms.localizationpriority: Normal -ROBOTS: NOINDEX, NOFOLLOW ---- - -# Out-of-box startup for Surface Hub 2S diff --git a/devices/surface-hub/surface-hub-2s-techspecs.md b/devices/surface-hub/surface-hub-2s-techspecs.md index e009e2d514..89a4871fbb 100644 --- a/devices/surface-hub/surface-hub-2s-techspecs.md +++ b/devices/surface-hub/surface-hub-2s-techspecs.md @@ -5,6 +5,7 @@ keywords: separate values with commas ms.prod: surface-hub ms.sitesec: library author: robmazz +manager: laurawi ms.author: robmazz audience: Admin ms.topic: article @@ -17,7 +18,9 @@ ms.localizationpriority: Normal |**Item**|**Details**| |:------ |:--------- | |**Dimensions**| 29.2" x 43.2" x 3.0” (741 mm x 1097 mm x 76 mm) | +|**Shipping dimensions**| 47.64" x 36.89" x 9.92" (1,210 mm x 937 mm x 252 mm)| |**Weight**| 61.6 lbs. (28 kg) | +|**Shipping Weight**| 81.08 lbs. (36.77 kg) | |**Resolution**| 3840 x 2560 | |**Display**| PixelSense Display, 3:2 aspect ratio, 10-bit color, 15.5 mm border, anti-glare, IPS LCD | |**Processor**| Quad-core 8th Generation Intel Core i5 processor, 8 GB RAM, 128 GB SSD 1 | @@ -31,6 +34,11 @@ ms.localizationpriority: Normal |**Exterior**| Casing: Precision machined aluminum with mineral-composite resin
Color: Platinum
Physical Buttons: Power, Volume, Source | |**What’s in the box**| One Surface Hub 2S
One Surface Hub 2 Pen
One Surface Hub 2 Camera
2.5 m AC Power Cable
Quick Start Guide | |**Warranty**| 1-year limited hardware warranty | +|**BTU**| 1518 BTU/hr | +|**Input Voltage**| 50/60Hz 110/230v nominal, 90-265v max | +|**Input power, operating**| 445 W (495 W Surge Load) | +|**Input Current**| 5.46 A | +|**Input Power, standby**| 5 W max | > [!NOTE] > 1 System software uses significant storage space. Available storage is subject to change based on system software updates and apps usage. 1 GB= 1 billion bytes. See Surface.com/Storage for more details.
2 Software license required for some features. Sold separately.
diff --git a/devices/surface-hub/surface-hub-2s-unpack.md b/devices/surface-hub/surface-hub-2s-unpack.md index cbf39bdba8..f6955de609 100644 --- a/devices/surface-hub/surface-hub-2s-unpack.md +++ b/devices/surface-hub/surface-hub-2s-unpack.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 diff --git a/devices/surface-hub/surface-hub-2s-whats-new.md b/devices/surface-hub/surface-hub-2s-whats-new.md index 3a04f06f59..b4c40fddde 100644 --- a/devices/surface-hub/surface-hub-2s-whats-new.md +++ b/devices/surface-hub/surface-hub-2s-whats-new.md @@ -6,6 +6,7 @@ ms.prod: surface-hub ms.sitesec: library author: robmazz ms.author: robmazz +manager: laurawi audience: Admin ms.topic: article ms.date: 06/20/2019 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. ![screenshot of the link dialog box on whiteboard](images/wb-collab-link.png) -5. Copy and paste this link into a Skype chat with another Surface Hub +5. Copy and paste this link into a Skype chat with another Surface Hub When the other Surface Hub receives the link, the recipient can tap on the link, sign in to Whiteboard, and then begin collaborating. You can copy and paste other content, use smart ink features like Ink to Shape, and co-author together. diff --git a/devices/surface/TOC.md b/devices/surface/TOC.md index 6cdd5c13fd..15a51ed349 100644 --- a/devices/surface/TOC.md +++ b/devices/surface/TOC.md @@ -30,7 +30,7 @@ ### [Surface System SKU reference](surface-system-sku-reference.md) ## Manage -### [Maintain optimal power settings on Surface devices](maintain-optimal-power-settings-on-Surface-devices.md) +### [Best practice power settings for Surface devices](maintain-optimal-power-settings-on-Surface-devices.md) ### [Battery Limit setting](battery-limit.md) ### [Surface Brightness Control](microsoft-surface-brightness-control.md) ### [Surface Asset Tag](assettag.md) @@ -48,7 +48,8 @@ ### [Unenroll Surface devices from SEMM](unenroll-surface-devices-from-semm.md) ## Support -### [Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md) +### [Fix common Surface problems using the Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-for-business-intro.md) +### [Deploy Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md) ### [Use Surface Diagnostic Toolkit for Business in desktop mode](surface-diagnostic-toolkit-desktop-mode.md) ### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md) ### [Surface Data Eraser](microsoft-surface-data-eraser.md) diff --git a/devices/surface/change-history-for-surface.md b/devices/surface/change-history-for-surface.md index 312c8a39b2..14eea5c91d 100644 --- a/devices/surface/change-history-for-surface.md +++ b/devices/surface/change-history-for-surface.md @@ -15,19 +15,27 @@ ms.topic: article This topic lists new and updated topics in the Surface documentation library. +## July 2019 + +| **New or changed topic** | **Description** | +| ------------------------ | --------------- | +| [Deploy Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md) | Renamed to reflect focus on deployment guidance for IT professionals. Covers minor changes in Version 2.41.139.0. | + + + ## June 2019 -New or changed topic | Description ---- | --- +| **New or changed topic** | **Description** | +| ------------------------ | --------------- | +|[Fix common Surface problems using the Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-for-business-intro.md) | New introductory page for the Surface Diagnostic Toolkit for Business. | +| [Best practice power settings for Surface devices](maintain-optimal-power-settings-on-Surface-devices.md) |Updated with summary of recommendations for managing power settings and optimizing battery life. | -[Fix common Surface problems using the Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-for-business-intro.md) | New ## March 2019 -New or changed topic | Description ---- | --- - -[Surface System SKU reference](surface-system-sku-reference.md) | New +| **New or changed topic** | **Description** | +| ------------------------ | --------------- | +| [Surface System SKU reference](surface-system-sku-reference.md) | New | ## February 2019 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 ![Show offline licenses apps checkbox](images/deploysurfapp-figure1-enablingapps.png "Show offline licenses apps checkbox")
*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. ![Control advanced Surface UEFI settings and Surface UEFI pages](images/surface-ent-mgmt-fig4-advancedsettings.png "Control advanced Surface UEFI settings and Surface UEFI pages") *Figure 5. Control advanced Surface UEFI settings and Surface UEFI pages with SEMM* -13. In the **Save As** dialog box, specify a name for the Surface UEFI configuration package, browse to the location where you would like to save the file, and then click **Save**. -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/images/Surface-Devices-400x140.svg b/devices/surface/images/Surface-Devices-400x140.svg index 9121e93531..4414de0f16 100644 --- a/devices/surface/images/Surface-Devices-400x140.svg +++ b/devices/surface/images/Surface-Devices-400x140.svg @@ -1 +1,25 @@ -Surface-Devices-400x140 \ No newline at end of file + + + + +Surface-Devices-400x140 + + + + + + + + + + + diff --git a/devices/surface/images/Surface-Hub-400x140.svg b/devices/surface/images/Surface-Hub-400x140.svg index 473fba1604..f5a5c12a56 100644 --- a/devices/surface/images/Surface-Hub-400x140.svg +++ b/devices/surface/images/Surface-Hub-400x140.svg @@ -1,59 +1,51 @@ - - - - - - win_it-pro-6 - - - - - - - - - - - - - - - DevicesLaptopTablet-blue - - - - - - - - - - - - - - - +win_it-pro-6 + + + + + + + + + + + + + DevicesLaptopTablet-blue + + + + + + + + + + + + + + diff --git a/devices/surface/surface-diagnostic-toolkit-business.md b/devices/surface/surface-diagnostic-toolkit-business.md index 82d39fd1a8..cd0812b2d9 100644 --- a/devices/surface/surface-diagnostic-toolkit-business.md +++ b/devices/surface/surface-diagnostic-toolkit-business.md @@ -33,7 +33,7 @@ To run SDT for Business, download the components listed in the following table. Mode | Primary scenarios | Download | Learn more --- | --- | --- | --- Desktop mode | Assist users in running SDT on their Surface devices to troubleshoot issues.
Create a custom package to deploy on one or more Surface devices allowing users to select specific logs to collect and analyze. | SDT distributable MSI package:
Microsoft Surface Diagnostic Toolkit for Business Installer
[Surface Tools for IT](https://www.microsoft.com/download/details.aspx?id=46703) | [Use Surface Diagnostic Toolkit in desktop mode](surface-diagnostic-toolkit-desktop-mode.md) -Command line | Directly troubleshoot Surface devices remotely without user interaction, using standard tools such as Configuration Manager. It includes the following commands:
`-DataCollector` collects all log files
`-bpa` runs health diagnostics using Best Practice Analyzer.
`-windowsupdate` checks Windows update for missing firmware or driver updates.
`-warranty` checks warranty information.

| SDT console app:
Microsoft Surface Diagnostics App Console
[Surface Tools for IT](https://www.microsoft.com/download/details.aspx?id=46703) | [Run Surface Diagnostic Toolkit using commands](surface-diagnostic-toolkit-command-line.md) +Command line | Directly troubleshoot Surface devices remotely without user interaction, using standard tools such as Configuration Manager. It includes the following commands:
`-DataCollector` collects all log files
`-bpa` runs health diagnostics using Best Practice Analyzer.
`-windowsupdate` checks Windows Update for missing firmware or driver updates.
`-warranty` checks warranty information.

| SDT console app:
Microsoft Surface Diagnostics App Console
[Surface Tools for IT](https://www.microsoft.com/download/details.aspx?id=46703) | [Run Surface Diagnostic Toolkit using commands](surface-diagnostic-toolkit-command-line.md) ## Supported devices @@ -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. ![Install Options: Advanced](images/sdt-install.png) -7. Click **Next** and then click **Install**. +7. Click **Next** and then click **Install**. ## Installing using the command line If desired, you can install SDT at a command prompt and set a custom flag to install the tool in admin mode. SDT contains the following install option flags: @@ -90,7 +90,7 @@ If desired, you can install SDT at a command prompt and set a custom flag to ins ### To install SDT from the command line: -1. Open a command prompt and enter: +1. Open a command prompt and enter: ``` msiexec.exe /i ADMINMODE=1. @@ -116,28 +116,29 @@ 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. ![Create custom package option](images/sdt-3.png) *Figure 3. Create custom package* -### Language and telemetry page +### Language and telemetry settings - -When you start creating the custom package, you’re asked whether you agree to send data to Microsoft to help improve the application. For more information,see the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement). Sharing is on by default, so uncheck the box if you wish to decline. + When creating a package, you can select language settings or opt out of sending telemetry information to Microsoft. By default, SDT sends telemetry to Microsoft that is used to improve the application in accordance with the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement). If you wish to decline, clear the check box when creating a custom package, as shown below. Or clear the **Send telemetry to Microsoft** check box on the **Install Options** page during SDT Setup. >[!NOTE] ->This setting is limited to only sharing data generated while running packages. +>This setting does not affect the minimal telemetry automatically stored on Microsoft servers when running tests and repairs that require an Internet connection, such as Windows Update and Software repair, or providing feedback using the Smile or Frown buttons in the app toolbar. + ![Select language and telemetry settings](images/sdt-4.png) *Figure 4. Select language and telemetry settings* + ### Windows Update page -Select the option appropriate for your organization. Most organizations with multiple users will typically select to receive updates via Windows Server Update Services (WSUS), as shown in figure 5. If using local Windows update packages or WSUS, enter the path as appropriate. +Select the option appropriate for your organization. Most organizations with multiple users will typically select to receive updates via Windows Server Update Services (WSUS), as shown in figure 5. If using local Windows Update packages or WSUS, enter the path as appropriate. ![Select Windows Update option](images/sdt-5.png) @@ -166,6 +167,13 @@ You can select to run a wide range of logs across applications, drivers, hardwar ## Changes and updates +### Version 2.41.139.0 +*Release date: June 24, 2019*
+This version of Surface Diagnostic Toolkit for Business adds support for the following: +- Driver version information included in logs and report. +- Ability to provide feedback about the app.
+ + ### Version 2.36.139.0 *Release date: April 26, 2019*
This version of Surface Diagnostic Toolkit for Business adds support for the following: @@ -173,11 +181,3 @@ This version of Surface Diagnostic Toolkit for Business adds support for the fol - Accessibility improvements. - Surface brightness control settings included in logs. - External monitor compatibility support link in report generator. - - - - - - - - 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. ![Start SDT in desktop mode](images/sdt-desk-1.png) @@ -63,9 +63,9 @@ For each test, if functionality does not work as expected and the user clicks ** *Figure 4. Running hardware diagnostics* -1. If the brightness successfully adjusts from 0-100 percent as expected, direct the user to click **Yes** and then click **Continue**. -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-diagnostic-toolkit-for-business-intro.md b/devices/surface/surface-diagnostic-toolkit-for-business-intro.md index 26bac290b4..83613f4a36 100644 --- a/devices/surface/surface-diagnostic-toolkit-for-business-intro.md +++ b/devices/surface/surface-diagnostic-toolkit-for-business-intro.md @@ -28,7 +28,7 @@ Before you run the diagnostic tool, make sure you have the latest Windows update **To run the Surface Diagnostic Toolkit for Business:** -1. Download the [Surface Diagnostic Toolkit for Business](https://aka.ms/checkmysurface). +1. Download the [Surface Diagnostic Toolkit for Business](https://aka.ms/SDT4B). 2. Select Run and follow the on-screen instructions. The diagnosis and repair time averages 15 minutes but could take an hour or longer, depending on internet connection speed and the number of updates or repairs required. For more detailed information on Surface Diagnostic Toolkit for Business, refer to [Deploy Surface Diagnostic Toolkit for Business](https://docs.microsoft.com/surface/surface-diagnostic-toolkit-business). 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/surface-system-sku-reference.md b/devices/surface/surface-system-sku-reference.md index b193b9e336..6b6e75f7d4 100644 --- a/devices/surface/surface-system-sku-reference.md +++ b/devices/surface/surface-system-sku-reference.md @@ -16,9 +16,9 @@ manager: dansimp # System SKU reference -This document provides a reference of System Model and System SKU names that you can use to quickly determine the machine state of a specific device using PowerShell or WMI. +This document provides a reference of System Model and System SKU names that you can use to quickly determine the machine state of a specific device by using PowerShell or WMI. -System Model and System SKU are variables stored in System Management BIOS (SMBIOS) tables in the UEFI layer of Surface devices. The System SKU name is required to differentiate between devices with the same System Model name, such as Surface Pro and Surface Pro with LTE Advanced. +System Model and System SKU are variables that are stored in the System Management BIOS (SMBIOS) tables in the UEFI layer of Surface devices. The System SKU name is required to differentiate between devices that have the same System Model name, such as Surface Pro and Surface Pro with LTE Advanced. | Device | System Model | System SKU | | ---------- | ----------- | -------------- | @@ -26,11 +26,13 @@ System Model and System SKU are variables stored in System Management BIOS (SMBI | Surface 3 LTE AT&T | Surface 3 | Surface_3_US1 | | Surface 3 LTE Verizon | Surface 3 | Surface_3_US2 | | Surface 3 LTE North America | Surface 3 | Surface_3_NAG | -| Surface 3 LTE Outside of North America and T-Mobile In Japan | Surface 3 | Surface_3_ROW | +| Surface 3 LTE Outside of North America and Y!mobile In Japan | Surface 3 | Surface_3_ROW | | Surface Pro | Surface Pro | Surface_Pro_1796 | | Surface Pro with LTE Advanced | Surface Pro | Surface_Pro_1807 | | Surface Book 2 13inch | Surface Book 2 | Surface_Book_1832 | | Surface Book 2 15inch | Surface Book 2 | Surface_Book_1793 | +| Surface Go LTE Consumer | Surface Go | Surface_Go_1825_Consumer | +| Surface Go LTE Commercial | System Go | Surface_Go_1825_Commercial | | Surface Go Consumer | Surface Go | Surface_Go_1824_Consumer | | Surface Go Commercial | Surface Go | Surface_Go_1824_Commercial | | Surface Pro 6 Consumer | Surface Pro 6 | Surface_Pro_6_1796_Consumer | @@ -40,22 +42,23 @@ System Model and System SKU are variables stored in System Management BIOS (SMBI ## Examples -**PowerShell** - Use the following PowerShell command to pull System SKU: +**Retrieving the SKU by using PowerShell** +Use the following PowerShell command to pull the System SKU information: - ``` + ``` powershell gwmi -namespace root\wmi -class MS_SystemInformation | select SystemSKU ``` -**System Information** -You can also find the System SKU and System Model for a device in System Information. +**Retrieving the SKU by using System Information** +You can also find the System SKU and System Model for a device in **System Information**. To do this, follow these steps: -- Go to **Start** > **MSInfo32**. - -One example of how you could use this in Microsoft Deployment Toolkit (MDT) or System Center Configuration Manager is as part of a Task Sequence WMI Condition. For example: - -**Task Sequence WMI Condition** +1. Select **Start**, and then type **MSInfo32** in the search box. +1. Select **System Information**. +**Using the SKU in a task sequence WMI condition** +You can use the System SKU information in the Microsoft Deployment Toolkit (MDT) or System Center Configuration Manager as part of a task sequence WMI condition. + ``` powershell - WMI Namespace – Root\WMI - WQL Query – SELECT * FROM MS_SystemInformation WHERE SystemSKU = "Surface_Pro_1796" + ``` 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**. ![Type password for SEMM certificate](images/surface-semm-unenroll-fig11.png "Type password for SEMM certificate") @@ -137,7 +137,7 @@ To initiate a Recovery Request, follow these steps: * If you displayed the Recovery Request (Reset Request) as a QR Code and then used a messaging or email application to send the code to the computer with Microsoft Surface UEFI Configurator, copy and paste the code into the provided field. * If you saved the Recovery Request (Reset Request) as a file to a USB drive, click the **Import** button, browse to and select the Recovery Request (Reset Request) file, and then click **OK**. -16. The reset verification code is displayed in Microsoft Surface UEFI Configurator, as shown in Figure 13. +16. The reset verification code is displayed in Microsoft Surface UEFI Configurator, as shown in Figure 13. ![Display of the reset verification code](images/surface-semm-unenroll-fig13.png "Display of the reset verification code") @@ -145,13 +145,13 @@ To initiate a Recovery Request, follow these steps: * Click the **Share** button to send the reset verification code by email. -17. Enter the reset verification code in the provided field on the Surface device (shown in Figure 8), and then click or press **Verify** to reset the device and unenroll the device from SEMM. -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. ![Example display of successful unenrollment from SEMM](images/surface-semm-unenroll-fig14.png "Example display of successful unenrollment from SEMM") *Figure 14. Successful unenrollment from SEMM* -19. Click **End** in Microsoft Surface UEFI Configurator to complete the Recovery Request (Reset Request) process and close Microsoft Surface UEFI Configurator. +19. Click **End** in Microsoft Surface UEFI Configurator to complete the Recovery Request (Reset Request) process and close Microsoft Surface UEFI Configurator. 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. ![A new Install Application step for Sample POS App](images/using-sda-newinstall-fig3.png "A new Install Application step for Sample POS App") *Figure 3. A new Install Application step for Sample POS App* -12. On the **Properties** tab of the new **Install Application** step, enter **Install - Sample POS App** in the **Name** field, where *Sample POS App* is the name of your app. +12. On the **Properties** tab of the new **Install Application** step, enter **Install - Sample POS App** in the **Name** field, where *Sample POS App* is the name of your app. -13. Click **Install a Single Application**, and then click **Browse** to view available applications that have been imported into the deployment share. +13. Click **Install a Single Application**, and then click **Browse** to view available applications that have been imported into the deployment share. -14. Select your app from the list of applications, and then click **OK**. +14. Select your app from the list of applications, and then click **OK**. -15. Click **OK** to close the task sequence properties. +15. Click **OK** to close the task sequence properties. -16. Close the Deployment Workbench. +16. Close the Deployment Workbench. ## Work with existing deployment shares diff --git a/education/get-started/enable-microsoft-teams.md b/education/get-started/enable-microsoft-teams.md index 350f3be922..170c94d505 100644 --- a/education/get-started/enable-microsoft-teams.md +++ b/education/get-started/enable-microsoft-teams.md @@ -19,12 +19,12 @@ manager: dansimp Microsoft Teams is a digital hub that brings conversations, content, and apps together in one place. Because it's built on Office 365, schools benefit from integration with their familiar Office apps and services. Your institution can use Microsoft Teams to create collaborative classrooms, connect in professional learning communities, and communicate with school staff all from a single experience in Office 365 for Education. -To get started, IT administrators need to use the Office 365 Admin Center to enable Microsoft Teams for your school. +To get started, IT administrators need to use the Microsoft 365 Admin Center to enable Microsoft Teams for your school. ## Enable Microsoft Teams for your school 1. Sign in to Office 365 with your work or school account. -2. Click **Admin** to go to the Office 365 admin center. +2. Click **Admin** to go to the admin center. 3. Go to **Settings > Services & add-ins**. 4. On the **Services & add-ins** page, select **Microsoft Teams**. diff --git a/education/get-started/finish-setup-and-other-tasks.md b/education/get-started/finish-setup-and-other-tasks.md index 94607c14e7..9495aa1d31 100644 --- a/education/get-started/finish-setup-and-other-tasks.md +++ b/education/get-started/finish-setup-and-other-tasks.md @@ -109,7 +109,7 @@ When a device is owned by the school, you may need to have a single person addin Follow the steps in this section to enable a single person to add many devices to your cloud infrastructure. -1. Sign in to the Office 365 admin center. +1. Sign in to the admin center. 2. Configure the device settings for the school's Active Directory. To do this, go to the new Azure portal, https://portal.azure.com. 3. Select **Azure Active Directory > Users and groups > Device settings**. @@ -125,7 +125,7 @@ When students move from using one device to another, they may need to have their Follow the steps in this section to ensure that settings for the each user follow them when they move from one device to another. -1. Sign in to the Office 365 admin center. +1. Sign in to the admin center. 2. Go to the new Azure portal, https://portal.azure.com. 3. Select **Azure Active Directory > Users and groups > Device settings**. 4. Find the setting **Users may sync settings and enterprise app data** and change the value to **All**. @@ -142,12 +142,12 @@ Now that your basic cloud infrastructure is up and running, it's time to complet ## Enable Microsoft Teams for your school Microsoft Teams is a digital hub that brings conversations, content, and apps together in one place. Because it's built on Office 365, schools benefit from integration with their familiar Office apps and services. Your institution can use Microsoft Teams to create collaborative classrooms, connect in professional learning communities, and communicate with school staff all from a single experience in Office 365 for Education. -To get started, IT administrators need to use the Office 365 Admin Center to enable Microsoft Teams for your school. +To get started, IT administrators need to use the Microsoft 365 Admin Center to enable Microsoft Teams for your school. **To enable Microsoft Teams for your school** 1. Sign in to Office 365 with your work or school account. -2. Click **Admin** to go to the Office 365 admin center. +2. Click **Admin** to go to the admin center. 3. Go to **Settings > Services & add-ins**. 4. On the **Services & add-ins** page, select **Microsoft Teams**. diff --git a/education/get-started/inclusive-classroom-it-admin.md b/education/get-started/inclusive-classroom-it-admin.md index 8f65cb8599..d8c3f7273d 100644 --- a/education/get-started/inclusive-classroom-it-admin.md +++ b/education/get-started/inclusive-classroom-it-admin.md @@ -29,12 +29,12 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea | Reading features | Available in which apps | Office 2016 MSI | Office 2019 | Office 365 ProPlus Monthly (C2R) | Office 365 ProPlus Semi Annual (C2R) | Office 365 ProPlus Annual (C2R) | |-------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------| -| Read aloud with simultaneous highlighting |

|

X

(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)

|

X

(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)

|

X

|

X

(N/A for Outlook PC)

|

X

(N/A for any OneNote apps or Outlook PC)

| -| Adjustable text spacing and font size | |

X

(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)

|

X

(N/A for Word for iOS, Word Online, Outlook Web Access, or Office Lens)

|

X

|

X

|

X

(N/A for any OneNote apps)

| -| Syllabification | | |

X

(N/A for Word for iOS, Word Online, Outlook Web Access)

|

X

(N/A for Word iOS)

|

X

(N/A for Word iOS)

|

X

(N/A for any OneNote apps or Word iOS)

| -| Parts of speech identification | |

X

(N/A for Word Online, Outlook Web Access)

|

X

(N/A for Word Online, Outlook Web Access)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

| -| Line focus mode | | |

X

(N/A for Word Online, Outlook Web Access)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

| -| Picture Dictionary | | |

X

(N/A for Word Online, Outlook Web Access)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

| +| Read aloud with simultaneous highlighting | |

X

(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)

|

X

(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)

|

X

|

X

(N/A for Outlook PC)

|

X

(N/A for any OneNote apps or Outlook PC)

| +| Adjustable text spacing and font size | |

X

(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)

|

X

(N/A for Word for iOS, Word in a browser, Outlook Web Access, or Office Lens)

|

X

|

X

|

X

(N/A for any OneNote apps)

| +| Syllabification | | |

X

(N/A for Word for iOS, Word in a browser, Outlook Web Access)

|

X

(N/A for Word iOS)

|

X

(N/A for Word iOS)

|

X

(N/A for any OneNote apps or Word iOS)

| +| Parts of speech identification | |

X

(N/A for Word in a browser, Outlook Web Access)

|

X

(N/A for Word in a browser, Outlook Web Access)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

| +| Line focus mode | | |

X

(N/A for Word in a browser, Outlook Web Access)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

| +| Picture Dictionary | | |

X

(N/A for Word in a browser, Outlook Web Access)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|

X

(N/A for any OneNote apps)

|
@@ -42,11 +42,11 @@ You will also learn how to deploy apps using Microsoft Intune, turn on or off Ea | Writing and proofing features | Available in which apps | Office 2016 MSI | Office 2019 | Office 365 ProPlus Monthly (C2R) | Office 365 ProPlus Semi Annual (C2R) | Office 365 ProPlus Annual (C2R) | |----------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|--------------------------------------|--------------------------------------|--------------------------------------|--------------------------------------|---------------------------------| | Dictation | | |

X

|

X

| | | -| Spelling suggestions for phonetic misspellings | | |

X

|

X

|

X

| | +| Spelling suggestions for phonetic misspellings | | |

X

|

X

|

X

| | | Synonyms alongside spelling suggestions that can be read aloud | | |

X

|

X

|

X

| | -| Grammar checks | | |

X

|

X

| | | +| Grammar checks | | |

X

|

X

| | | | Customizable writing critiques | |

X

|

X

|

X

| | | -| Tell me what you want to do | |

X

|

X

|

X

|

X

| | +| Tell me what you want to do | |

X

|

X

|

X

|

X

| | | Editor | | |

X

|

X

| | |
diff --git a/education/images/MSC17_cloud_005.png b/education/images/MSC17_cloud_005.png new file mode 100644 index 0000000000..dfda08109c Binary files /dev/null and b/education/images/MSC17_cloud_005.png differ diff --git a/education/images/MSC17_cloud_012_merged.png b/education/images/MSC17_cloud_012_merged.png new file mode 100644 index 0000000000..4defcaa59c Binary files /dev/null and b/education/images/MSC17_cloud_012_merged.png differ diff --git a/education/index.md b/education/index.md index b1cce0eedf..f07f216119 100644 --- a/education/index.md +++ b/education/index.md @@ -32,7 +32,7 @@ ms.prod: w10
- +
@@ -51,71 +51,12 @@ ms.prod: w10
- +
-

Deployment Overview

-

Learn how to deploy our suite of education offerings. Set up a cloud infrastructure for your school, acquire apps, and configure and manage Windows 10 devices.

-
-
-
-
- - -
  • -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    1. Cloud deployment

    -

    Get started by creating your Office 365 tenant, setting up a cloud infrastructure for your school, and creating, managing, and syncing user accounts.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    2. Device Management

    -

    Improve student learning outcomes through connected classrooms and engaging new technologies with streamlined device management.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    3. Tools for Teachers

    -

    The latest classroom resources at teachers’ fingertips when you deploy Learning Tools, OneNote Class Notebooks, Teams, and more.

    +

    Deployment Guidance

    +

    Dive right into the step-by-step process for the easiest deployment path to M365 EDU. We walk you through setting up cloud infrastructure, configuring and managing devices, and migrating on-premise servers for Sharepoint and Exchange to the cloud.

    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..f1d88dc8c8 100644 --- a/education/trial-in-a-box/educator-tib-get-started.md +++ b/education/trial-in-a-box/educator-tib-get-started.md @@ -78,7 +78,7 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse 4. Select the **Immersive Reader** button. - ![Word Online's Immersive Reader](images/word_online_immersive_reader.png) + ![Word's Immersive Reader](images/word_online_immersive_reader.png) 5. Press the **Play** button to hear text read aloud. @@ -86,7 +86,7 @@ Learning Tools and the Immersive Reader can be used in the Microsoft Edge browse | Text to Speech | Text Preferences | Grammar Options | Line Focus | | :------------: | :--------------: | :-------------: | :--------: | - | ![Word Online Text to Speech](images/wordonline_tts.png) | ![Word Online Text Preferences](images/wordonline_text_preferences.png) | ![Word Online Grammar Options](images/wordonline_grammar_options.png) | ![Word Online Line Focus](images/wordonline_line_focus.png) | + | ![Word Text to Speech](images/wordonline_tts.png) | ![Word Text Preferences](images/wordonline_text_preferences.png) | ![Word Grammar Options](images/wordonline_grammar_options.png) | ![Word Line Focus](images/wordonline_line_focus.png) |

    @@ -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/trial-in-a-box/itadmin-tib-get-started.md b/education/trial-in-a-box/itadmin-tib-get-started.md index 216eba31f2..bdb1df0296 100644 --- a/education/trial-in-a-box/itadmin-tib-get-started.md +++ b/education/trial-in-a-box/itadmin-tib-get-started.md @@ -257,7 +257,7 @@ Follow these instructions to confirm if you configured your tenant correctly and 3. If you added **Office 365 for Windows 10 S (Education Preview)** to the package and provisioned **Device B** with it, you need to click on one of the Office apps in the **Start** menu to complete app registration. * [Verify the device is Azure AD joined](https://docs.microsoft.com/education/get-started/finish-setup-and-other-tasks#verify-the-device-is-azure-ad-joined) - Confirm that your devices are being managed in Intune for Education. -* [Add more users](https://docs.microsoft.com/education/get-started/finish-setup-and-other-tasks#add-more-users) - Go to the Office 365 admin center to add more users. +* [Add more users](https://docs.microsoft.com/education/get-started/finish-setup-and-other-tasks#add-more-users) - Go to the Microsoft 365 admin center to add more users. * Get app updates (including updates for Office 365 for Windows 10 S) 1. Open the **Start** menu and go to the **Microsoft Store**. 2. From the **Microsoft Store**, click **...** (See more) and select **Downloads and updates**. diff --git a/education/trial-in-a-box/support-options.md b/education/trial-in-a-box/support-options.md index 80fd5383f3..b377719a91 100644 --- a/education/trial-in-a-box/support-options.md +++ b/education/trial-in-a-box/support-options.md @@ -31,7 +31,7 @@ For more information about checking for updates, and how to optionally turn on a ## 2. Confirm your admin contact information is current -1. Go to the     Office 365 admin center and sign in with your Office 365 admin credentials. +1. Go to the admin center and sign in with your Office 365 admin credentials. 2. In the admin center dashboard, select your profile on the upper righthand corner and select **My account** from the options. 3. Select **Personal info** and then edit **Contact details** to update your phone, primary email address, and alternate email address. 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 a7bc124171..bb621c32d8 100644 --- a/education/windows/deploy-windows-10-in-a-school-district.md +++ b/education/windows/deploy-windows-10-in-a-school-district.md @@ -9,7 +9,6 @@ ms.sitesec: library ms.localizationpriority: medium author: levinec ms.author: ellevin -ms.date: 10/30/2017 ms.reviewer: manager: dansimp --- @@ -616,7 +615,7 @@ Now that you have created your new Office 365 Education subscription, add the do #### To add additional domains and subdomains -1. In the Office 365 admin center, in the list view, click **DOMAINS**. +1. In the admin center, in the list view, click **DOMAINS**. 2. In the details pane, above the list of domains, on the menu bar, click **Add domain**. @@ -868,7 +867,7 @@ Now that you have created your new Office 365 Education subscription, you need t >**Note**  If your institution has AD DS, don’t create security accounts in Office 365. Instead, create the security groups in AD DS, and then use Azure AD integration to synchronize the security groups with your Office 365 tenant. -You can use the Office 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users). +You can use the Microsoft 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users). The bulk-add process assigns the same Office 365 Education license plan to all users on the list. Therefore, you must create a separate list for each license plan you recorded in Table 9. Depending on the number of faculty members who need to use the classroom, you may want to add the faculty Office 365 accounts manually; however, use the bulk-add process to add student accounts. @@ -962,7 +961,7 @@ Now that you have created your Microsoft Store for Business portal, you’re rea You can deploy apps to individual users or make apps available to users through your private store. Deploying apps to individual users restricts the app to those specified users. Making apps available through your private store allows all your users to install the apps. -For more information about how to find, acquire, and distribute apps in the portal, see [App inventory management for Microsoft Store for Business](../../store-for-business/app-inventory-management-microsoft-store-for-business.md). +For more information about how to find, acquire, and distribute apps in the portal, see [App inventory management for Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/app-inventory-management-microsoft-store-for-business). #### Summary @@ -1248,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. @@ -1809,7 +1808,7 @@ For more information about how to: For more information about how to: diff --git a/education/windows/deploy-windows-10-in-a-school.md b/education/windows/deploy-windows-10-in-a-school.md index ab4b67cf7b..f1696a220d 100644 --- a/education/windows/deploy-windows-10-in-a-school.md +++ b/education/windows/deploy-windows-10-in-a-school.md @@ -9,7 +9,6 @@ ms.sitesec: library ms.localizationpriority: medium author: levinec ms.author: ellevin -ms.date: 05/21/2019 ms.reviewer: manager: dansimp --- @@ -250,7 +249,7 @@ Now that you have created your new Office 365 Education subscription, add the do #### To add additional domains and subdomains -1. In the Office 365 admin center, in the list view, click **DOMAINS**. +1. In the admin center, in the list view, click **DOMAINS**. 2. In the details pane, above the list of domains, on the menu bar, click **Add domain**. 3. In the Add a New Domain in Office 365 Wizard, on the **Verify domain wizard** page, click **Let’s get started**. 4. On the **Verify domain** wizard page, in the **Enter a domain you already own** box, type your domain name, and then click **Next**. @@ -491,7 +490,7 @@ You can bulk-import user and group accounts directly into Office 365, reducing t Now that you have created your new Office 365 Education subscription, you need to create user accounts. You can add user accounts for the teachers, other faculty, and students who will use the classroom. -You can use the Office 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users). +You can use the Microsoft 365 admin center to add individual Office 365 accounts manually—a reasonable process when you’re adding only a few users. If you have many users, however, you can automate the process by creating a list of those users, and then use that list to create user accounts (that is, bulk-add users). The bulk-add process assigns the same Office 365 Education license plan to all users on the list. Therefore, you must create a separate list for each license plan you recorded in Table 2. Depending on the number of faculty members who need to use the classroom, you may want to add the faculty Office 365 accounts manually; however, use the bulk-add process to add student accounts. @@ -587,7 +586,7 @@ Now that you have created your Microsoft Store for Business portal, you’re rea You can deploy apps to individual users or make apps available to users through your private store. Deploying apps to individual users restricts the app to those specified users. Making apps available through your private store allows all your users. -For more information about how to find, acquire, and distribute apps in the portal, see [App inventory management for Microsoft Store for Business](../../store-for-business/app-inventory-management-microsoft-store-for-business.md). +For more information about how to find, acquire, and distribute apps in the portal, see [App inventory management for Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/app-inventory-management-microsoft-store-for-business). ### Summary @@ -1240,8 +1239,8 @@ For more information about how to: Create or modify security groups and manage group membership in Office 365.

    For more information about how to: @@ -1283,4 +1282,4 @@ Now, you have identified the tasks you need to perform monthly, at the end of an
  • Try it out: Windows 10 deployment (for educational institutions)
  • Try it out: Windows 10 in the classroom
  • Chromebook migration guide
    • - \ No newline at end of file + 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/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md index e3c51dea05..8f8f6c6aa2 100644 --- a/education/windows/test-windows10s-for-edu.md +++ b/education/windows/test-windows10s-for-edu.md @@ -9,7 +9,7 @@ ms.sitesec: library ms.localizationpriority: medium author: mjcaparas ms.author: macapara -ms.date: 04/30/2018 +ms.date: 07/30/2019 ms.reviewer: manager: dansimp --- @@ -90,7 +90,7 @@ Check with your device manufacturer before trying Windows 10 in S mode on your d | HP | Huawei | I Life | | iNET | Intel | LANIT Trading | | Lenovo | LG | MCJ | -| Micro P/Exertis | Microsoft | MSI | +| Micro P/Exertis | Microsoft | MSI | | Panasonic | PC Arts | Positivo SA | | Positivo da Bahia | Samsung | Teclast | | Thirdwave | Tongfang | Toshiba | diff --git a/it-client b/it-client deleted file mode 160000 index 61e0a21977..0000000000 --- a/it-client +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 61e0a21977430f3c0eef1c32e398999dc090c332 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/app-v-51-supported-configurations.md b/mdop/appv-v5/app-v-51-supported-configurations.md index 8b83ac6fad..63e4f12d3c 100644 --- a/mdop/appv-v5/app-v-51-supported-configurations.md +++ b/mdop/appv-v5/app-v-51-supported-configurations.md @@ -118,11 +118,21 @@ The following table lists the SQL Server versions that are supported for the App - + + + + + + + + + + + @@ -262,11 +272,21 @@ The following table lists the SQL Server versions that are supported for the App - + + + + + + + + + + + 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/mbam-v25/TOC.md b/mdop/mbam-v25/TOC.md index 22008a42bb..a33c126e12 100644 --- a/mdop/mbam-v25/TOC.md +++ b/mdop/mbam-v25/TOC.md @@ -83,6 +83,7 @@ #### [Monitoring Web Service Request Performance Counters](monitoring-web-service-request-performance-counters.md) ### [Using Windows PowerShell to Administer MBAM 2.5](using-windows-powershell-to-administer-mbam-25.md) ## [Troubleshooting MBAM 2.5](troubleshooting-mbam-25.md) +## [Applying hotfixes on MBAM 2.5 SP1](apply-hotfix-for-mbam-25-sp1.md) ## [Technical Reference for MBAM 2.5](technical-reference-for-mbam-25.md) ### [Client Event Logs](client-event-logs.md) ### [Server Event Logs](server-event-logs.md) diff --git a/mdop/mbam-v25/about-mbam-25.md b/mdop/mbam-v25/about-mbam-25.md index e379ef1ec5..7afb0c3d9f 100644 --- a/mdop/mbam-v25/about-mbam-25.md +++ b/mdop/mbam-v25/about-mbam-25.md @@ -358,7 +358,7 @@ MBAM is a part of the Microsoft Desktop Optimization Pack (MDOP). MDOP is part o For more information and late-breaking news that is not included in this documentation, see [Release Notes for MBAM 2.5](release-notes-for-mbam-25.md). ## Got a suggestion for MBAM? -- Add or vote on suggestions [here](http://mbam.uservoice.com/forums/268571-microsoft-bitlocker-administration-and-monitoring). +- Send your feedback [here](https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub). - For MBAM issues, use the [MBAM TechNet Forum](https://social.technet.microsoft.com/Forums/home?forum=mdopmbam). ## Related topics 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/smb/cloud-mode-business-setup.md b/smb/cloud-mode-business-setup.md index b92ec2a5d0..5db1de9950 100644 --- a/smb/cloud-mode-business-setup.md +++ b/smb/cloud-mode-business-setup.md @@ -40,7 +40,7 @@ Go to the Microsoft Bus Here's a few things to keep in mind before you get started: - You'll need a registered domain to successfully go through the walkthrough. - If you already own a domain, you can add this during the Office 365 setup. - - If you don't already own a domain, you'll have the option to purchase a domain from the Office 365 admin center. We'll show how to do this as part of the walkthrough. + - If you don't already own a domain, you'll have the option to purchase a domain from the Microsoft 365 admin center. We'll show how to do this as part of the walkthrough. - You'll need an email address to create your Office 365 tenant. - We recommend that you use Internet Explorer for the entire walkthrough. Right click on Internet Explorer and then choose **Start InPrivate Browsing**. @@ -79,22 +79,22 @@ If this is the first time you're setting this up, and you'd like to see how it's ![Office 365 portal](images/office365_portal.png) -6. Select the **Admin** tile to go to the Office 365 admin center. +6. Select the **Admin** tile to go to the admin center. 7. In the admin center, click **Next** to see the highlights and welcome info for the admin center. When you're done, click **Go to setup** to complete the Office 365 setup. This may take up to a half hour to complete. - **Figure 3** - Office 365 admin center + **Figure 3** - Admin center - ![Office 365 admin center](images/office365_admin_portal.png) + ![Microsoft 365 admin center](images/office365_admin_portal.png) -8. Go back to the Office 365 admin center to add or buy a domain. +8. Go back to the admin center to add or buy a domain. 1. Select the **Domains** option. **Figure 4** - Option to add or buy a domain - ![Add or buy a domain in Office 365 admin center](images/office365_buy_domain.png) + ![Add or buy a domain in admin center](images/office365_buy_domain.png) 2. In the **Home > Domains** page, you will see the Microsoft-provided domain, such as *fabrikamdesign.onmicrosoft.com*. @@ -110,16 +110,16 @@ If this is the first time you're setting this up, and you'd like to see how it's **Figure 6** - Domains - ![Verify your domains in Office 365 admin center](images/office365_additional_domain.png) + ![Verify your domains in the admin center](images/office365_additional_domain.png) ### 1.2 Add users and assign product licenses -Once you've set up Office and added your domain, it's time to add users so they have access to Office 365. People in your organization need an account before they can sign in and access Office 365. The easiest way to add users is to add them one at a time in the Office 365 admin center. +Once you've set up Office and added your domain, it's time to add users so they have access to Office 365. People in your organization need an account before they can sign in and access Office 365. The easiest way to add users is to add them one at a time in the Microsoft 365 admin center. When adding users, you can also assign admin privileges to certain users in your team. You'll also want to assign **Product licenses** to each user so that subscriptions can be assigned to the person. **To add users and assign product licenses** -1. In the Office 365 admin center, select **Users > Active users**. +1. In the admin center, select **Users > Active users**. **Figure 7** - Add users @@ -128,7 +128,7 @@ When adding users, you can also assign admin privileges to certain users in your 2. In the **Home > Active users** page, add users individually or in bulk. - To add users one at a time, select **+ Add a user**. - If you select this option, you'll see the **New user** screen and you can add details about the new user including their name, user name, role, and so on. You also have the opportunity to assign **Product licenses**. For detailed step-by-step info on adding a user account, see *Add a user account in the Office 365 admin center* in Add users individually or in bulk to Office 365 - Admin Help. + If you select this option, you'll see the **New user** screen and you can add details about the new user including their name, user name, role, and so on. You also have the opportunity to assign **Product licenses**. For detailed step-by-step info on adding a user account, see *Add a user account in the admin center* in Add users individually or in bulk to Office 365 - Admin Help. **Figure 8** - Add an individual user @@ -153,7 +153,7 @@ Microsoft Intune provides mobile device management, app management, and PC manag **To add Microsoft Intune to your tenant** -1. In the Office 365 admin center, select **Billing > Purchase services**. +1. In the admin center, select **Billing > Purchase services**. 2. In the **Home > Purchase services** screen, search for **Microsoft Intune**. Hover over **Microsoft Intune** to see the options to start a free 30-day trial or to buy now. 3. Confirm your order to enable access to Microsoft Intune. 4. In the admin center, the Intune licenses will show as available and ready to be assigned to users. Select **Users > Active users** and then edit the product licenses assigned to the users to turn on **Intune A Direct**. @@ -176,7 +176,7 @@ Microsoft Azure is an open and flexible cloud platform that enables you to quick **To add Azure AD to your domain** -1. In the Office 365 admin center, select **Admin centers > Azure AD**. +1. In the admin center, select **Admin centers > Azure AD**. > [!NOTE] > You will need Azure AD Premium to configure automatic MDM enrollment with Intune. 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/distribute-offline-apps.md b/store-for-business/distribute-offline-apps.md index 696f1be75a..52c8ea4a6b 100644 --- a/store-for-business/distribute-offline-apps.md +++ b/store-for-business/distribute-offline-apps.md @@ -66,8 +66,8 @@ There are several items to download or create for offline-licensed apps. The app 1. Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com/) or [Microsoft Store for Education](https://educationstore.microsoft.com). 2. Click **Manage**. -3. Under **Shopping Experience**, set **Show offline apps** to **On**. -4. Click **Shop for my group**. Search for the required inbox-app, select it, change the License type to **Offline**, and click **Get the app**, which will add the app to your inventory. +3. Click **Settings**. +4. Click **Shop**. Search for the **Shopping experience** section, change the License type to **Offline**, and click **Get the app**, which will add the app to your inventory. 5. Click **Manage**. You now have access to download the appx bundle package metadata and license file. 6. Go to **Products & services**, and select **Apps & software**. (The list may be empty, but it will auto-populate after some time.) 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/microsoft-store-for-business-overview.md b/store-for-business/microsoft-store-for-business-overview.md index ba34b5d8f5..4b9707b563 100644 --- a/store-for-business/microsoft-store-for-business-overview.md +++ b/store-for-business/microsoft-store-for-business-overview.md @@ -60,7 +60,7 @@ Microsoft Azure Active Directory (AD) accounts for your employees: - Employees need Azure AD account when they access Store for Business content from Windows devices. - If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account - For offline-licensed apps, Azure AD accounts are not required for employees. -- Admins can add or remove user accounts in the Office 365 admin center, even if you don’t have an Office 365 subscription. You can access the Office 365 admin portal directly from the Store for Business and Education. +- Admins can add or remove user accounts in the Microsoft 365 admin center, even if you don’t have an Office 365 subscription. You can access the Office 365 admin portal directly from the Store for Business and Education. For more information on Azure AD, see [About Office 365 and Azure Active Directory](https://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](https://go.microsoft.com/fwlink/p/?LinkId=708611). 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/app-v/appv-supported-configurations.md b/windows/application-management/app-v/appv-supported-configurations.md index 1618dde95c..cdf2a4782e 100644 --- a/windows/application-management/app-v/appv-supported-configurations.md +++ b/windows/application-management/app-v/appv-supported-configurations.md @@ -51,11 +51,12 @@ The following table lists the SQL Server versions that the App-V Management data |SQL Server version|Service pack|System architecture| |---|---|---| +|Microsoft SQL Server 2017||32-bit or 64-bit| +|Microsoft SQL Server 2016|SP2|32-bit or 64-bit| |Microsoft SQL Server 2014||32-bit or 64-bit| |Microsoft SQL Server 2012|SP2|32-bit or 64-bit| |Microsoft SQL Server 2008 R2|SP3|32-bit or 64-bit| - ### Publishing server operating system requirements The App-V Publishing server can be installed on a server that runs Windows Server 2008 R2 with SP1 or later. @@ -86,6 +87,8 @@ The following table lists the SQL Server versions that are supported for the App |SQL Server version|Service pack|System architecture| |---|---|---| +|Microsoft SQL Server 2017||32-bit or 64-bit| +|Microsoft SQL Server 2016|SP2|32-bit or 64-bit| |Microsoft SQL Server 2014||32-bit or 64-bit| |Microsoft SQL Server 2012|SP2|32-bit or 64-bit| |Microsoft SQL Server 2008 R2|SP3|32-bit or 64-bit| diff --git a/windows/application-management/manage-windows-mixed-reality.md b/windows/application-management/manage-windows-mixed-reality.md index 5c0ec34d50..56d7147923 100644 --- a/windows/application-management/manage-windows-mixed-reality.md +++ b/windows/application-management/manage-windows-mixed-reality.md @@ -22,10 +22,8 @@ ms.topic: article [Windows Mixed Reality](https://blogs.windows.com/windowsexperience/2017/10/03/the-era-of-windows-mixed-reality-begins-october-17/) was introduced in Windows 10, version 1709 (also known as the Fall Creators Update), as a [Windows 10 Feature on Demand (FOD)](https://docs.microsoft.com/windows-hardware/manufacture/desktop/features-on-demand-v2--capabilities). Features on Demand are Windows feature packages that can be added at any time. When a Windows 10 PC needs a new feature, it can request the feature package from Windows Update. -Organizations that use Windows Server Update Services (WSUS) must take action to [enable Windows Mixed Reality](#enable). Any organization that wants to prohibit use of Windows Mixed Reality can [block the installation of the Mixed Reality Portal](#block). +Organizations that use Windows Server Update Services (WSUS) must take action to [enable Windows Mixed Reality](#enable-windows-mixed-reality-in-wsus). Any organization that wants to prohibit use of Windows Mixed Reality can [block the installation of the Mixed Reality Portal](#block-the-mixed-reality-portal). - - ## Enable Windows Mixed Reality in WSUS 1. [Check your version of Windows 10.](https://support.microsoft.com/help/13443/windows-which-operating-system) @@ -52,8 +50,6 @@ Organizations that use Windows Server Update Services (WSUS) must take action to IT admins can also create [Side by side feature store (shared folder)](https://technet.microsoft.com/library/jj127275.aspx) to allow access to the Windows Mixed Reality FOD. - - ## Block the Mixed Reality Portal You can use the [AppLocker configuration service provider (CSP)](https://docs.microsoft.com/windows/client-management/mdm/applocker-csp) to block the Mixed Reality software. 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/mandatory-user-profile.md b/windows/client-management/mandatory-user-profile.md index 1ac82401a1..9197370e84 100644 --- a/windows/client-management/mandatory-user-profile.md +++ b/windows/client-management/mandatory-user-profile.md @@ -42,7 +42,7 @@ The name of the folder in which you store the mandatory profile must use the cor | Windows 8 | Windows Server 2012 | v3 | | Windows 8.1 | Windows Server 2012 R2 | v4 | | Windows 10, versions 1507 and 1511 | N/A | v5 | -| Windows 10, versions 1607, 1703, 1709, 1803, and 1809 | Windows Server 2016 | v6 | +| Windows 10, versions 1607, 1703, 1709, 1803, 1809 and 1903 | Windows Server 2016 and Windows Server 2019 | v6 | For more information, see [Deploy Roaming User Profiles, Appendix B](https://technet.microsoft.com/library/jj649079.aspx) and [Roaming user profiles versioning in Windows 10 and Windows Server Technical Preview](https://support.microsoft.com/kb/3056198). @@ -150,6 +150,8 @@ When a user is configured with a mandatory profile, Windows 10 starts as though | Computer Configuration > Administrative Templates > Windows Components > Search > **Allow Cortana** = Disabled | ![supported](images/checkmark.png) | ![supported](images/checkmark.png) | ![not supported](images/crossmark.png) | ![not supported](images/crossmark.png) | | Computer Configuration > Administrative Templates > Windows Components > Cloud Content > **Turn off Microsoft consumer experience** = Enabled | ![supported](images/checkmark.png) | ![not supported](images/crossmark.png) | ![not supported](images/crossmark.png) | ![not supported](images/crossmark.png) | +> [!Note] +> The Group Policy settings above can be applied in Windows 10 Professional edition. diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md index 4ec8751db6..d77896805e 100644 --- a/windows/client-management/mdm/TOC.md +++ b/windows/client-management/mdm/TOC.md @@ -45,28 +45,6 @@ ## [DMProcessConfigXMLFiltered](dmprocessconfigxmlfiltered.md) ## [Using PowerShell scripting with the WMI Bridge Provider](using-powershell-scripting-with-the-wmi-bridge-provider.md) ## [WMI providers supported in Windows 10](wmi-providers-supported-in-windows.md) -## [Create a custom configuration service provider](create-a-custom-configuration-service-provider.md) -### [Design a custom configuration service provider](design-a-custom-windows-csp.md) -### [IConfigServiceProvider2](iconfigserviceprovider2.md) -#### [IConfigServiceProvider2::ConfigManagerNotification](iconfigserviceprovider2configmanagernotification.md) -#### [IConfigServiceProvider2::GetNode](iconfigserviceprovider2getnode.md) -### [ICSPNode](icspnode.md) -#### [ICSPNode::Add](icspnodeadd.md) -#### [ICSPNode::Clear](icspnodeclear.md) -#### [ICSPNode::Copy](icspnodecopy.md) -#### [ICSPNode::DeleteChild](icspnodedeletechild.md) -#### [ICSPNode::DeleteProperty](icspnodedeleteproperty.md) -#### [ICSPNode::Execute](icspnodeexecute.md) -#### [ICSPNode::GetChildNodeNames](icspnodegetchildnodenames.md) -#### [ICSPNode::GetProperty](icspnodegetproperty.md) -#### [ICSPNode::GetPropertyIdentifiers](icspnodegetpropertyidentifiers.md) -#### [ICSPNode::GetValue](icspnodegetvalue.md) -#### [ICSPNode::Move](icspnodemove.md) -#### [ICSPNode::SetProperty](icspnodesetproperty.md) -#### [ICSPNode::SetValue](icspnodesetvalue.md) -### [ICSPNodeTransactioning](icspnodetransactioning.md) -### [ICSPValidate](icspvalidate.md) -### [Samples for writing a custom configuration service provider](samples-for-writing-a-custom-configuration-service-provider.md) ## [Configuration service provider reference](configuration-service-provider-reference.md) ### [AccountManagement CSP](accountmanagement-csp.md) #### [AccountManagement DDF file](accountmanagement-ddf.md) @@ -77,6 +55,8 @@ ### [AllJoynManagement CSP](alljoynmanagement-csp.md) #### [AllJoynManagement DDF](alljoynmanagement-ddf.md) ### [APPLICATION CSP](application-csp.md) +### [ApplicationControl CSP](applicationcontrol-csp.md) +#### [ApplicationControl DDF file](applicationcontrol-csp-ddf.md) ### [AppLocker CSP](applocker-csp.md) #### [AppLocker DDF file](applocker-ddf-file.md) #### [AppLocker XSD](applocker-xsd.md) 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/applicationcontrol-csp-ddf.md b/windows/client-management/mdm/applicationcontrol-csp-ddf.md new file mode 100644 index 0000000000..fa0bee9334 --- /dev/null +++ b/windows/client-management/mdm/applicationcontrol-csp-ddf.md @@ -0,0 +1,274 @@ +--- +title: ApplicationControl CSP +description: ApplicationControl CSP +ms.author: dansimp@microsoft.com +ms.topic: article +ms.prod: w10 +ms.technology: windows +author: ManikaDhiman +ms.date: 07/10/2019 +--- + +# ApplicationControl CSP DDF + + +This topic shows the OMA DM device description framework (DDF) for the **ApplicationControl** configuration service provider. DDF files are used only with OMA DM provisioning XML. + +Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download). + +### ApplicationControl CSP + +```xml + +]> + + 1.2 + + ApplicationControl + ./Vendor/MSFT + + + + + Root Node of the ApplicationControl CSP + + + + + + + + + + + + + + + Policies + + + + + Beginning of a Subtree that contains all policies. + + + + + + + + + + Policies + + + + + + + + + + + The GUID of the Policy + + + + + + + + + + Policy GUID + + + + + + Policy + + + + + + + + The policy binary encoded as base64 + + + + + + + + + + Policy + + + + + + + PolicyInfo + + + + + Information Describing the Policy indicated by the GUID + + + + + + + + + + PolicyInfo + + + + + + Version + + + + + Version of the Policy indicated by the GUID, as a string. When parsing use a uint64 as the containing data type + + + + + + + + + + Version + + text/plain + + + + + IsEffective + + + + + Whether the Policy indicated by the GUID is Effective on the system (loaded by the enforcement engine and in effect) + + + + + + + + + + IsEffective + + text/plain + + + + + IsDeployed + + + + + Whether the Policy indicated by the GUID is deployed on the system (on the physical machine) + + + + + + + + + + IsDeployed + + text/plain + + + + + IsAuthorized + + + + + Whether the Policy indicated by the GUID is authorized to be loaded by the enforcement engine on the system + + + + + + + + + + IsAuthorized + + text/plain + + + + + Status + + + + + The Current Status of the Policy Indicated by the Policy GUID + + + + + + + + + + Status + + text/plain + + + + + FriendlyName + + + + + The FriendlyName of the Policy Indicated by the Policy GUID + + + + + + + + + + FriendlyName + + text/plain + + + + + + + + +``` \ No newline at end of file diff --git a/windows/client-management/mdm/applicationcontrol-csp.md b/windows/client-management/mdm/applicationcontrol-csp.md new file mode 100644 index 0000000000..4f5c622cc0 --- /dev/null +++ b/windows/client-management/mdm/applicationcontrol-csp.md @@ -0,0 +1,236 @@ +--- +title: ApplicationControl CSP +description: ApplicationControl CSP +ms.author: dansimp@microsoft.com +ms.topic: article +ms.prod: w10 +ms.technology: windows +author: ManikaDhiman +ms.date: 05/21/2019 +--- + +# ApplicationControl CSP + +Windows Defender Application Control (WDAC) policies can be managed from an MDM server through ApplicationControl configuration service provider (CSP). This CSP provides expanded diagnostic capabilities and support for [multiple policies](https://docs.microsoft.com/en-us/windows/security/threat-protection/windows-defender-application-control/deploy-multiple-windows-defender-application-control-policies) (introduced in Windows 10, version 1903). It also provides support for rebootless policy deployment (introduced in Windows 10, version 1709). Unlike [AppLocker CSP](applocker-csp.md), ApplicationControl CSP correctly detects the presence of no-reboot option and consequently does not schedule a reboot. +Existing WDAC policies deployed using AppLocker CSP’s CodeIntegrity node can now be deployed using ApplicationControl CSP URI. Although WDAC policy deployment via AppLocker CSP will continue to be supported, all new feature work will be done in ApplicationControl CSP only. + +ApplicationControl CSP was added in Windows 10, version 1903. + +The following diagram shows ApplicationControl CSP in tree format. + +![tree diagram for applicationcontrol csp](images/provisioning-csp-applicationcontrol.png) + +**./Vendor/MSFT/ApplicationControl** +Defines the root node for ApplicationControl CSP. + +Scope is permanent. Supported operation is Get. + +**ApplicationControl/Policies** +An interior node that contains all the policies, each identified by their globally unique identifier (GUID). + +Scope is permanent. Supported operation is Get. + +**ApplicationControl/Policies/_Policy GUID_** +ApplicationControl CSP enforces that the “ID” segment of a given policy URI is the same GUID as the policy ID in the policy blob. Each *Policy GUID* node contains a Policy node and a corresponding PolicyInfo node. + +Scope is dynamic. Supported operation is Get. + +**ApplicationControl/Policies/_Policy GUID_/Policy** +This node is the policy binary itself, which is encoded as base64. + +Scope is dynamic. Supported operations are Get, Add, Delete, and Replace. + +Value type is b64. Supported value is any well-formed WDAC policy, i.e. the base64-encoded content output by the ConvertFrom-CIPolicy cmdlet. + +Default value is empty. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo** +An interior node that contains the nodes that describe the policy indicated by the GUID. + +Scope is dynamic. Supported operation is Get. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Version** +This node provides the version of the policy indicated by the GUID. Stored as a string, but when parsing use a uint64 as the containing data type. + +Scope is dynamic. Supported operation is Get. + +Value type is char. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsEffective** +This node specifies whether a policy is actually loaded by the enforcement engine and is in effect on a system. + +Scope is dynamic. Supported operation is Get. + +Value type is bool. Supported values are as follows: +- True — Indicates that the policy is actually loaded by the enforcement engine and is in effect on a system. +- False — Indicates that the policy is not loaded by the enforcement engine and is not in effect on a system. This is the default. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsDeployed** +This node specifies whether a policy is deployed on the system and is present on the physical machine. + +Scope is dynamic. Supported operation is Get. + +Value type is bool. Supported values are as follows: +- True — Indicates that the policy is deployed on the system and is present on the physical machine. +- False — Indicates that the policy is not deployed on the system and is not present on the physical machine. This is the default. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsAuthorized** +This node specifies whether the policy is authorized to be loaded by the enforcement engine on the system. If not authorized, a policy cannot take effect on the system. + +Scope is dynamic. Supported operation is Get. + +Value type is bool. Supported values are as follows: +- True — Indicates that the policy is authorized to be loaded by the enforcement engine on the system. +- False — Indicates that the policy is not authorized to be loaded by the enforcement engine on the system. This is the default. + +The following table provides the result of this policy based on different values of IsAuthorized, IsDeployed, and IsEffective nodes: + +|IsAuthorized | IsDeployed | IsEffective | Resultant | +|------------ | ---------- | ----------- | --------- | +|True|True|True|Policy is currently running and in effect.| +|True|True|False|Policy requires a reboot to take effect.| +|True|False|True|Policy requires a reboot to unload from CI.| +|False|True|True|Not Reachable.| +|True|False|False|*Not Reachable.| +|False|True|False|*Not Reachable.| +|False|False|True|Not Reachable.| +|False|False|False|*Not Reachable.| + +`*` denotes a valid intermediary state; however, if an MDM transaction results in this state configuration, the END_COMMAND_PROCESSING will result in a fail. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Status** +This node specifies whether the deployment of the policy indicated by the GUID was successful. + +Scope is dynamic. Supported operation is Get. + +Value type is integer. Default value is 0 == OK. + +**ApplicationControl/Policies/_Policy GUID_/PolicyInfo/FriendlyName** +This node provides the friendly name of the policy indicated by the policy GUID. + +Scope is dynamic. Supported operation is Get. + +Value type is char. + +## Usage guidance + +To use ApplicationControl CSP, you must: +- Know a generated policy’s GUID, which can be found in the policy xml as ``. +- Convert the policies to binary format using the ConvertFrom-CIPolicy cmdlet in order to be deployed. The binary policy may be signed or unsigned. +- Create a policy node (a Base64-encoded blob of the binary policy representation) using the [certutil -encode](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc732443(v=ws.11)#BKMK_encode) command line tool. + +Here is a sample certutil invocation: +``` +certutil -encode WinSiPolicy.p7b WinSiPolicy.cer +``` +An alternative to using certutil would be to use the following PowerShell invocation: +``` +[Convert]::ToBase64String($(Get-Content -Encoding Byte -ReadCount 0 -Path )) +``` +If you are using hybrid MDM management with System Center Configuration Manager or using Intune, ensure that you are using Base64 as the Data type when using Custom OMA-URI +functionality to apply the Code Integrity policy. + +### Deploy policies +To deploy a new base policy using the CSP, perform an ADD on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy** using the Base64-encoded policy node as {Data}. Refer to the the Format section in the Example 1 below. + +To deploy base policy and supplemental policies: +- Perform an ADD on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy** using the Base64-encoded policy node as {Data} with the GUID and policy data for the base policy. +- Repeat for each base or supplemental policy (with its own GUID and data). + +The following example shows the deployment of two base policies and a supplemental policy (which already specifies the base policy it supplements and does not need that reflected in the ADD). + +**Example 1: Add first base policy** +```xml + + 1 + + + ./Vendor/MSFT/ApplicationControl/Policies/{Base1GUID}/Policy + + + b64 + + {Base1Data} + + +``` +**Example 2: Add second base policy** +```xml + + 1 + + + ./Vendor/MSFT/ApplicationControl/Policies/{Base2GUID}/Policy + + + b64 + + {Base2Data} + + +``` +**Example 3: Add supplemental policy** +```xml + + 1 + + + ./Vendor/MSFT/ApplicationControl/Policies/{Supplemental1GUID}/Policy + + + b64 + + {Supplemental1Data} + + +``` +### Get policies + +Perform a GET using a deployed policy’s GUID to interrogate/inspect the policy itself or information about it. + +The following table displays the result of Get operation on different nodes: + +|Nodes | Get Results| +|------------- | ------| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy|raw p7b| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Version|Policy version| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsEffective|Is the policy in effect| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsDeployed|Is the policy on the system| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/IsAuthorized|Is the policy authorized on the system| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/Status|Was the deployment successful| +|./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/PolicyInfo/FriendlyName|Friendly name per the policy| + +The following is an example of Get command: +```xml + + 1 + + + ./Vendor/MSFT/ApplicationControl/Policies/{PolicyGUID}/Policy + + + +``` + +### Delete policies +To delete an unsigned policy, perform a DELETE on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy**. + +> [!Note] +> Only signed things should be able to update signed policies. Hence, performing a DELETE on **./Vendor/MSFT/ApplicationControl/Policies/_Policy GUID_/Policy** is not sufficient to delete a signed policy. + +To delete a signed policy: +1. Replace it with a signed update allowing unsigned policy. +2. Deploy another update with unsigned policy. +3. Perform delete. + +The following is an example of Delete command: +```xml + + 1 + + + ./Vendor/MSFT/ApplicationControl/Policies/{PolicyGUID}/Policy + + + +``` \ No newline at end of file diff --git a/windows/client-management/mdm/applocker-csp.md b/windows/client-management/mdm/applocker-csp.md index 7018d14a99..22a816cc20 100644 --- a/windows/client-management/mdm/applocker-csp.md +++ b/windows/client-management/mdm/applocker-csp.md @@ -9,7 +9,7 @@ ms.topic: article ms.prod: w10 ms.technology: windows author: lomayor -ms.date: 04/30/2018 +ms.date: 07/25/2019 --- # AppLocker CSP @@ -1693,119 +1693,145 @@ In this example, Contoso is the node name. We recommend using a GUID for this no chr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + - - - - - - + + - - - - + + - - - - - - + + - - - - + + - - - - - - + + - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md index 06824c4c4a..6889f31898 100644 --- a/windows/client-management/mdm/configuration-service-provider-reference.md +++ b/windows/client-management/mdm/configuration-service-provider-reference.md @@ -23,7 +23,7 @@ For information about the bridge WMI provider classes that map to these CSPs, se Additional lists: -- [List of CSPs supported in Windows Holographic](#hololens) +- [List of CSPs supported in HoloLens devices](#hololens) - [List of CSPs supported in Microsoft Surface Hub](#surfacehubcspsupport) - [List of CSPs supported in Windows 10 IoT Core](#iotcoresupport) @@ -172,6 +172,34 @@ Additional lists: + +[ApplicationControl CSP](applicationcontrol-csp.md) + + +

    Microsoft SQL Server 2014

    Microsoft SQL Server 2017

    32-bit or 64-bit

    Microsoft SQL Server 2016

    SP2

    32-bit or 64-bit

    Microsoft SQL Server 2014

    SP2

    32-bit or 64-bit

    Microsoft SQL Server 2012

    SP2

    32-bit or 64-bit

    Microsoft SQL Server 2014

    Microsoft SQL Server 2017

    32-bit or 64-bit

    Microsoft SQL Server 2016

    SP2

    32-bit or 64-bit

    Microsoft SQL Server 2014

    SP2

    32-bit or 64-bit

    Microsoft SQL Server 2012

    SP2

    32-bit or 64-bit

    + + + + + + + + + + + + + + + + + + +
    HomeProBusinessEnterpriseEducationMobileMobile Enterprise
    check mark6check mark6check mark6check mark6check mark6check mark6check mark6
    + + + + [AppLocker CSP](applocker-csp.md) @@ -2681,37 +2709,40 @@ You can download the DDF files for various CSPs from the links below: - [Download all the DDF files for Windows 10, version 1607](https://download.microsoft.com/download/2/3/E/23E27D6B-6E23-4833-B143-915EDA3BDD44/Windows10_1607_DDF.zip) -## CSPs supported in Windows Holographic +## CSPs supported in HoloLens devices -The following list shows the configuration service providers supported in Windows Holographic editions. +The following list shows the CSPs supported in HoloLens devices: -| Configuration service provider | Windows Holographic edition | Windows Holographic for Business edition | -|--------|--------|------------| -| [AccountManagement CSP](accountmanagement-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | -| [Accounts CSP](accounts-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) -| [AppLocker CSP](applocker-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [AssignedAccess CSP](assignedaccess-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | -| [CertificateStore CSP](certificatestore-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png)| -| [ClientCertificateInstall CSP](clientcertificateinstall-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [DevDetail CSP](devdetail-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DeveloperSetup CSP](developersetup-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)2 (runtime provisioning via provisioning packages only; no MDM support)| -| [DeviceStatus CSP](devicestatus-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [DevInfo CSP](devinfo-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DiagnosticLog CSP](diagnosticlog-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [DMAcc CSP](dmacc-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [DMClient CSP](dmclient-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -| [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [NodeCache CSP](nodecache-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | -[PassportForWork CSP](passportforwork-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [Policy CSP](policy-configuration-service-provider.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [RemoteFind CSP](remotefind-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | -| [RemoteWipe CSP](remotewipe-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | -| [RootCATrustedCertificates CSP](rootcacertificates-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [Update CSP](update-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [VPN2 CSP](vpnv2-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [WiFi CSP](wifi-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | -| [WindowsLicensing CSP](windowslicensing-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| Configuration service provider | HoloLens (1st gen) Development Edition | HoloLens (1st gen) Commercial Suite | HoloLens 2 | +|------|--------|--------|--------| +| [AccountManagement CSP](accountmanagement-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | ![check mark](images/checkmark.png) +| [Accounts CSP](accounts-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [ApplicationControl CSP](applicationcontrol-csp.md) | ![cross mark](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | +| [AppLocker CSP](applocker-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![cross mark](images/crossmark.png) | +| [AssignedAccess CSP](assignedaccess-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | ![check mark](images/checkmark.png) | +| [CertificateStore CSP](certificatestore-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png)| ![check mark](images/checkmark.png) | +| [ClientCertificateInstall CSP](clientcertificateinstall-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [DevDetail CSP](devdetail-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [DeveloperSetup CSP](developersetup-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)2 (runtime provisioning via provisioning packages only; no MDM support)| ![check mark](images/checkmark.png) | +| [DeviceManageability CSP](devicemanageability-csp.md) | ![cross mark](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | +| [DeviceStatus CSP](devicestatus-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [DevInfo CSP](devinfo-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [DiagnosticLog CSP](diagnosticlog-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [DMAcc CSP](dmacc-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [DMClient CSP](dmclient-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [EnterpriseModernAppManagement CSP](enterprisemodernappmanagement-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [NetworkProxy CSP](networkproxy-csp.md) | ![cross mark](images/crossmark.png) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | +| [NodeCache CSP](nodecache-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +[PassportForWork CSP](passportforwork-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [Policy CSP](policy-configuration-service-provider.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [RemoteFind CSP](remotefind-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | ![check mark](images/checkmark.png) | +| [RemoteWipe CSP](remotewipe-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png)4 | ![check mark](images/checkmark.png) | +| [RootCATrustedCertificates CSP](rootcacertificates-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [Update CSP](update-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [VPNv2 CSP](vpnv2-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [WiFi CSP](wifi-csp.md) | ![cross mark](images/crossmark.png) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | +| [WindowsLicensing CSP](windowslicensing-csp.md) | ![check mark](images/checkmark.png) | ![check mark](images/checkmark.png) | ![cross mark](images/crossmark.png) | ## CSPs supported in Microsoft Surface Hub diff --git a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md b/windows/client-management/mdm/create-a-custom-configuration-service-provider.md deleted file mode 100644 index cb8579e827..0000000000 --- a/windows/client-management/mdm/create-a-custom-configuration-service-provider.md +++ /dev/null @@ -1,97 +0,0 @@ ---- -title: Create a custom configuration service provider -description: Create a custom configuration service provider -ms.assetid: 0cb37f03-5bf2-4451-8276-23f4a1dee33f -ms.reviewer: -manager: dansimp -ms.author: dansimp -ms.topic: article -ms.prod: w10 -ms.technology: windows -author: manikadhiman -ms.date: 06/26/2017 ---- - -# Create a custom configuration service provider - -Mobile device OEMs can create custom configuration service providers to manage their devices. A configuration service provider includes an interface for creating, editing, and deleting nodes, and the nodes themselves. Each node contains data for one registry value and can optionally support get, set, and delete operations. - -To design a custom configuration service provider, the OEM must perform the following steps: - -1. Establish node semantics -2. Shape the configuration service provider's subtree -3. Choose a transactioning scheme for each node -4. Determine node operations - -For more information, see [Designing a custom configuration service provider](design-a-custom-windows-csp.md). - -To write a custom configuration service provider, the OEM must implement the following interfaces: - -- [IConfigServiceProvider2](iconfigserviceprovider2.md) (one per configuration service provider) - -- [ICSPNode](icspnode.md) (one per node) - -- [ICSPNodeTransactioning](icspnodetransactioning.md) (optional, for internally transactioned nodes only) - -- [ICSPValidate](icspvalidate.md) (optional, for UI only) - -This code must be compiled into a single .dll file and added to a package by using the instructions found in "Adding content to a package" in [Creating packages](https://msdn.microsoft.com/library/windows/hardware/dn756642). While writing this code, OEMs can store registry settings and files in the following locations. - - ---- - - - - - - - - - - -

    File location

    %DataDrive%\SharedData\OEM\CSP</p>

    Registry location

    $(HKLM.SOFTWARE)\OEM\CSP</p>

    - - -For examples of how to perform common tasks such as adding a node, replacing a node's value, querying a node's value, or enumerating a node's children, see [Samples for writing a custom configuration service provider](samples-for-writing-a-custom-configuration-service-provider.md). - -To register the configuration service provider as a COM object, you must add the following registry setting to your package. This step is required. In the following sample, replace *uniqueCSPguid* with a new, unique CLSID generated for this purpose. Replace *dllName* with the name of the .dll file that contains the code for your configuration service provider. - -``` syntax - - - - - -``` - -To register the configuration service provider with ConfigManager2, you must add the following registry setting to your package. This step is required. In the following sample, replace *dllName* with the name of the configuration service provider (the name of the root node). Replace *uniqueCSPguid* with the same *uniqueCSPguid* value as in the preceding example. - -``` syntax - - - - - -``` - -To make the configuration service provider accessible from WAP XML, you must register it with the WAP data processing unit by setting the following registry key in your package. Replace *Name* with the name of the configuration service provider. Leave the GUID value exactly as written here. - -``` syntax - - - - - -``` - - - - - - - - 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/design-a-custom-windows-csp.md b/windows/client-management/mdm/design-a-custom-windows-csp.md deleted file mode 100644 index 583e098cdc..0000000000 --- a/windows/client-management/mdm/design-a-custom-windows-csp.md +++ /dev/null @@ -1,169 +0,0 @@ ---- -title: Design a custom configuration service provider -description: Design a custom configuration service provider -MS-HAID: -- 'p\_phDeviceMgmt.designing\_a\_custom\_configuration\_service\_provider' -- 'p\_phDeviceMgmt.design\_a\_custom\_windows\_csp' -ms.assetid: 0fff9516-a71a-4036-a57b-503ef1a81a37 -ms.reviewer: -manager: dansimp -ms.author: dansimp -ms.topic: article -ms.prod: w10 -ms.technology: windows -author: manikadhiman -ms.date: 06/26/2017 ---- - -# Design a custom configuration service provider - -To design a custom configuration service provider, the OEM must perform the following steps: - -1. Establish node semantics -2. Shape the configuration service provider's subtree -3. Choose a transactioning scheme for each node -4. Determine node operations - -For more information about the larger process of writing a new configuration service provider, see [Create a custom configuration service provider](create-a-custom-configuration-service-provider.md). - -## Establish node semantics - -First, determine the nodes you need based on the kind of data to be stored in the registry. - -Nodes can represent anything from abstract concepts or collections (such as email accounts or connection settings) to more concrete objects (such as registry keys and values, directories, and files). - -### Example - -For example, a hypothetical Email configuration service provider might have these nodes: - -- Account: The name of the email account (such as "Hotmail") - -- Username: The user name or email address ("exampleAccount@hotmail.com") - -- Password: The user's password - -- Server: The DNS address of the server ("mail-serv1-example.mail.hotmail.com") - -The `Account`, `Username`, and `Server` nodes would hold text-based information about the email account, the user's email address, and the server address associated with that account. The `Password` node, however, might hold a binary hash of the user's password. - -## Shape the configuration service provider's subtree - -After determining what the nodes represent, decide where each node fits in the settings hierarchy. - -The root node of a configuration service provider's subtree must be the name of the configuration service provider. In this example, the root node is `Email`. - -All of the nodes defined in the previous step must reside under the configuration service provider's root node. Leaf nodes should be used to store data, and interior nodes should be used to group the data into logical collections. Node URIs must be unique. In other words, no two nodes can have both the same parent and the same name. - -There are three typical scenarios for grouping and structuring the nodes: - -- If all of the data belongs to the same component and no further categorizing or grouping is required, you can build a flat tree in which all values are stored directly under the root node. For examples of this design, see [DevInfo configuration service provider](devinfo-csp.md), [HotSpot configuration service provider](hotspot-csp.md), and [w4 APPLICATION configuration service provider](w4-application-csp.md). - -- If the configuration service provider's nodes represent a preexisting set of entities whose structure is well-defined (such as directories and files), the configuration service provider's nodes can simply mirror the existing structure. - -- If the data must be grouped by type or component, a more complex structure is required. This is especially true when there can be multiple instances of the dataset on the device, and each set is indexed by an ID, account name, or account type. In this case, you must build a more complex tree structure. For examples, see [ActiveSync configuration service provider](activesync-csp.md), [CertificateStore configuration service provider](certificatestore-csp.md), and [CMPolicy configuration service provider](cmpolicy-csp.md). - -### Example - -The following image shows an incorrect way to structure the hypothetical `Email` configuration service provider. The interior `Account` nodes group the account data (server name, user name, and user password). - -![provisioning\-customcsp\-example1](images/provisioning-customcsp-example1.png) - -However, the account nodes in this design are not unique. Even though the nodes are grouped sensibly, the path for each of the leaf nodes is ambiguous. There is no way to disambiguate the two `Username` nodes, for example, or to reliably access the same node by using the same path. This structure will not work. The easiest solution to this problem is usually to replace an interior node (the grouping node) by: - -1. Promoting a child node. - -2. Using the node value as the name of the new interior node. - -The following design conveys the same amount of information as the first design, but all nodes have a unique path, and therefore it will work. - -![provisioning\-customcsp\-example2](images/provisioning-customcsp-example2.png) - -In this case, the `Server` nodes have been promoted up one level to replace the `Account` nodes, and their values are now used as the node names. For example, you could have two different email accounts on the phone, with server names "www.hotmail.com" and "exchange.microsoft.com", each of which stores a user name and a password. - -Note that the process of shaping the configuration service provider’s subtree influences the choice of transactioning schemes for each node. If possible, peer nodes should not have dependencies on each other. Internode dependencies other than parent/child relationships create mandatory groups of settings, which makes configuration service provider development more difficult. - -## Choose a transactioning scheme for each node - -For each node, decide whether to use *external transactioning* or *internal transactioning* to manage the transaction phases (rollback persistence, rollback, and commitment) for the node. - -External transactioning is the simplest option because it allows ConfigManager2 to automatically handle the node's transactioning. - -However, you must use internal transactioning for the following types of nodes: - -- A node that supports the **Execute** method. - -- A node that contains sensitive information (such as a password) that must not be saved in plain text in the ConfigManager2 rollback document. - -- A node that has a dependency on another node that is not a parent. For example, if a parent node has two children that are both required, the configuration service provider could use internal transactioning to defer provisioning the account until both values are set. - -You can choose to mix transactioning modes in your configuration service provider, using internal transactioning for some operations but external transactioning for others. For more information about writing an internally transactioned node, see the [ICSPNodeTransactioning](icspnodetransactioning.md) interface. - -## Determine node operations - -The operations available for each node can vary depending on the purpose of the configuration service provider. The configuration service provider will be easier to use if the operations are consistent. For more information about the supported operations, see the [ICSPNode](icspnode.md) interface. - -For externally transactioned nodes, an operation implementation must include the contrary operations shown in the following table to allow rollback of the operation. - -For internally transactioned nodes, the practice of implementing the contrary commands for each command is recommended, but not required. - - ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Node operationContrary node operation

    Add

    Clear and DeleteChild

    Copy

    To copy to a new node: Clear and DeleteChild

    -

    To copy to an existing node: Add and SetValue

    Clear

    To restore the state of the deleted node: SetValue and SetProperty

    DeleteChild

    To restore the old node: Add

    DeleteProperty

    To restore the deleted property: SetProperty

    Execute

    Externally transactioned nodes do not support the Execute command.

    GetValue

    None

    Move

    To restore a source node: Move

    -

    To restore an overwritten target node: Add and SetValue

    SetValue

    To restore the previous value: SetValue

    - - - - - - - - - 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 3 1 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 7a78c6d820..c89db5f94c 100644 --- a/windows/client-management/mdm/diagnosticlog-csp.md +++ b/windows/client-management/mdm/diagnosticlog-csp.md @@ -357,7 +357,7 @@ Default value is 0 meaning no keyword. Get provider **Keywords** -``` xml +```xml @@ -377,7 +377,7 @@ Get provider **Keywords** Set provider **Keywords** -``` xml +```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: ![MDM policies](images/autoenrollment-mdm-policies.png) -4. Double-click **Auto MDM Enrollment with AAD Token**. +4. Double-click **Auto MDM Enrollment with AAD Token**. ![MDM autoenrollment policy](images/autoenrollment-policy.png) -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: ![Two-factor authentication notification](images/autoenrollment-2-factor-auth.png) -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. ![Work School Settings](images/autoenrollment-settings-work-school.png) @@ -91,9 +91,9 @@ Requirements: ![Task Scheduler search result](images/autoenrollment-task-schedulerapp.png) -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**. ![Auto-enrollment scheduled task](images/autoenrollment-scheduled-task.png) @@ -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 3 1 @@ -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 3 1 @@ -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