Merge branch 'rs1' into 6675772

browsers/edge/Index.md

@@ -12,9 +12,9 @@ title: Microsoft Edge - Deployment Guide for IT Pros (Microsoft Edge for IT Pros
 
 **Applies to:**
 
--   Windows 10
+- Windows 10
--   Windows 10 Mobile
+- Windows 10 Mobile
-
+- Windows Server 2016
 
 Microsoft Edge is the new, default web browser for Windows 10, helping you to experience modern web standards, better performance, improved security, and increased reliability. Microsoft Edge also introduces new features like Web Note, Reading View, and Cortana that you can use along with your normal web browsing abilities.
 

browsers/edge/available-policies.md

@@ -16,8 +16,6 @@ title: Available policies for Microsoft Edge (Microsoft Edge for IT Pros)
 - Windows 10 Mobile
 - Windows Server 2016
 
-<span style="color:#ED1C24;">[Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.]</span>
-
 Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPO's) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences.
 
 By using Group Policy and Intune, you can set up a policy setting once, and then copy that setting onto many computers. For example, you can set up multiple security settings in a GPO that's linked to a domain, and then apply all of those settings to every computer in the domain.

browsers/edge/change-history-for-microsoft-edge.md

@@ -14,7 +14,7 @@ For a detailed feature list of what's in the current Microsoft Edge releases, th
 ## July 2016
 |New or changed topic | Description |
 |----------------------|-------------|
-|[Microsoft Edge - Deployment Guide for IT Pros](index.md)| Updated to include support for Windows Server 2016 and a note about the Long Term Servicing Branch (LTSB) |
+|[Microsoft Edge - Deployment Guide for IT Pros](index.md)| Updated various topics to include support for Windows Server 2016 and a note about the Long Term Servicing Branch (LTSB) |
 
 ## July 2016
 |New or changed topic | Description |

browsers/edge/emie-to-improve-compatibility.md

@@ -14,7 +14,6 @@ title: Use Enterprise Mode to improve compatibility (Microsoft Edge for IT Pros)
 **Applies to:**
 
 - Windows 10
-- Windows 10 Mobile
 - Windows Server 2016
 
 If you have specific web sites and apps that you know have compatibility problems with Microsoft Edge, you can use the Enterprise Mode site list so that the web sites will automatically open using Internet Explorer 11. Additionally, if you know that your intranet sites aren't going to work properly with Microsoft Edge, you can set all intranet sites to automatically open using IE11.

windows/deploy/provision-pcs-for-initial-deployment.md

@@ -44,13 +44,14 @@ In a simple provisioning package, you can configure:
 
 Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more. To learn about provisioning packages that include more than the settings in a simple provisioning package, see [Provision PCs with apps and certificates](provision-pcs-with-apps-and-certificates.md). 
 
-> **Tip!**  Use simple provisioning to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc.
+> [!TIP]
+> Use simple provisioning to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc.
 
 ![open advanced editor](images/icd-simple-edit.png)
 
 ## Create the provisioning package
 
-Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
+Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK and select **Configuration Designer**.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
 
 1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
 
@@ -64,7 +65,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
 
 4. In the **Set up device** step, enter a unique 15-character name for the device. For help generating a unique name, you can use %SERIAL%, which includes a hardware-specific serial number, or you can use %RAND:x%, which generates random characters of x length.
 
-5. (Optional) You can upgrade the following editions of Windows 10 by providing a product key for the edition to upgrade to.
+5. (*Optional*) You can upgrade the following editions of Windows 10 by providing a product key for the edition to upgrade to.
     - Pro to Education
     - Pro to Enterprise
     - Enterprise to Education
@@ -75,7 +76,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
 
 8. Click **Enroll into Active Directory**.
 
-9. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (Optional) Enter a user name and password to create a local administrator account.
+9. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (*Optional*) Enter a user name and password to create a local administrator account.
 
     > **Warning**: If you don't create a local administrator account and the device fails to enroll in Active Directory for any reason, you will have to reimage the device and start over. As a best practice, we recommend:
       - Use a least-privileged domain account to join the device to the domain.
@@ -88,7 +89,8 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
 
 12. Click **Create**.
 
-> **Important**  When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
+> [!IMPORTANT]
+> When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
 
 ## Apply package
 

windows/deploy/provision-pcs-with-apps-and-certificates.md

@@ -34,7 +34,7 @@ You can apply a provisioning package on a USB drive to off-the-shelf devices dur
 
 ## Create the provisioning package
 
-Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
+Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK and select **Configuration Designer**.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
 
 1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
 
@@ -55,7 +55,8 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
 
 3. Go to **Runtime settings** > **ProvisioningCommands** > **DeviceContext** > **CommandLine** and specify the command line that needs to be executed to install the app. This is a single command line (such as a script, executable, or msi) that triggers a silent install of your CommandFiles. Note that the install must execute silently (without displaying any UI). For MSI installers use, the `msiexec /quiet` option. 
 
-> **Note**: If you are installing more than one app, then use CommandLine to invoke the script or batch file that orchestrates installation of the files. For more information, see [Install a Win32 app using a provisioning package](https://msdn.microsoft.com/library/windows/hardware/mt703295%28v=vs.85%29.aspx). 
+> [!NOTE]
+> If you are installing more than one app, then use CommandLine to invoke the script or batch file that orchestrates installation of the files. For more information, see [Install a Win32 app using a provisioning package](https://msdn.microsoft.com/library/windows/hardware/mt703295%28v=vs.85%29.aspx). 
 
 
 ### Add a universal app to your package
@@ -80,7 +81,8 @@ Universal apps that you can distribute in the provisioning package can be line-o
 
 [Learn more about distributing offline apps from the Windows Store for Business.](../manage/distribute-offline-apps.md)
 
-> **Note:** Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
+> [!NOTE]
+> Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
 
 
 
@@ -116,8 +118,8 @@ For details about the settings you can customize in provisioning packages, see [
 
 10. Set a value for **Package Version**.
 
-    **Tip**  
+    > [!TIP]  
-    You can make changes to existing packages and change the version number to update previously applied packages.
+    > You can make changes to existing packages and change the version number to update previously applied packages.
 
 11. Optional. In the **Provisioning package security** window, you can choose to encrypt the package and enable package signing.
 
@@ -161,7 +163,7 @@ If your build is successful, the name of the provisioning package, output direct
 
 ## Apply package
 
-**During initial setup, from a USB drive**
+### During initial setup, from a USB drive
 
 1. Start with a computer on the first-run setup screen. If the PC has gone past this screen, reset the PC to start over. To reset the PC, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
 
@@ -204,7 +206,7 @@ If your build is successful, the name of the provisioning package, output direct
     ![Sign in](images/sign-in-prov.png)
     
 
-**After setup, from a USB drive, network folder, or SharePoint site**
+### After setup, from a USB drive, network folder, or SharePoint site
 
 On a desktop computer, navigate to **Settings** > **Accounts** > **Work access** > **Add or remove a management package** > **Add a package**, and select the package to install. 
 

windows/deploy/provisioning-packages.md

@@ -46,7 +46,8 @@ Windows ICD in Windows 10, Version 1607, supports the following scenarios for IT
     * Mobile Iron (password-string based enrollment) 
     * Other MDMs (cert-based enrollment) 
 
-> **Note:** Windows ICD in Windows 10, Version 1607, also provides a wizard to create provisioning packages for school PCs. To learn more, see [Set up students' PCs to join domain](https://technet.microsoft.com/edu/windows/index).
+> [!NOTE]
+> Windows ICD in Windows 10, Version 1607, also provides a wizard to create provisioning packages for school PCs. To learn more, see [Set up students' PCs to join domain](https://technet.microsoft.com/edu/windows/index).
 
 ## Benefits of provisioning packages
 
@@ -95,11 +96,14 @@ For details about the settings you can customize in provisioning packages, see [
 
 With Windows 10, you can use the Windows Imaging and Configuration Designer (ICD) tool to create provisioning packages. To install Windows ICD and create provisioning packages, you must [install the Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit).
 
-While running ADKsetup.exe for Windows 10, version 1607, select the following feature from the **Select the features you want to install** dialog box:
+When you run ADKsetup.exe for Windows 10, version 1607, select the following feature from the **Select the features you want to install** dialog box:
 
--   Configuration Designer
+-   **Configuration Designer**
 
-> **Note:** In previous versions of the Windows 10 ADK, you had to install additional features for Windows ICD to run. Starting in version 1607, you can install Windows ICD without other ADK features.
+![Choose Configuration Designer](images/adk-install.png)
+
+> [!NOTE]
+> In previous versions of the Windows 10 ADK, you had to install additional features for Windows ICD to run. Starting in version 1607, you can install Windows ICD without other ADK features.
 
 After you install Windows ICD, you can use it to create a provisioning package. For detailed instructions on how to create a provisioning package, see [Build and apply a provisioning package](http://go.microsoft.com/fwlink/p/?LinkID=629651).
 

windows/keep-secure/create-and-verify-an-efs-dra-certificate.md

@@ -43,7 +43,7 @@ If you already have an EFS DRA certificate for your organization, you can skip c
     >**Note**<br>
     To add your EFS DRA certificate to your policy by using Microsoft Intune, see the [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) topic. To add your EFS DRA certificate to your policy by using System Center Configuration Manager, see the [Create a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) topic.
 
-**To verify your data recovery certificate is correctly set up on an WIP client computer**
+**To verify your data recovery certificate is correctly set up on a WIP client computer**
 
 1. Find or create a file that's encrypted using Windows Information Protection. For example, you could open an app on your allowed app list, and then create and save a file so it’s encrypted by WIP. 
 

windows/keep-secure/create-wip-policy-using-intune.md

@@ -24,10 +24,10 @@ We've received some great feedback from you, our Windows 10 Insider Preview cust
 
 Note that if you exit the **Policy** page before you've saved your new policy, your existing deployments won't be affected. However, if you save the policy without reconfiguring your apps, an updated policy will be deployed to your employees with an empty app rules list.
  
-## Add an WIP policy
+## Add a WIP policy
-After you’ve set up Intune for your organization, you must create an WIP-specific policy.
+After you’ve set up Intune for your organization, you must create a WIP-specific policy.
 
-**To add an WIP policy**
+**To add a WIP policy**
 1.  Open the Intune administration console, and go to the **Policy** node, and then click **Add Policy** from the **Tasks** area.
 
 2.  Go to **Windows**, click the **Windows Information Protection (Windows 10 Desktop and Mobile and later) policy**, click **Create and Deploy a Custom Policy**, and then click **Create Policy**.

windows/keep-secure/create-wip-policy-using-sccm.md

@@ -20,9 +20,9 @@ author: eross-msft
 System Center Configuration Manager helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection mode, and how to find enterprise data on the network.
 
 >**Important**<br>
-If you previously created an WIP policy using System Center Configuration Manager version 1511 or 1602, you’ll need to recreate it using version 1606 or later. Editing a WIP policy created in version 1511 or 1602 is not supported in later versions and there is no migration path between older and newer WIP policies.
+If you previously created a WIP policy using System Center Configuration Manager version 1511 or 1602, you’ll need to recreate it using version 1606 or later. Editing a WIP policy created in version 1511 or 1602 is not supported in later versions and there is no migration path between older and newer WIP policies.
 
-## Add an WIP policy
+## Add a WIP policy
 After you’ve installed and set up System Center Configuration Manager for your organization, you must create a configuration item for WIP, which in turn becomes your WIP policy.
 
 **To create a configuration item for WIP**

windows/keep-secure/credential-guard.md

@@ -143,7 +143,8 @@ If you would like to add Credential Guard to an image, you can do this by adding
 ### Add the virtualization-based security features
 
 First, you must add the virtualization-based security features. You can do this by using either the Control Panel or the Deployment Image Servicing and Management tool (DISM).
-> **Note:**  If you enable Credential Guard by using Group Policy, these steps are not required. Group Policy will install the features for you.
+> [!NOTE]  
+> If you enable Credential Guard by using Group Policy, these steps are not required. Group Policy will install the features for you.
  
 **Add the virtualization-based security features by using Programs and Features**
 1.  Open the Programs and Features control panel.
@@ -157,7 +158,8 @@ First, you must add the virtualization-based security features. You can do this
     ``` syntax
     dism /image:<WIM file name> /Enable-Feature /FeatureName:Microsoft-Hyper-V-Hypervisor /all
     ```
-> **Note:**  You can also add these features to an online image by using either DISM or Configuration Manager.
+> [!NOTE]  
+> You can also add these features to an online image by using either DISM or Configuration Manager.
 
 
 In Windows 10, version 1607, Isolated User Mode is included with Hyper-V and does not need to be installed separately. If you're running a version of Windows 10 that's earlier than Windows 10, version 1607, you can run the following command to install Isolated User Mode:
@@ -181,14 +183,30 @@ If you don't use Group Policy, you can enable Credential Guard by using the regi
     -   Add a new DWORD value named **LsaCfgFlags**. Set the value of this registry setting to 1 to enable Credential Guard with UEFI lock, set it to 2 to enable Credential Guard without lock, and set it to 0 to disable it.
 4.  Close Registry Editor.
 
-> **Note:**  You can also turn on Credential Guard by setting the registry entries in the [FirstLogonCommands](http://msdn.microsoft.com/library/windows/hardware/dn922797.aspx) unattend setting.
+> [!NOTE]  
+> You can also turn on Credential Guard by setting the registry entries in the [FirstLogonCommands](http://msdn.microsoft.com/library/windows/hardware/dn922797.aspx) unattend setting.
+
+**Turn on Credential Guard by using the Device Guard and Credential Guard hardware readiness tool**
+
+You can also enable Credential Guard by using the [Device Guard and Credential Guard hardware readiness tool](https://www.microsoft.com/download/details.aspx?id=53337).
+
+```
+DG_Readiness_Tool_v2.0.ps1 -Enable -AutoReboot
+```
  
 ### Remove Credential Guard
 
 If you have to remove Credential Guard on a PC, you need to do the following:
 
 1.  If you used Group Policy, disable the Group Policy setting that you used to enable Credential Guard (**Computer Configuration** -&gt; **Administrative Templates** -&gt; **System** -&gt; **Device Guard** -&gt; **Turn on Virtualization Based Security**).
-2.  Delete the following registry setting: HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DeviceGuard\\LsaCfgFlags
+2.  Delete the following registry settings:
+    - HKEY\_LOCAL\_MACHINE\\System\\CurrentControlSet\\Control\\LSA\LsaCfgFlags
+    - HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DeviceGuard\\EnableVirtualizationBasedSecurity
+    - HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DeviceGuard\\RequirePlatformSecurityFeatures
+
+    > [!IMPORTANT]  
+    > If you manually remove these registry settings, make sure to delete them all. If you don't remove them all, the device might go into BitLocker recovery.
+
 3.  Delete the Credential Guard EFI variables by using bcdedit.
 
 **Delete the Credential Guard EFI variables**
@@ -208,9 +226,18 @@ If you have to remove Credential Guard on a PC, you need to do the following:
 3.  Accept the prompt to disable Credential Guard.
 4.  Alternatively, you can disable the virtualization-based security features to turn off Credential Guard.
 
-> **Note:** The PC must have one-time access to a domain controller to decrypt content, such as files that were encrypted with EFS. If you want to turn off both Credential Guard and virtualization-based security, run the following bcdedit command after turning off all virtualization-based security Group Policy and registry settings: bcdedit /set {0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO,DISABLE-VBS
+> [!NOTE]  
+> The PC must have one-time access to a domain controller to decrypt content, such as files that were encrypted with EFS. If you want to turn off both Credential Guard and virtualization-based security, run the following bcdedit command after turning off all virtualization-based security Group Policy and registry settings: bcdedit /set {0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO,DISABLE-VBS
 
 For more info on virtualization-based security and Device Guard, see [Device Guard deployment guide](device-guard-deployment-guide.md).
+
+**Turn off Credential Guard by using the Device Guard and Credential Guard hardware readiness tool**
+
+You can also enable Credential Guard by using the [Device Guard and Credential Guard hardware readiness tool](https://www.microsoft.com/download/details.aspx?id=53337).
+
+```
+DG_Readiness_Tool_v2.0.ps1 -Disable -AutoReboot
+```
  
 ### Check that Credential Guard is running
 
@@ -224,6 +251,12 @@ You can use System Information to ensure that Credential Guard is running on a P
     
     ![System Information](images/credguard-msinfo32.png)
 
+You can also check that Credential Guard is running by using the [Device Guard and Credential Guard hardware readiness tool](https://www.microsoft.com/download/details.aspx?id=53337).
+
+```
+DG_Readiness_Tool_v2.0.ps1 -Ready
+```
+    
 ## Considerations when using Credential Guard
 
 -   If Credential Guard is enabled on a device after it's joined to a domain, the user and device secrets may already be compromised. We recommend that Credential Guard is enabled before the PC is joined to a domain.
@@ -314,7 +347,8 @@ On devices that are running Credential Guard, enroll the devices using the machi
 ``` syntax
 CertReq -EnrollCredGuardCert MachineAuthentication
 ```
-> **Note:**  You must restart the device after enrolling the machine authentication certificate.
+> [!NOTE]  
+> You must restart the device after enrolling the machine authentication certificate.
  
 ### Link the issuance policies to a group
 
@@ -353,7 +387,8 @@ Now you can set up an authentication policy to use Credential Guard.
 14. Click **OK** to create the authentication policy.
 15. Close Active Directory Administrative Center.
 
-> **Note:**  When authentication policies in enforcement mode are deployed with Credential Guard, users will not be able to sign in using devices that do not have the machine authentication certificate provisioned. This applies to both local and remote sign in scenarios.
+> [!NOTE]  
+> When authentication policies in enforcement mode are deployed with Credential Guard, users will not be able to sign in using devices that do not have the machine authentication certificate provisioned. This applies to both local and remote sign in scenarios.
  
 ### Appendix: Scripts
 
@@ -547,7 +582,8 @@ write-host "There are no issuance policies which are not mapped to groups"
     }
 }
 ```
-> **Note:**  If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter.
+> [!NOTE]  
+> If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter.
  
 #### <a href="" id="bkmk-setscript"></a>Link an issuance policy to a group
 
@@ -828,7 +864,8 @@ write-host $tmp -Foreground Red
 }
 ```
 
-> **Note:**  If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter.
+> [!NOTE]  
+> If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter.
  
 ## Related topics
 

windows/keep-secure/protect-enterprise-data-using-wip.md

@@ -56,7 +56,7 @@ WIP gives you a new way to manage data policy enforcement for apps and documents
 
 -   **Manage your enterprise documents, apps, and encryption modes.**
 
-    -   **Copying or downloading enterprise data.** When an employee or an app downloads content from a location like SharePoint, a network share, or an enterprise web location, while using an WIP-protected device, WIP encrypts the data on the device.
+    -   **Copying or downloading enterprise data.** When an employee or an app downloads content from a location like SharePoint, a network share, or an enterprise web location, while using a WIP-protected device, WIP encrypts the data on the device.
 
     - **Using allowed apps.** Managed apps (apps that you've included on the Allowed Apps list in your WIP policy) are allowed to access your enterprise data and will interact differently when used with unallowed, non-enterprise aware, or personal-only apps. For example, if WIP management is set to **Block**, your employees can copy and paste from one protected app to another allowed app, but not to personal apps. Imagine an HR person wants to copy a job description from an allowed app to the internal career website, an enterprise-protected location, but goofs and tries to paste into a personal app instead. The paste action fails and a notification pops up, saying that the app couldn’t paste because of a policy restriction. The HR person then correctly pastes to the career website without a problem.
 

windows/keep-secure/testing-scenarios-for-wip.md

@@ -25,9 +25,9 @@ You can try any of the processes included in these scenarios, but you should foc
 |---------|----------|
 |Automatically encrypt files from enterprise apps |<ol><li>Start an unmodified (for example, WIP-unaware) line-of-business app that's on your allowed apps list and then create, edit, write, and save files.</li><li>Make sure that all of the files you worked with from the WIP-unaware app are encrypted to your configured Enterprise Identity. In some cases, you might need to close the file and wait a few moments for it to be automatically encrypted.</li><li>Open File Explorer and make sure your modified files are appearing with a **Lock** icon.<p>**Note**<br>Some file types, like .exe and .dll, along with some file paths, like `%windir%` and `%programfiles%`, are excluded from automatic encryption.</li></ol> |
 |Block enterprise data from non-enterprise apps |<ol><li>Start an app that doesn't appear on your allowed apps list, and then try to open an enterprise-encrypted file.<p>The app shouldn't be able to access the file.</li><li>Try double-clicking or tapping on the enterprise-encrypted file.<p>If your default app association is an app not on your allowed apps list, you should get an **Access Denied** error message.</li></ol> |
-|Copy and paste from enterprise apps to non-enterprise apps |<ol><li>Copy (CTRL+C) content from an app on your allowed apps list, and then try to paste (CTRL+V) the content into an app that doesn't appear on your allowed apps list.<p>You should see an WIP-related warning box, asking you to click either **Got it** or **Cancel**.</li><li>Click **Cancel**.<p>The content isn't pasted into the non-enterprise app.</li><li>Repeat Step 1, but this time click **Got it**, and try to paste the content again.<p>The content is pasted into the non-enterprise app.</li><li>Try copying and pasting content between apps on your allowed apps list.<p>The content should copy and paste between apps without any warning messages.</li></ol> |
+|Copy and paste from enterprise apps to non-enterprise apps |<ol><li>Copy (CTRL+C) content from an app on your allowed apps list, and then try to paste (CTRL+V) the content into an app that doesn't appear on your allowed apps list.<p>You should see a WIP-related warning box, asking you to click either **Got it** or **Cancel**.</li><li>Click **Cancel**.<p>The content isn't pasted into the non-enterprise app.</li><li>Repeat Step 1, but this time click **Got it**, and try to paste the content again.<p>The content is pasted into the non-enterprise app.</li><li>Try copying and pasting content between apps on your allowed apps list.<p>The content should copy and paste between apps without any warning messages.</li></ol> |
-|Drag and drop from enterprise apps to non-enterprise apps |<ol><li>Drag content from an app on your allowed apps list, and then try to drop the content into an app that doesn't appear on your allowed apps list.<p>You should see an WIP-related warning box, asking you to click either **Drag Anyway** or **Cancel**.</li><li>Click **Cancel**.<p>The content isn't dropped into the non-enterprise app.</li><li>Repeat Step 1, but this time click **Drag Anyway**, and try to drop the content again.<p>The content is dropped into the non-enterprise app.</li><li>Try dragging and dropping content between apps on your allowed apps list.<p>The content should move between the apps without any warning messages.</li></ol> |
+|Drag and drop from enterprise apps to non-enterprise apps |<ol><li>Drag content from an app on your allowed apps list, and then try to drop the content into an app that doesn't appear on your allowed apps list.<p>You should see a WIP-related warning box, asking you to click either **Drag Anyway** or **Cancel**.</li><li>Click **Cancel**.<p>The content isn't dropped into the non-enterprise app.</li><li>Repeat Step 1, but this time click **Drag Anyway**, and try to drop the content again.<p>The content is dropped into the non-enterprise app.</li><li>Try dragging and dropping content between apps on your allowed apps list.<p>The content should move between the apps without any warning messages.</li></ol> |
-|Share between enterprise apps and non-enterprise apps |<ol><li>Open an app on your allowed apps list, like Microsoft Photos, and try to share content with an app that doesn't appear on your allowed apps list, like Facebook.<p>You should see an WIP-related warning box, asking you to click either **Share Anyway** or **Cancel**.</li><li>Click **Cancel**.<p>The content isn't shared into Facebook.</li><li>Repeat Step 1, but this time click **Share Anyway**, and try to share the content again.<p>The content is shared into Facebook.</li><li>Try sharing content between apps on your allowed apps list.<p>The content should share between the apps without any warning messages.</li></ol> | 
+|Share between enterprise apps and non-enterprise apps |<ol><li>Open an app on your allowed apps list, like Microsoft Photos, and try to share content with an app that doesn't appear on your allowed apps list, like Facebook.<p>You should see a WIP-related warning box, asking you to click either **Share Anyway** or **Cancel**.</li><li>Click **Cancel**.<p>The content isn't shared into Facebook.</li><li>Repeat Step 1, but this time click **Share Anyway**, and try to share the content again.<p>The content is shared into Facebook.</li><li>Try sharing content between apps on your allowed apps list.<p>The content should share between the apps without any warning messages.</li></ol> | 
 |Use the **Encrypt to** functionality |<ol><li>Open File Explorer on the desktop, right-click a decrypted file, and then click **Encrypt to** from the **Encrypt to** menu.<p>WIP should encrypt the file to your Enterprise Identity.</li><li>Make sure that the newly encrypted file has a **Lock** icon.</li><li>In the **Encrypted to** column of File Explorer on the desktop, look for the enterprise ID value.</li><li>Right-click the encrypted file, and then click **Not encrypted** from the **Encrypt to** menu.<p>The file should be decrypted and the **Lock** icon should disappear.</li></ol> |
 |Verify that Windows system components can use WIP |<ol><li>Start Windows Journal and Internet Explorer 11, creating, editing, and saving files in both apps.</li><li>Make sure that all of the files you worked with are encrypted to your configured Enterprise Identity. In some cases, you might need to close the file and wait a few moments for it to be automatically encrypted.</li><li>Open File Explorer and make sure your modified files are appearing with a **Lock** icon</li><li>Try copying and pasting, dragging and dropping, and sharing using these apps with other apps that appear both on and off the allowed apps list.<p>**Note**<br>Most Windows-signed components like Windows Explorer (when running in the user’s context), should have access to enterprise data.<p>A few notable exceptions include some of the user-facing in-box apps, like Wordpad, Notepad, and Microsoft Paint. These apps don't have access by default, but can be added to your allowed apps list.</li></ol> |
 |Use WIP on FAT/exFAT systems |<ol><li>Start an app that uses the FAT or exFAT file system and appears on your allowed apps list.</li><li>Create, edit, write, save, and move files.<p>Basic file and folder operations like copy, move, rename, delete, and so on, should work properly on encrypted files.</li><li>Try copying and moving files or folders between apps that use NTFS, FAT and exFAT file systems.</li></ol> |

windows/keep-secure/windows-security-baselines.md

@@ -14,6 +14,9 @@ Microsoft is dedicated to provide our customers with a secure operating system,
 
 We recommend implementing an industry-standard configuration that is broadly known and well-tested, such as a Microsoft security baseline, as opposed to creating one yourself. This helps increase flexibility and reduce costs.
 
+ > [!NOTE]  
+ > Microsoft Security Compliance Manager 4.0 is available from the [Microsoft Download Center](https://www.microsoft.com/en-us/download/details.aspx?id=53353).  
+
 ## What are security baselines?
 
 Every organization faces security threats. However, the types of security threats that are of most concern to one organization can be completely different from another organization. For example, an e-commerce company may focus on protecting their Internet-facing web apps, while a hospital may focus on protecting confidential patient information. The one thing that all organizations have in common is a need to keep their apps and devices secure. These devices must be compliant with the security standards (or security baselines) defined by the organization.
@@ -31,18 +34,19 @@ In modern organizations, the security threat landscape is constantly evolving. I
 
 To help faster deployments and increase the ease of managing Windows, Microsoft provides customers with security baselines that are available in formats that can be consumed, such as Group Policy Objects backups.
  
- ## How can you use security baselines?
+## How can you use security baselines?
  
  You can use security baselines to:
  
  - Ensure that user and device configuration settings are compliant with the baseline. 
  - Set configuration settings. For example, you can use Group Policy, System Center Configuration Manager, or Microsoft Intune to configure a device with the setting values specified in the baseline. 
  
- ## Where can I get the security baselines?
+## Where can I get the security baselines?
  
  Here's a list of security baselines that are currently available.
 
- > **Note:**  If you want to know what has changed with each security baseline, or if you want to stay up-to-date on what’s happening with them, check out the [Microsoft Security Guidance](http://blogs.technet.microsoft.com/secguide) blog.
+ > [!NOTE]  
+ > If you want to know what has changed with each security baseline, or if you want to stay up-to-date on what’s happening with them, check out the [Microsoft Security Guidance](http://blogs.technet.microsoft.com/secguide) blog.
 
 ### Windows 10 security baselines
  

windows/manage/TOC.md

@@ -144,6 +144,7 @@
 #### [Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications 5.1](appv-running-locally-installed-applications-inside-a-virtual-environment.md)
 ## [Windows Store for Business](windows-store-for-business.md)
 ### [Sign up and get started](sign-up-windows-store-for-business-overview.md)
+####[Windows Store for Business overview](windows-store-for-business-overview.md)
 #### [Prerequisites for Windows Store for Business](prerequisites-windows-store-for-business.md)
 #### [Sign up for Windows Store for Business](sign-up-windows-store-for-business.md)
 #### [Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md)

windows/manage/configure-windows-10-taskbar.md

@@ -12,7 +12,8 @@ localizationpriority: medium
 
 Starting in Windows 10, version 1607, administrators can pin additional apps to the taskbar and remove default pinned apps from the taskbar by adding a `<TaskbarLayout>` section to a layout modification XML file. This method never removes user-pinned apps from the taskbar.
 
-> **Note:** The only aspect of the taskbar that can currently be configured by the layout modification XML file is the layout.
+> [!NOTE]
+> The only aspect of the taskbar that can currently be configured by the layout modification XML file is the layout.
 
 You can specify different taskbar configurations based on device locale and region. There is no limit on the number of apps that you can pin. You specify apps using the [Application User Model ID (AUMID)](http://go.microsoft.com/fwlink/p/?LinkId=614867) or Desktop Application Link Path (the local path to the application). 
 
@@ -20,7 +21,8 @@ If you specify an app to be pinned that is not installed on the computer, it won
 
 The order of apps in the xml file dictates order of apps on taskbar from left to right, to the right of any existing apps pinned by user.
 
-> **Note**  In operating systems configured to use a right-to-left language, the taskbar order will be reversed.
+> [!NOTE]
+> In operating systems configured to use a right-to-left language, the taskbar order will be reversed.
 
 The following example shows how apps will be pinned: Windows default apps to the left (blue circle), apps pinned by the user in the center (orange triangle), and apps that you pin using XML to the right (green square).
 
@@ -220,7 +222,8 @@ The resulting taskbar for computers in any other country region:
 ![taskbar for all other regions](images/taskbar-region-other.png)
 
 
-> **Note**  [Look up country and region codes (use the ISO Short column)](http://go.microsoft.com/fwlink/p/?LinkId=786445)
+> [!NOTE]
+> [Look up country and region codes (use the ISO Short column)](http://go.microsoft.com/fwlink/p/?LinkId=786445)
 
 
 

windows/manage/group-policies-for-enterprise-and-education-editions.md

@@ -20,7 +20,7 @@ In Windows 10, version 1607, the following Group Policies apply only to Windows
 | **Configure Spotlight on lock screen** | User Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md). Note that an additional **Cloud Content** policy, **Do not suggest third-party content in Windows spotlight**, does apply to Windows 10 Pro. |
 | **Turn off all Windows Spotlight features** | User Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md) |
 | **Turn off Microsoft consumer features** | Computer Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md) |
-| **Do not display the lock screen** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md |
+| **Do not display the lock screen** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md) |
 | **Do not require CTRL+ALT+DEL** </br>combined with</br>**Turn off app notifications on the lock screen** | Computer Configuration > Administrative Templates > System > Logon </br>and</br>Computer Configuration > Windows Settings > Security Settings > Local Policies > Security Options > Interactive logon | When both of these policy settings are enabled, the combination will also disable lock screen apps ([assigned access](set-up-a-device-for-anyone-to-use.md)) on Windows 10 Enterprise and Windows 10 Education only. These policy settings can be applied to Windows 10 Pro, but lock screen apps will not be disabled on Windows 10 Pro. </br></br>**Important:** The description for **Interactive logon: Do not require CTRL+ALT+DEL** in the Group Policy Editor incorrectly states that it only applies to Windows 10 Enterprise and Education. The description will be corrected in a future release.|
 | **Do not show Windows Tips** | Computer Configuration > Administrative Templates > Windows Components > Cloud Content | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md |
 | **Force a specific default lock screen image** | Computer Configuration > Administrative Templates > Control Panel > Personalization | For more info, see [Windows spotlight on the lock screen](windows-spotlight.md) |

windows/manage/lockdown-xml.md

@@ -22,7 +22,8 @@ This topic provides example XML that you can use in your own lockdown XML file t
 
 Lockdown XML is an XML file that contains settings for Windows 10 Mobile. When you deploy the lockdown XML file to a device, it is saved on the device as **wehlockdown.xml**. When the device boots, it looks for wehlockdown.xml and applies any settings configured in the file. In this topic, you'll learn how to create an XML file that contains all lockdown entries available in the AssignedAccessXml area of the [EnterpriseAssignedAccess configuration service provider (CSP)](http://go.microsoft.com/fwlink/p/?LinkID=618601).
 
->  **Note**  On Windows 10 desktop editions, *assigned access* is a feature that lets you configure the device to run a single app above the lockscreen ([kiosk mode](set-up-a-device-for-anyone-to-use.md)). On a Windows 10 Mobile device, assigned access refers to the lockdown settings in AssignedAccessXml in the [EnterpriseAssignedAccess configuration service provider (CSP)](http://go.microsoft.com/fwlink/p/?LinkID=618601).
+> [!NOTE]
+>  On Windows 10 desktop editions, *assigned access* is a feature that lets you configure the device to run a single app above the lockscreen ([kiosk mode](set-up-a-device-for-anyone-to-use.md)). On a Windows 10 Mobile device, assigned access refers to the lockdown settings in AssignedAccessXml in the [EnterpriseAssignedAccess configuration service provider (CSP)](http://go.microsoft.com/fwlink/p/?LinkID=618601).
 
 If you're not familiar with CSPs, read [Introduction to configuration service providers (CSPs)](how-it-pros-can-use-configuration-service-providers.md) first.
 
@@ -211,7 +212,8 @@ Search | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![yes](im
 Camera | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![yes](images/checkmark.png)
 Custom 1, 2, and 3 | ![yes](images/checkmark.png) | ![yes](images/checkmark.png) | ![yes](images/checkmark.png)
 
->  **Note**  Custom buttons are hardware buttons that can be added to devices by OEMs.
+> [!NOTE]
+>  Custom buttons are hardware buttons that can be added to devices by OEMs.
 
 In the following example, press-and-hold is disabled for the Back button.
 
@@ -240,7 +242,8 @@ If you don't specify a button event, all actions for the button are disabled. In
 
 ButtonRemapList lets you change the app that a button will run. You can remap the Search button and any custom buttons included by the OEM. You can't remap the Back, Start, or Camera buttons.
 
->  **Warning**  Button remapping can enable a user to open an application that is not in the allow list for that user role. Use button lock down to prevent application access for a user role.
+> [!WARNING]
+>  Button remapping can enable a user to open an application that is not in the allow list for that user role. Use button lock down to prevent application access for a user role.
  
 To remap a button, you specify the button, the event, and the product ID for the app that you want the event to open. 
 In the following example, when a user presses the Search button, the phone dialer will open instead of the Search app.
@@ -268,7 +271,8 @@ CSPRunner is helpful when you are configuring a device to support multiple roles
 
 In CSPRunner, you specify the CSP and settings using SyncML, a standardized markup language for device management. A SyncML section can include multiple settings, or you can use multiple SyncML sections -- it's up to you how you want to organize settings in this section.
 
->  **Note**  This description of SyncML is just the information that you need to use SyncML in a lockdown XML file. To learn more about SyncML, see [Structure of OMA DM provisioning files](https://msdn.microsoft.com/windows/hardware/dn914774.aspx).
+> [!NOTE]
+> This description of SyncML is just the information that you need to use SyncML in a lockdown XML file. To learn more about SyncML, see [Structure of OMA DM provisioning files](https://msdn.microsoft.com/windows/hardware/dn914774.aspx).
 
 Let's start with the structure of SyncML in the following example:
 
@@ -354,7 +358,9 @@ For a list of the settings and quick actions that you can allow or block, see [S
  ![XML for tiles](images/TilesXML.png)
  
  By default, under Assigned Access, tile manipulation is turned off (blocked) and only available if enabled in the user’s profile. If tile manipulation is enabled in the user’s profile, they can pin/unpin, move, and resize tiles based on their preferences. When multiple people use one device and you want to enable tile manipulation for multiple users, you must enable it for each user in their user profile. 
- > **Important**   If a device is turned off then back on, the tiles reset to their predefined layout. If a device has only one profile, the only way to reset the tiles is to turn off then turn on the device. If a device has multiple profiles, the device resets the tiles to the predefined layout based on the logged-in user’s profile. 
+ 
+ > [!IMPORTANT]
+ > If a device is turned off then back on, the tiles reset to their predefined layout. If a device has only one profile, the only way to reset the tiles is to turn off then turn on the device. If a device has multiple profiles, the device resets the tiles to the predefined layout based on the logged-in user’s profile. 
  
  ```xml
  <Tiles>

windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md

@@ -60,83 +60,85 @@ Here's what's covered in this article:
     
     -   [9. Mail synchronization](#bkmk-mailsync)
 
-    -   [10. Microsoft Edge](#bkmk-edge)
+    -   [10. Microsoft Account](#bkmk-microsoft-account)
 
-        -   [10.1 Microsoft Edge Group Policies](#bkmk-edgegp)
+    -   [11. Microsoft Edge](#bkmk-edge)
 
-        -   [10.2 Microsoft Edge MDM policies](#bkmk-edge-mdm)
+        -   [11.1 Microsoft Edge Group Policies](#bkmk-edgegp)
 
-        -   [10.3 Microsoft Edge Windows Provisioning](#bkmk-edge-prov)
+        -   [11.2 Microsoft Edge MDM policies](#bkmk-edge-mdm)
 
-    -   [11. Network Connection Status Indicator](#bkmk-ncsi)
+        -   [11.3 Microsoft Edge Windows Provisioning](#bkmk-edge-prov)
 
-    -   [12. Offline maps](#bkmk-offlinemaps)
+    -   [12. Network Connection Status Indicator](#bkmk-ncsi)
 
-    -   [13. OneDrive](#bkmk-onedrive)
+    -   [13. Offline maps](#bkmk-offlinemaps)
 
-    -   [14. Preinstalled apps](#bkmk-preinstalledapps)
+    -   [14. OneDrive](#bkmk-onedrive)
 
-    -   [15. Settings > Privacy](#bkmk-settingssection)
+    -   [15. Preinstalled apps](#bkmk-preinstalledapps)
 
-        -   [15.1 General](#bkmk-priv-general)
+    -   [16. Settings > Privacy](#bkmk-settingssection)
 
-        -   [15.2 Location](#bkmk-priv-location)
+        -   [16.1 General](#bkmk-priv-general)
 
-        -   [15.3 Camera](#bkmk-priv-camera)
+        -   [16.2 Location](#bkmk-priv-location)
 
-        -   [15.4 Microphone](#bkmk-priv-microphone)
+        -   [16.3 Camera](#bkmk-priv-camera)
 
-        -   [15.5 Notifications](#bkmk-priv-notifications)
+        -   [16.4 Microphone](#bkmk-priv-microphone)
 
-        -   [15.6 Speech, inking, & typing](#bkmk-priv-speech)
+        -   [16.5 Notifications](#bkmk-priv-notifications)
 
-        -   [15.7 Account info](#bkmk-priv-accounts)
+        -   [16.6 Speech, inking, & typing](#bkmk-priv-speech)
 
-        -   [15.8 Contacts](#bkmk-priv-contacts)
+        -   [16.7 Account info](#bkmk-priv-accounts)
 
-        -   [15.9 Calendar](#bkmk-priv-calendar)
+        -   [16.8 Contacts](#bkmk-priv-contacts)
 
-        -   [15.10 Call history](#bkmk-priv-callhistory)
+        -   [16.9 Calendar](#bkmk-priv-calendar)
 
-        -   [15.11 Email](#bkmk-priv-email)
+        -   [16.10 Call history](#bkmk-priv-callhistory)
 
-        -   [15.12 Messaging](#bkmk-priv-messaging)
+        -   [16.11 Email](#bkmk-priv-email)
 
-        -   [15.13 Radios](#bkmk-priv-radios)
+        -   [16.12 Messaging](#bkmk-priv-messaging)
 
-        -   [15.14 Other devices](#bkmk-priv-other-devices)
+        -   [16.13 Radios](#bkmk-priv-radios)
 
-        -   [15.15 Feedback & diagnostics](#bkmk-priv-feedback)
+        -   [16.14 Other devices](#bkmk-priv-other-devices)
 
-        -   [15.16 Background apps](#bkmk-priv-background)
+        -   [16.15 Feedback & diagnostics](#bkmk-priv-feedback)
 
-    -   [16. Software Protection Platform](#bkmk-spp)
+        -   [16.16 Background apps](#bkmk-priv-background)
 
-    -   [17. Sync your settings](#bkmk-syncsettings)
+    -   [17. Software Protection Platform](#bkmk-spp)
 
-    -   [18. Teredo](#bkmk-teredo)
+    -   [18. Sync your settings](#bkmk-syncsettings)
 
-    -   [19. Wi-Fi Sense](#bkmk-wifisense)
+    -   [19. Teredo](#bkmk-teredo)
 
-    -   [20. Windows Defender](#bkmk-defender)
+    -   [20. Wi-Fi Sense](#bkmk-wifisense)
 
-    -   [21. Windows Media Player](#bkmk-wmp)
+    -   [21. Windows Defender](#bkmk-defender)
 
-    -   [22. Windows spotlight](#bkmk-spotlight)
+    -   [22. Windows Media Player](#bkmk-wmp)
 
-    -   [23. Windows Store](#bkmk-windowsstore)
+    -   [23. Windows spotlight](#bkmk-spotlight)
 
-    -   [24. Windows Update Delivery Optimization](#bkmk-updates)
+    -   [24. Windows Store](#bkmk-windowsstore)
 
-        -   [24.1 Settings > Update & security](#bkmk-wudo-ui)
+    -   [25. Windows Update Delivery Optimization](#bkmk-updates)
 
-        -   [24.2 Delivery Optimization Group Policies](#bkmk-wudo-gp)
+        -   [25.1 Settings > Update & security](#bkmk-wudo-ui)
 
-        -   [24.3 Delivery Optimization MDM policies](#bkmk-wudo-mdm)
+        -   [25.2 Delivery Optimization Group Policies](#bkmk-wudo-gp)
 
-        -   [24.4 Delivery Optimization Windows Provisioning](#bkmk-wudo-prov)
+        -   [25.3 Delivery Optimization MDM policies](#bkmk-wudo-mdm)
 
-    -   [25. Windows Update](#bkmk-wu)
+        -   [25.4 Delivery Optimization Windows Provisioning](#bkmk-wudo-prov)
+
+    -   [26. Windows Update](#bkmk-wu)
 
 ## What's new in Windows 10, version 1607
 
@@ -147,6 +149,7 @@ Here's a list of changes that were made to this article for Windows 10, version
 - Added a section on how to turn off automatic root updates to stop updating the certificate trust list in [1. Certificate trust lists](#certificate-trust-lists).
 - Added a new setting in [25. Windows Update](#bkmk-wu). 
 - Changed the NCSI URL in [11. Network Connection Status Indicator](#bkmk-ncsi).
+- Added a section on how to turn off the automatic download of the Microsoft Account configuration file in [10. Microsoft Account](#bkmk-microsoft-account).
 
 - Added the following Group Policies:
 
@@ -351,11 +354,18 @@ To turn off the Windows Mail app:
 
 -   Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Windows Mail** > **Turn off Windows Mail application**
 
-### <a href="" id="bkmk-edge"></a>10. Microsoft Edge
+### <a href="" id="bkmk-microsoft-account"></a>10. Microsoft Account
+
+To turn off the automatic download of the Microsoft Account configuration file:
+
+-   Change the **Start** REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentControlSet\\Services\\wlidsvc** to 4.
+
+
+### <a href="" id="bkmk-edge"></a>11. Microsoft Edge
 
 Use either Group Policy or MDM policies to manage settings for Microsoft Edge. For more info, see [Microsoft Edge and privacy: FAQ](http://go.microsoft.com/fwlink/p/?LinkId=730682).
 
-### <a href="" id="bkmk-edgegp"></a>10.1 Microsoft Edge Group Policies
+### <a href="" id="bkmk-edgegp"></a>11.1 Microsoft Edge Group Policies
 
 Find the Microsoft Edge Group Policy objects under **Computer Configuration** &gt; **Administrative Templates** &gt; **Windows Components** &gt; **Microsoft Edge**.
 
@@ -385,7 +395,7 @@ The Windows 10, version 1511 Microsoft Edge Group Policy names are:
 | Open a new tab with an empty tab                     | Choose whether a new tab page appears.  <br /> Default: Enabled                                     |
 | Configure corporate Home pages                       | Choose the corporate Home page for domain-joined devices. <br /> Set this to **about:blank**        |
 
-### <a href="" id="bkmk-edge-mdm"></a>10.2 Microsoft Edge MDM policies
+### <a href="" id="bkmk-edge-mdm"></a>11.2 Microsoft Edge MDM policies
 
 The following Microsoft Edge MDM policies are available in the [Policy CSP](http://msdn.microsoft.com/library/windows/hardware/dn904962.aspx).
 
@@ -397,13 +407,13 @@ The following Microsoft Edge MDM policies are available in the [Policy CSP](http
 | Browser/AllowSearchSuggestionsinAddressBar           | Choose whether the address bar shows search suggestions.. <br /> Default: Allowed                   |
 | Browser/AllowSmartScreen                             | Choose whether SmartScreen is turned on or off.  <br /> Default: Allowed                            |
 
-### <a href="" id="bkmk-edge-prov"></a>10.3 Microsoft Edge Windows Provisioning
+### <a href="" id="bkmk-edge-prov"></a>11.3 Microsoft Edge Windows Provisioning
 
 Use Windows ICD to create a provisioning package with the settings for these policies, go to **Runtime settings** &gt; **Policies**.
 
 For a complete list of the Microsoft Edge policies, see [Available policies for Microsoft Edge](http://technet.microsoft.com/library/mt270204.aspx).
 
-### <a href="" id="bkmk-ncsi"></a>11. Network Connection Status Indicator
+### <a href="" id="bkmk-ncsi"></a>12. Network Connection Status Indicator
 
 Network Connection Status Indicator (NCSI) detects Internet connectivity and corporate network connectivity status. NCSI sends a DNS request and HTTP query to http://www.msftconnecttest.com/connecttest.txt to determine if the device can communicate with the Internet. For more info about NCIS, see [The Network Connection Status Icon](http://blogs.technet.com/b/networking/archive/2012/12/20/the-network-connection-status-icon.aspx).
 
@@ -416,7 +426,7 @@ You can turn off NCSI through Group Policy:
 > [!NOTE] 
 > After you apply this policy, you must restart the device for the policy setting to take effect.
 
-### <a href="" id="bkmk-offlinemaps"></a>12. Offline maps
+### <a href="" id="bkmk-offlinemaps"></a>13. Offline maps
 
 You can turn off the ability to download and update offline maps.
 
@@ -426,13 +436,13 @@ You can turn off the ability to download and update offline maps.
 
 - In Windows 10, version 1607 and later, apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Maps** > **Turn off unsolicited network traffic on the Offline Maps settings page**
 
-### <a href="" id="bkmk-onedrive"></a>13. OneDrive
+### <a href="" id="bkmk-onedrive"></a>14. OneDrive
 
 To turn off OneDrive in your organization:
 
 -   Apply the Group Policy: **Computer Configuration** &gt; **Administrative Templates** &gt; **Windows Components** &gt; **OneDrive** &gt; **Prevent the usage of OneDrive for file storage**
 
-### <a href="" id="bkmk-preinstalledapps"></a>14. Preinstalled apps
+### <a href="" id="bkmk-preinstalledapps"></a>15. Preinstalled apps
 
 Some preinstalled apps get content before they are opened to ensure a great experience. You can remove these using the steps in this section.
 
@@ -544,43 +554,43 @@ To remove the Get Skype app:
 
     Remove the app for the current user. From an elevated command prompt, run the following Windows PowerShell command: **Get-AppxPackage Microsoft.SkypeApp | Remove-AppxPackage**
 
-### <a href="" id="bkmk-settingssection"></a>15. Settings &gt; Privacy
+### <a href="" id="bkmk-settingssection"></a>16. Settings &gt; Privacy
 
 Use Settings &gt; Privacy to configure some settings that may be important to your organization. Except for the Feedback & Diagnostics page, these settings must be configured for every user account that signs into the PC.
 
--   [15.1 General](#bkmk-general)
+-   [16.1 General](#bkmk-general)
 
--   [15.2 Location](#bkmk-priv-location)
+-   [16.2 Location](#bkmk-priv-location)
 
--   [15.3 Camera](#bkmk-priv-camera)
+-   [16.3 Camera](#bkmk-priv-camera)
 
--   [15.4 Microphone](#bkmk-priv-microphone)
+-   [16.4 Microphone](#bkmk-priv-microphone)
 
--   [15.5 Notifications](#bkmk-priv-notifications)
+-   [16.5 Notifications](#bkmk-priv-notifications)
 
--   [15.6 Speech, inking, & typing](#bkmk-priv-speech)
+-   [16.6 Speech, inking, & typing](#bkmk-priv-speech)
 
--   [15.7 Account info](#bkmk-priv-accounts)
+-   [16.7 Account info](#bkmk-priv-accounts)
 
--   [15.8 Contacts](#bkmk-priv-contacts)
+-   [16.8 Contacts](#bkmk-priv-contacts)
 
--   [15.9 Calendar](#bkmk-priv-calendar)
+-   [16.9 Calendar](#bkmk-priv-calendar)
 
--   [15.10 Call history](#bkmk-priv-callhistory)
+-   [16.10 Call history](#bkmk-priv-callhistory)
 
--   [15.11 Email](#bkmk-priv-email)
+-   [16.11 Email](#bkmk-priv-email)
 
--   [15.12 Messaging](#bkmk-priv-messaging)
+-   [16.12 Messaging](#bkmk-priv-messaging)
 
--   [15.13 Radios](#bkmk-priv-radios)
+-   [16.13 Radios](#bkmk-priv-radios)
 
--   [15.14 Other devices](#bkmk-priv-other-devices)
+-   [16.14 Other devices](#bkmk-priv-other-devices)
 
--   [15.15 Feedback & diagnostics](#bkmk-priv-feedback)
+-   [16.15 Feedback & diagnostics](#bkmk-priv-feedback)
 
--   [15.16 Background apps](#bkmk-priv-background)
+-   [16.16 Background apps](#bkmk-priv-background)
 
-### <a href="" id="bkmk-general"></a>15.1 General
+### <a href="" id="bkmk-general"></a>16.1 General
 
 **General** includes options that don't fall into other areas.
 
@@ -658,7 +668,7 @@ To turn off **Let apps on my other devices use Bluetooth to open apps and contin
 
 - Turn off the feature in the UI.
 
-### <a href="" id="bkmk-priv-location"></a>15.2 Location
+### <a href="" id="bkmk-priv-location"></a>16.2 Location
 
 In the **Location** area, you choose whether devices have access to location-specific sensors and which apps have access to the device's location.
 
@@ -709,7 +719,7 @@ To turn off **Choose apps that can use your location**:
 
 -   Turn off each app using the UI.
 
-### <a href="" id="bkmk-priv-camera"></a>15.3 Camera
+### <a href="" id="bkmk-priv-camera"></a>16.3 Camera
 
 In the **Camera** area, you can choose which apps can access a device's camera.
 
@@ -746,7 +756,7 @@ To turn off **Choose apps that can use your camera**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-priv-microphone"></a>15.4 Microphone
+### <a href="" id="bkmk-priv-microphone"></a>16.4 Microphone
 
 In the **Microphone** area, you can choose which apps can access a device's microphone.
 
@@ -764,7 +774,7 @@ To turn off **Choose apps that can use your microphone**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-priv-notifications"></a>15.5 Notifications
+### <a href="" id="bkmk-priv-notifications"></a>16.5 Notifications
 
 In the **Notifications** area, you can choose which apps have access to notifications.
 
@@ -778,7 +788,7 @@ To turn off **Let apps access my notifications**:
 
     -   Set the **Select a setting** box to **Force Deny**.
 
-### <a href="" id="bkmk-priv-speech"></a>15.6 Speech, inking, & typing
+### <a href="" id="bkmk-priv-speech"></a>16.6 Speech, inking, & typing
 
 In the **Speech, Inking, & Typing** area, you can let Windows and Cortana better understand your employee's voice and written input by sampling their voice and writing, and by comparing verbal and written input to contact names and calendar entrees.
 
@@ -813,7 +823,7 @@ Apply the Speech/AllowSpeechModelUpdate MDM policy from the [Policy CSP](https:/
 
 - Create a REG\_DWORD registry setting called **AllowSpeechModelUpdate** in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Microsoft\\PolicyManager\\Current\\Device\\Speech**, with a value of 0 (zero).
 
-### <a href="" id="bkmk-priv-accounts"></a>15.7 Account info
+### <a href="" id="bkmk-priv-accounts"></a>16.7 Account info
 
 In the **Account Info** area, you can choose which apps can access your name, picture, and other account info.
 
@@ -831,7 +841,7 @@ To turn off **Choose the apps that can access your account info**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-priv-contacts"></a>15.8 Contacts
+### <a href="" id="bkmk-priv-contacts"></a>16.8 Contacts
 
 In the **Contacts** area, you can choose which apps can access an employee's contacts list.
 
@@ -845,7 +855,7 @@ To turn off **Choose apps that can access contacts**:
 
     -   Set the **Select a setting** box to **Force Deny**.
 
-### <a href="" id="bkmk-priv-calendar"></a>15.9 Calendar
+### <a href="" id="bkmk-priv-calendar"></a>16.9 Calendar
 
 In the **Calendar** area, you can choose which apps have access to an employee's calendar.
 
@@ -863,7 +873,7 @@ To turn off **Choose apps that can access calendar**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-priv-callhistory"></a>15.10 Call history
+### <a href="" id="bkmk-priv-callhistory"></a>16.10 Call history
 
 In the **Call history** area, you can choose which apps have access to an employee's call history.
 
@@ -877,7 +887,7 @@ To turn off **Let apps access my call history**:
 
     -   Set the **Select a setting** box to **Force Deny**.
 
-### <a href="" id="bkmk-priv-email"></a>15.11 Email
+### <a href="" id="bkmk-priv-email"></a>16.11 Email
 
 In the **Email** area, you can choose which apps have can access and send email.
 
@@ -891,7 +901,7 @@ To turn off **Let apps access and send email**:
 
     -   Set the **Select a setting** box to **Force Deny**.
 
-### <a href="" id="bkmk-priv-messaging"></a>15.12 Messaging
+### <a href="" id="bkmk-priv-messaging"></a>16.12 Messaging
 
 In the **Messaging** area, you can choose which apps can read or send messages.
 
@@ -909,7 +919,7 @@ To turn off **Choose apps that can read or send messages**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-priv-radios"></a>15.13 Radios
+### <a href="" id="bkmk-priv-radios"></a>16.13 Radios
 
 In the **Radios** area, you can choose which apps can turn a device's radio on or off.
 
@@ -927,7 +937,7 @@ To turn off **Choose apps that can control radios**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-priv-other-devices"></a>15.14 Other devices
+### <a href="" id="bkmk-priv-other-devices"></a>16.14 Other devices
 
 In the **Other Devices** area, you can choose whether devices that aren't paired to PCs, such as an Xbox One, can share and sync info.
 
@@ -945,7 +955,7 @@ To turn off **Let your apps use your trusted devices (hardware you've already co
 
     -   Set the **Select a setting** box to **Force Deny**.
 
-### <a href="" id="bkmk-priv-feedback"></a>15.15 Feedback & diagnostics
+### <a href="" id="bkmk-priv-feedback"></a>16.15 Feedback & diagnostics
 
 In the **Feedback & Diagnostics** area, you can choose how often you're asked for feedback and how much diagnostic and usage information is sent to Microsoft.
 
@@ -1019,7 +1029,7 @@ To change the level of diagnostic and usage data sent when you **Send your devic
 
     -   **3**. Maps to the **Full** level.
 
-### <a href="" id="bkmk-priv-background"></a>15.16 Background apps
+### <a href="" id="bkmk-priv-background"></a>16.16 Background apps
 
 In the **Background Apps** area, you can choose which apps can run in the background.
 
@@ -1027,7 +1037,7 @@ To turn off **Let apps run in the background**:
 
 -   Turn off the feature in the UI for each app.
 
-### <a href="" id="bkmk-spp"></a>16. Software Protection Platform
+### <a href="" id="bkmk-spp"></a>17. Software Protection Platform
 
 Enterprise customers can manage their Windows activation status with volume licensing using an on-premise Key Management Server. You can opt out of sending KMS client activation data to Microsoft automatically by doing one of the following:
 
@@ -1039,7 +1049,7 @@ Enterprise customers can manage their Windows activation status with volume lice
 
 The Windows activation status will be valid for a rolling period of 180 days with weekly activation status checks to the KMS.
 
-### <a href="" id="bkmk-syncsettings"></a>17. Sync your settings
+### <a href="" id="bkmk-syncsettings"></a>18. Sync your settings
 
 You can control if your settings are synchronized:
 
@@ -1065,13 +1075,13 @@ To turn off Messaging cloud sync:
 
 -   Create a REG\_DWORD registry setting called **CloudServiceSyncEnabled** in **HKEY\_CURRENT\_USER\\SOFTWARE\\Microsoft\\Messaging**, with a value of 0 (zero).
 
-### <a href="" id="bkmk-teredo"></a>18. Teredo
+### <a href="" id="bkmk-teredo"></a>19. Teredo
 
 You can disable Teredo by using the netsh.exe command. For more info on Teredo, see [Internet Protocol Version 6, Teredo, and Related Technologies](http://technet.microsoft.com/library/cc722030.aspx).
 
 -   From an elevated command prompt, run **netsh interface teredo set state disabled**
 
-### <a href="" id="bkmk-wifisense"></a>19. Wi-Fi Sense
+### <a href="" id="bkmk-wifisense"></a>20. Wi-Fi Sense
 
 Wi-Fi Sense automatically connects devices to known hotspots and to the wireless networks the person’s contacts have shared with them.
 
@@ -1097,7 +1107,7 @@ To turn off **Connect to suggested open hotspots** and **Connect to networks sha
 
 When turned off, the Wi-Fi Sense settings still appear on the Wi-Fi Settings screen, but they’re non-functional and they can’t be controlled by the employee.
 
-### <a href="" id="bkmk-defender"></a>20. Windows Defender
+### <a href="" id="bkmk-defender"></a>21. Windows Defender
 
 You can disconnect from the Microsoft Antimalware Protection Service.
 
@@ -1149,7 +1159,7 @@ You can stop Enhanced Notifications:
 
 You can also use the registry to turn off Malicious Software Reporting Tool telemetry by setting the REG\_DWORD value **HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\MRT\\DontReportInfectionInformation** to 1.
 
-### <a href="" id="bkmk-wmp"></a>21. Windows Media Player
+### <a href="" id="bkmk-wmp"></a>22. Windows Media Player
 
 To remove Windows Media Player:
 
@@ -1159,7 +1169,7 @@ To remove Windows Media Player:
 
 -   Run the following DISM command from an elevated command prompt: **dism /online /Disable-Feature /FeatureName:WindowsMediaPlayer**
 
-### <a href="" id="bkmk-spotlight"></a>22. Windows spotlight
+### <a href="" id="bkmk-spotlight"></a>23. Windows spotlight
 
 Windows spotlight provides features such as different background images and text on the lock screen, suggested apps, Microsoft account notifications, and Windows tips. You can control it by using the user interface or through Group Policy.
 
@@ -1197,13 +1207,13 @@ If you're not running Windows 10, version 1607 or later, you can use the other o
 
 For more info, see [Windows Spotlight on the lock screen](../manage/windows-spotlight.md).
 
-### <a href="" id="bkmk-windowsstore"></a>23. Windows Store
+### <a href="" id="bkmk-windowsstore"></a>24. Windows Store
 
 You can turn off the ability to launch apps from the Windows Store that were preinstalled or downloaded. This will also turn off automatic app updates, and the Windows Store will be disabled.
 
 -   Apply the Group Policy: **Computer Configuration** &gt; **Administrative Templates** &gt; **Windows Components** &gt; **Store** &gt; **Disable all apps from Windows Store**.
 
-### <a href="" id="bkmk-updates"></a>24. Windows Update Delivery Optimization
+### <a href="" id="bkmk-updates"></a>25. Windows Update Delivery Optimization
 
 Windows Update Delivery Optimization lets you get Windows updates and Windows Store apps from sources in addition to Microsoft, which not only helps when you have a limited or unreliable Internet connection, but can also help you reduce the amount of bandwidth needed to keep all of your organization's PCs up-to-date. If you have Delivery Optimization turned on, PCs on your network may send and receive updates and apps to other PCs on your local network, if you choose, or to PCs on the Internet.
 
@@ -1213,13 +1223,13 @@ Use the UI, Group Policy, MDM policies, or Windows Provisioning to set up Delive
 
 In Windows 10, version 1607, you can stop network traffic related to Windows Update Delivery Optimization by setting **Download Mode** to **Simple** (99) or **Bypass** (100), as described below.
 
-### <a href="" id="bkmk-wudo-ui"></a>24.1 Settings &gt; Update & security
+### <a href="" id="bkmk-wudo-ui"></a>25.1 Settings &gt; Update & security
 
 You can set up Delivery Optimization from the **Settings** UI.
 
 -   Go to **Settings** &gt; **Update & security** &gt; **Windows Update** &gt; **Advanced options** &gt; **Choose how updates are delivered**.
 
-### <a href="" id="bkmk-wudo-gp"></a>24.2 Delivery Optimization Group Policies
+### <a href="" id="bkmk-wudo-gp"></a>25.2 Delivery Optimization Group Policies
 
 You can find the Delivery Optimization Group Policy objects under **Computer Configuration** &gt; **Administrative Templates** &gt; **Windows Components** &gt; **Delivery Optimization**.
 
@@ -1231,7 +1241,7 @@ You can find the Delivery Optimization Group Policy objects under **Computer Con
 | Max Cache Size            | Lets you specify the maximum cache size as a percentage of disk size. <br /> The default value is 20, which represents 20% of the disk.|
 | Max Upload Bandwidth      | Lets you specify the maximum upload bandwidth (in KB/second) that a device uses across all concurrent upload activity. <br /> The default value is 0, which means unlimited possible bandwidth.|
 
-### <a href="" id="bkmk-wudo-mdm"></a>24.3 Delivery Optimization MDM policies
+### <a href="" id="bkmk-wudo-mdm"></a>25.3 Delivery Optimization MDM policies
 
 The following Delivery Optimization MDM policies are available in the [Policy CSP](http://msdn.microsoft.com/library/windows/hardware/dn904962.aspx).
 
@@ -1244,7 +1254,7 @@ The following Delivery Optimization MDM policies are available in the [Policy CS
 | DeliveryOptimization/DOMaxUploadBandwidth      | Lets you specify the maximum upload bandwidth (in KB/second) that a device uses across all concurrent upload activity. <br /> The default value is 0, which means unlimited possible bandwidth.|
 
 
-### <a href="" id="bkmk-wudo-prov"></a>24.4 Delivery Optimization Windows Provisioning
+### <a href="" id="bkmk-wudo-prov"></a>25.4 Delivery Optimization Windows Provisioning
 
 If you don't have an MDM server in your enterprise, you can use Windows Provisioning to configure the Delivery Optimization policies
 
@@ -1260,7 +1270,7 @@ Use Windows ICD, included with the [Windows Assessment and Deployment Kit (Windo
 
 For more info about Delivery Optimization in general, see [Windows Update Delivery Optimization: FAQ](http://go.microsoft.com/fwlink/p/?LinkId=730684).
 
-### <a href="" id="bkmk-wu"></a>25. Windows Update
+### <a href="" id="bkmk-wu"></a>26. Windows Update
 
 You can turn off Windows Update by setting the following registry entries:
 

windows/manage/set-up-a-device-for-anyone-to-use.md

@@ -33,8 +33,8 @@ Do you need a computer that can only do one thing? For example:
 
 The following table identifies the type of application that can be used on each Windows 10 edition to create a kiosk device.
 
-**Note**  
+> [!NOTE]  
-A Universal Windows app is built on the Universal Windows Platform (UWP), which was first introduced in Windows 8 as the Windows Runtime. A Classic Windows application uses the Classic Windows Platform (CWP) (e.g., COM, Win32, WPF, WinForms, etc.) and is typically launched using an .EXE or .DLL file.
+> A Universal Windows app is built on the Universal Windows Platform (UWP), which was first introduced in Windows 8 as the Windows Runtime. A Classic Windows application uses the Classic Windows Platform (CWP) (e.g., COM, Win32, WPF, WinForms, etc.) and is typically launched using an .EXE or .DLL file.
 
  
 

windows/manage/set-up-shared-or-guest-pc.md

@@ -18,7 +18,8 @@ localizationpriority: medium
 
 Windows 10, version 1607, introduces *shared PC mode*, which optimizes Windows 10 for shared use scenarios, such as touchdown spaces in an enterprise  and temporary customer use in retail. You can apply shared PC mode to Windows 10 Pro, Pro Education, Education, and Enterprise.
 
-> **Note:** If you're interested in using Windows 10 for shared PCs in a school, see [Use Set up School PCs app](https://technet.microsoft.com/edu/windows/use-set-up-school-pcs-app) which provides a simple way to configure PCs with shared PC mode plus additional settings specific for education.
+> [!NOTE]
+> If you're interested in using Windows 10 for shared PCs in a school, see [Use Set up School PCs app](https://technet.microsoft.com/edu/windows/use-set-up-school-pcs-app) which provides a simple way to configure PCs with shared PC mode plus additional settings specific for education.
 
 ##Shared PC mode concepts
 A Windows 10 PC in shared PC mode is designed to be management- and maintenance-free with high reliability. In shared PC mode, only one user can be signed in at a time. When the PC is locked, the currently signed in user can always be signed out at the lock screen. Users who sign-in are signed in as standard users, not admin users.
@@ -65,7 +66,9 @@ Shared PC mode exposes a set of customizations to tailor the behavior to your re
 ##Configuring shared PC mode on Windows
 You can configure Windows to be in shared PC mode in a couple different ways:
 - Mobile device management (MDM): Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx). Your MDM policy can contain any of the options listed in the [Customization](#customization) section. The following image shows a Microsoft Intune policy with the shared PC options added as OMA-URI settings. [Learn more about Windows 10 policy settings in Microsoft Intune.](https://docs.microsoft.com/intune/deploy-use/windows-10-policy-settings-in-microsoft-intune)
+
 ![custom OMA-URI policy in Intune](images/oma-uri-shared-pc.png) 
+
 - A provisioning package created with the Windows Imaging and Configuration Designer (ICD): You can apply a provisioning package when you initially set up the PC (also known as the out-of-box-experience or OOBE), or you can apply the provisioning package to a Windows 10 PC that is already in use. The provisioning package is created in Windows Imaging and Configuration Designer (ICD). Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://msdn.microsoft.com/library/windows/hardware/mt723294.aspx), exposed in ICD as SharedPC.
 
 ![Shared PC settings in ICD](images/icd-adv-shared-pc.png)
@@ -73,7 +76,7 @@ You can configure Windows to be in shared PC mode in a couple different ways:
 
 ### Create a provisioning package for shared use
 
-Use the Windows ICD tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package that configures a device for shared PC mode. [Install the ADK.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
+Use the Windows ICD tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package that configures a device for shared PC mode. [Install the ADK and select **Configuration Designer**.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit)
 
 1.  Open Windows ICD (by default, %windir%\\Program Files (x86)\\Windows Kits\\10\\Assessment and Deployment Kit\\Imaging and Configuration Designer\\x86\\ICD.exe). 
 
@@ -91,14 +94,14 @@ Use the Windows ICD tool included in the Windows Assessment and Deployment Kit (
 8.  On the **Export** menu, select **Provisioning package**.
 9.  Change **Owner** to **IT Admin**, which will set the precedence of this provisioning package higher than provisioning packages applied to this device from other sources, and then select **Next.**
 10. Set a value for **Package Version**.
-    > **Tip**  
+    > [!TIP]
-    You can make changes to existing packages and change the version number to update previously applied packages.
+    > You can make changes to existing packages and change the version number to update previously applied packages.
   
-11. Optional. In the **Provisioning package security** window, you can choose to encrypt the package and enable package signing.
+11. (*Optional*) In the **Provisioning package security** window, you can choose to encrypt the package and enable package signing.
     -   **Enable package encryption** - If you select this option, an auto-generated password will be shown on the screen.
     -   **Enable package signing** - If you select this option, you must select a valid certificate to use for signing the package. You can specify the certificate by clicking **Select...** and choosing the certificate you want to use to sign the package.
-       > **Important**  
+       > [!IMPORTANT]  
-        We recommend that you include a trusted provisioning certificate in your provisioning package. When the package is applied to a device, the certificate is added to the system store and any package signed with that certificate thereafter can be applied silently.
+       > We recommend that you include a trusted provisioning certificate in your provisioning package. When the package is applied to a device, the certificate is added to the system store and any package signed with that certificate thereafter can be applied silently.
         
 12. Click **Next** to specify the output location where you want the provisioning package to go once it's built. By default, Windows ICD uses the project folder as the output location.
     Optionally, you can click **Browse** to change the default output location.
@@ -170,7 +173,8 @@ On a desktop computer, navigate to **Settings** > **Accounts** > **Work ac
 
 ![add a package option](images/package.png)
 
-> **Note:** If you apply the setup file to a computer that has already been set up, existing accounts and data might be lost.
+> [!NOTE]
+> If you apply the setup file to a computer that has already been set up, existing accounts and data might be lost.
 
 ## Guidance for accounts on shared PCs
 
@@ -203,7 +207,8 @@ On a desktop computer, navigate to **Settings** > **Accounts** > **Work ac
 ## Policies set by shared PC mode
 Shared PC mode sets local group policies to configure the device. Some of these are configurable using the shared pc mode options.
 
-> **Important**: It is not recommended to set additional policies on PCs configured for **Shared PC Mode**.	The shared PC mode has been optimized to be fast and reliable over time with minimal to no manual maintenance required.
+> [!IMPORTANT]
+> It is not recommended to set additional policies on PCs configured for **Shared PC Mode**.	The shared PC mode has been optimized to be fast and reliable over time with minimal to no manual maintenance required.
 
 <table border="1"> 
 

windows/manage/sign-up-windows-store-for-business-overview.md

@@ -36,18 +36,22 @@ IT admins can sign up for the Windows Store for Business, and get started workin
 </thead>
 <tbody>
 <tr class="odd">
+<td align="left"><p>[Windows Store for Business overview](windows-store-for-business-overview.md)</p></td>
+<td align="left"><p>Learn about Windows Store for Business.</p></td>
+</tr>
+<tr class="even">
 <td align="left"><p>[Prerequisites for Windows Store for Business](prerequisites-windows-store-for-business.md)</p></td>
 <td align="left"><p>There are a few prerequisites for using Store for Business.</p></td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td align="left"><p>[Sign up for Windows Store for Business](sign-up-windows-store-for-business.md)</p></td>
 <td align="left"><p>Before you sign up for Store for Business, at a minimum, you'll need an Azure Active Directory (AD) account for your organization, and you'll need to be the global administrator for your organization. If your organization is already using Azure AD, you can go ahead and sign up for Store for Business. If not, we'll help you create an Azure AD account and directory as part of the sign up process.</p></td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td align="left"><p>[Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md)</p></td>
 <td align="left"><p>The first person to sign in to Store for Business must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees.</p></td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td align="left"><p>[Settings reference: Windows Store for Business](settings-reference-windows-store-for-business.md)</p></td>
 <td align="left"><p>The Store for Business has a group of settings that admins use to manage the store.</p></td>
 </tr>

windows/manage/windows-store-for-business-overview.md

@@ -0,0 +1,277 @@
+---
+title: Windows Store for Business overview (Windows 10)
+description: With the new Windows Store for Business, organizations can make volume purchases of Windows apps.
+ms.assetid: 9DA71F6B-654D-4121-9A40-D473CC654A1C
+ms.prod: w10
+ms.pagetype: store, mobile
+ms.mktglfcycl: manage
+ms.sitesec: library
+author: TrudyHa
+---
+
+# Windows Store for Business overview
+
+
+**Applies to**
+
+-   Windows 10
+-   Windows 10 Mobile
+
+With the new Windows Store for Business, organizations can make volume purchases of Windows apps. The Store for Business provides app purchases based on organizational identity, flexible distribution options, and the ability to reclaim or re-use licenses. Organizations can also use the Store for Business to create a private store for their employees that includes apps from the Store, as well private Line-of-Business (LOB) apps.
+
+## Features
+
+
+Organizations of any size can benefit from using the Store for Business provides:
+
+-   **Scales to fit the size of your business** - For smaller businesses, with Azure AD accounts and Windows 10 devices, you can quickly have an end-to-end process for acquiring and distributing content using the Store for Business. For larger businesses, all the capabilities of the Store for Businessare available to you, or you can integrate the Store for Businesswith management tools, for greater control over access to apps and app updates. You can use existing work or school accounts.
+
+-   **Bulk app acquisition** - Acquire apps in volume from the Store for Business.
+
+-   **Private store** - Curate a private store for your business that’s easily available from any Windows 10 device.
+
+-   **Flexible distribution options** - Flexible options for distributing content and apps to your employee devices:
+
+    -   Distribute through Store for Business 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.
+
+    -   Offline licensing model allows you to distribute apps without connecting to Store services, and for managing images.
+
+-   **Line-of-business apps** - Privately add and distribute your internal line-of-business apps using any of the distribution options.
+
+-   **App license management**: Admins can reclaim and reuse app licenses. Online and offline licenses allow you to customize how you decide to deploy apps.
+
+-   **Up-to-date apps** - The Store for Business manages the update process for apps with online licenses. Apps are automatically updated so you are always current with the most recent software updates and product features. Store for Business apps also uninstall cleanly, without leaving behind extra files, for times when you need to switch apps for specific employees.
+
+## Prerequisites
+
+
+You'll need this software to work with the Store for Business.
+
+### Required
+
+-   IT Pros that are administering Store for Business need a browser compatible with Store for Business running on a PC or mobile device. Supported browsers include: Internet Explorer 10 or later, Microsoft Edge, or current versions of Chrome or Firefox.
+
+-   Employees using apps from Store for Business need Windows 10, version 1511 running on a PC or mobile device.
+
+Microsoft Azure Active Directory (AD) accounts for your employees:
+
+-   Admins need Azure AD accounts to sign up for the Store for Business, and then to sign in, get apps, distribute apps, and manage app licenses.
+
+-   Employees need Azure AD account when they access Store for Business content from Windows devices.
+
+-   If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account
+
+-   For offline-licensed apps, Azure AD accounts are not required for employees.
+
+For more information on Azure AD, see [About Office 365 and Azure Active Directory](http://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](http://go.microsoft.com/fwlink/p/?LinkId=708611).
+
+### Optional
+
+While not required, you can use a management tool to distribute and manage apps. Using a management tool allows you to distribute content, scope app availability, and control when app updates are installed. This might make sense for larger organizations that already use a management tool. A couple of things to note about management tools:
+
+-   Need to integrate with Windows 10 management framework and Azure AD.
+
+-   Need to sync with the Store for Business inventory to distribute apps.
+
+## How does the Store for Business work?
+
+
+### Sign up!
+
+The first step for getting your organization started with the Store for Business is signing up. To sign up for the Business store, you need an Azure AD account and you must be a Global Administrator for your organization.
+
+For more information, see [Sign up for the Store for Business](../manage/sign-up-windows-store-for-business.md).
+
+### Set up
+
+After your admin signs up for the Store for Business, they can assign roles to other employees in your company. The admin needs Azure AD User Admin permissions to assign WSFB roles. These are the roles and their permissions.
+
+<table>
+<colgroup>
+<col width="20%" />
+<col width="20%" />
+<col width="20%" />
+<col width="20%" />
+<col width="20%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th align="left">Permission</th>
+<th align="left">Account settings</th>
+<th align="left">Acquire apps</th>
+<th align="left">Distribute apps</th>
+<th align="left">Device Guard signing</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td align="left"><p>Admin</p></td>
+<td align="left"><p>X</p></td>
+<td align="left"><p>X</p></td>
+<td align="left"><p>X</p></td>
+<td align="left"></td>
+</tr>
+<tr class="even">
+<td align="left"><p>Purchaser</p></td>
+<td align="left"></td>
+<td align="left"><p>X</p></td>
+<td align="left"><p>X</p></td>
+<td align="left"></td>
+</tr>
+<tr class="odd">
+<td align="left"><p>Device Guard signer</p></td>
+<td align="left"></td>
+<td align="left"></td>
+<td align="left"></td>
+<td align="left"><p>X</p></td>
+</tr>
+</tbody>
+</table>
+
+ 
+
+In some cases, admins will need to add Azure Active Directory (AD) accounts for their employees. For more information, see [Manage user accounts and groups](../manage/manage-users-and-groups-windows-store-for-business.md).
+
+Also, if your organization plans to use a management tool, you’ll need to configure your management tool to sync with the Store for Business.
+
+### Get apps and content
+
+Once signed in to the Store for Business, you can browse and search for all products in the Store for Business catalog. Some apps are free, and some apps charge a price. We're continuing to add more paid apps to the Store for Business. Check back if you don't see the app that you're looking for. Currently, you can pay for apps with a credit card. We'll be adding more payment options over time. 
+
+**App types** -- These app types are supported in the Store for Business:
+
+-   Universal Windows Platform apps
+
+-   Universal Windows apps, by device: Phone, Surface Hub, IOT devices , HoloLens
+
+Apps purchased from the Store for Business only work on Windows 10 devices.
+
+Line-of-business (LOB) apps are also supported via the Business store. You can invite IT developers or ISVs to be LOB publishers for your organization. This allows them to submit apps via the developer center that are only available to your organization. These apps can be distributed using the distribution methods discussed in this topic. For more information, see Working with Line-of-Business apps.
+
+**App licensing model**
+
+The Business store supports two options to license apps: online and offline. **Online** licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require users and devices to connect to the Store for Business service to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center.
+
+For more information, see [Apps in the Store for Business](../manage/apps-in-windows-store-for-business.md#licensing-model).
+
+### Distribute apps and content
+
+App distribution is handled through two channels, either through the Store for Business, or using a management tool. You can use either or both distribution methods in your organization.
+
+**Using the Store for Business** – Distribution options for the Store for Business:
+
+-   Email link – After purchasing an app, admins can send employees a link in an email message. Employees can click the link to install the app.
+
+-   Curate private store for all employees – A private store can include content you’ve purchased from the Store, and your line-of-business apps that you’ve submitted to the Store for Business. Apps in your private store are available to all of your employees. They can browse the private store and install apps when needed.
+
+-   To use the options above users must be signed in with an Azure AD account on a Windows 10 device.
+
+**Using a management tool** – For larger organizations that might want a greater level of control over how apps are distributed and managed, a management tools provides other distribution options:
+
+-   Scoped content distribution – Ability to scope content distribution to specific groups of employees.
+
+-   Install apps for employees – Employees are not responsible for installing apps. Management tool installs apps for employees.
+
+Management tools can synchronize content that has been acquired in the Store for Business. If an offline application has been purchased this will also include the app package, license and metadata for the app (like, icons, count, or localized product descriptions). Using the metadata, management tools can enable portals or apps as a destination for employees to acquire apps.
+
+For more information, see [Distribute apps to your employees from the Store for Business](../manage/distribute-apps-to-your-employees-windows-store-for-business.md).
+
+### Manage Store for Business settings and content
+
+Once you are signed up with the Business store and have purchased apps, Admins can manage Store for Business settings and inventory.
+
+**Manage Store for Business settings**
+
+-   Assign and change roles for employees or groups
+
+-   Device Guard signing
+
+-   Register a management server to deploy and install content
+
+-   Manage relationships with LOB publishers
+
+-   Manage offline licenses
+
+-   Update the name of your private store
+
+**Manage inventory**
+
+-   Assign app licenses to employees
+
+-   Reclaim and reassign app licenses
+
+-   Manage app updates for all apps, or customize updates for each app. Online apps will automatically update from the Store. Offline apps can be updated using a management server.
+
+-   Download apps for offline installs
+
+For more information, see [Manage settings in the Store for Business](../manage/manage-settings-windows-store-for-business.md) and [Manage apps](../manage/manage-apps-windows-store-for-business-overview.md).
+
+## Supported markets
+
+
+Store for Business is currently available in these markets.
+
+|Country or locale|Paid apps|Free apps|
+|-----------------|---------|---------|
+|Argentina|X|X|
+|Australia|X|X|
+|Austria|X|X|
+|Belgium (Dutch, French)|X|X|
+|Brazil| |X|
+|Canada (English, French)|X|X|
+|Chile|X|X|
+|Columbia|X|X|
+|Croatia|X|X|
+|Czech Republic|X|X|
+|Denmark|X|X|
+|Finland|X|X|
+|France|X|X|
+|Germany|X|X|
+|Greece|X|X|
+|Hong Kong SAR|X|X|
+|Hungary|X|X|
+|India| |X|
+|Indonesia|X|X|
+|Ireland|X|X|
+|Italy|X|X|
+|Japan|X|X|
+|Malaysia|X|X|
+|Mexico|X|X|
+|Netherlands|X|X|
+|New Zealand|X|X|
+|Norway|X|X|
+|Philippines|X|X|
+|Poland|X|X|
+|Portugal|X|X|
+|Romania|X|X|
+|Russia| |X|
+|Singapore|X|X|
+|Slovakia|X|X|
+|South Africa|X|X|
+|Spain|X|X|
+|Sweden|X|X|
+|Switzerland (French, German)|X|X|
+|Taiwan| |X|
+|Thailand|X|X|
+|Turkey|X|X|
+|Ukraine| |X|
+|United Kingdom|X|X|
+|United States|X|X|
+|Vietnam|X|X|
+  
+## <a href="" id="isv-wsfb"></a>ISVs and the Store for Business
+
+
+Developers in your organization, or ISVs can create content specific to your organization. In the Store for Business, we call these app line-of-business (LOB) apps, and the devs that create them are LOB publishers. The process looks like this:
+
+-   Admin invites devs to be LOB publishers for your organization. These devs can be internal devs, or external ISVs.
+
+-   LOB publishers accept the invitation, develop apps, and submits the app to the Windows Dev Center. LOB publishers use Enterprise associations when submitting the app to make the app exclusive to your organization.
+
+-   Admin adds the app to Store for Business inventory.
+
+Once the app is in inventory, admins can choose how to distribute the app. ISVs creating apps through the dev center can make their apps available in the Store for Business. ISVs can opt-in their apps to make them available for offline licensing. Apps purchased in the Store for Business will work only on Windows 10.
+
+For more information on line-of-business apps, see [Working with Line-of-Business apps](../manage/working-with-line-of-business-apps.md).

windows/plan/windows-10-servicing-options.md

@@ -72,6 +72,7 @@ Windows 10 enables organizations to fulfill the desire to provide users with the
 
 ## Related topics
 
+[Windows 10 release information](https://technet.microsoft.com/windows/release-info)<BR>
 [Windows 10 deployment considerations](windows-10-deployment-considerations.md)<BR>
 [Windows 10 compatibility](windows-10-compatibility.md)<BR>
 [Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md)

windows/whats-new/whats-new-windows-10-version-1507-and-1511.md

@@ -298,6 +298,14 @@ A standard, customized Start layout can be useful on devices that are common to
 
 Administrators can also use mobile device management (MDM) or Group Policy to disable the use of [Windows Spotlight on the lock screen](../manage/windows-spotlight.md).
 
+### Windows Store for Business
+**New in Windows 10, version 1511**
+
+With the Windows Store for Business, organizations can make volume purchases of Windows apps. The Store for Business provides app purchases based on organizational identity, flexible distribution options, and the ability to reclaim or re-use licenses. Organizations can also use the Store for Business to create a private store for their employees that includes apps from the Store, as well private Line-of-Business (LOB) apps. 
+
+For more information, see [Windows Store for Business overview](../manage/windows-store-for-business-overview.md).
+
+
 ## Updates
 
 Windows Update for Business enables information technology administrators to keep the Windows 10-based devices in their organization always up to date with the latest security defenses and Windows features by directly connecting these systems to Microsoft’s Windows Update service.

windows/whats-new/whats-new-windows-10-version-1607.md

@@ -20,7 +20,7 @@ Below is a list of some of the new and updated features in Windows 10, version 1
 
 ### Windows Imaging and Configuration Designer (ICD)
 
-In previous versions of the Windows 10 ADK, you had to install additional features for Windows ICD to run. Starting in version 1607, you can install Windows ICD without other ADK features. [Install the ADK.](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit)
+In previous versions of the Windows 10 Assessment and Deployment Kit (ADK), you had to install additional features for Windows ICD to run. Starting in version 1607, you can install Windows ICD without other ADK features. [Install the ADK.](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit)
 
 Windows ICD now includes simplified workflows for creating provisioning packages:
 
@@ -43,8 +43,8 @@ When Windows 10 first shipped, it included Microsoft Passport and Windows Hello,
 Additional changes for Windows Hello in Windows 10, version 1607:
 
 - Personal (Microsoft account) and corporate (Active Directory or Azure AD) accounts use a single container for keys. 
-- Group Policy for managing Windows Hello for Business are now available for both **User Configuration** and **Computer Configuration**. 
+- Group Policy settings for managing Windows Hello for Business are now available for both **User Configuration** and **Computer Configuration**. 
-- Users can use Windows Phone with Windows Hello to sign in to a PC, connect to VPN, and sign in to Office 365 in a browser.
+<!--- Users can use Windows Phone with Windows Hello to sign in to a PC, connect to VPN, and sign in to Office 365 in a browser.-->
 
 [Learn more about Windows Hello for Business.](../keep-secure/manage-identity-verification-using-microsoft-passport.md)
 

windows/whats-new/windows-store-for-business-overview.md

@@ -6,281 +6,6 @@ ms.prod: w10
 ms.pagetype: store, mobile
 ms.mktglfcycl: manage
 ms.sitesec: library
+redirect_url: https://technet.microsoft.com/itpro/windows/manage/windows-store-for-business-overview
 author: TrudyHa
 ---
-
-# Windows Store for Business overview
-
-
-**Applies to**
-
--   Windows 10
--   Windows 10 Mobile
-
-With the new Windows Store for Business, organizations can make volume purchases of Windows apps. The Store for Business provides app purchases based on organizational identity, flexible distribution options, and the ability to reclaim or re-use licenses. Organizations can also use the Store for Business to create a private store for their employees that includes apps from the Store, as well private Line-of-Business (LOB) apps.
-
-## Features
-
-
-Organizations of any size can benefit from using the Store for Business provides:
-
--   **Scales to fit the size of your business** - For smaller businesses, with Azure AD accounts and Windows 10 devices, you can quickly have an end-to-end process for acquiring and distributing content using the Store for Business. For larger businesses, all the capabilities of the Store for Businessare available to you, or you can integrate the Store for Businesswith management tools, for greater control over access to apps and app updates. You can use existing work or school accounts.
-
--   **Bulk app acquisition** - Acquire apps in volume from the Store for Business.
-
--   **Private store** - Curate a private store for your business that’s easily available from any Windows 10 device.
-
--   **Flexible distribution options** - Flexible options for distributing content and apps to your employee devices:
-
-    -   Distribute through Store for Business 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.
-
-    -   Offline licensing model allows you to distribute apps without connecting to Store services, and for managing images.
-
--   **Line-of-business apps** - Privately add and distribute your internal line-of-business apps using any of the distribution options.
-
--   **App license management**: Admins can reclaim and reuse app licenses. Online and offline licenses allow you to customize how you decide to deploy apps.
-
--   **Up-to-date apps** - The Store for Business manages the update process for apps with online licenses. Apps are automatically updated so you are always current with the most recent software updates and product features. Store for Business apps also uninstall cleanly, without leaving behind extra files, for times when you need to switch apps for specific employees.
-
-## Prerequisites
-
-
-You'll need this software to work with the Store for Business.
-
-### Required
-
--   IT Pros that are administering Store for Business need a browser compatible with Store for Business running on a PC or mobile device. Supported browsers include: Internet Explorer 10 or later, Microsoft Edge, or current versions of Chrome or Firefox.
-
--   Employees using apps from Store for Business need Windows 10, version 1511 running on a PC or mobile device.
-
-Microsoft Azure Active Directory (AD) accounts for your employees:
-
--   Admins need Azure AD accounts to sign up for the Store for Business, and then to sign in, get apps, distribute apps, and manage app licenses.
-
--   Employees need Azure AD account when they access Store for Business content from Windows devices.
-
--   If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account
-
--   For offline-licensed apps, Azure AD accounts are not required for employees.
-
-For more information on Azure AD, see [About Office 365 and Azure Active Directory](http://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](http://go.microsoft.com/fwlink/p/?LinkId=708611).
-
-### Optional
-
-While not required, you can use a management tool to distribute and manage apps. Using a management tool allows you to distribute content, scope app availability, and control when app updates are installed. This might make sense for larger organizations that already use a management tool. A couple of things to note about management tools:
-
--   Need to integrate with Windows 10 management framework and Azure AD.
-
--   Need to sync with the Store for Business inventory to distribute apps.
-
-## How does the Store for Business work?
-
-
-### Sign up!
-
-The first step for getting your organization started with the Store for Business is signing up. To sign up for the Business store, you need an Azure AD account and you must be a Global Administrator for your organization.
-
-For more information, see [Sign up for the Store for Business](../manage/sign-up-windows-store-for-business.md).
-
-### Set up
-
-After your admin signs up for the Store for Business, they can assign roles to other employees in your company. The admin needs Azure AD User Admin permissions to assign WSFB roles. These are the roles and their permissions.
-
-<table>
-<colgroup>
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-<col width="20%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th align="left">Permission</th>
-<th align="left">Account settings</th>
-<th align="left">Acquire apps</th>
-<th align="left">Distribute apps</th>
-<th align="left">Device Guard signing</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left"><p>Admin</p></td>
-<td align="left"><p>X</p></td>
-<td align="left"><p>X</p></td>
-<td align="left"><p>X</p></td>
-<td align="left"></td>
-</tr>
-<tr class="even">
-<td align="left"><p>Purchaser</p></td>
-<td align="left"></td>
-<td align="left"><p>X</p></td>
-<td align="left"><p>X</p></td>
-<td align="left"></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>Device Guard signer</p></td>
-<td align="left"></td>
-<td align="left"></td>
-<td align="left"></td>
-<td align="left"><p>X</p></td>
-</tr>
-</tbody>
-</table>
-
- 
-
-In some cases, admins will need to add Azure Active Directory (AD) accounts for their employees. For more information, see [Manage user accounts and groups](../manage/manage-users-and-groups-windows-store-for-business.md).
-
-Also, if your organization plans to use a management tool, you’ll need to configure your management tool to sync with the Store for Business.
-
-### Get apps and content
-
-Once signed in to the Store for Business, you can browse and search for all products in the Store for Business catalog. Some apps are free, and some apps charge a price. We're continuing to add more paid apps to the Store for Business. Check back if you don't see the app that you're looking for. Currently, you can pay for apps with a credit card. We'll be adding more payment options over time. 
-
-**App types** -- These app types are supported in the Store for Business:
-
--   Universal Windows Platform apps
-
--   Universal Windows apps, by device: Phone, Surface Hub, IOT devices , HoloLens
-
-Apps purchased from the Store for Business only work on Windows 10 devices.
-
-Line-of-business (LOB) apps are also supported via the Business store. You can invite IT developers or ISVs to be LOB publishers for your organization. This allows them to submit apps via the developer center that are only available to your organization. These apps can be distributed using the distribution methods discussed in this topic. For more information, see Working with Line-of-Business apps.
-
-**App licensing model**
-
-The Business store supports two options to license apps: online and offline. **Online** licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require users and devices to connect to the Store for Business service to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center.
-
-For more information, see [Apps in the Store for Business](../manage/apps-in-windows-store-for-business.md#licensing-model).
-
-### Distribute apps and content
-
-App distribution is handled through two channels, either through the Store for Business, or using a management tool. You can use either or both distribution methods in your organization.
-
-**Using the Store for Business** – Distribution options for the Store for Business:
-
--   Email link – After purchasing an app, admins can send employees a link in an email message. Employees can click the link to install the app.
-
--   Curate private store for all employees – A private store can include content you’ve purchased from the Store, and your line-of-business apps that you’ve submitted to the Store for Business. Apps in your private store are available to all of your employees. They can browse the private store and install apps when needed.
-
--   To use the options above users must be signed in with an Azure AD account on a Windows 10 device.
-
-**Using a management tool** – For larger organizations that might want a greater level of control over how apps are distributed and managed, a management tools provides other distribution options:
-
--   Scoped content distribution – Ability to scope content distribution to specific groups of employees.
-
--   Install apps for employees – Employees are not responsible for installing apps. Management tool installs apps for employees.
-
-Management tools can synchronize content that has been acquired in the Store for Business. If an offline application has been purchased this will also include the app package, license and metadata for the app (like, icons, count, or localized product descriptions). Using the metadata, management tools can enable portals or apps as a destination for employees to acquire apps.
-
-For more information, see [Distribute apps to your employees from the Store for Business](../manage/distribute-apps-to-your-employees-windows-store-for-business.md).
-
-### Manage Store for Business settings and content
-
-Once you are signed up with the Business store and have purchased apps, Admins can manage Store for Business settings and inventory.
-
-**Manage Store for Business settings**
-
--   Assign and change roles for employees or groups
-
--   Device Guard signing
-
--   Register a management server to deploy and install content
-
--   Manage relationships with LOB publishers
-
--   Manage offline licenses
-
--   Update the name of your private store
-
-**Manage inventory**
-
--   Assign app licenses to employees
-
--   Reclaim and reassign app licenses
-
--   Manage app updates for all apps, or customize updates for each app. Online apps will automatically update from the Store. Offline apps can be updated using a management server.
-
--   Download apps for offline installs
-
-For more information, see [Manage settings in the Store for Business](../manage/manage-settings-windows-store-for-business.md) and [Manage apps](../manage/manage-apps-windows-store-for-business-overview.md).
-
-## Supported markets
-
-
-Store for Business is currently available in these markets.
-
-|Country or locale|Paid apps|Free apps|
-|-----------------|---------|---------|
-|Argentina|X|X|
-|Australia|X|X|
-|Austria|X|X|
-|Belgium (Dutch, French)|X|X|
-|Brazil| |X|
-|Canada (English, French)|X|X|
-|Chile|X|X|
-|Columbia|X|X|
-|Croatia|X|X|
-|Czech Republic|X|X|
-|Denmark|X|X|
-|Finland|X|X|
-|France|X|X|
-|Germany|X|X|
-|Greece|X|X|
-|Hong Kong SAR|X|X|
-|Hungary|X|X|
-|India| |X|
-|Indonesia|X|X|
-|Ireland|X|X|
-|Italy|X|X|
-|Japan|X|X|
-|Malaysia|X|X|
-|Mexico|X|X|
-|Netherlands|X|X|
-|New Zealand|X|X|
-|Norway|X|X|
-|Philippines|X|X|
-|Poland|X|X|
-|Portugal|X|X|
-|Romania|X|X|
-|Russia| |X|
-|Singapore|X|X|
-|Slovakia|X|X|
-|South Africa|X|X|
-|Spain|X|X|
-|Sweden|X|X|
-|Switzerland (French, German)|X|X|
-|Taiwan| |X|
-|Thailand|X|X|
-|Turkey|X|X|
-|Ukraine| |X|
-|United Kingdom|X|X|
-|United States|X|X|
-|Vietnam|X|X|
-  
-## <a href="" id="isv-wsfb"></a>ISVs and the Store for Business
-
-
-Developers in your organization, or ISVs can create content specific to your organization. In the Store for Business, we call these app line-of-business (LOB) apps, and the devs that create them are LOB publishers. The process looks like this:
-
--   Admin invites devs to be LOB publishers for your organization. These devs can be internal devs, or external ISVs.
-
--   LOB publishers accept the invitation, develop apps, and submits the app to the Windows Dev Center. LOB publishers use Enterprise associations when submitting the app to make the app exclusive to your organization.
-
--   Admin adds the app to Store for Business inventory.
-
-Once the app is in inventory, admins can choose how to distribute the app. ISVs creating apps through the dev center can make their apps available in the Store for Business. ISVs can opt-in their apps to make them available for offline licensing. Apps purchased in the Store for Business will work only on Windows 10.
-
-For more information on line-of-business apps, see [Working with Line-of-Business apps](../manage/working-with-line-of-business-apps.md).
-
- 
-
- 
-
-
-
-
-