From d2b8783ca31759791a0553fc4c58d2c9ed28a4f2 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Fri, 19 Jan 2018 10:43:03 -0800 Subject: [PATCH 1/5] revised per CSS --- .../bitlocker/bitlocker-group-policy-settings.md | 2 +- .../bitlocker/bitlocker-how-to-enable-network-unlock.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/windows/device-security/bitlocker/bitlocker-group-policy-settings.md b/windows/device-security/bitlocker/bitlocker-group-policy-settings.md index 3982df4fb6..1a5ccc63f1 100644 --- a/windows/device-security/bitlocker/bitlocker-group-policy-settings.md +++ b/windows/device-security/bitlocker/bitlocker-group-policy-settings.md @@ -1856,7 +1856,7 @@ This policy controls how BitLocker-enabled system volumes are handled in conjunc

Conflicts

-

If the Configure TPM platform validation profile for native UEFI firmware configurations Group Policy setting is enabled and PCR 7 is omitted, BitLocker is prevented from using Secure Boot for platform or BCD integrity validation.

+

If you enable**Allow Secure Boot for integrity validation**, make sure the Configure TPM platform validation profile for native UEFI firmware configurations Group Policy setting is not enabled or include PCR 7 to allow BitLocker to use Secure Boot for platform or BCD integrity validation.

