From 78c11800c5fdb289eb56b3420783fcea89511ac3 Mon Sep 17 00:00:00 2001 From: Saumya Singh Date: Mon, 6 Aug 2018 11:06:07 -0700 Subject: [PATCH 1/6] Updated policy for cloud speech services privacy --- windows/client-management/mdm/policy-csp-privacy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/client-management/mdm/policy-csp-privacy.md b/windows/client-management/mdm/policy-csp-privacy.md index ac16face75..57093ef791 100644 --- a/windows/client-management/mdm/policy-csp-privacy.md +++ b/windows/client-management/mdm/policy-csp-privacy.md @@ -433,7 +433,7 @@ The following list shows the supported values: -Updated in Windows 10, version 1709. Allows the usage of cloud based speech services for Cortana, dictation, or Store applications. Setting this policy to 1, lets Microsoft use the user's voice data to improve cloud speech services for all users. +Updated in Windows 10, version 1809. This policy specifies whether users on the device have the option to enable online speech recognition. When enabled, users can use their voice for dictation and to talk to Cortana and other apps that use Microsoft cloud-based speech recognition. Microsoft will use voice input to help improve our speech services. If the policy value is set to 0, online speech recognition will be disabled and users cannot enable online speech recognition via settings. If policy value is set to 1 or is not configured, control is deferred to users. Most restricted value is 0. @@ -450,7 +450,7 @@ ADMX Info: The following list shows the supported values: - 0 – Not allowed. -- 1 (default) – Allowed. +- 1 (default) – Choice deferred to user's preference. From ac24f2f615b5a6fc925453a29e63b228b7e7cc4c Mon Sep 17 00:00:00 2001 From: John Flores Date: Mon, 6 Aug 2018 14:17:47 -0700 Subject: [PATCH 2/6] Content Idea Request 84638 --- .../security-policy-settings/account-lockout-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md b/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md index c0380358d5..16a6c63d06 100644 --- a/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md +++ b/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md @@ -25,8 +25,8 @@ The following topics provide a discussion of each policy setting's implementatio | Topic | Description | | - | - | -| [Account lockout duration](account-lockout-duration.md) | Describes the best practices, location, values, and security considerations for the **Account lockout duration** security policy setting. | | [Account lockout threshold](account-lockout-threshold.md) | Describes the best practices, location, values, and security considerations for the **Account lockout threshold** security policy setting. | +| [Account lockout duration](account-lockout-duration.md) | Describes the best practices, location, values, and security considerations for the **Account lockout duration** security policy setting. | | [Reset account lockout counter after](reset-account-lockout-counter-after.md) | Describes the best practices, location, values, and security considerations for the **Reset account lockout counter after** security policy setting. |   ## Related topics From 2f2f92f631d5e6c77e33bf1f836c2fcfed385a4c Mon Sep 17 00:00:00 2001 From: Patti Short <35278231+shortpatti@users.noreply.github.com> Date: Mon, 6 Aug 2018 15:01:17 -0700 Subject: [PATCH 3/6] Update do-not-sync-browser-settings-include.md --- .../edge/includes/do-not-sync-browser-settings-include.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browsers/edge/includes/do-not-sync-browser-settings-include.md b/browsers/edge/includes/do-not-sync-browser-settings-include.md index 87c355b74f..0cec03f45e 100644 --- a/browsers/edge/includes/do-not-sync-browser-settings-include.md +++ b/browsers/edge/includes/do-not-sync-browser-settings-include.md @@ -27,9 +27,9 @@ For more details about configuring the browser syncing options, see [Sync browse - **GP ADMX file name:** SettingSync.admx #### MDM settings -- **MDM name:** [Experience/DoNotSyncBrowserSetting](../available-policies.md#do-not-sync-browser-settings) +- **MDM name:** [Experience/DoNotSyncBrowserSettings](../available-policies.md#do-not-sync-browser-settings) - **Supported devices:** Desktop -- **URI full path:** ./Vendor/MSFT/Policy/Config/Experience/DoNotSyncBrowserSetting +- **URI full path:** ./Vendor/MSFT/Policy/Config/Experience/DoNotSyncBrowserSettings - **Data type:** Integer #### Registry settings @@ -48,4 +48,4 @@ For more details about configuring the browser syncing options, see [Sync browse [About sync setting on Microsoft Edge on Windows 10 devices](http://windows.microsoft.com/windows-10/about-sync-settings-on-windows-10-devices)

-

