Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8300464

This commit is contained in:
LizRoss
2016-08-03 07:36:12 -07:00
11 changed files with 199 additions and 96 deletions

View File

@ -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": []
}

1
education/TOC.md Normal file
View File

@ -0,0 +1 @@
# [Index](index.md)

1
education/index.md Normal file
View File

@ -0,0 +1 @@
# Index test file for Open Publishing

1
itpro-hololens/TOC.md Normal file
View File

@ -0,0 +1 @@
# [Index](index.md)

37
itpro-hololens/docfx.json Normal file
View File

@ -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"
}
}

1
itpro-hololens/index.md Normal file
View File

@ -0,0 +1 @@
# Index test file for Open Publishing

1
itpro/hololens/TOC.md Normal file
View File

@ -0,0 +1 @@
# [Index](index.md)

37
itpro/hololens/docfx.json Normal file
View File

@ -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"
}
}

1
itpro/hololens/index.md Normal file
View File

@ -0,0 +1 @@
# Index test file for Open Publishing

View File

@ -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:<br>
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**.<br>
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 wont 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

View File

@ -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, youll 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, youll 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. <br>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). <br>If you are upgrading from an existing UE-V installation, youll 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. <br>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). <br>If you are upgrading from an existing UE-V installation, youll 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.<br>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). |
<!-- PRESERVING ORIGINAL IMAGE CODING JUST IN CASE - NOTE THAT UPDATED IMAGE IS A PNG FILE
@ -65,7 +65,7 @@ UE-V synchronizes settings for these applications by default. For a complete lis
- Microsoft Office 2016, 2013, and 2010
- Internet Explorer 11, 10, and 9
- Internet Explorer 11 and 10
- Many Windows applications, such as Xbox
@ -73,22 +73,22 @@ UE-V synchronizes settings for these applications by default. For a complete lis
- Many Windows settings, such as desktop background or wallpaper
**Note**
>**Note**
You can also [customize UE-V to synchronize settings](uev-deploy-uev-for-custom-applications.md) for applications other than those synchronized by default.
## Other resources for this feature
- [Get Started with UE-V](uev-getting-started.md)
- [Get Started with UE-V for Windows 10](uev-getting-started.md)
- [UE-V Release Notes](uev-release-notes-1607.md)
- [UE-V for Windows 10 Release Notes](uev-release-notes-1607.md)
- [Prepare a UE-V Deployment](uev-prepare-for-deployment.md)
- [Prepare to deploy UE-V for Windows 10](uev-prepare-for-deployment.md)
- [Upgrade to UE-V for Windows 10](uev-upgrade-uev-from-previous-releases.md)
- [Administer UE-V](uev-administering-uev.md)
- [Administer UE-V for Windows 10](uev-administering-uev.md)
- [Technical Reference for UE-V](uev-technical-reference.md)
- [Technical Reference for UE-V for Windows 10](uev-technical-reference.md)
## Have a suggestion for UE-V?