Merge pull request #455 from MicrosoftDocs/FromPrivateRepo

From private repo

.openpublishing.publish.config.json

@@ -102,24 +102,6 @@
       "moniker_groups": [],
       "version": 0
     },
-    {
-      "docset_name": "microsoft-365",
-      "build_source_folder": "microsoft-365",
-      "build_output_subfolder": "microsoft-365",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": false,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "moniker_groups": [],
-      "version": 0
-    },
     {
       "docset_name": "microsoft-edge-VSTS",
       "build_source_folder": "browsers/edge",

.openpublishing.redirection.json

@@ -51,6 +51,11 @@
 "redirect_document_id": true
 },
 {
+"source_path": "windows/configuration/configure-windows-telemetry-in-your-organization.md",
+"redirect_url": "/windows/configuration/configure-windows-diagnostic-data-in-your-organization",
+"redirect_document_id": true
+},
+{
 "source_path": "windows/configuration/EventName.md",
 "redirect_url": "/windows/configuration/enhanced-telemetry-windows-analytics-events-and-fields",
 "redirect_document_id": true

microsoft-365/docfx.json

@@ -1,37 +0,0 @@
-{
-  "build": {
-    "content": [
-      {
-        "files": [
-          "**/*.md"
-        ],
-        "exclude": [
-          "**/obj/**",
-          "**/includes/**",
-          "README.md",
-          "LICENSE",
-          "LICENSE-CODE",
-          "ThirdPartyNotices"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "**/*.png",
-          "**/*.jpg"
-        ],
-        "exclude": [
-          "**/obj/**",
-          "**/includes/**"
-        ]
-      }
-    ],
-    "overwrite": [],
-    "externalReference": [],
-    "globalMetadata": {},
-    "fileMetadata": {},
-    "template": [],
-    "dest": "microsoft-365"
-  }
-}

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

@@ -7,12 +7,15 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 06/26/2017
+ms.date: 01/29/2018
 ---
 
 # Defender 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 Windows Defender configuration service provider is used to configure various Windows Defender actions across the enterprise.
 
 The following image shows the Windows Defender configuration service provider in tree format.
@@ -310,6 +313,11 @@ Node that can be used to perform signature updates for Windows Defender.
 
 Supported operations are Get and Execute.
 
+<a href="" id="offlinescan"></a>**OfflineScan**  
+Added in Windows 10, next major update. OfflineScan action starts a Windows Defender offline scan on the computer where you run the command. This command causes the computer reboot and start in Windows Defender offline mode to begin the scan.
+
+Supported operations are Get and Execute.
+
 ## Related topics
 
 

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

@@ -7,12 +7,15 @@ ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: nickbrower
-ms.date: 12/05/2017
+ms.date: 01/29/20178
 ---
 
 # Defender DDF file
 
 
+> [!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 **Defender** configuration service provider. DDF files are used only with OMA DM provisioning XML.
 
 Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download).
@@ -43,7 +46,7 @@ The XML below is the current version for this CSP.
             <Permanent />
           </Scope>
           <DFType>
-                <DDFName></DDFName>
+            <MIME>com.microsoft/1.1/MDM/Defender</MIME>
           </DFType>
         </DFProperties>
         <Node>
@@ -649,6 +652,27 @@ The XML below is the current version for this CSP.
             </DFType>
           </DFProperties>
         </Node>
+        <Node>
+          <NodeName>OfflineScan</NodeName>
+          <DFProperties>
+            <AccessType>
+              <Exec />
+              <Get />
+            </AccessType>
+            <DFFormat>
+              <chr />
+            </DFFormat>
+            <Occurrence>
+              <One />
+            </Occurrence>
+            <Scope>
+              <Permanent />
+            </Scope>
+            <DFType>
+              <MIME>text/plain</MIME>
+            </DFType>
+          </DFProperties>
+        </Node>
       </Node>
 </MgmtTree>
 ```
@@ -657,13 +681,3 @@ The XML below is the current version for this CSP.
 
 
 [Defender configuration service provider](defender-csp.md)
-
- 
-
- 
-
-
-
-
-
-

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

@@ -1514,6 +1514,10 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
 <td style="vertical-align:top">[BitLocker CSP](bitlocker-csp.md)</td>
 <td style="vertical-align:top"><p>Updated the description for AllowWarningForOtherDiskEncryption to describe changes added in Windows 10, next major update.</p>
 </td></tr>
+<tr class="odd">
+<td style="vertical-align:top">[Defender CSP](defender-csp.md)</td>
+<td style="vertical-align:top"><p>Added new node (OfflineScan) in Windows 10, next major update.</p>
+</td></tr>
 </tbody>
 </table>