Merged PR 2806: Merge maricia-12040373 to master

windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md

@@ -974,6 +974,13 @@ For details about Microsoft mobile device management protocols for Windows 10 s
 </ul>
 </td></tr>
 <tr class="odd">
+<td style="vertical-align:top">[Office CSP](office-csp.md)</td>
+<td style="vertical-align:top"><p>Added the following setting in Windows 10, version 1709:</p>
+<ul>
+<li>Installation/CurrentStatus</li>
+</ul>
+</td></tr>
+<tr class="odd">
 <td style="vertical-align:top">[Policy CSP](policy-configuration-service-provider.md)</td>
 <td style="vertical-align:top"><p>Added the following new policies for Windows 10, version 1709:</p> 
 <ul>
@@ -1367,6 +1374,13 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
 </ul>
 </td></tr>
 <tr class="odd">
+<td style="vertical-align:top">[Office CSP](office-csp.md)</td>
+<td style="vertical-align:top"><p>Added the following setting in Windows 10, version 1709:</p>
+<ul>
+<li>Installation/CurrentStatus</li>
+</ul>
+</td></tr>
+<tr class="odd">
 <td style="vertical-align:top">[BitLocker CSP](bitlocker-csp.md)</td>
 <td style="vertical-align:top">Added information to the ADMX-backed policies.
 </td></tr>

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

@@ -6,11 +6,14 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 06/19/2017
+ms.date: 08/22/2017
 ---
 
 # Office 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.
