Merge branch 'master' of https://github.com/microsoftdocs/windows-itpro-docs

browsers/internet-explorer/ie11-ieak/licensing-version-and-features-ieak11.md

@@ -26,7 +26,7 @@ During installation, you must pick a version of IEAK 11, either **External** or
 ## Available features by version
 
 | Feature | Internal | External |
-| ---------------------------------------- | --------------------------------------------- | ---------------------------------------------- |
+| ---------------------------------------- | :---------------------------------------------: | :----------------------------------------------: |
 |Welcome screen                            | ![Available](https://docs.microsoft.com/en-us/microsoft-edge/deploy/images/148767.png)    | ![Available](https://docs.microsoft.com/en-us/microsoft-edge/deploy/images/148767.png)     |
 |File locations                            | ![Available](https://docs.microsoft.com/en-us/microsoft-edge/deploy/images/148767.png)    | ![Available](https://docs.microsoft.com/en-us/microsoft-edge/deploy/images/148767.png)     |
 |Platform selection                        | ![Available](https://docs.microsoft.com/en-us/microsoft-edge/deploy/images/148767.png)    | ![Available](https://docs.microsoft.com/en-us/microsoft-edge/deploy/images/148767.png)     |

devices/surface/surface-enterprise-management-mode.md

@@ -191,6 +191,11 @@ For use with SEMM and Microsoft Surface UEFI Configurator, the certificate must
 
 ## Version History
 
+
+### Version 2.21.136.9
+* Add support to Surface Pro 6
+* Add support to Surface Laptop 2
+
 ### Version 2.14.136.0
 * Add support to Surface Go
 

mdop/mbam-v25/mbam-25-supported-configurations.md

@@ -1,13 +1,13 @@
 ---
 title: MBAM 2.5 Supported Configurations
 description: MBAM 2.5 Supported Configurations
-author: jamiejdt
+author: shortpatti
 ms.assetid: ce689aff-9a55-4ae7-a968-23c7bda9b4d6
 ms.pagetype: mdop, security
 ms.mktglfcycl: manage
 ms.sitesec: library
 ms.prod: w10
-ms.date: 03/30/2017
+ms.date: 10/24/2018
 ---
 
 
@@ -581,6 +581,16 @@ The MBAM server can be deployed in Azure Infrastructure as a Service (IaaS) on a
 The MBAM client is not supported on virtual machines and is also not supported on Azure IaaS.
 
 
+## Service releases 
+
+- [April 2016 hotfix](https://support.microsoft.com/en-us/help/3144445/april-2016-hotfix-rollup-for-microsoft-desktop-optimization-pack)
+- [September 2016](https://support.microsoft.com/ms-my/help/3168628/september-2016-servicing-release-for-microsoft-desktop-optimization-pa)
+- [December 2016](https://support.microsoft.com/en-us/help/3198158/december-2016-servicing-release-for-microsoft-desktop-optimization-pac)
+- [March 2017](https://support.microsoft.com/en-ie/help/4014009/march-2017-servicing-release-for-microsoft-desktop-optimization-pack) 
+- [June 2017](https://support.microsoft.com/af-za/help/4018510/june-2017-servicing-release-for-microsoft-desktop-optimization-pack)
+- [September 2017](https://support.microsoft.com/en-ie/help/4041137/september-2017-servicing-release-for-microsoft-desktop-optimization)
+- [March 2018](https://support.microsoft.com/en-us/help/4074878/march-2018-servicing-release-for-microsoft-desktop-optimization-pack)
+- [July 2018](https://support.microsoft.com/en-us/help/4340040/july-2018-servicing-release-for-microsoft-desktop-optimization-pack)
 
 ## Related topics
 

windows/client-management/mdm/reboot-csp.md

@@ -36,12 +36,14 @@ The following diagram shows the Reboot configuration service provider management
 <p style="margin-left: 20px">The supported operation is Get.</p>
 
 <a href="" id="schedule-single"></a>**Schedule/Single**  
-<p style="margin-left: 20px">This node will execute a reboot at a scheduled date and time. Setting a null (empty) date will delete the existing schedule. The date and time value is ISO8601, and both the date and time are required. For example: 2015-12-15T07:36:25Z</p>
+<p style="margin-left: 20px">This node will execute a reboot at a scheduled date and time. Setting a null (empty) date will delete the existing schedule. The date and time value is ISO8601, and both the date and time are required.  </br>
+Example to configure: 2018-10-25T18:00:00</p>
 
 <p style="margin-left: 20px">The supported operations are Get, Add, Replace, and Delete.</p>
 
 <a href="" id="schedule-dailyrecurrent"></a>**Schedule/DailyRecurrent**  
-<p style="margin-left: 20px">This node will execute a reboot each day at a scheduled time starting at the configured starting time and date. Setting a null (empty) date will delete the existing schedule. The date and time value is ISO8601, and both the date and time are required. The CSP will return the date time in the following format: 2018-06-29T10:00:00+01:00. </p>
+<p style="margin-left: 20px">This node will execute a reboot each day at a scheduled time starting at the configured starting time and date. Setting a null (empty) date will delete the existing schedule. The date and time value is ISO8601, and both the date and time are required. The CSP will return the date time in the following format: 2018-06-29T10:00:00+01:00.  </br>
+Example to configure: 2018-10-25T18:00:00</p>
 
 <p style="margin-left: 20px">The supported operations are Get, Add, Replace, and Delete.</p>
 

windows/client-management/mdm/wifi-csp.md

@@ -7,13 +7,13 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: MariciaAlforque
-ms.date: 06/28/2018
+ms.date: 10/24/2018
 ---
 
 # WiFi CSP
 
 > [!WARNING]
-> Some information relates to prereleased 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.
+> Some information relates to pre-released products, which may be substantially modified before it's commercially released. Microsoft makes no warranties, expressed or implied, concerning the information provided here.
 
 The WiFi configuration service provider provides the functionality to add or delete Wi-Fi networks on a Windows device. The configuration service provider accepts SyncML input and converts it to a network profile that is installed on the device. This profile enables the device to connect to the Wi-Fi network when it is in range.