\ No newline at end of file +
From 37559c148be935055027f4506ed2be549cd11adf Mon Sep 17 00:00:00 2001 From: Patti Short <35278231+shortpatti@users.noreply.github.com> Date: Mon, 6 Aug 2018 15:02:14 -0700 Subject: [PATCH 4/6] Update new-policies.md --- browsers/edge/new-policies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browsers/edge/new-policies.md b/browsers/edge/new-policies.md index f44167ad09..8783ea1791 100644 --- a/browsers/edge/new-policies.md +++ b/browsers/edge/new-policies.md @@ -44,7 +44,7 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis | [Configure kiosk mode](#configure-kiosk-mode) | New | [ConfigureKioskMode](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskmode) | New | | [Configure kiosk reset after idle timeout](#configure-kiosk-reset-after-idle-timeout) | New | [ConfigureKioskResetAfterIdleTimeout](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskresetafteridletimeout) | New | | [Configure Open Microsoft Edge With](#configure-open-microsoft-edge-with) | New | [ConfigureOpenEdgeWith](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configureopenmicrosoftedgewith) | New | -| [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | Experience/DoNotSyncBrowserSetting | New | +| [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | Experience/DoNotSyncBrowserSettings | New | | [Prevent certificate error overrides](#prevent-certificate-error-overrides) | New | [PreventCertErrorOverrides](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-preventcerterroroverrides) | New | | [Prevent users from turning on browser syncing](#preventusersfromturningonbrowsersyncing) | New | Experience/PreventUsersFromTurningOnBrowserSyncing | New | | [Prevent turning off required extensions](#prevent-turning-off-required-extensions) | New | PreventTurningOffRequiredExtensions | New | From e0e28aba669d2ce2de9e709f128f08e80fc2a704 Mon Sep 17 00:00:00 2001 From: Jonathan Herlin Date: Tue, 7 Aug 2018 10:57:57 +0200 Subject: [PATCH 5/6] Fix code block formatting Fix code block formatting --- .../bitlocker/bitlocker-how-to-enable-network-unlock.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md b/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md index 0b99703f80..4643595543 100644 --- a/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md +++ b/windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md @@ -351,6 +351,7 @@ The following steps can be used to configure Network Unlock on these older syste 6. [Step Six: Configure registry settings for Network Unlock](#bkmk-stepsix) Apply the registry settings by running the following certutil script on each computer running any of the client operating systems designated in the **Applies To** list at the beginning of this topic. + certutil -f -grouppolicy -addstore FVE_NKP BitLocker-NetworkUnlock.cer reg add "HKLM\SOFTWARE\Policies\Microsoft\FVE" /v OSManageNKP /t REG_DWORD /d 1 /f reg add "HKLM\SOFTWARE\Policies\Microsoft\FVE" /v UseAdvancedStartup /t REG_DWORD /d 1 /f From e38f8b999e8817f58722158ec241da01894173e2 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 7 Aug 2018 09:51:34 -0700 Subject: [PATCH 6/6] now the conflict is fixed --- .../edge/includes/do-not-sync-browser-settings-include.md | 4 ---- browsers/edge/new-policies.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/browsers/edge/includes/do-not-sync-browser-settings-include.md b/browsers/edge/includes/do-not-sync-browser-settings-include.md index 4b6a8343c2..267812b6ac 100644 --- a/browsers/edge/includes/do-not-sync-browser-settings-include.md +++ b/browsers/edge/includes/do-not-sync-browser-settings-include.md @@ -27,11 +27,7 @@ For more details about configuring the browser syncing options, see [Sync browse - **GP ADMX file name:** SettingSync.admx #### MDM settings -<<<<<<< HEAD - **MDM name:** [Experience/DoNotSyncBrowserSettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-donotsyncbrowsersetting) -======= -- **MDM name:** [Experience/DoNotSyncBrowserSettings](../available-policies.md#do-not-sync-browser-settings) ->>>>>>> 5fa3b7b039c599d82dd9013a4b2092f20578f503 - **Supported devices:** Desktop - **URI full path:** ./Vendor/MSFT/Policy/Config/Experience/DoNotSyncBrowserSettings - **Data type:** Integer diff --git a/browsers/edge/new-policies.md b/browsers/edge/new-policies.md index ab2a400dae..48df9f6016 100644 --- a/browsers/edge/new-policies.md +++ b/browsers/edge/new-policies.md @@ -44,11 +44,7 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis | [Configure kiosk mode](#configure-kiosk-mode) | New | [ConfigureKioskMode](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskmode) | New | | [Configure kiosk reset after idle timeout](#configure-kiosk-reset-after-idle-timeout) | New | [ConfigureKioskResetAfterIdleTimeout](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskresetafteridletimeout) | New | | [Configure Open Microsoft Edge With](#configure-open-microsoft-edge-with) | New | [ConfigureOpenEdgeWith](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configureopenmicrosoftedgewith) | New | -<<<<<<< HEAD | [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | [Experience/DoNotSyncBrowserSettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-donotsyncbrowsersetting) | New | -======= -| [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | Experience/DoNotSyncBrowserSettings | New | ->>>>>>> 5fa3b7b039c599d82dd9013a4b2092f20578f503 | [Prevent certificate error overrides](#prevent-certificate-error-overrides) | New | [PreventCertErrorOverrides](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-preventcerterroroverrides) | New | | [Prevent users from turning on browser syncing](#preventusersfromturningonbrowsersyncing) | New | Experience/PreventUsersFromTurningOnBrowserSyncing | New | | [Prevent turning off required extensions](#prevent-turning-off-required-extensions) | New | [PreventTurningOffRequiredExtensions](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-preventusersfromturningonbrowsersyncing) | New |