fixed merge conflicts from private repo

This commit is contained in:
Liza Poggemeyer
2019-08-09 14:48:50 -07:00
691 changed files with 52440 additions and 52369 deletions

View File

@ -1,13 +1,15 @@
# [Microsoft HoloLens](index.md)
# [What's new in HoloLens](hololens-whats-new.md)
# [HoloLens in the enterprise: requirements and FAQ](hololens-requirements.md)
# [Set up HoloLens](hololens-setup.md)
# Deploy HoloLens in a commercial environment
## [Overview and deployment planning](hololens-requirements.md)
## [Configure HoloLens using a provisioning package](hololens-provisioning.md)
## [Enroll HoloLens in MDM](hololens-enroll-mdm.md)
# Device Management
## [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md)
## [Install localized version of HoloLens](hololens-install-localized.md)
## [Configure HoloLens using a provisioning package](hololens-provisioning.md)
## [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)

Binary file not shown.

After

Width:  |  Height:  |  Size: 1017 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@ -3,6 +3,7 @@ title: Microsoft HoloLens (HoloLens)
description: Landing page for HoloLens commercial and enterprise management.
ms.prod: hololens
ms.sitesec: library
ms.assetid: 0947f5b3-8f0f-42f0-aa27-6d2cad51d040
author: scooley
ms.author: scooley
ms.topic: article
@ -18,7 +19,9 @@ ms.date: 07/14/2019
<p>Now, with the introduction of HoloLens 2, every device provides commercial ready management enhanced by the reliability, security, and scalability of cloud and AI services from Microsoft.</p>
</td><td align="left" style="border: 0px"><img alt="HoloLens 2 side view" src="./images/hololens2-side-render.png"/></td></tr>
<p>To learn more about HoloLens 2 for developers, check out the <a href="https://docs.microsoft.com/windows/mixed-reality/">mixed reality developer documentation</a>.</p>
</td><td align="left" style="border: 0px"><img alt="HoloLens 2 side view" src="images/hololens2-side-render-xs.png"/></td></tr>
</tbody></table>
## Guides in this section
@ -26,7 +29,7 @@ ms.date: 07/14/2019
| 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. |
| [Deploy HoloLens in a commercial environment](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. |

View File

@ -9,6 +9,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: landing-page
description: "Get started with Microsoft Surface Hub."
localization_priority: High
---
# Get started with Surface Hub

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Create Surface Hub 2S device account

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 07/18/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S adoption toolkit

View File

@ -10,7 +10,7 @@ audience: Admin
ms.manager: laurawi
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Change history for Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Connect devices to Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Customize wall mount of Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Deploy apps to Surface Hub 2S using Intune

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S deployment checklists

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Create provisioning packages for Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Install and mount Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Manage Surface Hub 2S with Intune

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Manage device account password rotation

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Configure Surface Hub 2S on-premises accounts with PowerShell

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 07/09/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Adjust Surface Hub 2S brightness, volume, and input

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 07/1/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# How to pack and ship your Surface Hub 2S for service

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Configure password-less phone sign-in for Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S ports and keypad overview

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Prepare your environment for Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S quick start

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Reset and recovery for Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Secure and manage Surface Hub 2S with SEMM and UEFI

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 07/03/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# First time Setup for Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S site planning

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S site readiness guide

View File

@ -10,7 +10,7 @@ ms.author: robmazz
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Surface Hub 2S tech specs

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# Unpack Surface Hub 2S

View File

@ -10,7 +10,7 @@ manager: laurawi
audience: Admin
ms.topic: article
ms.date: 06/20/2019
ms.localizationpriority: Normal
ms.localizationpriority: Medium
---
# What's new in Surface Hub 2S for IT admins

View File

@ -1,6 +1,6 @@
# [Surface](index.md)
## Get started
## [Get started](get-started.md)
## Overview
### [Surface Pro Tech specs](https://www.microsoft.com/surface/devices/surface-pro/tech-specs)

View File

@ -9,6 +9,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: landing-page
description: "Get started with Microsoft Surface devices"
localization_priority: High
---
# Get started with Surface devices

View File

@ -8,7 +8,7 @@ ms.author: robmazz
manager: laurawi
ms.topic: hub-page
keywords: Microsoft Surface, Microsoft Surface Hub, Surface documentation
localization_priority: Normal
localization_priority: High
audience: ITPro
ms.prod: Surface
description: Learn about Microsoft Surface and Surface Hub devices.