For more information about PCR 7, see [Platform Configuration Register (PCR)](#bkmk-pcr) in this topic.

diff --git a/windows/device-security/bitlocker/bitlocker-how-to-enable-network-unlock.md b/windows/device-security/bitlocker/bitlocker-how-to-enable-network-unlock.md index 247cea5fb2..c292812427 100644 --- a/windows/device-security/bitlocker/bitlocker-how-to-enable-network-unlock.md +++ b/windows/device-security/bitlocker/bitlocker-how-to-enable-network-unlock.md @@ -335,6 +335,7 @@ Files to gather when troubleshooting BitLocker Network Unlock include: ## Configure Network Unlock Group Policy settings on earlier versions Network Unlock and the accompanying Group Policy settings were introduced in Windows Server 2012 but can be deployed using operating systems running Windows Server 2008 R2 and Windows Server 2008. + **Requirements** - The server hosting WDS must be running any of the server operating systems designated in the **Applies To** list at the beginning of this topic. From c3259e399d5c5f4ba6ef5162120cd8f0db9d42c0 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Fri, 19 Jan 2018 10:44:44 -0800 Subject: [PATCH 2/5] revised per CSS --- .../bitlocker/bitlocker-group-policy-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/device-security/bitlocker/bitlocker-group-policy-settings.md b/windows/device-security/bitlocker/bitlocker-group-policy-settings.md index 1a5ccc63f1..41f2b07751 100644 --- a/windows/device-security/bitlocker/bitlocker-group-policy-settings.md +++ b/windows/device-security/bitlocker/bitlocker-group-policy-settings.md @@ -1856,7 +1856,7 @@ This policy controls how BitLocker-enabled system volumes are handled in conjunc

Conflicts

-

If you enable**Allow Secure Boot for integrity validation**, make sure the Configure TPM platform validation profile for native UEFI firmware configurations Group Policy setting is not enabled or include PCR 7 to allow BitLocker to use Secure Boot for platform or BCD integrity validation.

+

If you enable **Allow Secure Boot for integrity validation**, make sure the Configure TPM platform validation profile for native UEFI firmware configurations Group Policy setting is not enabled or include PCR 7 to allow BitLocker to use Secure Boot for platform or BCD integrity validation.

For more information about PCR 7, see [Platform Configuration Register (PCR)](#bkmk-pcr) in this topic.

From 2c61cf9ea65dc2ce9eca6a3b8362d2549015a0c9 Mon Sep 17 00:00:00 2001 From: Lachlan Picking Date: Sun, 21 Jan 2018 13:42:37 +1000 Subject: [PATCH 3/5] Fix typos in resolve-windows-10-upgrade-errors.md --- .../upgrade/resolve-windows-10-upgrade-errors.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md index f67599ce30..6edb1da2c1 100644 --- a/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md +++ b/windows/deployment/upgrade/resolve-windows-10-upgrade-errors.md @@ -69,7 +69,7 @@ The following steps can resolve many Windows upgrade problems.
  • chkdsk /F
    • -
  • Attept to restore and repair system files by typing the following commands at an elevated command prompt. It may take several minutes for the command operations to be completed. For more information, see [Repair a Windows Image](https://msdn.microsoft.com/windows/hardware/commercialize/manufacture/desktop/repair-a-windows-image). +
  • Attempt to restore and repair system files by typing the following commands at an elevated command prompt. It may take several minutes for the command operations to be completed. For more information, see [Repair a Windows Image](https://msdn.microsoft.com/windows/hardware/commercialize/manufacture/desktop/repair-a-windows-image).
    • DISM.exe /Online /Cleanup-image /Restorehealth
    • sfc /scannow
      • @@ -105,7 +105,7 @@ Note: If only a result code is returned, this can be because a tool is being use Result codes can be matched to the type of error encountered. To match a result code to an error: -1. Identify the error code type, either Win32 or NTSTATUS, using the first hexidecimal digit: +1. Identify the error code type, either Win32 or NTSTATUS, using the first hexadecimal digit:
      8 = Win32 error code (ex: 0x**8**0070070)
      C = NTSTATUS value (ex: 0x**C**1900107) 2. Write down the last 4 digits of the error code (ex: 0x8007**0070** = 0070). These digits correspond to the last 16 bits of the [HRESULT](https://msdn.microsoft.com/en-us/library/cc231198.aspx) or the [NTSTATUS](https://msdn.microsoft.com/en-us/library/cc231200.aspx) structure. @@ -412,7 +412,7 @@ The device install log is particularly helpful if rollback occurs during the sys Cause A driver has caused an illegal operation.
      Windows was not able to migrate the driver, resulting in a rollback of the operating system. -
      This is a safeOS boot failure, typically caused by drivers or non-Microsoft disk encryption software. +
      This is a SafeOS boot failure, typically caused by drivers or non-Microsoft disk encryption software. @@ -515,7 +515,7 @@ Disconnect all peripheral devices that are connected to the system, except for t
      Info SP Rollback: Showing splash window with restoring text: Restoring your previous version of Windows. -
      Typically there is a a dump file for the crash to analyze. If you are not equipped to debug the dump, then attempt the following basic troubleshooting procedures:
      +
      Typically, there is a dump file for the crash to analyze. If you are not equipped to debug the dump, then attempt the following basic troubleshooting procedures:
      1. Make sure you have enough disk space.
      2. If a driver is identified in the bug check message, disable the driver or check with the manufacturer for driver updates.
      @@ -684,7 +684,7 @@ The installation failed in the FIRST_BOOT phase with an error during MIGRATE_DAT Mitigation -[Analyze log files](#analyze-log-files) in order to determine the files or registry entires that are blocking data migration. +[Analyze log files](#analyze-log-files) in order to determine the files or registry entries that are blocking data migration. This error can be due to a problem with user profiles. It can occur due to corrupt registry entries under **HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList** or invalid files in the **\\Users** directory. @@ -878,8 +878,8 @@ Download and run the media creation tool. See [Download windows 10](https://www. 0x8007007E -Occurs when update synchronization fails because you do not have hotfix 3095113 installed before you enable update synchronization. Specifically, the CopyToCache operation fails on clients that have already downlaoded the upgrade because Windows Server Update Services has bad metadata related to the upgrade. It can occur when you are using standalone Windows Server Update Services or when WSUS is integrated with System Center Configuration Manager. - Use the following steps to repair Windows Server Update Services. You must run these steps on each WSUS server that synched metadate before you installed the hotfix. +Occurs when update synchronization fails because you do not have hotfix 3095113 installed before you enable update synchronization. Specifically, the CopyToCache operation fails on clients that have already downloaded the upgrade because Windows Server Update Services has bad metadata related to the upgrade. It can occur when you are using standalone Windows Server Update Services or when WSUS is integrated with System Center Configuration Manager. + Use the following steps to repair Windows Server Update Services. You must run these steps on each WSUS server that synched metadata before you installed the hotfix.
      1. Stop the Windows Update service. Sign in as a user with administrative privileges, and then do the following: @@ -965,4 +965,4 @@ Alternatively, re-create installation media the [Media Creation Tool](https://ww
        [Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
        [Fix Windows Update errors by using the DISM or System Update Readiness tool](https://support.microsoft.com/kb/947821) -Not finding content you need? Windows 10 users, tell us what you want on [Feedback Hub](feedback-hub://?referrer=techDocsUcPage&tabid=2&contextid=897&newFeedback=true&topic=resolve-windows-10-upgrade-errors.md). \ No newline at end of file +Not finding content you need? Windows 10 users, tell us what you want on [Feedback Hub](feedback-hub://?referrer=techDocsUcPage&tabid=2&contextid=897&newFeedback=true&topic=resolve-windows-10-upgrade-errors.md). From a78857bfb72f47083491e970ef7ec859d98a3ac9 Mon Sep 17 00:00:00 2001 From: Dwaine12 Date: Mon, 22 Jan 2018 13:48:06 +0100 Subject: [PATCH 4/5] Update microsoft-store-for-business-overview.md Replace Curate to -> Create --- store-for-business/microsoft-store-for-business-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-for-business/microsoft-store-for-business-overview.md b/store-for-business/microsoft-store-for-business-overview.md index 6380c8eee4..53ac6bd262 100644 --- a/store-for-business/microsoft-store-for-business-overview.md +++ b/store-for-business/microsoft-store-for-business-overview.md @@ -30,7 +30,7 @@ Organizations or schools of any size can benefit from using Microsoft Store for - **Microsoft Store for Education** – Apps and subscriptions - **Office 365** – Subscriptions - **Volume licensing** - Apps purchased with volume licensing -- **Private store** - Curate a private store for your business that’s easily available from any Windows 10 device. Your private store is available from Microsoft Store on Windows 10, or with a browser on the Web. People in your organization can download apps from your organization's private store on Windows 10 devices. +- **Private store** - Create a private store for your business that’s easily available from any Windows 10 device. Your private store is available from Microsoft Store on Windows 10, or with a browser on the Web. People in your organization can download apps from your organization's private store on Windows 10 devices. - **Flexible distribution options** - Flexible options for distributing content and apps to your employee devices: - Distribute through Microsoft Store services. You can assign apps to individual employees, or make apps available to all employees in your private store. - Use a management tool from Microsoft, or a 3rd-party tool for advanced distribution and management functions, or for managing images. From 2a5ced37c46a6a031219afde018c6466c7e3ebfb Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 23 Jan 2018 20:11:50 +0000 Subject: [PATCH 5/5] Merged PR 5428: Merge msfb-updates to master Fix table of contents entry. --- store-for-business/education/TOC.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-for-business/education/TOC.md b/store-for-business/education/TOC.md index 43f7ab7345..63f52ca1ce 100644 --- a/store-for-business/education/TOC.md +++ b/store-for-business/education/TOC.md @@ -14,7 +14,7 @@ ## [Get Minecraft: Education Edition](/education/windows/get-minecraft-for-education?toc=/microsoft-store/education/toc.json) ### [For teachers: get Minecraft Education Edition](/education/windows/teacher-get-minecraft?toc=/microsoft-store/education/toc.json) ### [For IT administrators: get Minecraft Education Edition](/education/windows/school-get-minecraft?toc=/microsoft-store/education/toc.json) -### [Get Minecraft: Education Edition with Windows 10 device promotion](/education/windows/get-minecraft-for-education?toc=/microsoft-store/education/toc.json) +### [Get Minecraft: Education Edition with Windows 10 device promotion](/education/windows/get-minecraft-device-promotion?toc=/microsoft-store/education/toc.json) ## [Distribute apps to your employees from the Microsoft Store for Business and Education](/microsoft-store/distribute-apps-to-your-employees-microsoft-store-for-business?toc=/microsoft-store/education/toc.json) ### [Distribute apps using your private store](/microsoft-store/distribute-apps-from-your-private-store?toc=/microsoft-store/education/toc.json) ### [Assign apps to employees](/microsoft-store/assign-apps-to-employees?toc=/microsoft-store/education/toc.json)