Merged PR 1977: Merge master to live

2025-05-20 17:27:23 +00:00 · 2017-06-28 17:11:23 +00:00 · 2017-06-28 17:11:23 +00:00 · 74f7d21655
commit 74f7d21655
parent b450713685 e7d0780b9f
6 changed files with 51 additions and 190 deletions
--- a/devices/surface/microsoft-surface-data-eraser.md
+++ b/devices/surface/microsoft-surface-data-eraser.md
@ -23,6 +23,12 @@ Find out how the Microsoft Surface Data Eraser tool can help you securely wipe d
 Compatible Surface devices include:
 - Surface Studio
 - Surface Pro
 - Surface Laptop
 - Surface Book
 - Surface Pro 4
@ -35,6 +41,9 @@ Compatible Surface devices include:
 - Surface Pro 2
 >[!NOTE]
 >Surface Pro devices with 1 TB storage are not currently supported by Microsoft Surface Data Eraser.
 Some scenarios where Microsoft Surface Data Eraser can be helpful include:
 -   Prepare a Surface device to be sent for repair
@ -137,7 +146,20 @@ After you create a Microsoft Surface Data Eraser USB stick, you can boot a suppo
 8.  Click the **Yes** button to continue erasing data on the Surface device.
- 
+## Changes and updates
 Microsoft Surface Data Eraser is periodically updated by Microsoft. For information about the changes provided in each new version, see the following:
 ### Version 3.2.36
 This version of Microsoft Surface Data Eraser adds support for the following:
 - Surface Pro
 - Surface Laptop
 >[!NOTE]
 >The Microsoft Surface Data Eraser USB drive creation tool is unable to run on Windows 10 S. To wipe a Surface Laptop running Windows 10 S, you must first create the Microsoft Surface Data Eraser USB drive on another computer with Windows 10 Pro or Windows 10 Enterprise.