+
 The Office configuration service provider (CSP) enables a Microsoft Office client to be installed on a device via the Office Deployment Tool. For more information, see [Configuration options for the Office Deployment Tool](https://technet.microsoft.com/en-us/library/jj219426.aspx). 
 This CSP was added in Windows 10, version 1703.
 
@@ -38,7 +41,7 @@ The following diagram shows the Office configuration service provider in tree fo
 
 <a href="" id="install"></a>**Install**  
 
-<p style="margin-left: 20px">Installs office by using the XML data specified in the configuration.xml file. 
+<p style="margin-left: 20px">Installs Office by using the XML data specified in the configuration.xml file. 
 
 <p style="margin-left: 20px">The supported operations are Get and Execute.
 
@@ -48,13 +51,18 @@ The following diagram shows the Office configuration service provider in tree fo
 
 <p style="margin-left: 20px">The only supported operation is Get.
 
+<a href="" id="currentstatus"></a>**CurrentStatus** 
+
+<p style="margin-left: 20px">Returns an XML of current Office 365 installation status on the device.
+
+<p style="margin-left: 20px">The only supported operation is Get.
 
 ## Examples
 
 Sample SyncML to install Office 365 Business Retail from current channel.
 
 ```syntax
-<SyncML xmlns="SYNCML:SYNCML1.1">
+<SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Exec>
       <CmdID>7</CmdID>
@@ -76,7 +84,7 @@ Sample SyncML to install Office 365 Business Retail from current channel.
 To uninstall the Office 365 from the system:
 
 ```syntax
-<SyncML xmlns="SYNCML:SYNCML1.1">
+<SyncML xmlns="SYNCML:SYNCML1.2">
   <SyncBody>
     <Exec>
       <CmdID>7</CmdID>
@@ -95,6 +103,24 @@ To uninstall the Office 365 from the system:
 </SyncML>
 ```
 
+To get the current status of Office 365 on the device.
+
+``` syntax
+<SyncML xmlns="SYNCML:SYNCML1.2">
+  <SyncBody>
+    <Get>
+      <CmdID>7</CmdID>
+        <Item>
+          <Target>
+            <LocURI>./Vendor/MSFT/Office/Installation/CurrentStatus</LocURI>
+          </Target>
+        </Item>
+    </Get>
+    <Final/>
+  </SyncBody>
+</SyncML>
+```
+
 ## Status code
 
 <table>

windows/client-management/mdm/office-ddf.md

@@ -7,11 +7,14 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 06/19/2017
+ms.date: 08/22/2017
 ---
 
 # Office DDF
 
+> [!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.
+
 This topic shows the OMA DM device description framework (DDF) for the **Office** configuration service provider. DDF files are used only with OMA DM provisioning XML.
 
 You can download the DDF files from the links below:
@@ -19,7 +22,7 @@ You can download the DDF files from the links below:
 - [Download all the DDF files for Windows 10, version 1703](http://download.microsoft.com/download/C/7/C/C7C94663-44CF-4221-ABCA-BC895F42B6C2/Windows10_1703_DDF_download.zip)
 - [Download all the DDF files for Windows 10, version 1607](http://download.microsoft.com/download/2/3/E/23E27D6B-6E23-4833-B143-915EDA3BDD44/Windows10_1607_DDF.zip)
 
-The XML below is the current version for this CSP.
+The XML below is for Windows 10, version 1709.
 
 ``` syntax
 <?xml version="1.0" encoding="UTF-8"?>
@@ -30,12 +33,12 @@ The XML below is the current version for this CSP.
   <VerDTD>1.2</VerDTD>
       <Node>
         <NodeName>Office</NodeName>
-        <Path>./Vendor/MSFT</Path>
+        <Path>./User/Vendor/MSFT</Path>
         <DFProperties>
           <AccessType>
             <Get />
           </AccessType>
-          <Description>Root of the office CSP.</Description>
+          <Description>Root of the Office CSP.</Description>
           <DFFormat>
             <node />
           </DFFormat>
@@ -46,7 +49,7 @@ The XML below is the current version for this CSP.
             <Permanent />
           </Scope>
           <DFType>
-            <MIME>com.microsoft/1.0/MDM/Office</MIME>
+            <MIME>com.microsoft/1.3/MDM/Office</MIME>
           </DFType>
         </DFProperties>
         <Node>
@@ -55,7 +58,7 @@ The XML below is the current version for this CSP.
             <AccessType>
               <Get />
             </AccessType>
-            <Description>Installation options for the office CSP.</Description>
+            <Description>Installation options for the Office CSP.</Description>
             <DFFormat>
               <node />
             </DFFormat>
@@ -100,7 +103,7 @@ The XML below is the current version for this CSP.
                   <Exec />
                   <Get />
                 </AccessType>
-                <Description>The install action will install office given the configuration in the data.  The string data is the xml configuration to use in order to install office.</Description>
+                <Description>The install action will install Office given the configuration in the data.  The string data is the xml configuration to use in order to install Office.</Description>
                 <DFFormat>
                   <chr />
                 </DFFormat>
@@ -137,6 +140,27 @@ The XML below is the current version for this CSP.
               </DFProperties>
             </Node>
           </Node>
+          <Node>
+            <NodeName>CurrentStatus</NodeName>
+            <DFProperties>
+              <AccessType>
+                <Get />
+              </AccessType>
+              <Description>The current Office 365 installation status on the machine</Description>
+              <DFFormat>
+                <xml />
+              </DFFormat>
+              <Occurrence>
+                <One />
+              </Occurrence>
+              <Scope>
+                <Permanent />
+              </Scope>
+              <DFType>
+                <MIME>text/plain</MIME>
+              </DFType>
+            </DFProperties>
+          </Node>
         </Node>
       </Node>
       <Node>
@@ -156,7 +180,7 @@ The XML below is the current version for this CSP.
             <Permanent />
           </Scope>
           <DFType>
-            <DDFName></DDFName>
+            <MIME>com.microsoft/1.3/MDM/Office</MIME>
           </DFType>
         </DFProperties>
         <Node>
@@ -243,6 +267,27 @@ The XML below is the current version for this CSP.
               </DFProperties>
             </Node>
           </Node>
+          <Node>
+            <NodeName>CurrentStatus</NodeName>
+            <DFProperties>
+              <AccessType>
+                <Get />
+              </AccessType>
+              <Description>The current Office 365 installation status on the machine</Description>
+              <DFFormat>
+                <xml />
+              </DFFormat>
+              <Occurrence>
+                <One />
+              </Occurrence>
+              <Scope>
+                <Permanent />
+              </Scope>
+              <DFType>
+                <MIME>text/plain</MIME>
+              </DFType>
+            </DFProperties>
+          </Node>
         </Node>
       </Node>
 </MgmtTree>