deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-28 21:27:23 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Sarah Cooley 2019-09-13 16:13:29 -07:00
commit a900e65ece
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devices/hololens/TOC.md
View File

@ -29,13 +29,13 @@
## [Set up limited application access](hololens-kiosk.md)
# Navigating Windows Holographic
## [Windows Mixed Reality home](holographic-home.md)
## [Voice and Cortana](hololens-cortana.md)
## [Navigate the mixed reality home](holographic-home.md)
## [Use your voice with HoloLens](hololens-cortana.md)
## [Find and save files](hololens-find-and-save-files.md)
## [Create, share, and view photos and video](holographic-photos-and-video.md)
# Holographic Applications
## [Try 3D Viewer (beta)](holographic-3d-viewer-beta.md)
## [Try 3D Viewer (Beta)](holographic-3d-viewer-beta.md)
## [Find, install, and uninstall applications](holographic-store-apps.md)
## [Install and uninstall custom applications](holographic-custom-apps.md)

4
devices/hololens/hololens-commercial-features.md
View File

@ -12,7 +12,7 @@ ms.localizationpriority: medium
ms.reviewer:
manager: jarrettr
appliesto:
- HoloLens (1st Gen)
- HoloLens (1st gen)
- HoloLens 2
---
@ -22,7 +22,7 @@ HoloLens includes features that make it easier for businesses to manage HoloLens
Every HoloLens 2 device has commercial features available.
HoloLens (1st Gen) came with two licensing options, the developer license and a commercial license. To unlock HoloLens's commercial capabilities, upgrade from the developer license to a commercial license. To purchase the Microsoft HoloLens Commercial Suite, contact your local Microsoft account manager.
HoloLens (1st gen) came with two licensing options, the developer license and a commercial license. To unlock HoloLens's commercial capabilities, upgrade from the developer license to a commercial license. To purchase the Microsoft HoloLens Commercial Suite, contact your local Microsoft account manager.
>[!VIDEO https://www.youtube.com/embed/tNd0e2CiAkE]

22
devices/hololens/hololens-connect-devices.md
View File

@ -8,14 +8,14 @@ author: Teresa-Motiv
ms.author: v-tea
ms.topic: article
ms.localizationpriority: medium
ms.date: 8/12/19
ms.date: 9/13/2019
manager: jarrettr
appliesto:
- HoloLens (1st gen)
- HoloLens 2
---
# Connect devices and accessories
# Connect to Bluetooth and USB-C devices
## Pair Bluetooth devices
@ -38,18 +38,20 @@ Classes of Bluetooth devices supported by HoloLens (1st gen):
### Pair a Bluetooth keyboard or mouse
1. Turn on your keyboard or mouse and make it discoverable. The way you make it discoverable depends on the device. Check the device or visit the manufacturer's website to learn how.
1. Turn on your keyboard or mouse and make it discoverable. The way you make it discoverable depends on the device. To learn how to do this, check the device or visit the manufacturer's website.
1. Go to **Start**, then select **Settings**.
1. Select **Devices** and make sure Bluetooth is on. When you see the device name, select **Pair** and follow the instructions.
1. Use the bloom gesture (HoloLens (1st gen) or the start gesture (HoloLens 2) to go to **Start**, then select **Settings**.
1. Select **Devices** and make sure that Bluetooth is on. When you see the device name, select **Pair** and follow the instructions.
> Learn more about supported languages for HoloLens [here]().
### Pair the clicker
> Applies to HoloLens (1st gen) only.
1. Use the bloom gesture to go to **Start**, then select **Settings**.
1. Select **Devices** and make sure Bluetooth is on.
1. Select **Devices** and make sure that Bluetooth is on.
1. Use the tip of a pen to press and hold the clicker's pairing button until the status light blinks white. Make sure to hold the button down until the light starts blinking. [Where's the pairing button?](hololens-clicker.md)
1. On the pairing screen, select **Clicker** > **Pair**.
@ -57,11 +59,15 @@ Classes of Bluetooth devices supported by HoloLens (1st gen):
> Applies to HoloLens 2 only.
<<<<<<< HEAD
HoloLens 2 lets you connect a wide range of USB-C devices.
=======
You can connect a wide range of USB-c devices to your HoloLens 2 device.
>>>>>>> 4aded6340829591f44959c9e1b1428ac25d711b0
Devices classes supported by HoloLens 2:
HoloLens 2 supports the following devices classes:
- Mass storage devices (e.g. thumb drives)
- Mass storage devices (such as thumb drives)
- Ethernet adapters (including ethernet with charging)
- USB-C to 3.5mm digital audio adapters
- USB-C digital audio headsets (including headset adapters with charging)

28
devices/hololens/hololens-cortana.md
View File

@ -1,8 +1,8 @@
---
title: Cortana on HoloLens
title: Use your voice with HoloLens
description: Cortana can help you do all kinds of things on your HoloLens
ms.assetid: fd96fb0e-6759-4dbe-be1f-58bedad66fed
ms.date: 08/14/2019
ms.date: 9/13/2019
keywords: hololens
ms.prod: hololens
ms.sitesec: library
@ -18,14 +18,14 @@ appliesto:
# Use your voice with HoloLens
You can use your voice to do almost anything on HoloLens, like taking a quick photo or opening an app. Many voice commands are built into HoloLens, others are available through Cortana.
You can use your voice to do almost anything on HoloLens, such as taking a quick photo or opening an app. Many voice commands are built into HoloLens, while others are available through Cortana.
This article will teach you how to control HoloLens and your holographic world with your voice and with Cortana.
This article teachs you how to control HoloLens and your holographic world with your voice and with Cortana.
> [!NOTE]
>
> Speech is only supported in [some languages](https://support.microsoft.com/en-us/help/4039262#Languages). The speech language is based on the Windows display language, not the keyboard language.
> You can verify the Windows display language in **Settings** > **Time and Language** > **Language**.
>
> You can verify the Windows display language by selecting **Settings** > **Time and Language** > **Language**.
## Built-in voice commands
@ -61,14 +61,14 @@ Many buttons and other elements on HoloLens also respond to your voice—for exa
### Dictation mode
Tired of typing? Switch to dictation mode any time the holographic keyboard is active. Select the microphone icon to get started, or say "Start dictating." To stop dictating, select **Done** or say "Stop dictating." To delete what you just dictated, say "Delete that."
Tired of typing? Switch to dictation mode any time that the holographic keyboard is active. To get started, select the microphone icon or say "Start dictating." To stop dictating, select **Done** or say "Stop dictating." To delete what you just dictated, say "Delete that."
> [!NOTE]
> You need an Internet connection to use dictation mode.
> To use dictation mode, you have to have an internet connection.
HoloLens dictation uses explicit punctuation, meaning that you say the name of the punctuation you want to use. For instance, you might say "Hey **comma** what are you up to **question mark**."
Here are the punctuation keywords you can use:
Here are the punctuation keywords that you can use:
- Period, comma, question mark, exclamation point/exclamation mark
- New line/new paragraph
@ -81,7 +81,7 @@ Sometimes it's helpful to spell out things like email addresses. For instance, t
## Do more with Cortana
Cortana can help you do all kinds of things on your HoloLens, from searching the web to shutting down your device. To get her attention, select Cortana on Start or say "Hey Cortana" anytime. If you turn Cortana off, these voice commands won't be available.
Cortana can help you do all kinds of things on your HoloLens, from searching the web to shutting down your device. She can give you suggestions, ideas, reminders, alerts, and more. To get her attention, select Cortana on **Start** or say "Hey Cortana" anytime.
![Hey Cortana!](images/cortana-on-hololens.png)
@ -96,19 +96,19 @@ Here are some things you can try saying (remember to say "Hey Cortana" first).
- Restart.
- Go to sleep.
- Mute.
- Launch `<app name>`.
- Move `<app name>` here (gaze at the spot you want the app to move to).
- Launch /<*app name*/>.
- Move /<*app name*/>`here (gaze at the spot that you want the app to move to).
- Go to Start.
- Take a picture.
- Start recording. (Starts recording a video.)
- Stop recording. (Stops recording a video.)
- Call `<contact>`. (Requires Skype.)
- Call /<*contact*/>. (Requires Skype.)
- What time is it?
- Show me the latest NBA scores.
- How much battery do I have left?
- Tell me a joke.
Some Cortana features you're used to from Windows on your PC or phone (for example, reminders and notifications) aren't supported in Microsoft. The Cortana experience may vary among regions.
Some Cortana features that 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 from one region to another.
### Turn Cortana off