diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 469c22cfdc..ec7f86cf0e 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -1,78 +1,107 @@ { - "build_entry_point": "", - "git_repository_url_open_to_public_contributors": "", - "docsets_to_publish": [ - { - "docset_name": "microsoft-edge", - "build_output_subfolder": "browsers/edge", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - }, - { - "docset_name": "internet-explorer", - "build_output_subfolder": "browsers/internet-explorer", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - }, - { - "docset_name": "windows", - "build_output_subfolder": "windows", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - }, - { - "docset_name": "surface", - "build_output_subfolder": "devices/surface", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - }, - { - "docset_name": "surface-hub", - "build_output_subfolder": "devices/surface-hub", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - }, - { - "docset_name": "mdop", - "build_output_subfolder": "mdop", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - }, - { - "docset_name": "education", - "build_output_subfolder": "education", - "locale": "en-us", - "version": 0, - "open_to_public_contributors": "false", - "type_mapping": { - "Conceptual": "Content" - } - } - ], - "notification_subscribers": ["brianlic@microsoft.com"], - "branches_to_filter": [""] -} + "build_entry_point": "", + "need_generate_pdf": false, + "need_generate_intellisense": false, + "docsets_to_publish": [ + { + "docset_name": "education", + "build_source_folder": "education", + "build_output_subfolder": "education", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + }, + { + "docset_name": "internet-explorer", + "build_source_folder": "browsers/internet-explorer", + "build_output_subfolder": "browsers/internet-explorer", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + }, + { + "docset_name": "itpro-hololens", + "build_source_folder": "itpro-hololens", + "build_output_subfolder": "itpro-hololens", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "op" + }, + { + "docset_name": "mdop", + "build_source_folder": "mdop", + "build_output_subfolder": "mdop", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + }, + { + "docset_name": "microsoft-edge", + "build_source_folder": "browsers/edge", + "build_output_subfolder": "browsers/edge", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + }, + { + "docset_name": "surface", + "build_source_folder": "devices/surface", + "build_output_subfolder": "devices/surface", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + }, + { + "docset_name": "surface-hub", + "build_source_folder": "devices/surface-hub", + "build_output_subfolder": "devices/surface-hub", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + }, + { + "docset_name": "windows", + "build_source_folder": "windows", + "build_output_subfolder": "windows", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content" + } + } + ], + "notification_subscribers": [ + "brianlic@microsoft.com" + ], + "branches_to_filter": [ + "" + ], + "git_repository_url_open_to_public_contributors": "", + "skip_source_output_uploading": false, + "dependent_repositories": [] +} \ No newline at end of file diff --git a/education/TOC.md b/education/TOC.md new file mode 100644 index 0000000000..06913f7aef --- /dev/null +++ b/education/TOC.md @@ -0,0 +1 @@ +# [Index](index.md) \ No newline at end of file diff --git a/education/index.md b/education/index.md new file mode 100644 index 0000000000..beccdc8994 --- /dev/null +++ b/education/index.md @@ -0,0 +1 @@ +# Index test file for Open Publishing \ No newline at end of file diff --git a/itpro-hololens/TOC.md b/itpro-hololens/TOC.md new file mode 100644 index 0000000000..06913f7aef --- /dev/null +++ b/itpro-hololens/TOC.md @@ -0,0 +1 @@ +# [Index](index.md) \ No newline at end of file diff --git a/itpro-hololens/docfx.json b/itpro-hololens/docfx.json new file mode 100644 index 0000000000..24fe1da56d --- /dev/null +++ b/itpro-hololens/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "itpro-hololens/**", + "**/includes/**" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "itpro-hololens/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [ + null + ], + "dest": "itpro-hololens" + } +} \ No newline at end of file diff --git a/itpro-hololens/index.md b/itpro-hololens/index.md new file mode 100644 index 0000000000..beccdc8994 --- /dev/null +++ b/itpro-hololens/index.md @@ -0,0 +1 @@ +# Index test file for Open Publishing \ No newline at end of file diff --git a/itpro/hololens/TOC.md b/itpro/hololens/TOC.md new file mode 100644 index 0000000000..06913f7aef --- /dev/null +++ b/itpro/hololens/TOC.md @@ -0,0 +1 @@ +# [Index](index.md) \ No newline at end of file diff --git a/itpro/hololens/docfx.json b/itpro/hololens/docfx.json new file mode 100644 index 0000000000..24fe1da56d --- /dev/null +++ b/itpro/hololens/docfx.json @@ -0,0 +1,37 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "itpro-hololens/**", + "**/includes/**" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "itpro-hololens/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [ + null + ], + "dest": "itpro-hololens" + } +} \ No newline at end of file diff --git a/itpro/hololens/index.md b/itpro/hololens/index.md new file mode 100644 index 0000000000..beccdc8994 --- /dev/null +++ b/itpro/hololens/index.md @@ -0,0 +1 @@ +# Index test file for Open Publishing \ No newline at end of file diff --git a/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md b/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md index 286b327ba1..72171eec5e 100644 --- a/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md +++ b/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md @@ -32,7 +32,7 @@ Since the stakes are higher in an enterprise environment, the potential disaster ##Enable PUA protection in SCCM and Intune -The PUA feature is available for enterprise users who are running System Center Configuration Manager (SCCM) or Microsoft Intune in their infrastructure. +The PUA feature is available for enterprise users who are running System Center Configuration Manager (SCCM) or Intune in their infrastructure. ###Configure PUA in SCCM @@ -53,10 +53,8 @@ You can use PowerShell to detect PUA without blocking them. In fact, you can run a. Click **Start**, type **powershell**, and press **Enter**. b. Click **Windows PowerShell** to open the interface. - > [!NOTE] > You may need to open an administrator-level version of PowerShell. Right-click the item in the Start menu, click **Run as administrator** and click **Yes** at the permissions prompt. - 2. Enter the PowerShell command: ```text @@ -89,15 +87,12 @@ You can find a complete list of the Microsoft antimalware event IDs, the symbol, ##What PUA notifications look like -When a detection occurs, end users who enabled the PUA detection feature will see the following notification:
+When a detection occurs, end users who enabled the PUA detection feature will see the following notification: -![Image showing the potentally unwanted application detection](images/pua1.png) -To see historical PUA detections that occurred on a PC, users can go to History, then **Quarantined items** or **All detected items**.
+To see historical PUA detections that occurred on a PC, users can go to History, then **Quarantined items** or **All detected items**. -![Image showing the potentally unwanted application detection history](images/pua2.png) - -##PUA threat file-naming convention +##PUA threat naming convention When enabled, potentially unwanted applications are identified with threat names that start with “PUA:”, such as, PUA:Win32/Creprote. @@ -105,6 +100,5 @@ When enabled, potentially unwanted applications are identified with threat names PUA protection quarantines the file so they won’t run. PUA will be blocked only at download or install-time. A file will be included for blocking if it has been identified as PUA and meets one of the following conditions: * The file is being scanned from the browser -* The file has [Mark of the Web](https://msdn.microsoft.com/en-us/library/ms537628%28v=vs.85%29.aspx) set * The file is in the %downloads% folder * Or if the file in the %temp% folder diff --git a/windows/manage/uev-for-windows.md b/windows/manage/uev-for-windows.md index f7a70e651a..96293f71db 100644 --- a/windows/manage/uev-for-windows.md +++ b/windows/manage/uev-for-windows.md @@ -24,7 +24,7 @@ With User Experience Virtualization (UE-V), you can capture user-customized Wind - Recover settings after hardware replacement or upgrade, or after re-imaging a virtual machine to its initial state -With the release of Windows 10, version 1607, UE-V is included with the Windows 10 for Enterprise edition. If you are new to Windows 10 and EU-V or upgrading from a previous version of UE-V, you’ll need to download, activate, and install server- and client-side components to start synchronizing user-customized settings across devices. +With the release of Windows 10, version 1607, UE-V is included with the Windows 10 for Enterprise edition. If you are new to Windows 10 and UE-V or upgrading from a previous version of UE-V, you’ll need to download, activate, and install server- and client-side components to start synchronizing user-customized settings across devices. ## Components of UE-V @@ -50,7 +50,7 @@ Use these UE-V components to create and manage custom templates for your third-p | Component | Description | |-------------------------------|---------------| -| **UE-V template generator** | Use the **UE-V template generator** to create custom settings location templates that you can then distribute to user computers. The UE-V template generator also lets you edit an existing template or validate a template that was created with a different XML editor.
With the Windows 10, version 1607 release, the UE-V template generator is installed with the [Windows 10 Assessment and Deployment kit](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit) (Windows ADK).
If you are upgrading from an existing UE-V installation, you’ll need to use the new generator to create new settings location templates. Application templates created with previous versions of the UE-V template generator are still supported, however. | +| **UE-V template generator** | Use the **UE-V template generator** to create custom settings location templates that you can then distribute to user computers. The UE-V template generator also lets you edit an existing template or validate a template that was created with a different XML editor.
With the Windows 10, version 1607 release, the UE-V template generator is installed with the [Windows Assessment and Deployment kit for Windows 10, version 1607](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit) (Windows ADK).
If you are upgrading from an existing UE-V installation, you’ll need to use the new generator to create new settings location templates. Application templates created with previous versions of the UE-V template generator are still supported, however. | | **Settings template catalog** | The **settings template catalog** is a folder path on UE-V computers or a Server Message Block (SMB) network share that stores the custom settings location templates. The UE-V service checks this location once a day, retrieves new or updated templates, and updates its synchronization behavior.
If you use only the UE-V default settings location templates, then a settings template catalog is unnecessary. For more information about settings deployment catalogs, see [Deploy a UE-V settings template catalog](uev-deploy-uev-for-custom-applications.md#deploycatalogue). |