diff --git a/devices/hololens/hololens-FAQ.md b/devices/hololens/hololens-FAQ.md
index 8cc17b758c..38964c7a7d 100644
--- a/devices/hololens/hololens-FAQ.md
+++ b/devices/hololens/hololens-FAQ.md
@@ -207,7 +207,7 @@ You can pair other Bluetooth HID and GATT devices together with your HoloLens. H
Use the [clicker](hololens1-clicker.md) to select, scroll, move, and resize holograms. Individial apps may support additional clicker gestures.
-If you're having trouble using the clicker, make sure that it's charged and paired with your HoloLens. If the battery is low, the indicator light blinks amber. To verify that the clicker is paired, go to **Settings** > **Devices** and see if it shows up there. For more information, see [Pair the clicker](hololens-connect-devices.md#pair-the-clicker).
+If you're having trouble using the clicker, make sure that it's charged and paired with your HoloLens. If the battery is low, the indicator light blinks amber. To verify that the clicker is paired, go to **Settings** > **Devices** and see if it shows up there. For more information, see [Pair the clicker](hololens-connect-devices.md#hololens-1st-gen-pair-the-clicker).
If the clicker is charged and paired and you're still having problems, reset it by holding down the main button and the pairing button for 15 seconds. Then pair the clicker with your HoloLens again.
diff --git a/devices/hololens/hololens-connect-devices.md b/devices/hololens/hololens-connect-devices.md
index bbe2dad4d3..fd770fd0cc 100644
--- a/devices/hololens/hololens-connect-devices.md
+++ b/devices/hololens/hololens-connect-devices.md
@@ -8,7 +8,7 @@ author: Teresa-Motiv
ms.author: v-tea
ms.topic: article
ms.localizationpriority: high
-ms.date: 09/13/2019
+ms.date: 03/11/2020
manager: jarrettr
appliesto:
- HoloLens (1st gen)
@@ -19,56 +19,58 @@ appliesto:
## Pair Bluetooth devices
-Pair a Bluetooth mouse and keyboard with HoloLens, then use them to interact with holograms and to type anywhere you'd use the holographic keyboard.
-
-Classes of Bluetooth devices supported by HoloLens 2:
+HoloLens 2 supports the following classes of Bluetooth devices:
- Mouse
- Keyboard
- Bluetooth audio output (A2DP) devices
-Classes of Bluetooth devices supported by HoloLens (1st gen):
+HoloLens (1st gen) supports the following classes of Bluetooth devices:
- Mouse
- Keyboard
- HoloLens (1st gen) clicker
> [!NOTE]
-> Other types of Bluetooth devices, such as speakers, headsets, smartphones, and game pads, may appear as available in HoloLens settings, but aren't supported on HoloLens (1st gen). [Learn more](https://go.microsoft.com/fwlink/p/?LinkId=746660).
+> Other types of Bluetooth devices, such as speakers, headsets, smartphones, and game pads, may be listed as available in HoloLens settings. However, these devices aren't supported on HoloLens (1st gen). For more information, see [I'm having problems pairing or using a Bluetooth device](hololens-FAQ.md#im-having-problems-pairing-or-using-a-bluetooth-device).
### 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. To learn how to do this, check the device or visit the manufacturer's website.
+1. Turn on your keyboard or mouse, and make it discoverable. To learn how to make the device discoverable, look for information on the device (or its documentation) or visit the manufacturer's website.
-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.
+1. Use the bloom gesture (HoloLens (1st gen)) or the start gesture (HoloLens 2) to go to **Start**, and then select **Settings**.
+1. Select **Devices**, and make sure that Bluetooth is on.
+1. When you see the device name, select **Pair**, and then follow the instructions.
-### Pair the clicker
+### HoloLens (1st gen): 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 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?](hololens1-clicker.md)
+1. Use the bloom gesture to go to **Start**, and then select **Settings**.
+1. Select **Devices**, and make sure that Bluetooth is on.
+1. Use the tip of a pen to press and hold the clicker pairing button until the clicker status light blinks white. Make sure to hold down the button until the light starts blinking.
+ The pairing button is on the underside of the clicker, next to the finger loop.
+ 
1. On the pairing screen, select **Clicker** > **Pair**.
-## Connect USB-C devices
+## HoloLens 2: Connect USB-C devices
-> Applies to HoloLens 2 only.
-
-HoloLens 2 lets you connect a wide range of USB-C devices.
-
-HoloLens 2 supports the following devices classes:
+HoloLens 2 supports the following classes of USB-C devices:
- 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)
+- Ethernet adapters (including ethernet plus charging)
+- USB-C-to-3.5mm digital audio adapters
+- USB-C digital audio headsets (including headset adapters plus charging)
- Wired mouse
- Wired keyboard
-- Combination PD hubs (USB A + PD charging)
+- Combination PD hubs (USB A plus PD charging)
## Connect to Miracast
-Use Miracast by opening the **Start** menu and selecting the display icon or saying "Connect" while gazing at the **Start** menu. Choose an available device from the list that appears and complete pairing to begin projection.
+To use Miracast, follow these steps:
+
+1. Do one of the following:
+
+ - Open the **Start** menu, and select the display icon.
+ - Say "Connect" while you gaze at the **Start** menu.
+
+1. On the list of devices that appears, select an available device.
+1. Complete the pairing to begin projecting.
diff --git a/devices/hololens/hololens2-language-support.md b/devices/hololens/hololens2-language-support.md
index 9c56ec9d8c..955eec82e6 100644
--- a/devices/hololens/hololens2-language-support.md
+++ b/devices/hololens/hololens2-language-support.md
@@ -7,7 +7,11 @@ author: Teresa-Motiv
ms.author: v-tea
ms.topic: article
ms.localizationpriority: medium
-ms.date: 9/12/2019
+ms.custom:
+- CI 115225
+- CSSTroubleshooting
+keywords: localize, language support, display language, keyboard language, IME, keyboard layout
+ms.date: 03/12/2020
audience: ITPro
ms.reviewer: jarrettr
manager: jarrettr
@@ -17,7 +21,7 @@ appliesto:
# Supported languages for HoloLens 2
-HoloLens 2 supports the following languages, including voice commands and dictation features, keyboard layouts, and OCR recognition within apps.
+HoloLens 2 is localized into the following languages. The localization features include speech commands and dictation, keyboard layouts, and OCR recognition within apps.
- Chinese Simplified (China)
- English (Australia)
@@ -31,43 +35,43 @@ HoloLens 2 supports the following languages, including voice commands and dictat
- Japanese (Japan)
- Spanish (Spain)
-HoloLens 2 is also available in the following languages. However, this support does not include speech commands or dictation features.
+HoloLens 2 also supports the following languages. However, this support does not include speech commands or dictation features.
- Chinese Traditional (Taiwan and Hong Kong)
- Dutch (Netherlands)
- Korean (Korea)
-## Changing language or keyboard
-
-The setup process configures your HoloLens for a region and language. You can change this configuration by using the **Time & language** section of **Settings**.
-
-> [!NOTE]
-> Your speech and dictation language depends on the Windows display language.
-
-## To change the Windows display language
-
-1. Go to the **Start** menu, and then select **Settings** > **Time and language** > **Language**.
-2. Select **Windows display language**, and then select a language.
-
-If the supported language you’re looking for is not in the menu, follow these steps:
-
-1. Under **Preferred languages** select **Add a language**.
-2. Search for and add the language.
-3. Select the **Windows display language** menu again and choose the language you added.
-
-The Windows display language affects the following settings for Windows and for apps that support localization:
+Some features of HoloLens 2 use the Windows display language. The Windows display language affects the following settings for Windows and for apps that support localization:
- The user interface text language.
- The speech language.
- The default layout of the on-screen keyboard.
-## To change the keyboard layout
+## Change the language or keyboard layout
-To add or remove a keyboard layout, open the **Start** menu and then select **Settings** > **Time & language** > **Keyboard**.
+The setup process configures your HoloLens for a specific region and language. You can change this configuration by using the **Time & language** section of **Settings**.
+
+> [!NOTE]
+> Your speech and dictation language depends on (and is the same as) the Windows display language.
+
+### To change the Windows display language
+
+1. Open the **Start** menu, and then select **Settings** > **Time and language** > **Language**.
+2. Select **Windows display language**, and then select a language.
+
+If the supported language that you're looking for is not in the menu, follow these steps:
+
+1. Under **Preferred languages**, select **Add a language**.
+2. Locater and add the language.
+3. Select the **Windows display language** menu again, and then select the language that you added in the previous step.
+
+### To change the keyboard layout
+
+To add or remove a keyboard layout, open the **Start** menu, and then select **Settings** > **Time & language** > **Keyboard**.
If your HoloLens has more than one keyboard layout, use the **Layout** key to switch between them. The **Layout** key is in the lower right corner of the on-screen keyboard.
-> [!NOTE]
+> [!NOTE]
> The on-screen keyboard can use Input Method Editor (IME) to enter characters in languages such as Chinese. However, HoloLens does not support external Bluetooth keyboards that use IME.
->
-> While you use IME with the on-screen keyboard, you can continue to use a Bluetooth keyboard to type in English. To switch between keyboards, press ~.
+>
+> While you use IME together with the on-screen keyboard, you can continue to use a Bluetooth keyboard to type in English. To switch between keyboards, press the tilde character button (**~**).
diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md
index 26f73d572e..52098ee14c 100644
--- a/windows/client-management/mdm/policy-csp-update.md
+++ b/windows/client-management/mdm/policy-csp-update.md
@@ -1204,19 +1204,19 @@ The following list shows the supported values:
| Pro |
-  3 |
+ 6 |
| Business |
- 3 |
+ 6 |
| Enterprise |
- 3 |
+ 6 |
| Education |
- 3 |
+ 6 |
@@ -1234,7 +1234,7 @@ The following list shows the supported values:
-Added in Windows 10, version 1709. Allows IT admins to specify the number of days a user has before feature updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
+Added in Windows 10, version 1903. Also available in Windows 10, versions 1809, 1803, and 1709. Allows IT admins to specify the number of days a user has before feature updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
ADMX Info:
@@ -1275,19 +1275,19 @@ Default value is 7.
| Pro |
- 3 |
+ 6 |
| Business |
- 3 |
+ 6 |
| Enterprise |
- 3 |
+ 6 |
| Education |
- 3 |
+ 6 |
@@ -1305,7 +1305,7 @@ Default value is 7.
-Added in Windows 10, version 1709. Allows IT admins to specify the number of days a user has before quality updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
+Added in Windows 10, version 1903. Also available in Windows 10, versions 1809, 1803, and 1709. Allows IT admins to specify the number of days a user has before quality updates are installed on their devices automatically. Updates and restarts will occur regardless of active hours and the user will not be able to reschedule.
ADMX Info:
@@ -1346,19 +1346,19 @@ Default value is 7.
| Pro |
- 3 |
+ 6 |
| Business |
- 3 |
+ 6 |
| Enterprise |
- 3 |
+ 6 |
| Education |
- 3 |
+ 6 |
@@ -1376,7 +1376,7 @@ Default value is 7.
-Added in Windows 10, version 1709. Allows the IT admin (when used with [Update/ConfigureDeadlineForFeatureUpdates](#update-configuredeadlineforfeatureupdates) or [Update/ConfigureDeadlineForQualityUpdates](#update-configuredeadlineforqualityupdates)) to specify a minimum number of days until restarts occur automatically. Setting the grace period may extend the effective deadline set by the deadline policies.
+Added in Windows 10, version 1903. Also available in Windows 10, versions 1809, 1803, and 1709. Allows the IT admin (when used with [Update/ConfigureDeadlineForFeatureUpdates](#update-configuredeadlineforfeatureupdates) or [Update/ConfigureDeadlineForQualityUpdates](#update-configuredeadlineforqualityupdates)) to specify a minimum number of days until restarts occur automatically. Setting the grace period may extend the effective deadline set by the deadline policies.
@@ -1418,19 +1418,19 @@ Default value is 2.
| Pro |
- 3 |
+ 6 |
| Business |
- 3 |
+ 6 |
| Enterprise |
- 3 |
+ 6 |
| Education |
- 3 |
+ 6 |
@@ -1448,7 +1448,7 @@ Default value is 2.
-Added in Windows 10, version 1709. If enabled (when used with [Update/ConfigureDeadlineForFeatureUpdates](#update-configuredeadlineforfeatureupdates) or [Update/ConfigureDeadlineForQualityUpdates](#update-configuredeadlineforqualityupdates)), devices will not automatically restart outside of active hours until the deadline is reached, even if applicable updates are already installed and pending a restart.
+Added in Windows 10, version 1903. Also available in Windows 10, versions 1809, 1803, and 1709. If enabled (when used with [Update/ConfigureDeadlineForFeatureUpdates](#update-configuredeadlineforfeatureupdates) or [Update/ConfigureDeadlineForQualityUpdates](#update-configuredeadlineforqualityupdates)), devices will not automatically restart outside of active hours until the deadline is reached, even if applicable updates are already installed and pending a restart.
When disabled, if the device has installed the required updates and is outside of active hours, it may attempt an automatic restart before the deadline.
diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md
index 728fac1163..35ac0e33f0 100644
--- a/windows/security/threat-protection/index.md
+++ b/windows/security/threat-protection/index.md
@@ -31,7 +31,7 @@ ms.topic: conceptual
|
-Centratlized configuration and administration, APIs |
+Centralized configuration and administration, APIs
| Microsoft Threat Protection |
@@ -42,9 +42,9 @@ ms.topic: conceptual
**[Threat & Vulnerability Management](microsoft-defender-atp/next-gen-threat-and-vuln-mgt.md)**
-This built-in capability uses a game-changing risk-based approach to the discovery, prioritization, and remediation of endpoint vulnerabilities and misconfigurations.
+This built-in capability uses a game-changing risk-based approach to the discovery, prioritization, and remediation of endpoint vulnerabilities and misconfigurations.
-- [Risk-based Threat & Vulnerability Management](microsoft-defender-atp/next-gen-threat-and-vuln-mgt.md)
+- [Risk-based Threat & Vulnerability Management](microsoft-defender-atp/next-gen-threat-and-vuln-mgt.md)
- [Supported operating systems and platforms](microsoft-defender-atp/tvm-supported-os.md)
- [What's in the dashboard and what it means for my organization](microsoft-defender-atp/tvm-dashboard-insights.md)
- [Exposure score](microsoft-defender-atp/tvm-exposure-score.md)
@@ -97,7 +97,7 @@ Endpoint detection and response capabilities are put in place to detect, investi
**[Automated investigation and remediation](microsoft-defender-atp/automated-investigations.md)**
-In conjunction with being able to quickly respond to advanced attacks, Microsoft Defender ATP offers automatic investigation and remediation capabilities that help reduce the volume of alerts in minutes at scale.
+In conjunction with being able to quickly respond to advanced attacks, Microsoft Defender ATP offers automatic investigation and remediation capabilities that help reduce the volume of alerts in minutes at scale.
- [Automated investigation and remediation](microsoft-defender-atp/automated-investigations.md)
- [View details and results of automated investigations](microsoft-defender-atp/auto-investigation-action-center.md)
@@ -116,7 +116,7 @@ Microsoft Defender ATP includes a configuration score to help you dynamically as
**[Microsoft Threat Experts](microsoft-defender-atp/microsoft-threat-experts.md)**
-Microsoft Defender ATP's new managed threat hunting service provides proactive hunting, prioritization and additional context and insights that further empower Security Operation Centers (SOCs) to identify and respond to threats quickly and accurately.
+Microsoft Defender ATP's new managed threat hunting service provides proactive hunting, prioritization and additional context and insights that further empower Security Operation Centers (SOCs) to identify and respond to threats quickly and accurately.
- [Targeted attack notification](microsoft-defender-atp/microsoft-threat-experts.md)
- [Experts-on-demand](microsoft-defender-atp/microsoft-threat-experts.md)
@@ -139,7 +139,7 @@ Integrate Microsoft Defender Advanced Threat Protection into your existing workf
- Office 365 ATP
- Azure ATP
- Azure Security Center
-- Skype for Business
+- Skype for Business
- Microsoft Cloud App Security
diff --git a/windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api.md b/windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api.md
index ab3dd486d7..5b7477d473 100644
--- a/windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api.md
+++ b/windows/security/threat-protection/microsoft-defender-atp/offboard-machine-api.md
@@ -28,11 +28,14 @@ Offboard machine from Microsoft Defender ATP.
## Limitations
-1. Rate limitations for this API are 100 calls per minute and 1500 calls per hour.
+ - Rate limitations for this API are 100 calls per minute and 1500 calls per hour.
[!include[Machine actions note](../../includes/machineactionsnote.md)]
+>[!Note]
+> This does not support offboarding macOS Devices.
+
## Permissions
One of the following permissions is required to call this API. To learn more, including how to choose permissions, see [Use Microsoft Defender ATP APIs](apis-intro.md)
@@ -83,4 +86,4 @@ Content-type: application/json
{
"Comment": "Offboard machine by automation"
}
-```
\ No newline at end of file
+```
diff --git a/windows/security/threat-protection/windows-defender-antivirus/shadow-protection.md b/windows/security/threat-protection/windows-defender-antivirus/shadow-protection.md
index 8e3706c360..01648e4177 100644
--- a/windows/security/threat-protection/windows-defender-antivirus/shadow-protection.md
+++ b/windows/security/threat-protection/windows-defender-antivirus/shadow-protection.md
@@ -48,13 +48,13 @@ The following images shows an instance of unwanted software that was detected an
3. Turn shadow protection on.
> [!NOTE]
-> Currently, shadow protection can be turned on only in the Microsoft Defender Security Center. You cannot use registry keys, Intune, or group policies to turn shadow protection on or off at this time.
+> Shadow protection can be turned on only in the Microsoft Defender Security Center. You cannot use registry keys, Intune, or group policies to turn shadow protection on or off.
## Requirements for shadow protection
|Requirement |Details |
|---------|---------|
-|Permissions |One of the following roles should be assigned in [Azure Active Directory](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-users-assign-role-azure-portal):
- Security Administrator or Global Administrator
- Security Reader
See [Basic permissions](https://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-atp/basic-permissions). |
+|Permissions |Global Administrator or Security Administrator role assigned in [Azure Active Directory](https://docs.microsoft.com/azure/active-directory/fundamentals/active-directory-users-assign-role-azure-portal). See [Basic permissions](https://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-atp/basic-permissions). |
|Operating system |One of the following:
- Windows 10 (all releases)
- Windows Server 2016 or later |
|Windows E5 enrollment |This is included in the following subscriptions:
- Microsoft 365 E5
- Microsoft 365 E3 together with the Identity & Threat Protection offering
See [Components](https://docs.microsoft.com/microsoft-365/enterprise/microsoft-365-overview?view=o365-worldwide#components) and [Features and capabilities for each plan](https://www.microsoft.com/microsoft-365/compare-all-microsoft-365-plans). |
|Cloud-delivered protection |Make sure Windows Defender Antivirus is configured such that cloud-delivered protection is enabled.
See [Enable cloud-delivered protection](https://docs.microsoft.com/windows/security/threat-protection/windows-defender-antivirus/enable-cloud-protection-windows-defender-antivirus). |