From cee4842cb9a357f180faafe7bd68196a0407298d Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Thu, 15 Feb 2018 00:13:56 +0000 Subject: [PATCH 1/4] Merged PR 5885: Small clarification small change --- .../deployment/windows-10-enterprise-subscription-activation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deployment/windows-10-enterprise-subscription-activation.md b/windows/deployment/windows-10-enterprise-subscription-activation.md index f7f5d176dd..de3ae148a3 100644 --- a/windows/deployment/windows-10-enterprise-subscription-activation.md +++ b/windows/deployment/windows-10-enterprise-subscription-activation.md @@ -68,7 +68,7 @@ With Windows 10 Enterprise, businesses can benefit from enterprise-level securit You can benefit by moving to Windows as an online service in the following ways: 1. Licenses for Windows 10 Enterprise are checked based on Azure Active Directory (Azure AD) credentials, so now businesses have a systematic way to assign licenses to end users and groups in their organization. -2. Azure AD logon triggers a silent edition upgrade, with no reboot required +2. User logon triggers a silent edition upgrade, with no reboot required 3. Support for mobile worker/BYOD activation; transition away from on-prem KMS and MAK keys. 4. Compliance support via seat assignment. From 8fd2d534be4f85a48263659fb31b555030a8216e Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Thu, 15 Feb 2018 14:46:12 +0000 Subject: [PATCH 2/4] Merged PR 5887: fix redirect --- .openpublishing.redirection.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 599204ce64..19546735ca 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -4907,7 +4907,7 @@ }, { "source_path": "windows/manage/configure-windows-telemetry-in-your-organization.md", -"redirect_url": "/windows/configuration/configure-windows-telemetry-in-your-organization", +"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization", "redirect_document_id": true }, { @@ -5932,7 +5932,12 @@ }, { "source_path": "windows/configure/configure-windows-telemetry-in-your-organization.md", -"redirect_url": "/windows/configuration/configure-windows-telemetry-in-your-organization", +"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization", +"redirect_document_id": true +}, +{ +"source_path": "windows/configuration/configure-windows-telemetry-in-your-organization.md", +"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization", "redirect_document_id": true }, { From 74e840247b99693cef1acacb0bc0a108954ca3b8 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Thu, 15 Feb 2018 18:45:09 +0000 Subject: [PATCH 3/4] Merged PR 5889: Add link --- devices/hololens/hololens-enroll-mdm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/hololens/hololens-enroll-mdm.md b/devices/hololens/hololens-enroll-mdm.md index 428a49e956..1412357e31 100644 --- a/devices/hololens/hololens-enroll-mdm.md +++ b/devices/hololens/hololens-enroll-mdm.md @@ -12,7 +12,7 @@ ms.date: 07/27/2017 # Enroll HoloLens in MDM -You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft Intune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. See the [configuration service providers (CSPs) that are supported in Windows Holographic](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/configuration-service-provider-reference#hololens) and the [policies supported by Windows Holographic for Business](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#hololenspolicies). +You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft Intune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. See [Manage devices running Windows Holographic with Microsoft Intune](https://docs.microsoft.com/intune/windows-holographic-for-business), the [configuration service providers (CSPs) that are supported in Windows Holographic](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/configuration-service-provider-reference#hololens), and the [policies supported by Windows Holographic for Business](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#hololenspolicies). >[!NOTE] >Mobile device management (MDM), including the VPN, Bitlocker, and kiosk mode features, is only available when you [upgrade to Windows Holographic for Business](hololens-upgrade-enterprise.md). From 65c76d207c3d226f8cfc02b6998eba16812f3694 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Thu, 15 Feb 2018 21:15:19 +0000 Subject: [PATCH 4/4] Merged PR 5893: Fix table format --- windows/configuration/wcd/wcd-cellcore.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/configuration/wcd/wcd-cellcore.md b/windows/configuration/wcd/wcd-cellcore.md index dc86093dd9..fa754b467b 100644 --- a/windows/configuration/wcd/wcd-cellcore.md +++ b/windows/configuration/wcd/wcd-cellcore.md @@ -425,6 +425,7 @@ The following table shows the scenarios supported by this customization: Multivariant setting set?|SPN provisioned?|MSISDN (last 4 digits: 1234, for example) provisioned?|Default SIM name +--- | --- | --- | --- Yes|Yes|Yes|*MultivariantProvisionedSPN*1234 or *MultivariantProvisionedSPN*" "1234 Yes|No|No|*MultivariantProvisionedSPN* (up to 16 characters) Yes|Yes|No|*MultivariantProvisionedSPN* (up to 16 characters)