diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 7215ed2787..7c6bb4d033 100644 --- a/.openpublishing.publish.config.json +++ b/.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", diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 395247be86..c88dcfc75b 100644 --- a/.openpublishing.redirection.json +++ b/.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 @@ -8448,7 +8453,7 @@ { "source_path": "bcs/index.md", "redirect_url": "/microsoft-365/business/index", -"redirect_document_id": true +"redirect_document_id": false }, { "source_path": "bcs/support/microsoft-365-business-faqs.md", @@ -8461,4 +8466,4 @@ "redirect_document_id": true } ] -} \ No newline at end of file +} diff --git a/devices/hololens/change-history-hololens.md b/devices/hololens/change-history-hololens.md index 6b4a3479c5..20d0866be8 100644 --- a/devices/hololens/change-history-hololens.md +++ b/devices/hololens/change-history-hololens.md @@ -8,13 +8,19 @@ ms.sitesec: library ms.pagetype: surfacehub author: jdeckerms ms.localizationpriority: medium -ms.date: 12/20/2017 +ms.date: 02/02/2018 --- # Change history for Microsoft HoloLens documentation This topic lists new and updated topics in the [Microsoft HoloLens documentation](index.md). +## February 2018 + +New or changed topic | Description +--- | --- +[Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md) | Replaced the instructions for upgrading to Windows Holographic for Business using Microsoft Intune with a link to the new Intune topic. + ## December 2017 New or changed topic | Description diff --git a/devices/hololens/hololens-upgrade-enterprise.md b/devices/hololens/hololens-upgrade-enterprise.md index d85bb461aa..cc97f37aba 100644 --- a/devices/hololens/hololens-upgrade-enterprise.md +++ b/devices/hololens/hololens-upgrade-enterprise.md @@ -7,12 +7,12 @@ ms.pagetype: hololens, devices ms.sitesec: library author: jdeckerms ms.localizationpriority: medium -ms.date: 07/27/2017 +ms.date: 02/02/2018 --- # Unlock Windows Holographic for Business features -Microsoft HoloLens is available in the *Development Edition*, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the [Commercial Suite](https://developer.microsoft.com/windows/mixed-reality/release_notes#introducing_microsoft_hololens_commercial_suite), which provides extra features designed for business. +Microsoft HoloLens is available in the *Development Edition*, which runs Windows Holographic (an edition of Windows 10 designed for HoloLens), and in the [Commercial Suite](https://developer.microsoft.com/windows/mixed-reality/release_notes_-_august_2016#introducing_microsoft_hololens_commercial_suite), which provides extra features designed for business. When you purchase the Commercial Suite, you receive a license that upgrades Windows Holographic to Windows Holographic for Business. This license can be applied to the device either through the organization's [mobile device management (MDM) provider](#edition-upgrade-using-mdm) or a [provisioning package](#edition-upgrade-using-a-provisioning-package). @@ -25,50 +25,12 @@ When you purchase the Commercial Suite, you receive a license that upgrades Wind The enterprise license can be applied by any MDM provider that supports the [WindowsLicensing configuration service provider (CSP)](https://msdn.microsoft.com/library/windows/hardware/dn904983.aspx). The latest version of the Microsoft MDM API will support WindowsLicensing CSP. +For step-by-step instructions for upgrading HoloLens using Microsoft Intune, see [Upgrade devices running Windows Holographic to Windows Holographic for Business](https://docs.microsoft.com/intune/holographic-upgrade). -**Overview** - -1. Set up the edition upgrade policy. -2. Deploy the policy. -3. [Enroll the device through the Settings app](hololens-enroll-mdm.md). - -The procedures in this topic use Microsoft Intune as an example. On other MDM providers, the specific steps for setting up and deploying the policy might vary. - -### Set up the Edition Upgrade policy - -1. Sign into the Intune Dashboard with your Intune admin account. - -2. In the **Policy** workspace, select **Configuration Policies** and then **Add**. - - ![Click Add](images/intune1.png) - -3. In **Create a new policy**, select the **Edition Upgrade Policy (Windows 10 Holographic and later** template, and click **Create Policy**. - - ![Select template](images/intune2.png) - -4. Enter a name for the policy. - -5. In the **Edition Upgrade** section, in **License File**, browse to and select the XML license file that was provided when you purchased the Commercial Suite. - - ![Enter the XML file name](images/intune3.png) - -5. Click **Save Policy**. + On other MDM providers, the specific steps for setting up and deploying the policy might vary. -### Deploy the Edition Upgrade policy - -Next, you will assign the Edition Upgrade policy to selected groups. - -1. In the **Policy** workspace, select the Edition upgrade policy that you created, and then choose **Manage Deployment**. - -2. In the **Manage Deployment** dialog box, select one or more groups to which you want to deploy the policy, and then choose **Add** > **OK**. - -When these users enroll their devices in MDM, the Edition Upgrade policy will be applied. - - -For more information about groups, see [Use groups to manage users and devices in Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/use-groups-to-manage-users-and-devices-with-microsoft-intune). - ## Edition upgrade using a provisioning package Provisioning packages are files created by the Windows Configuration Designer tool that apply a specified configuration to a device. diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 0deb4b8fbc..3999707536 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -292,7 +292,7 @@ The Set up School PCs app produces a specialized provisioning package that makes