--- a/store-for-business/windows-store-for-business-overview.md
+++ b/store-for-business/windows-store-for-business-overview.md
@ -157,7 +157,8 @@ For more information, see [Manage settings in the Store for Business](manage-set
 Microsoft Store for Business and Education is currently available in these markets.
-<!--- <table>
+### Support for free and paid apps
 <table>
   <tr>
        <th align="center" colspan="4">Support for free and paid apps</th>
   </tr>
@ -302,185 +303,6 @@ Microsoft Store for Business and Education is currently available in these marke
   </tr>
 </table>
 <table>
   <tr>
        <th align="center">Support for free apps only</th>
   </tr>
   <tr align="left">
     <td>
        <ul>
            <li>Russia</li>
        </ul>
    </td>
   </tr>
 </table>
 <table>
   <tr>
        <th align="center">Support for free apps and Minecraft: Education Edition</th>
   </tr>
   <tr align="left">
     <td>
        <ul>
            <li>Albania</li>
            <li>Armenia</li>
            <li>Azerbaijan</li>
            <li>Belarus</li>
            <li>Bosnia</li>
            <li>Brazil</li>
            <li>Georgia</li>
            <li>India</li>
            <li>Kazakhstan</li>
            <li>Korea</li>
            <li>Kyrgyzstan</li>
            <li>Moldova</li>
            <li>Taiwan</li>
            <li>Tajikistan</li>
            <li>Turkmenistan</li>
            <li>Ukraine</li>
            <li>Uzbekistan</li>
        </ul>
    </td>
   </tr>
 </table> -->
 ### Support for free and paid apps
 <table>
   <tr>
        <th align="center" colspan="4">Support for free and paid apps</th>
   </tr>
   <tr align="left">
     <td>
        <ul>
            <li>Algeria</li>
            <li>Angola</li>
            <li>Argentina</li>
            <li>Australia</li>
            <li>Austria</li>
            <li>Bahamas</li>
            <li>Bahrain</li>
            <li>Bangladesh</li>
            <li>Barbados</li>
            <li>Belgium</li>
            <li>Belize</li>
            <li>Bermuda</li>
            <li>Bolivia</li>
            <li>Botswana</li>
            <li>Brunei Darussalam</li>
            <li>Bulgaria</li>
            <li>Cameroon</li>
            <li>Canada</li>
            <li>Republic of Cabo Verde</li>
            <li>Cayman Islands</li>
            <li>Chile</li>
            <li>Colombia</li>
            <li>Costa Rica</li>
            <li>C&ocirc;te D'ivoire</li>
            <li>Croatia</li>
            <li>Cur&ccedil;ao</li>
            <li>Cyprus</li>
            <li>Czech Republic</li>
            <li>Denmark</li>
        </ul>
    </td>
     <td>
        <ul>
            <li>Dominican Republic</li>
            <li>Ecuador</li>
            <li>Egypt</li>
            <li>El Salvador</li>
            <li>Estonia</li>
            <li>Faroe Islands</li>
            <li>Fiji</li>
            <li>Finland</li>
            <li>France</li>
            <li>Germany</li>
            <li>Ghana</li>
            <li>Greece</li>
            <li>Guatemala</li>
            <li>Honduras</li>
            <li>Hong Kong SAR</li>
            <li>Hungary</li>
            <li>Iceland</li>
            <li>Indonesia</li>
            <li>Iraq</li>
            <li>Ireland</li>
            <li>Israel</li>
            <li>Italy</li>
            <li>Jamaica</li>
            <li>Japan</li>
            <li>Jordan</li>
            <li>Kenya</li>
            <li>Kuwait</li>
            <li>Latvia</li>
            <li>Lebanon</li>
        </ul>
    </td>
    <td>
        <ul>
            <li>Libya</li>
            <li>Liechtenstein</li>
            <li>Lithuania</li>
            <li>Luxembourg</li>
            <li>Malaysia</li>
            <li>Malta</li>
            <li>Mauritius</li>
            <li>Mexico</li>
            <li>Mongolia</li>
            <li>Montenegro</li>
            <li>Morocco</li>
            <li>Namibia</li>
            <li>Netherlands</li>
            <li>New Zealand</li>
            <li>Nicaragua</li>
            <li>Nigeria</li>
            <li>Norway</li>
            <li>Oman</li>
            <li>Pakistan</li>
            <li>Palestinian Authority</li>
            <li>Panama</li>
            <li>Paraguay</li>
            <li>Peru</li>
            <li>Philippines</li>
            <li>Poland</li>
            <li>Portugal</li>
            <li>Puerto Rico</li>
            <li>Qatar</li>
            <li>Romania</li>          
        </ul>
    </td>
    <td>
        <ul>
            <li>Rwanda</li>
            <li>Saint Kitts and Nevis</li>
            <li>Saudi Arabia</li>
            <li>Senegal</li>
            <li>Serbia</li>
            <li>Singapore</li>
            <li>Slovakia</li>
            <li>Slovenia</li>
            <li>South Africa</li>
            <li>Spain</li>
            <li>Sweden</li>
            <li>Switzerland</li>
            <li>Tanzania</li>
            <li>Thailand</li>
            <li>Trinidad and Tobago</li>
            <li>Tunisia</li>
            <li>Turkey</li>
            <li>Uganda</li>
            <li>United Arab Emirates</li>
            <li>United Kingdom</li>
            <li>United States</li>
            <li>Uruguay</li>
            <li>Vietnam</li>
            <li>Virgin Islands, U.S.</li>
            <li>Zambia</li>
            <li>Zimbabwe<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</li>           
        </ul>
    </td>
   </tr>
 </table>
 ### Support for free apps
 Customers in these markets can use Microsoft Store for Business and Education to acquire free apps:
 - India
@ -489,11 +311,17 @@ Customers in these markets can use Microsoft Store for Business and Education to
 ### Support for free apps and Minecraft: Education Edition
 Customers in these markets can use Microsoft Store for Business and Education to acquire free apps and Minecraft: Education Edition:  
 - Albania
 - Aremenia
 - Azerbaijan
 - Belarus
 - Bosnia
 - Brazil
 - Georgia
 - Kazakhstan
 - Korea
 - Republic of Moldova
 - Taiwan
 - Tajikistan
 - Ukraine 
 This table summarize what customers can purchase, depending on which Microsoft Store they are using. 
--- a/windows/client-management/mdm/configuration-service-provider-reference.md
+++ b/windows/client-management/mdm/configuration-service-provider-reference.md
@ -7,7 +7,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 06/19/2017
+ms.date: 06/27/2017
 ---
 # Configuration service provider reference
@ -26,6 +26,10 @@ Additional lists:
 - [List of CSPs supported in Windows 10 S](#windows10s)
 The following tables show the configuration service providers support in Windows 10.  
 Footnotes: 
 - 1 - Added in Windows 10, version 1607
 - 2 - Added in Windows 10, version 1703
 - 3 - Added in Windows 10, version 1709
 <!--StartCSPs-->
 <hr/>
@ -836,8 +840,8 @@ The following tables show the configuration service providers support in Windows
 	<td><img src="images/crossmark.png" alt="cross mark" /></td>
 	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>
 	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>
-	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
-	<td><img src="images/checkmark.png" alt="check mark" /><sup>2</sup></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
 </tr>
 </table>
--- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
@ -10,7 +10,7 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 06/19/2017
+ms.date: 06/27/2017
 ---
 # What's new in MDM enrollment and management
@ -1257,6 +1257,10 @@ Also Added [Firewall DDF file](firewall-ddf-file.md).</td></tr>
 <li>DeviceTagging/Criticality</li>
 </ul>
 </td></tr>
 <tr class="even">
 <td style="vertical-align:top">[DynamicManagement CSP](dynamicmanagement-csp.md)</td>
 <td style="vertical-align:top">The DynamicManagement CSP is not supported in Windows 10 Mobile and Mobile Enterprise. The table of SKU information in the [Configuration service provider reference](configuration-service-provider-reference.md) was updated.</td>
 </tr>
 </tbody>
 </table>
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@ -1781,12 +1781,15 @@ ADMX Info:
 <!--StartDescription-->
 <p style="margin-left: 20px">Specifies the BitLocker Drive Encryption method and cipher strength.
 > [!NOTE]
 > XTS-AES 128-bit and XTS-AES 256-bit values are only supported on Windows 10 for desktop.
 <p style="margin-left: 20px">The following list shows the supported values:
-   3- AES 128-bit
+-   3 - AES-CBC 128-bit
-   4- AES 256
+-   4 - AES-CBC 256-bit
-   6 -XTS 128
+-   6 - XTS-AES 128-bit (Desktop only)
-   7 - XTS 256
+-   7 - XTS-AES 256-bit (Desktop only)
 <!--EndDescription-->
 <!--EndPolicy-->
--- a/windows/device-security/tpm/tpm-recommendations.md
+++ b/windows/device-security/tpm/tpm-recommendations.md
@ -84,7 +84,7 @@ For end consumers, TPM is behind the scenes but is still very relevant. TPM is u
 ### Windows 10 for desktop editions (Home, Pro, Enterprise, and Education)
-   Since July 28, 2016, all new device models, lines or series (or if you are updating the hardware configuration of a existing model, line or series with a major update, such as CPU, graphic cards) must implement and enable by default TPM 2.0 (details in section 3.7 of the [Minimum hardware requirements](https://msdn.microsoft.com/library/windows/hardware/dn915086(v=vs.85).aspx) page).
+-   Since July 28, 2016, all new device models, lines or series (or if you are updating the hardware configuration of a existing model, line or series with a major update, such as CPU, graphic cards) must implement and enable by default TPM 2.0 (details in section 3.7 of the [Minimum hardware requirements](https://msdn.microsoft.com/library/windows/hardware/dn91508.aspx) page). The requirement to enable TPM 2.0 only applies to the manufacturing of new devices. For TPM recommendations for specific Windows features, see [TPM and Windows Features](#tpm-and-windows-features).
 ### IoT Core