Interactive logon: Sign-in last interactive user automatically after a system-initiated restart

Disabled

-

Shutdown: Allow system to be shut down without having to log on

Disabled

+

Shutdown: Allow system to be shut down without having to log on

Enabled

User Account Control: Behavior of the elevation prompt for standard users

Auto deny

diff --git a/microsoft-365/docfx.json b/microsoft-365/docfx.json deleted file mode 100644 index 585130e915..0000000000 --- a/microsoft-365/docfx.json +++ /dev/null @@ -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" - } -} \ No newline at end of file diff --git a/store-for-business/whats-new-microsoft-store-business-education.md b/store-for-business/whats-new-microsoft-store-business-education.md index 38af4a8e01..80d4cc6d6c 100644 --- a/store-for-business/whats-new-microsoft-store-business-education.md +++ b/store-for-business/whats-new-microsoft-store-business-education.md @@ -11,7 +11,7 @@ ms.date: 1/8/2018 # What's new in Microsoft Store for Business and Education -Microsoft Store for Business and Education regularly releases new and improved feaures. +Microsoft Store for Business and Education regularly releases new and improved features. ## Latest updates for Store for Business and Education diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md index cf0031cf4f..b214cbdc2a 100644 --- a/windows/client-management/mdm/TOC.md +++ b/windows/client-management/mdm/TOC.md @@ -228,6 +228,7 @@ #### [RemoteManagement](policy-csp-remotemanagement.md) #### [RemoteProcedureCall](policy-csp-remoteprocedurecall.md) #### [RemoteShell](policy-csp-remoteshell.md) +#### [RestrictedGroups](policy-csp-restrictedgroups.md) #### [Search](policy-csp-search.md) #### [Security](policy-csp-security.md) #### [Settings](policy-csp-settings.md) diff --git a/windows/client-management/mdm/defender-csp.md b/windows/client-management/mdm/defender-csp.md index 36cb8e6e0f..bcab5ce598 100644 --- a/windows/client-management/mdm/defender-csp.md +++ b/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. +**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 diff --git a/windows/client-management/mdm/defender-ddf.md b/windows/client-management/mdm/defender-ddf.md index 126869323b..4077ab58af 100644 --- a/windows/client-management/mdm/defender-ddf.md +++ b/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). @@ -22,648 +25,659 @@ The XML below is the current version for this CSP. ``` syntax ]> + "http://www.openmobilealliance.org/tech/DTD/DM_DDF-V1_2.dtd" + []> - 1.2 - + 1.2 + Defender ./Vendor/MSFT - - - - - - - - - - - - - - - + + + + + + + + + + + + + + com.microsoft/1.1/MDM/Defender + - Detections + Detections + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + ThreatId + + + - - - - - - - - - - - - - - - ThreatId - - - - - - Name - - - - - - - - - - - - - - - text/plain - - - - - URL - - - - - - - - - - - - - - - text/plain - - - - - Severity - - - - - - - - - - - - - - - text/plain - - - - - Category - - - - - - - - - - - - - - - text/plain - - - - - CurrentStatus - - - - - - - - - - - - - - - text/plain - - - - - ExecutionStatus - - - - - - - - - - - - - - - text/plain - - - - - InitialDetectionTime - - - - - - - - - - - - - - - text/plain - - - - - LastThreatStatusChangeTime - - - - - - - - - - - - - - - text/plain - - - - - NumberOfDetections - - - - - - - - - - - - - - - text/plain - - - + Name + + + + + + + + + + + + + + + text/plain + + + + URL + + + + + + + + + + + + + + + text/plain + + + + + Severity + + + + + + + + + + + + + + + text/plain + + + + + Category + + + + + + + + + + + + + + + text/plain + + + + + CurrentStatus + + + + + + + + + + + + + + + text/plain + + + + + ExecutionStatus + + + + + + + + + + + + + + + text/plain + + + + + InitialDetectionTime + + + + + + + + + + + + + + + text/plain + + + + + LastThreatStatusChangeTime + + + + + + + + + + + + + + + text/plain + + + + + NumberOfDetections + + + + + + + + + + + + + + + text/plain + + + + - Health + Health + + + + + + + + + + + + + + + + + + + ComputerState - - - - - - - - - - - - - - - + + + + + + + + + + + + + + text/plain + - - ComputerState - - - - - - - - - - - - - - - text/plain - - - - - DefenderEnabled - - - - - - - - - - - - - - - text/plain - - - - - RtpEnabled - - - - - - - - - - - - - - - text/plain - - - - - NisEnabled - - - - - - - - - - - - - - - text/plain - - - - - QuickScanOverdue - - - - - - - - - - - - - - - text/plain - - - - - FullScanOverdue - - - - - - - - - - - - - - - text/plain - - - - - SignatureOutOfDate - - - - - - - - - - - - - - - text/plain - - - - - RebootRequired - - - - - - - - - - - - - - - text/plain - - - - - FullScanRequired - - - - - - - - - - - - - - - text/plain - - - - - EngineVersion - - - - - - - - - - - - - - - text/plain - - - - - SignatureVersion - - - - - - - - - - - - - - - text/plain - - - - - DefenderVersion - - - - - - - - - - - - - - - text/plain - - - - - QuickScanTime - - - - - - - - - - - - - - - text/plain - - - - - FullScanTime - - - - - - - - - - - - - - - text/plain - - - - - QuickScanSigVersion - - - - - - - - - - - - - - - text/plain - - - - - FullScanSigVersion - - - - - - - - - - - - - - - text/plain - - - + + + DefenderEnabled + + + + + + + + + + + + + + + text/plain + + + + + RtpEnabled + + + + + + + + + + + + + + + text/plain + + + + + NisEnabled + + + + + + + + + + + + + + + text/plain + + + + + QuickScanOverdue + + + + + + + + + + + + + + + text/plain + + + + + FullScanOverdue + + + + + + + + + + + + + + + text/plain + + + + + SignatureOutOfDate + + + + + + + + + + + + + + + text/plain + + + + + RebootRequired + + + + + + + + + + + + + + + text/plain + + + + + FullScanRequired + + + + + + + + + + + + + + + text/plain + + + + + EngineVersion + + + + + + + + + + + + + + + text/plain + + + + + SignatureVersion + + + + + + + + + + + + + + + text/plain + + + + + DefenderVersion + + + + + + + + + + + + + + + text/plain + + + + + QuickScanTime + + + + + + + + + + + + + + + text/plain + + + + + FullScanTime + + + + + + + + + + + + + + + text/plain + + + + + QuickScanSigVersion + + + + + + + + + + + + + + + text/plain + + + + + FullScanSigVersion + + + + + + + + + + + + + + + text/plain + + + - Scan - - - - - - - - - - - - - - - - text/plain - - + Scan + + + + + + + + + + + + + + + + text/plain + + - UpdateSignature - - - - - - - - - - - - - - - - text/plain - - + UpdateSignature + + + + + + + + + + + + + + + + text/plain + + - + + OfflineScan + + + + + + + + + + + + + + + + text/plain + + + + ``` ## Related topics -[Defender configuration service provider](defender-csp.md) - -  - -  - - - - - - +[Defender configuration service provider](defender-csp.md) \ No newline at end of file diff --git a/windows/client-management/mdm/images/provisioning-csp-defender.png b/windows/client-management/mdm/images/provisioning-csp-defender.png index b3be3ba7f4..8d34e77eb9 100644 Binary files a/windows/client-management/mdm/images/provisioning-csp-defender.png and b/windows/client-management/mdm/images/provisioning-csp-defender.png differ diff --git a/windows/client-management/mdm/images/provisioning-csp-remotewipe-dmandcp.png b/windows/client-management/mdm/images/provisioning-csp-remotewipe-dmandcp.png index fdbeb278ab..c6e1215e4d 100644 Binary files a/windows/client-management/mdm/images/provisioning-csp-remotewipe-dmandcp.png and b/windows/client-management/mdm/images/provisioning-csp-remotewipe-dmandcp.png differ diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 71fbb6027f..820cf5dfd6 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -1405,6 +1405,7 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware